Merge tag 'cleanup-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

d2033f2c · Linus Torvalds <[email protected]> · 2013-07-02 13:25:35 -07:00

Pull ARM SoC cleanups from Arnd Bergmann:
 "This contains cleanups as preparation for other branches adding new
  features, we pulled 16 branches for 9 platforms into this one.

  Most notable here is the removal of support for ATAGS based OMAP4
  systems.  Since all OMAP4 machines are fully functional with DT based
  booting in 3.10, we can remove a lot of code here.

  Also noteworthy is Maxime Ripard's cleanup of the machine descriptors,
  which means we need no machine descriptors in a lot more cases and can
  boot additional machines by just having the respective device drivers
  enabled."

* tag 'cleanup-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (76 commits)
  ARM: picoxcell: remove .nr_irqs reference
  ARM: s5p64x0: avoid build warning for uncompress.h
  ARM: SAMSUNG: Remove unused plat/regs-watchdog.h header
  ARM: SAMSUNG: Remove legacy watchdog reset code
  ARM: SAMSUNG: Let platforms use the new watchdog reset driver
  ARM: SAMSUNG: Add watchdog reset driver
  ARM: SAMSUNG: Use local definitions of watchdog registers
  watchdog: s3c2410_wdt: Use local register definitions
  ARM: S5P64X0: Use common uncompress.h part for plat-samsung
  ARM: SAMSUNG: Consolidate uncompress subroutine
  ARM: at91: drop rm9200dk board support
  ARM: dts: msm: Fix merge resolution
  ARM: OMAP1: Remove dma.h
  ARM: OMAP1: Remove legacy irda.h and irda setup from board files
  ARM: OMAP1: Remove duplicated DMA channel definitions
  ARM: OMAP1: Remove McBSP DMA channel definitions
  ARM: OMAP2+: Remove dma.h
  ARM: OMAP2+: hwmod: Remove remaining DMA channel definitions
  ARM: OMAP2+: Remove duplicated DMA channel definitions
  ARM: OMAP2+: Remove AES crypto device DMA channel definitions
  ...

Commit: d2033f2c1d1de2239ded15e478ddb4028f192a15
Parents: 22237d5a · 0ee8090c

Merge commit. Changes below are compared with the first parent: 22237d5a.

Changes

175 files changed · +2257 −9029

File	Status	Add	Del	Content
Documentation/arm/sunxi/README	modified	+13	−8	View file
Documentation/devicetree/bindings/gpio/gpio-msm.txt	added	+26	−0	View file
Documentation/devicetree/bindings/interrupt-controller/allwinner,sun4i-ic.txt	modified	+2	−85	View file
Documentation/devicetree/bindings/interrupt-controller/sunxi/sun4i-a10.txt	added	+89	−0	View file
Documentation/devicetree/bindings/interrupt-controller/sunxi/sun5i-a13.txt	added	+55	−0	View file
arch/arm/Kconfig	modified	+3	−0	View file
arch/arm/boot/dts/aks-cdu.dts	modified	+6	−6	View file
arch/arm/boot/dts/am33xx.dtsi	modified	+0	−1	View file
arch/arm/boot/dts/animeo_ip.dts	modified	+9	−9	View file
arch/arm/boot/dts/at91-ariag25.dts	modified	+3	−3	View file
arch/arm/boot/dts/at91rm9200.dtsi	modified	+107	−100	View file
arch/arm/boot/dts/at91rm9200ek.dts	modified	+5	−5	View file
arch/arm/boot/dts/at91sam9260.dtsi	modified	+111	−104	View file
arch/arm/boot/dts/at91sam9263.dtsi	modified	+103	−100	View file
arch/arm/boot/dts/at91sam9263ek.dts	modified	+12	−12	View file
arch/arm/boot/dts/at91sam9g15.dtsi	modified	+1	−1	View file
arch/arm/boot/dts/at91sam9g15ek.dts	modified	+2	−2	View file
arch/arm/boot/dts/at91sam9g20.dtsi	modified	+1	−1	View file
arch/arm/boot/dts/at91sam9g20ek.dts	modified	+3	−3	View file
arch/arm/boot/dts/at91sam9g20ek_2mmc.dts	modified	+5	−5	View file
arch/arm/boot/dts/at91sam9g20ek_common.dtsi	modified	+13	−15	View file
arch/arm/boot/dts/at91sam9g25.dtsi	modified	+1	−1	View file
arch/arm/boot/dts/at91sam9g25ek.dts	modified	+2	−2	View file
arch/arm/boot/dts/at91sam9g35.dtsi	modified	+1	−1	View file
arch/arm/boot/dts/at91sam9g35ek.dts	modified	+2	−2	View file
arch/arm/boot/dts/at91sam9g45.dtsi	modified	+108	−105	View file
arch/arm/boot/dts/at91sam9m10g45ek.dts	modified	+19	−19	View file
arch/arm/boot/dts/at91sam9n12.dtsi	modified	+72	−69	View file
arch/arm/boot/dts/at91sam9n12ek.dts	modified	+7	−7	View file
arch/arm/boot/dts/at91sam9x25.dtsi	modified	+11	−11	View file
arch/arm/boot/dts/at91sam9x25ek.dts	modified	+2	−2	View file
arch/arm/boot/dts/at91sam9x35.dtsi	modified	+1	−1	View file
arch/arm/boot/dts/at91sam9x35ek.dts	modified	+2	−2	View file
arch/arm/boot/dts/at91sam9x5.dtsi	modified	+141	−138	View file
arch/arm/boot/dts/at91sam9x5cm.dtsi	modified	+4	−4	View file
arch/arm/boot/dts/at91sam9x5ek.dtsi	modified	+7	−7	View file
arch/arm/boot/dts/ethernut5.dts	modified	+3	−3	View file
arch/arm/boot/dts/evk-pro3.dts	modified	+3	−3	View file
arch/arm/boot/dts/ge863-pro3.dtsi	modified	+1	−1	View file
arch/arm/boot/dts/kizbox.dts	modified	+8	−8	View file
arch/arm/boot/dts/mpa1600.dts	modified	+2	−2	View file
arch/arm/boot/dts/msm8660-surf.dts	modified	+11	−0	View file
arch/arm/boot/dts/msm8960-cdp.dts	modified	+11	−0	View file
arch/arm/boot/dts/pm9g45.dts	modified	+11	−11	View file
arch/arm/boot/dts/sama5d3.dtsi	modified	+261	−259	View file
arch/arm/boot/dts/sama5d31ek.dts	modified	+3	−3	View file
arch/arm/boot/dts/sama5d33ek.dts	modified	+2	−2	View file
arch/arm/boot/dts/sama5d34ek.dts	modified	+3	−3	View file
arch/arm/boot/dts/sama5d35ek.dts	modified	+2	−2	View file
arch/arm/boot/dts/sama5d3xcm.dtsi	modified	+2	−2	View file
arch/arm/boot/dts/sama5d3xdm.dtsi	modified	+1	−1	View file
arch/arm/boot/dts/sama5d3xmb.dtsi	modified	+13	−13	View file
arch/arm/boot/dts/tny_a9260.dts	modified	+2	−2	View file
arch/arm/boot/dts/tny_a9263.dts	modified	+2	−2	View file
arch/arm/boot/dts/tny_a9g20.dts	modified	+2	−2	View file
arch/arm/boot/dts/usb_a9260.dts	modified	+2	−2	View file
arch/arm/boot/dts/usb_a9260_common.dtsi	modified	+3	−3	View file
arch/arm/boot/dts/usb_a9263.dts	modified	+4	−4	View file
arch/arm/boot/dts/usb_a9g20-dab-mmx.dtsi	modified	+11	−11	View file
arch/arm/boot/dts/usb_a9g20.dts	modified	+2	−2	View file
arch/arm/configs/at91_dt_defconfig	modified	+31	−24	View file
arch/arm/configs/at91rm9200_defconfig	modified	+29	−190	View file
arch/arm/configs/at91sam9g20_defconfig → arch/arm/configs/at91sam9260_9g20_defconfig	renamed	+48	−19	View file
arch/arm/configs/at91sam9260_defconfig	deleted	+0	−91	View before deletion
arch/arm/configs/at91sam9261_defconfig → arch/arm/configs/at91sam9261_9g10_defconfig	renamed	+5	−14	View file
arch/arm/configs/at91sam9263_defconfig	modified	+13	−26	View file
arch/arm/configs/at91sam9g45_defconfig	modified	+28	−66	View file
arch/arm/configs/sama5_defconfig	modified	+29	−6	View file
arch/arm/mach-at91/Kconfig.non_dt	modified	+71	−95	View file
arch/arm/mach-at91/Makefile	modified	+0	−3	View file
arch/arm/mach-at91/board-rm9200dk.c	deleted	+0	−228	View before deletion
arch/arm/mach-at91/board-sam9261ek.c	modified	+14	−14	View file
arch/arm/mach-bcm/board_bcm.c	modified	+0	−2	View file
arch/arm/mach-exynos/include/mach/uncompress.h	modified	+0	−3	View file
arch/arm/mach-highbank/highbank.c	modified	+0	−1	View file
arch/arm/mach-msm/Kconfig	modified	+5	−8	View file
arch/arm/mach-msm/Makefile	modified	+2	−4	View file
arch/arm/mach-msm/board-dt-8660.c	modified	+0	−2	View file
arch/arm/mach-msm/board-dt-8960.c	modified	+0	−2	View file
arch/arm/mach-msm/core.h	deleted	+0	−2	View before deletion
arch/arm/mach-msm/gpiomux-8x60.c	deleted	+0	−19	View before deletion
arch/arm/mach-msm/gpiomux-v2.c	deleted	+0	−25	View before deletion
arch/arm/mach-msm/gpiomux-v2.h	deleted	+0	−61	View before deletion
arch/arm/mach-msm/gpiomux.c	modified	+15	−0	View file
arch/arm/mach-msm/gpiomux.h	modified	+0	−5	View file
arch/arm/mach-msm/include/mach/msm_iomap-8960.h	modified	+0	−7	View file
arch/arm/mach-msm/include/mach/msm_iomap-8x60.h	modified	+0	−6	View file
arch/arm/mach-msm/include/mach/msm_iomap.h	modified	+0	−2	View file
arch/arm/mach-msm/io.c	modified	+0	−4	View file
arch/arm/mach-mvebu/armada-370-xp.c	modified	+3	−5	View file
arch/arm/mach-mxs/mach-mxs.c	modified	+0	−1	View file
arch/arm/mach-nomadik/cpu-8815.c	modified	+0	−2	View file
arch/arm/mach-omap1/board-h2.c	modified	+0	−36	View file
arch/arm/mach-omap1/board-palmte.c	modified	+0	−31	View file
arch/arm/mach-omap1/board-palmtt.c	modified	+0	−30	View file
arch/arm/mach-omap1/board-palmz71.c	modified	+0	−31	View file
arch/arm/mach-omap1/board-sx1.c	modified	+0	−36	View file
arch/arm/mach-omap1/devices.c	modified	+4	−5	View file
arch/arm/mach-omap1/dma.c	modified	+0	−2	View file
arch/arm/mach-omap1/dma.h	deleted	+0	−42	View before deletion
arch/arm/mach-omap1/include/mach/irda.h	deleted	+0	−33	View before deletion
arch/arm/mach-omap1/lcd_dma.c	modified	+0	−2	View file
arch/arm/mach-omap1/mcbsp.c	modified	+16	−17	View file
arch/arm/mach-omap2/Kconfig	modified	+0	−22	View file
arch/arm/mach-omap2/Makefile	modified	+0	−4	View file
arch/arm/mach-omap2/board-4430sdp.c	deleted	+0	−765	View before deletion
arch/arm/mach-omap2/board-omap4panda.c	deleted	+0	−455	View before deletion
arch/arm/mach-omap2/devices.c	modified	+24	−109	View file
arch/arm/mach-omap2/dma.h	deleted	+0	−61	View before deletion
arch/arm/mach-omap2/hsmmc.c	modified	+10	−93	View file
arch/arm/mach-omap2/io.c	modified	+0	−1	View file
arch/arm/mach-omap2/mux.h	modified	+0	−3	View file
arch/arm/mach-omap2/mux44xx.c	deleted	+0	−1356	View before deletion
arch/arm/mach-omap2/mux44xx.h	deleted	+0	−298	View before deletion
arch/arm/mach-omap2/omap_device.c	modified	+2	−7	View file
arch/arm/mach-omap2/omap_device.h	modified	+0	−10	View file
arch/arm/mach-omap2/omap_hwmod_2xxx_3xxx_ipblock_data.c	modified	+10	−11	View file
arch/arm/mach-omap2/omap_hwmod_33xx_data.c	modified	+0	−1074	View file
arch/arm/mach-omap2/omap_hwmod_3xxx_data.c	modified	+9	−10	View file
arch/arm/mach-omap2/omap_hwmod_44xx_data.c	modified	+20	−1524	View file
arch/arm/mach-omap2/powerdomain.c	modified	+5	−0	View file
arch/arm/mach-omap2/powerdomain.h	modified	+2	−0	View file
arch/arm/mach-omap2/prm33xx.c	modified	+7	−0	View file
arch/arm/mach-omap2/serial.c	modified	+0	−7	View file
arch/arm/mach-omap2/usb-host.c	modified	+0	−194	View file
arch/arm/mach-omap2/usb-musb.c	modified	+0	−3	View file
arch/arm/mach-omap2/voltage.h	modified	+0	−1	View file
arch/arm/mach-omap2/voltagedomains33xx_data.c	deleted	+0	−43	View before deletion
arch/arm/mach-picoxcell/common.c	modified	+0	−8	View file
arch/arm/mach-picoxcell/common.h	deleted	+0	−17	View before deletion
arch/arm/mach-prima2/common.c	modified	+0	−4	View file
arch/arm/mach-s3c24xx/Kconfig	modified	+2	−0	View file
arch/arm/mach-s3c24xx/include/mach/uncompress.h	modified	+3	−0	View file
arch/arm/mach-s3c24xx/s3c2410.c	modified	+2	−1	View file
arch/arm/mach-s3c24xx/s3c244x.c	modified	+2	−1	View file
arch/arm/mach-s3c64xx/common.c	modified	+7	−1	View file
arch/arm/mach-s3c64xx/include/mach/uncompress.h	modified	+3	−0	View file
arch/arm/mach-s5p64x0/common.c	modified	+3	−1	View file
arch/arm/mach-s5p64x0/include/mach/uncompress.h	modified	+6	−156	View file
arch/arm/mach-s5pc100/common.c	modified	+2	−1	View file
arch/arm/mach-s5pc100/include/mach/uncompress.h	modified	+2	−0	View file
arch/arm/mach-s5pv210/include/mach/uncompress.h	modified	+2	−0	View file
arch/arm/mach-spear/spear1310.c	modified	+0	−2	View file
arch/arm/mach-spear/spear1340.c	modified	+0	−2	View file
arch/arm/mach-spear/spear300.c	modified	+0	−2	View file
arch/arm/mach-spear/spear310.c	modified	+0	−2	View file
arch/arm/mach-spear/spear320.c	modified	+0	−2	View file
arch/arm/mach-spear/spear6xx.c	modified	+0	−2	View file
arch/arm/mach-sunxi/sunxi.c	modified	+0	−19	View file
arch/arm/mach-sunxi/sunxi.h	deleted	+0	−20	View before deletion
arch/arm/mach-vexpress/v2m.c	modified	+0	−2	View file
arch/arm/mach-virt/virt.c	modified	+0	−2	View file
arch/arm/mach-vt8500/vt8500.c	modified	+0	−2	View file
arch/arm/mach-zynq/common.c	modified	+0	−2	View file
arch/arm/mach-zynq/platsmp.c	modified	+26	−26	View file
arch/arm/mm/mmu.c	modified	+2	−0	View file
arch/arm/plat-omap/dma.c	modified	+4	−7	View file
arch/arm/plat-samsung/Kconfig	modified	+6	−0	View file
arch/arm/plat-samsung/Makefile	modified	+1	−0	View file
arch/arm/plat-samsung/include/plat/regs-watchdog.h	deleted	+0	−41	View before deletion
arch/arm/plat-samsung/include/plat/uncompress.h	modified	+14	−7	View file
arch/arm/plat-samsung/include/plat/watchdog-reset.h	modified	+6	−32	View file
arch/arm/plat-samsung/watchdog-reset.c	added	+97	−0	View file
drivers/bus/mvebu-mbus.c	modified	+5	−3	View file
drivers/bus/omap-ocp2scp.c	modified	+0	−60	View file
drivers/gpio/Kconfig	modified	+1	−1	View file
drivers/gpio/gpio-msm-v2.c	modified	+115	−80	View file
drivers/of/address.c	modified	+67	−0	View file
drivers/of/of_pci.c	modified	+54	−5	View file
drivers/ssbi/ssbi.c	modified	+11	−58	View file
drivers/watchdog/s3c2410_wdt.c	modified	+13	−4	View file
include/dt-bindings/pinctrl/at91.h	added	+35	−0	View file
include/linux/of_address.h	modified	+48	−0	View file
include/linux/of_pci.h	modified	+2	−0	View file
include/linux/platform_data/omap_ocp2scp.h	deleted	+0	−31	View before deletion

Only the first 600 diff lines are shown. Download the complete patch.

Documentation/arm/sunxi/README

View file

diff --git a/Documentation/arm/sunxi/README b/Documentation/arm/sunxi/README
index 87a1e8f..d9a372d 100644
--- a/Documentation/arm/sunxi/README
+++ b/Documentation/arm/sunxi/README
@@ -3,17 +3,22 @@ ARM Allwinner SoCs
 
 This document lists all the ARM Allwinner SoCs that are currently
 supported in mainline by the Linux kernel. This document will also
-provide links to documentation and or datasheet for these SoCs.
+provide links to documentation and/or datasheet for these SoCs.
 
 SunXi family
 ------------
+  Linux kernel mach directory: arch/arm/mach-sunxi
 
   Flavors:
-        Allwinner A10 (sun4i)
-                Datasheet       : http://dl.linux-sunxi.org/A10/A10%20Datasheet%20-%20v1.21%20%282012-04-06%29.pdf
+    * ARM Cortex-A8 based SoCs
+      - Allwinner A10 (sun4i)
+        + Datasheet
+	  http://dl.linux-sunxi.org/A10/A10%20Datasheet%20-%20v1.21%20%282012-04-06%29.pdf
+	+ User Manual
+	  http://dl.linux-sunxi.org/A10/A10%20User%20Manual%20-%20v1.20%20%282012-04-09%2c%20DECRYPTED%29.pdf
 
-        Allwinner A13 (sun5i)
-                Datasheet       : http://dl.linux-sunxi.org/A13/A13%20Datasheet%20-%20v1.12%20%282012-03-29%29.pdf
-
-  Core: Cortex A8
-  Linux kernel mach directory: arch/arm/mach-sunxi
\ No newline at end of file
+      - Allwinner A13 (sun5i)
+        + Datasheet
+	  http://dl.linux-sunxi.org/A13/A13%20Datasheet%20-%20v1.12%20%282012-03-29%29.pdf
+        + User Manual
+	  http://dl.linux-sunxi.org/A13/A13%20User%20Manual%20-%20v1.2%20%282013-08-08%29.pdf

Documentation/devicetree/bindings/gpio/gpio-msm.txt

View file

diff --git a/Documentation/devicetree/bindings/gpio/gpio-msm.txt b/Documentation/devicetree/bindings/gpio/gpio-msm.txt
new file mode 100644
index 0000000..ac20e68
--- /dev/null
+++ b/Documentation/devicetree/bindings/gpio/gpio-msm.txt
@@ -0,0 +1,26 @@
+MSM GPIO controller bindings
+
+Required properties:
+- compatible:
+  - "qcom,msm-gpio" for MSM controllers
+- #gpio-cells : Should be two.
+  - first cell is the pin number
+  - second cell is used to specify optional parameters (unused)
+- gpio-controller : Marks the device node as a GPIO controller.
+- #interrupt-cells : Should be 2.
+- interrupt-controller: Mark the device node as an interrupt controller
+- interrupts : Specify the TLMM summary interrupt number
+- ngpio : Specify the number of MSM GPIOs
+
+Example:
+
+	msmgpio: gpio@fd510000 {
+		compatible = "qcom,msm-gpio";
+		gpio-controller;
+		#gpio-cells = <2>;
+		interrupt-controller;
+		#interrupt-cells = <2>;
+		reg = <0xfd510000 0x4000>;
+		interrupts = <0 208 0>;
+		ngpio = <150>;
+	};

Documentation/devicetree/bindings/interrupt-controller/allwinner,sun4i-ic.txt

View file

diff --git a/Documentation/devicetree/bindings/interrupt-controller/allwinner,sun4i-ic.txt b/Documentation/devicetree/bindings/interrupt-controller/allwinner,sun4i-ic.txt
index e7f4dc1..57edb30 100644
--- a/Documentation/devicetree/bindings/interrupt-controller/allwinner,sun4i-ic.txt
+++ b/Documentation/devicetree/bindings/interrupt-controller/allwinner,sun4i-ic.txt
@@ -8,91 +8,8 @@ Required properties:
 - #interrupt-cells : Specifies the number of cells needed to encode an
   interrupt source. The value shall be 1.
 
-The interrupt sources are as follows:
-
-0: ENMI
-1: UART0
-2: UART1
-3: UART2
-4: UART3
-5: IR0
-6: IR1
-7: I2C0
-8: I2C1
-9: I2C2
-10: SPI0
-11: SPI1
-12: SPI2
-13: SPDIF
-14: AC97
-15: TS
-16: I2S
-17: UART4
-18: UART5
-19: UART6
-20: UART7
-21: KEYPAD
-22: TIMER0
-23: TIMER1
-24: TIMER2
-25: TIMER3
-26: CAN
-27: DMA
-28: PIO
-29: TOUCH_PANEL
-30: AUDIO_CODEC
-31: LRADC
-32: SDMC0
-33: SDMC1
-34: SDMC2
-35: SDMC3
-36: MEMSTICK
-37: NAND
-38: USB0
-39: USB1
-40: USB2
-41: SCR
-42: CSI0
-43: CSI1
-44: LCDCTRL0
-45: LCDCTRL1
-46: MP
-47: DEFEBE0
-48: DEFEBE1
-49: PMU
-50: SPI3
-51: TZASC
-52: PATA
-53: VE
-54: SS
-55: EMAC
-56: SATA
-57: GPS
-58: HDMI
-59: TVE
-60: ACE
-61: TVD
-62: PS2_0
-63: PS2_1
-64: USB3
-65: USB4
-66: PLE_PFM
-67: TIMER4
-68: TIMER5
-69: GPU_GP
-70: GPU_GPMMU
-71: GPU_PP0
-72: GPU_PPMMU0
-73: GPU_PMU
-74: GPU_RSV0
-75: GPU_RSV1
-76: GPU_RSV2
-77: GPU_RSV3
-78: GPU_RSV4
-79: GPU_RSV5
-80: GPU_RSV6
-82: SYNC_TIMER0
-83: SYNC_TIMER1
+For the valid interrupt sources for your SoC, see the documentation in
+sunxi/<soc>.txt
 
 Example:
 

Documentation/devicetree/bindings/interrupt-controller/sunxi/sun4i-a10.txt

View file

diff --git a/Documentation/devicetree/bindings/interrupt-controller/sunxi/sun4i-a10.txt b/Documentation/devicetree/bindings/interrupt-controller/sunxi/sun4i-a10.txt
new file mode 100644
index 0000000..76b98c8
--- /dev/null
+++ b/Documentation/devicetree/bindings/interrupt-controller/sunxi/sun4i-a10.txt
@@ -0,0 +1,89 @@
+Allwinner A10 (sun4i) interrupt sources
+---------------------------------------
+
+The interrupt sources available for the Allwinner A10 SoC are the
+following one:
+
+0: ENMI
+1: UART0
+2: UART1
+3: UART2
+4: UART3
+5: IR0
+6: IR1
+7: I2C0
+8: I2C1
+9: I2C2
+10: SPI0
+11: SPI1
+12: SPI2
+13: SPDIF
+14: AC97
+15: TS
+16: I2S
+17: UART4
+18: UART5
+19: UART6
+20: UART7
+21: KEYPAD
+22: TIMER0
+23: TIMER1
+24: TIMER2
+25: TIMER3
+26: CAN
+27: DMA
+28: PIO
+29: TOUCH_PANEL
+30: AUDIO_CODEC
+31: LRADC
+32: MMC0
+33: MMC1
+34: MMC2
+35: MMC3
+36: MEMSTICK
+37: NAND
+38: USB0
+39: USB1
+40: USB2
+41: SCR
+42: CSI0
+43: CSI1
+44: LCDCTRL0
+45: LCDCTRL1
+46: MP
+47: DEFEBE0
+48: DEFEBE1
+49: PMU
+50: SPI3
+51: TZASC
+52: PATA
+53: VE
+54: SS
+55: EMAC
+56: SATA
+57: GPS
+58: HDMI
+59: TVE
+60: ACE
+61: TVD
+62: PS2_0
+63: PS2_1
+64: USB3
+65: USB4
+66: PLE_PFM
+67: TIMER4
+68: TIMER5
+69: GPU_GP
+70: GPU_GPMMU
+71: GPU_PP0
+72: GPU_PPMMU0
+73: GPU_PMU
+74: GPU_RSV0
+75: GPU_RSV1
+76: GPU_RSV2
+77: GPU_RSV3
+78: GPU_RSV4
+79: GPU_RSV5
+80: GPU_RSV6
+82: SYNC_TIMER0
+83: SYNC_TIMER1

Documentation/devicetree/bindings/interrupt-controller/sunxi/sun5i-a13.txt

View file

diff --git a/Documentation/devicetree/bindings/interrupt-controller/sunxi/sun5i-a13.txt b/Documentation/devicetree/bindings/interrupt-controller/sunxi/sun5i-a13.txt
new file mode 100644
index 0000000..2ec3b5c
--- /dev/null
+++ b/Documentation/devicetree/bindings/interrupt-controller/sunxi/sun5i-a13.txt
@@ -0,0 +1,55 @@
+Allwinner A13 (sun5i) interrupt sources
+---------------------------------------
+
+The interrupt sources available for the Allwinner A13 SoC are the
+following one:
+
+0: ENMI
+2: UART1
+4: UART3
+5: IR
+7: I2C0
+8: I2C1
+9: I2C2
+10: SPI0
+11: SPI1
+12: SPI2
+22: TIMER0
+23: TIMER1
+24: TIMER2
+25: TIMER3
+27: DMA
+28: PIO
+29: TOUCH_PANEL
+30: AUDIO_CODEC
+31: LRADC
+32: MMC0
+33: MMC1
+34: MMC2
+37: NAND
+38: USB OTG
+39: USB EHCI
+40: USB OHCI
+42: CSI
+44: LCDCTRL
+47: DEFEBE
+49: PMU
+53: VE
+54: SS
+66: PLE_PFM
+67: TIMER4
+68: TIMER5
+69: GPU_GP
+70: GPU_GPMMU
+71: GPU_PP0
+72: GPU_PPMMU0
+73: GPU_PMU
+74: GPU_RSV0
+75: GPU_RSV1
+76: GPU_RSV2
+77: GPU_RSV3
+78: GPU_RSV4
+79: GPU_RSV5
+80: GPU_RSV6
+82: SYNC_TIMER0
+83: SYNC_TIMER1

arch/arm/Kconfig

View file

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index b519015..941dbb8 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -729,6 +729,7 @@ config ARCH_S3C64XX
 	select SAMSUNG_CLKSRC
 	select SAMSUNG_GPIOLIB_4BIT
 	select SAMSUNG_IRQ_VIC_TIMER
+	select SAMSUNG_WDT_RESET
 	select USB_ARCH_HAS_OHCI
 	help
 	  Samsung S3C64XX series based systems
@@ -744,6 +745,7 @@ config ARCH_S5P64X0
 	select HAVE_S3C2410_WATCHDOG if WATCHDOG
 	select HAVE_S3C_RTC if RTC_CLASS
 	select NEED_MACH_GPIO_H
+	select SAMSUNG_WDT_RESET
 	help
 	  Samsung S5P64X0 CPU based systems, such as the Samsung SMDK6440,
 	  SMDK6450.
@@ -760,6 +762,7 @@ config ARCH_S5PC100
 	select HAVE_S3C2410_WATCHDOG if WATCHDOG
 	select HAVE_S3C_RTC if RTC_CLASS
 	select NEED_MACH_GPIO_H
+	select SAMSUNG_WDT_RESET
 	help
 	  Samsung S5PC100 series based systems
 

arch/arm/boot/dts/aks-cdu.dts

View file

diff --git a/arch/arm/boot/dts/aks-cdu.dts b/arch/arm/boot/dts/aks-cdu.dts
index 29b9f15..54cb5cf 100644
--- a/arch/arm/boot/dts/aks-cdu.dts
+++ b/arch/arm/boot/dts/aks-cdu.dts
@@ -9,7 +9,7 @@
 
 /dts-v1/;
 
-/include/ "ge863-pro3.dtsi"
+#include "ge863-pro3.dtsi"
 
 / {
 	chosen {
@@ -46,7 +46,7 @@
 			};
 
 			usb1: gadget@fffa4000 {
-				atmel,vbus-gpio = <&pioC 15 0>;
+				atmel,vbus-gpio = <&pioC 15 GPIO_ACTIVE_HIGH>;
 				status = "okay";
 			};
 		};
@@ -90,23 +90,23 @@
 		compatible = "gpio-leds";
 
 		red {
-			gpios = <&pioC 10 0>;
+			gpios = <&pioC 10 GPIO_ACTIVE_HIGH>;
 			linux,default-trigger = "none";
 		};
 
 		green {
-			gpios = <&pioA 5 1>;
+			gpios = <&pioA 5 GPIO_ACTIVE_LOW>;
 			linux,default-trigger = "none";
 			default-state = "on";
 		};
 
 		yellow {
-			gpios = <&pioB 20 1>;
+			gpios = <&pioB 20 GPIO_ACTIVE_LOW>;
 			linux,default-trigger = "none";
 		};
 
 		blue {
-			gpios = <&pioB 21 1>;
+			gpios = <&pioB 21 GPIO_ACTIVE_LOW>;
 			linux,default-trigger = "none";
 		};
 	};

arch/arm/boot/dts/am33xx.dtsi

View file

diff --git a/arch/arm/boot/dts/am33xx.dtsi b/arch/arm/boot/dts/am33xx.dtsi
index 8e1248f..77aa1b0 100644
--- a/arch/arm/boot/dts/am33xx.dtsi
+++ b/arch/arm/boot/dts/am33xx.dtsi
@@ -394,7 +394,6 @@
 			compatible = "ti,am3352-ocmcram";
 			reg = <0x40300000 0x10000>;
 			ti,hwmods = "ocmcram";
-			ti,no_idle_on_suspend;
 		};
 
 		wkup_m3: wkup_m3@44d00000 {

arch/arm/boot/dts/animeo_ip.dts

View file

diff --git a/arch/arm/boot/dts/animeo_ip.dts b/arch/arm/boot/dts/animeo_ip.dts
index 5160210..3a1de9e 100644
--- a/arch/arm/boot/dts/animeo_ip.dts
+++ b/arch/arm/boot/dts/animeo_ip.dts
@@ -7,7 +7,7 @@
  */
 
 /dts-v1/;
-/include/ "at91sam9260.dtsi"
+#include "at91sam9260.dtsi"
 
 / {
 	model = "Somfy Animeo IP";
@@ -123,7 +123,7 @@
 
 		usb0: ohci@00500000 {
 			num-ports = <2>;
-			atmel,vbus-gpio = <&pioB 15 1>;
+			atmel,vbus-gpio = <&pioB 15 GPIO_ACTIVE_LOW>;
 			status = "okay";
 		};
 	};
@@ -133,23 +133,23 @@
 
 		power_green {
 			label = "power_green";
-			gpios = <&pioC 17 0>;
+			gpios = <&pioC 17 GPIO_ACTIVE_HIGH>;
 			linux,default-trigger = "heartbeat";
 		};
 
 		power_red {
 			label = "power_red";
-			gpios = <&pioA 2 0>;
+			gpios = <&pioA 2 GPIO_ACTIVE_HIGH>;
 		};
 
 		tx_green {
 			label = "tx_green";
-			gpios = <&pioC 19 0>;
+			gpios = <&pioC 19 GPIO_ACTIVE_HIGH>;
 		};
 
 		tx_red {
 			label = "tx_red";
-			gpios = <&pioC 18 0>;
+			gpios = <&pioC 18 GPIO_ACTIVE_HIGH>;
 		};
 	};
 
@@ -160,21 +160,21 @@
 
 		keyswitch_in {
 			label = "keyswitch_in";
-			gpios = <&pioB 1 0>;
+			gpios = <&pioB 1 GPIO_ACTIVE_HIGH>;
 			linux,code = <28>;
 			gpio-key,wakeup;
 		};
 
 		error_in {
 			label = "error_in";
-			gpios = <&pioB 2 0>;
+			gpios = <&pioB 2 GPIO_ACTIVE_HIGH>;
 			linux,code = <29>;
 			gpio-key,wakeup;
 		};
 
 		btn {
 			label = "btn";
-			gpios = <&pioC 23 0>;
+			gpios = <&pioC 23 GPIO_ACTIVE_HIGH>;
 			linux,code = <31>;
 			gpio-key,wakeup;
 		};

arch/arm/boot/dts/at91-ariag25.dts

View file

diff --git a/arch/arm/boot/dts/at91-ariag25.dts b/arch/arm/boot/dts/at91-ariag25.dts
index c7aebba..5ede767 100644
--- a/arch/arm/boot/dts/at91-ariag25.dts
+++ b/arch/arm/boot/dts/at91-ariag25.dts
@@ -7,7 +7,7 @@
  * Licensed under GPLv2 or later.
  */
 /dts-v1/;
-/include/ "at91sam9g25.dtsi"
+#include "at91sam9g25.dtsi"
 
 / {
 	model = "Acme Systems Aria G25";
@@ -156,7 +156,7 @@
 		/* little green LED in middle of Aria G25 module */
 		aria_led {
 			label = "aria_led";
-			gpios = <&pioB 8 0>; /* PB8 */
+			gpios = <&pioB 8 GPIO_ACTIVE_HIGH>; /* PB8 */
 			linux,default-trigger = "heartbeat";
 		};
 
@@ -164,7 +164,7 @@
 
 	onewire@0 {
 		compatible = "w1-gpio";
-		gpios = <&pioA 21 1>;
+		gpios = <&pioA 21 GPIO_ACTIVE_LOW>;
 		pinctrl-names = "default";
 		pinctrl-0 = <&pinctrl_w1_0>;
 	};

arch/arm/boot/dts/at91rm9200.dtsi

View file

diff --git a/arch/arm/boot/dts/at91rm9200.dtsi b/arch/arm/boot/dts/at91rm9200.dtsi
index 5d3ed5a..4aad0d9 100644
--- a/arch/arm/boot/dts/at91rm9200.dtsi
+++ b/arch/arm/boot/dts/at91rm9200.dtsi
@@ -10,7 +10,10 @@
  * Licensed under GPLv2 or later.
  */
 
-/include/ "skeleton.dtsi"
+#include "skeleton.dtsi"
+#include <dt-bindings/pinctrl/at91.h>
+#include <dt-bindings/interrupt-controller/irq.h>
+#include <dt-bindings/gpio/gpio.h>
 
 / {
 	model = "Atmel AT91RM9200 family SoC";
@@ -77,25 +80,29 @@
 			st: timer@fffffd00 {
 				compatible = "atmel,at91rm9200-st";
 				reg = <0xfffffd00 0x100>;
-				interrupts = <1 4 7>;
+				interrupts = <1 IRQ_TYPE_LEVEL_HIGH 7>;
 			};
 
 			tcb0: timer@fffa0000 {
 				compatible = "atmel,at91rm9200-tcb";
 				reg = <0xfffa0000 0x100>;
-				interrupts = <17 4 0 18 4 0 19 4 0>;
+				interrupts = <17 IRQ_TYPE_LEVEL_HIGH 0
+					      18 IRQ_TYPE_LEVEL_HIGH 0
+					      19 IRQ_TYPE_LEVEL_HIGH 0>;
 			};
 
 			tcb1: timer@fffa4000 {
 				compatible = "atmel,at91rm9200-tcb";
 				reg = <0xfffa4000 0x100>;
-				interrupts = <20 4 0 21 4 0 22 4 0>;
+				interrupts = <20 IRQ_TYPE_LEVEL_HIGH 0
+					      21 IRQ_TYPE_LEVEL_HIGH 0
+					      22 IRQ_TYPE_LEVEL_HIGH 0>;
 			};
 
 			i2c0: i2c@fffb8000 {
 				compatible = "atmel,at91rm9200-i2c";
 				reg = <0xfffb8000 0x4000>;
-				interrupts = <12 4 6>;
+				interrupts = <12 IRQ_TYPE_LEVEL_HIGH 6>;
 				pinctrl-names = "default";
 				pinctrl-0 = <&pinctrl_twi>;
 				#address-cells = <1>;
@@ -106,7 +113,7 @@
 			mmc0: mmc@fffb4000 {
 				compatible = "atmel,hsmci";
 				reg = <0xfffb4000 0x4000>;
-				interrupts = <10 4 0>;
+				interrupts = <10 IRQ_TYPE_LEVEL_HIGH 0>;
 				#address-cells = <1>;
 				#size-cells = <0>;
 				status = "disabled";
@@ -115,7 +122,7 @@
 			ssc0: ssc@fffd0000 {
 				compatible = "atmel,at91rm9200-ssc";
 				reg = <0xfffd0000 0x4000>;
-				interrupts = <14 4 5>;
+				interrupts = <14 IRQ_TYPE_LEVEL_HIGH 5>;
 				pinctrl-names = "default";
 				pinctrl-0 = <&pinctrl_ssc0_tx &pinctrl_ssc0_rx>;
 				status = "disable";
@@ -124,7 +131,7 @@
 			ssc1: ssc@fffd4000 {
 				compatible = "atmel,at91rm9200-ssc";
 				reg = <0xfffd4000 0x4000>;
-				interrupts = <15 4 5>;
+				interrupts = <15 IRQ_TYPE_LEVEL_HIGH 5>;
 				pinctrl-names = "default";
 				pinctrl-0 = <&pinctrl_ssc1_tx &pinctrl_ssc1_rx>;
 				status = "disable";
@@ -133,7 +140,7 @@
 			ssc2: ssc@fffd8000 {
 				compatible = "atmel,at91rm9200-ssc";
 				reg = <0xfffd8000 0x4000>;
-				interrupts = <16 4 5>;