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

Pull ARM SoC late cleanups from Arnd Bergmann:
 "These are cleanups and smaller changes that either depend on earlier
  feature branches or came in late during the development cycle.  We
  normally try to get all cleanups early, so these are the exceptions:

   - A follow-up on the clocksource reworks, hopefully the last time we
     need to merge clocksource subsystem changes through arm-soc.

     A first set of patches was part of the original 3.10 arm-soc
     cleanup series because of interdependencies with timer drivers now
     moved out of arch/arm.

   - Migrating the SPEAr13xx platform away from using auxdata for DMA
     channel descriptions towards using information in device tree,
     based on the earlier SPEAr multiplatform series

   - A few follow-ups on the Atmel SAMA5 support and other changes for
     Atmel at91 based on the larger at91 reworks.

   - Moving the armada irqchip implementation to drivers/irqchip

   - Several OMAP cleanups following up on the larger series already
     merged in 3.10."

* tag 'cleanup-for-linus-2' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (50 commits)
  ARM: OMAP4: change the device names in usb_bind_phy
  ARM: OMAP2+: Fix mismerge for timer.c between ff931c82 and da4a686a
  ARM: SPEAr: conditionalize SMP code
  ARM: arch_timer: Silence debug preempt warnings
  ARM: OMAP: remove unused variable
  serial: amba-pl011: fix !CONFIG_DMA_ENGINE case
  ata: arasan: remove the need for platform_data
  ARM: at91/sama5d34ek.dts: remove not needed compatibility string
  ARM: at91: dts: add MCI DMA support
  ARM: at91: dts: add i2c dma support
  ARM: at91: dts: set #dma-cells to the correct value
  ARM: at91: suspend both memory controllers on at91sam9263
  irqchip: armada-370-xp: slightly cleanup irq controller driver
  irqchip: armada-370-xp: move IRQ handler to avoid forward declaration
  irqchip: move IRQ driver for Armada 370/XP
  ARM: mvebu: move L2 cache initialization in init_early()
  devtree: add binding documentation for sp804
  ARM: integrator-cp: convert use CLKSRC_OF for timer init
  ARM: versatile: use OF init for sp804 timer
  ARM: versatile: add versatile dtbs to dtbs target
  ...

11 files changed, 92 insertions, 7 deletions

diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
index e6611eaa2885..5f1f4dfd706e 100644
--- a/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@ -194,6 +194,8 @@ dtb-$(CONFIG_ARCH_TEGRA) += tegra20-harmony.dtb \
         tegra30-cardhu-a04.dtb \
         tegra114-dalmore.dtb \
         tegra114-pluto.dtb
+dtb-$(CONFIG_ARCH_VERSATILE) += versatile-ab.dtb \
+        versatile-pb.dtb
 dtb-$(CONFIG_ARCH_VEXPRESS) += vexpress-v2p-ca5s.dtb \
         vexpress-v2p-ca9.dtb \
         vexpress-v2p-ca15-tc1.dtb \
diff --git a/arch/arm/boot/dts/at91sam9g45.dtsi b/arch/arm/boot/dts/at91sam9g45.dtsi
index f8f7370e8669..bf18a735c37d 100644
--- a/arch/arm/boot/dts/at91sam9g45.dtsi
+++ b/arch/arm/boot/dts/at91sam9g45.dtsi
@@ -108,6 +108,7 @@
                                 compatible = "atmel,at91sam9g45-dma";
                                 reg = <0xffffec00 0x200>;
                                 interrupts = <21 4 0>;
+                                #dma-cells = <2>;
                         };
 
                         pinctrl@fffff200 {
@@ -533,6 +534,8 @@
                                 compatible = "atmel,hsmci";
                                 reg = <0xfff80000 0x600>;
                                 interrupts = <11 4 0>;
+                                dmas = <&dma 1 0>;
+                                dma-names = "rxtx";
                                 #address-cells = <1>;
                                 #size-cells = <0>;
                                 status = "disabled";
@@ -542,6 +545,8 @@
                                 compatible = "atmel,hsmci";
                                 reg = <0xfffd0000 0x600>;
                                 interrupts = <29 4 0>;
+                                dmas = <&dma 1 13>;
+                                dma-names = "rxtx";
                                 #address-cells = <1>;
                                 #size-cells = <0>;
                                 status = "disabled";
diff --git a/arch/arm/boot/dts/at91sam9n12.dtsi b/arch/arm/boot/dts/at91sam9n12.dtsi
index b2961f1ea51b..3de8e6dfbcb1 100644
--- a/arch/arm/boot/dts/at91sam9n12.dtsi
+++ b/arch/arm/boot/dts/at91sam9n12.dtsi
@@ -89,6 +89,8 @@
                                 compatible = "atmel,hsmci";
                                 reg = <0xf0008000 0x600>;
                                 interrupts = <12 4 0>;
+                                dmas = <&dma 1 0>;
+                                dma-names = "rxtx";
                                 #address-cells = <1>;
                                 #size-cells = <0>;
                                 status = "disabled";
@@ -110,6 +112,7 @@
                                 compatible = "atmel,at91sam9g45-dma";
                                 reg = <0xffffec00 0x200>;
                                 interrupts = <20 4 0>;
+                                #dma-cells = <2>;
                         };
 
                         pinctrl@fffff400 {
@@ -378,6 +381,9 @@
                                 compatible = "atmel,at91sam9x5-i2c";
                                 reg = <0xf8010000 0x100>;
                                 interrupts = <9 4 6>;
+                                dmas = <&dma 1 13>,
+                                       <&dma 1 14>;
+                                dma-names = "tx", "rx";
                                 #address-cells = <1>;
                                 #size-cells = <0>;
                                 status = "disabled";
@@ -387,6 +393,9 @@
                                 compatible = "atmel,at91sam9x5-i2c";
                                 reg = <0xf8014000 0x100>;
                                 interrupts = <10 4 6>;
+                                dmas = <&dma 1 15>,
+                                       <&dma 1 16>;
+                                dma-names = "tx", "rx";
                                 #address-cells = <1>;
                                 #size-cells = <0>;
                                 status = "disabled";
diff --git a/arch/arm/boot/dts/at91sam9x5.dtsi b/arch/arm/boot/dts/at91sam9x5.dtsi
index 640b3bbbb706..1145ac330fb7 100644
--- a/arch/arm/boot/dts/at91sam9x5.dtsi
+++ b/arch/arm/boot/dts/at91sam9x5.dtsi
@@ -104,12 +104,14 @@
                                 compatible = "atmel,at91sam9g45-dma";
                                 reg = <0xffffec00 0x200>;
                                 interrupts = <20 4 0>;
+                                #dma-cells = <2>;
                         };
 
                         dma1: dma-controller@ffffee00 {
                                 compatible = "atmel,at91sam9g45-dma";
                                 reg = <0xffffee00 0x200>;
                                 interrupts = <21 4 0>;
+                                #dma-cells = <2>;
                         };
 
                         pinctrl@fffff400 {
@@ -465,6 +467,8 @@
                                 compatible = "atmel,hsmci";
                                 reg = <0xf0008000 0x600>;
                                 interrupts = <12 4 0>;
+                                dmas = <&dma0 1 0>;
+                                dma-names = "rxtx";
                                 #address-cells = <1>;
                                 #size-cells = <0>;
                                 status = "disabled";
@@ -474,6 +478,8 @@
                                 compatible = "atmel,hsmci";
                                 reg = <0xf000c000 0x600>;
                                 interrupts = <26 4 0>;
+                                dmas = <&dma1 1 0>;
+                                dma-names = "rxtx";
                                 #address-cells = <1>;
                                 #size-cells = <0>;
                                 status = "disabled";
@@ -535,6 +541,9 @@
                                 compatible = "atmel,at91sam9x5-i2c";
                                 reg = <0xf8010000 0x100>;
                                 interrupts = <9 4 6>;
+                                dmas = <&dma0 1 7>,
+                                       <&dma0 1 8>;
+                                dma-names = "tx", "rx";
                                 #address-cells = <1>;
                                 #size-cells = <0>;
                                 pinctrl-names = "default";
@@ -546,6 +555,9 @@
                                 compatible = "atmel,at91sam9x5-i2c";
                                 reg = <0xf8014000 0x100>;
                                 interrupts = <10 4 6>;
+                                dmas = <&dma1 1 5>,
+                                       <&dma1 1 6>;
+                                dma-names = "tx", "rx";
                                 #address-cells = <1>;
                                 #size-cells = <0>;
                                 pinctrl-names = "default";
@@ -557,6 +569,9 @@
                                 compatible = "atmel,at91sam9x5-i2c";
                                 reg = <0xf8018000 0x100>;
                                 interrupts = <11 4 6>;
+                                dmas = <&dma0 1 9>,
+                                       <&dma0 1 10>;
+                                dma-names = "tx", "rx";
                                 #address-cells = <1>;
                                 #size-cells = <0>;
                                 pinctrl-names = "default";
diff --git a/arch/arm/boot/dts/integratorcp.dts b/arch/arm/boot/dts/integratorcp.dts
index 8b119399025a..ff1aea0ee043 100644
--- a/arch/arm/boot/dts/integratorcp.dts
+++ b/arch/arm/boot/dts/integratorcp.dts
@@ -24,15 +24,15 @@
         };
 
         timer0: timer@13000000 {
-                compatible = "arm,sp804", "arm,primecell";
+                compatible = "arm,integrator-cp-timer";
         };
 
         timer1: timer@13000100 {
-                compatible = "arm,sp804", "arm,primecell";
+                compatible = "arm,integrator-cp-timer";
         };
 
         timer2: timer@13000200 {
-                compatible = "arm,sp804", "arm,primecell";
+                compatible = "arm,integrator-cp-timer";
         };
 
         pic: pic@14000000 {
diff --git a/arch/arm/boot/dts/sama5d3.dtsi b/arch/arm/boot/dts/sama5d3.dtsi
index 39b0458d365a..2e643ea51cce 100644
--- a/arch/arm/boot/dts/sama5d3.dtsi
+++ b/arch/arm/boot/dts/sama5d3.dtsi
@@ -60,6 +60,8 @@
                                 compatible = "atmel,hsmci";
                                 reg = <0xf0000000 0x600>;
                                 interrupts = <21 4 0>;
+                                dmas = <&dma0 2 0>;
+                                dma-names = "rxtx";
                                 pinctrl-names = "default";
                                 pinctrl-0 = <&pinctrl_mmc0_clk_cmd_dat0 &pinctrl_mmc0_dat1_3 &pinctrl_mmc0_dat4_7>;
                                 status = "disabled";
@@ -111,6 +113,9 @@
                                 compatible = "atmel,at91sam9x5-i2c";
                                 reg = <0xf0014000 0x4000>;
                                 interrupts = <18 4 6>;
+                                dmas = <&dma0 2 7>,
+                                       <&dma0 2 8>;
+                                dma-names = "tx", "rx";
                                 pinctrl-names = "default";
                                 pinctrl-0 = <&pinctrl_i2c0>;
                                 #address-cells = <1>;
@@ -122,6 +127,9 @@
                                 compatible = "atmel,at91sam9x5-i2c";
                                 reg = <0xf0018000 0x4000>;
                                 interrupts = <19 4 6>;
+                                dmas = <&dma0 2 9>,
+                                       <&dma0 2 10>;
+                                dma-names = "tx", "rx";
                                 pinctrl-names = "default";
                                 pinctrl-0 = <&pinctrl_i2c1>;
                                 #address-cells = <1>;
@@ -167,6 +175,8 @@
                                 compatible = "atmel,hsmci";
                                 reg = <0xf8000000 0x600>;
                                 interrupts = <22 4 0>;
+                                dmas = <&dma1 2 0>;
+                                dma-names = "rxtx";
                                 pinctrl-names = "default";
                                 pinctrl-0 = <&pinctrl_mmc1_clk_cmd_dat0 &pinctrl_mmc1_dat1_3>;
                                 status = "disabled";
@@ -178,6 +188,8 @@
                                 compatible = "atmel,hsmci";
                                 reg = <0xf8004000 0x600>;
                                 interrupts = <23 4 0>;
+                                dmas = <&dma1 2 1>;
+                                dma-names = "rxtx";
                                 pinctrl-names = "default";
                                 pinctrl-0 = <&pinctrl_mmc2_clk_cmd_dat0 &pinctrl_mmc2_dat1_3>;
                                 status = "disabled";
@@ -294,6 +306,9 @@
                                 compatible = "atmel,at91sam9x5-i2c";
                                 reg = <0xf801c000 0x4000>;
                                 interrupts = <20 4 6>;
+                                dmas = <&dma1 2 11>,
+                                       <&dma1 2 12>;
+                                dma-names = "tx", "rx";
                                 #address-cells = <1>;
                                 #size-cells = <0>;
                                 status = "disabled";
@@ -348,14 +363,14 @@
                                 compatible = "atmel,at91sam9g45-dma";
                                 reg = <0xffffe600 0x200>;
                                 interrupts = <30 4 0>;
-                                #dma-cells = <1>;
+                                #dma-cells = <2>;
                         };
 
                         dma1: dma-controller@ffffe800 {
                                 compatible = "atmel,at91sam9g45-dma";
                                 reg = <0xffffe800 0x200>;
                                 interrupts = <31 4 0>;
-                                #dma-cells = <1>;
+                                #dma-cells = <2>;
                         };
 
                         ramc0: ramc@ffffea00 {
diff --git a/arch/arm/boot/dts/sama5d34ek.dts b/arch/arm/boot/dts/sama5d34ek.dts
index d2739f8d7ae9..6bebfcdcb1d1 100644
--- a/arch/arm/boot/dts/sama5d34ek.dts
+++ b/arch/arm/boot/dts/sama5d34ek.dts
@@ -12,7 +12,7 @@
 
 / {
         model = "Atmel SAMA5D34-EK";
-        compatible = "atmel,sama5d34ek", "atmel,sama5ek", "atmel,sama5d3xmb", "atmel,sama5d3xcm", "atmel,sama5d3", "atmel,sama5";
+        compatible = "atmel,sama5d34ek", "atmel,sama5d3xmb", "atmel,sama5d3xcm", "atmel,sama5d3", "atmel,sama5";
 
         ahb {
                 apb {
diff --git a/arch/arm/boot/dts/spear1340.dtsi b/arch/arm/boot/dts/spear1340.dtsi
index c511c4772efd..54d128d35681 100644
--- a/arch/arm/boot/dts/spear1340.dtsi
+++ b/arch/arm/boot/dts/spear1340.dtsi
@@ -113,6 +113,9 @@
                                 reg = <0xb4100000 0x1000>;
                                 interrupts = <0 105 0x4>;
                                 status = "disabled";
+                                dmas = <&dwdma0 0x600 0 0 1>, /* 0xC << 11 */
+                                        <&dwdma0 0x680 0 1 0>; /* 0xD << 7 */
+                                dma-names = "tx", "rx";
                         };
 
                         thermal@e07008c4 {
diff --git a/arch/arm/boot/dts/spear13xx.dtsi b/arch/arm/boot/dts/spear13xx.dtsi
index b4ca60f4eb42..45597fd91050 100644
--- a/arch/arm/boot/dts/spear13xx.dtsi
+++ b/arch/arm/boot/dts/spear13xx.dtsi
@@ -98,13 +98,24 @@
                         reg = <0xb2800000 0x1000>;
                         interrupts = <0 29 0x4>;
                         status = "disabled";
+                        dmas = <&dwdma0 0 0 0 0>;
+                        dma-names = "data";
                 };
 
-                dma@ea800000 {
+                dwdma0: dma@ea800000 {
                         compatible = "snps,dma-spear1340";
                         reg = <0xea800000 0x1000>;
                         interrupts = <0 19 0x4>;
                         status = "disabled";
+
+                        dma-channels = <8>;
+                        #dma-cells = <3>;
+                        dma-requests = <32>;
+                        chan_allocation_order = <1>;
+                        chan_priority = <1>;
+                        block_size = <0xfff>;
+                        dma-masters = <2>;
+                        data_width = <3 3 0 0>;
                 };
 
                 dma@eb000000 {
@@ -112,6 +123,15 @@
                         reg = <0xeb000000 0x1000>;
                         interrupts = <0 59 0x4>;
                         status = "disabled";
+
+                        dma-requests = <32>;
+                        dma-channels = <8>;
+                        dma-masters = <2>;
+                        #dma-cells = <3>;
+                        chan_allocation_order = <1>;
+                        chan_priority = <1>;
+                        block_size = <0xfff>;
+                        data_width = <3 3 0 0>;
                 };
 
                 fsmc: flash@b0000000 {
@@ -261,6 +281,9 @@
                                 #size-cells = <0>;
                                 interrupts = <0 31 0x4>;
                                 status = "disabled";
+                                dmas = <&dwdma0 0x2000 0 0 0>, /* 0x4 << 11 */
+                                        <&dwdma0 0x0280 0 0 0>;  /* 0x5 << 7 */
+                                dma-names = "tx", "rx";
                         };
 
                         rtc@e0580000 {
diff --git a/arch/arm/boot/dts/versatile-ab.dts b/arch/arm/boot/dts/versatile-ab.dts
index e2fe3195c0d1..dde75ae8b4b1 100644
--- a/arch/arm/boot/dts/versatile-ab.dts
+++ b/arch/arm/boot/dts/versatile-ab.dts
@@ -121,6 +121,18 @@
                         interrupts = <0>;
                 };
 
+                timer@101e2000 {
+                        compatible = "arm,sp804", "arm,primecell";
+                        reg = <0x101e2000 0x1000>;
+                        interrupts = <4>;
+                };
+
+                timer@101e3000 {
+                        compatible = "arm,sp804", "arm,primecell";
+                        reg = <0x101e3000 0x1000>;
+                        interrupts = <5>;
+                };
+
                 gpio0: gpio@101e4000 {
                         compatible = "arm,pl061", "arm,primecell";
                         reg = <0x101e4000 0x1000>;
diff --git a/arch/arm/boot/dts/vexpress-v2p-ca9.dts b/arch/arm/boot/dts/vexpress-v2p-ca9.dts
index 1420bb14d95c..62d9b225dcce 100644
--- a/arch/arm/boot/dts/vexpress-v2p-ca9.dts
+++ b/arch/arm/boot/dts/vexpress-v2p-ca9.dts
@@ -98,6 +98,7 @@
                              <0 49 4>;
                 clocks = <&oscclk2>, <&oscclk2>;
                 clock-names = "timclk", "apb_pclk";
+                status = "disabled";
         };
 
         watchdog@100e5000 {