Merge tag 'mvebu_fixes_for_v3.8' of git://git.infradead.org/users/jcooper/linux into fixes

From Jason Cooper:

fixes for mvebu/kirkwood v3.8
 - use correct uart driver for mvebu boards
 - add a missing DT clocks
 - gpio-poweroff level vs. edge triggering, use gpio_is_valid()
 - remove an inappropriate __init, modules need to access function.
 - various DT fixes
 - error handling in mv_xor

* tag 'mvebu_fixes_for_v3.8' of git://git.infradead.org/users/jcooper/linux:
  pinctrl: mvebu: make pdma clock on dove mandatory
  ARM: Dove: Add pinctrl clock to DT
  dma: mv_xor: fix error handling for clocks
  dma: mv_xor: fix error handling of mv_xor_channel_add()
  arm: mvebu: Add missing ; for cpu node.
  arm: mvebu: Armada XP MV78230 has only three Ethernet interfaces
  arm: mvebu: Armada XP MV78230 has two cores, not one
  clk: mvebu: Remove inappropriate __init tagging
  ARM: Kirkwood: Use fixed-regulator instead of board gpio call
  ARM: Kirkwood: Fix missing sdio clock
  ARM: Kirkwood: Switch TWSI1 of 88f6282 to DT clock providers
  Power: gpio-poweroff: Fix documentation and gpio_is_valid
  ARM: Kirkwood: Fix missing clk for USB device.
  arm: mvebu: Use dw-apb-uart instead of ns16650 as UART driver

Signed-off-by: Olof Johansson <olof@lixom.net>

9 files changed, 52 insertions, 13 deletions

diff --git a/arch/arm/boot/dts/armada-370-xp.dtsi b/arch/arm/boot/dts/armada-370-xp.dtsi
index cf6c48a09eac..4c0abe85405f 100644
--- a/arch/arm/boot/dts/armada-370-xp.dtsi
+++ b/arch/arm/boot/dts/armada-370-xp.dtsi
@@ -50,17 +50,19 @@
                 ranges;
 
                 serial@d0012000 {
-                                compatible = "ns16550";
+                                compatible = "snps,dw-apb-uart";
                                 reg = <0xd0012000 0x100>;
                                 reg-shift = <2>;
                                 interrupts = <41>;
+                                reg-io-width = <4>;
                                 status = "disabled";
                 };
                 serial@d0012100 {
-                                compatible = "ns16550";
+                                compatible = "snps,dw-apb-uart";
                                 reg = <0xd0012100 0x100>;
                                 reg-shift = <2>;
                                 interrupts = <42>;
+                                reg-io-width = <4>;
                                 status = "disabled";
                 };
 
diff --git a/arch/arm/boot/dts/armada-xp-mv78230.dtsi b/arch/arm/boot/dts/armada-xp-mv78230.dtsi
index c45c7b4dc352..271855a6e224 100644
--- a/arch/arm/boot/dts/armada-xp-mv78230.dtsi
+++ b/arch/arm/boot/dts/armada-xp-mv78230.dtsi
@@ -34,7 +34,14 @@
                 reg = <0>;
                 clocks = <&cpuclk 0>;
             };
-        }
+
+            cpu@1 {
+                device_type = "cpu";
+                compatible = "marvell,sheeva-v7";
+                reg = <1>;
+                clocks = <&cpuclk 1>;
+            };
+        };
 
         soc {
                 pinctrl {
diff --git a/arch/arm/boot/dts/armada-xp-mv78260.dtsi b/arch/arm/boot/dts/armada-xp-mv78260.dtsi
index a2aee5707377..1c1937dbce73 100644
--- a/arch/arm/boot/dts/armada-xp-mv78260.dtsi
+++ b/arch/arm/boot/dts/armada-xp-mv78260.dtsi
@@ -85,5 +85,13 @@
                         #interrupts-cells = <2>;
                         interrupts = <24>;
                 };
+
+                ethernet@d0034000 {
+                                compatible = "marvell,armada-370-neta";
+                                reg = <0xd0034000 0x2500>;
+                                interrupts = <14>;
+                                clocks = <&gateclk 1>;
+                                status = "disabled";
+                };
         };
 };
diff --git a/arch/arm/boot/dts/armada-xp-mv78460.dtsi b/arch/arm/boot/dts/armada-xp-mv78460.dtsi
index da03a129243a..4905cf3a5ef8 100644
--- a/arch/arm/boot/dts/armada-xp-mv78460.dtsi
+++ b/arch/arm/boot/dts/armada-xp-mv78460.dtsi
@@ -100,5 +100,13 @@
                         #interrupts-cells = <2>;
                         interrupts = <24>;
                 };
+
+                ethernet@d0034000 {
+                                compatible = "marvell,armada-370-neta";
+                                reg = <0xd0034000 0x2500>;
+                                interrupts = <14>;
+                                clocks = <&gateclk 1>;
+                                status = "disabled";
+                };
         };
  };
diff --git a/arch/arm/boot/dts/armada-xp.dtsi b/arch/arm/boot/dts/armada-xp.dtsi
index 367aa3f94912..2e37ef101c90 100644
--- a/arch/arm/boot/dts/armada-xp.dtsi
+++ b/arch/arm/boot/dts/armada-xp.dtsi
@@ -42,17 +42,19 @@
 
         soc {
                 serial@d0012200 {
-                                compatible = "ns16550";
+                                compatible = "snps,dw-apb-uart";
                                 reg = <0xd0012200 0x100>;
                                 reg-shift = <2>;
                                 interrupts = <43>;
+                                reg-io-width = <4>;
                                 status = "disabled";
                 };
                 serial@d0012300 {
-                                compatible = "ns16550";
+                                compatible = "snps,dw-apb-uart";
                                 reg = <0xd0012300 0x100>;
                                 reg-shift = <2>;
                                 interrupts = <44>;
+                                reg-io-width = <4>;
                                 status = "disabled";
                 };
 
@@ -93,14 +95,6 @@
                                 status = "disabled";
                 };
 
-                ethernet@d0034000 {
-                                compatible = "marvell,armada-370-neta";
-                                reg = <0xd0034000 0x2500>;
-                                interrupts = <14>;
-                                clocks = <&gateclk 1>;
-                                status = "disabled";
-                };
-
                 xor@d0060900 {
                         compatible = "marvell,orion-xor";
                         reg = <0xd0060900 0x100
diff --git a/arch/arm/boot/dts/dove.dtsi b/arch/arm/boot/dts/dove.dtsi
index f3f7e9d8adca..42eac1ff3cc8 100644
--- a/arch/arm/boot/dts/dove.dtsi
+++ b/arch/arm/boot/dts/dove.dtsi
@@ -117,6 +117,7 @@
                 pinctrl: pinctrl@d0200 {
                         compatible = "marvell,dove-pinctrl";
                         reg = <0xd0200 0x10>;
+                        clocks = <&gate_clk 22>;
                 };
 
                 spi0: spi@10600 {
diff --git a/arch/arm/boot/dts/kirkwood-6282.dtsi b/arch/arm/boot/dts/kirkwood-6282.dtsi
index 9ae2004d5675..4ccea2130a6c 100644
--- a/arch/arm/boot/dts/kirkwood-6282.dtsi
+++ b/arch/arm/boot/dts/kirkwood-6282.dtsi
@@ -39,6 +39,7 @@
                         #size-cells = <0>;
                         interrupts = <32>;
                         clock-frequency = <100000>;
+                        clocks = <&gate_clk 7>;
                         status = "disabled";
                 };
         };
diff --git a/arch/arm/boot/dts/kirkwood-topkick.dts b/arch/arm/boot/dts/kirkwood-topkick.dts
index c0de5a7f660d..cd15452a52a6 100644
--- a/arch/arm/boot/dts/kirkwood-topkick.dts
+++ b/arch/arm/boot/dts/kirkwood-topkick.dts
@@ -82,4 +82,21 @@
                         gpios = <&gpio1 16 1>;
                 };
         };
+        regulators {
+                compatible = "simple-bus";
+                #address-cells = <1>;
+                #size-cells = <0>;
+
+                sata0_power: regulator@1 {
+                        compatible = "regulator-fixed";
+                        reg = <1>;
+                        regulator-name = "SATA0 Power";
+                        regulator-min-microvolt = <5000000>;
+                        regulator-max-microvolt = <5000000>;
+                        enable-active-high;
+                        regulator-always-on;
+                        regulator-boot-on;
+                        gpio = <&gpio1 4 0>;
+                };
+        };
 };
diff --git a/arch/arm/boot/dts/kirkwood.dtsi b/arch/arm/boot/dts/kirkwood.dtsi
index 7735cee4a9c6..110d6cbb795b 100644
--- a/arch/arm/boot/dts/kirkwood.dtsi
+++ b/arch/arm/boot/dts/kirkwood.dtsi
@@ -144,6 +144,7 @@
                         compatible = "marvell,orion-ehci";
                         reg = <0x50000 0x1000>;
                         interrupts = <19>;
+                        clocks = <&gate_clk 3>;
                         status = "okay";
                 };