Merge tag 'tags/mvebu_fixes_for_v3.9_round3' into mvebu/dt

pulling in mvebu branches which changes armada*.dts? files for LPAE changes

mvebu fixes for v3.9 round 3

 - Kirkwood
    - a couple of small fixes for the Iomega ix2-200 board (ether and led)
 - mvebu
    - allow GPIO button to work on Mirabox when running SMP

diff --combined arch/arm/boot/dts/armada-370-mirabox.dts
index 70effc617123dc163af1bdcd1a6fffc8bfa241a8,3234875824dcc35258bef8909d6bd0a283710765..58ee79372206e2100c08d106d1baef256553076d
--- 1/arch/arm/boot/dts/armada-370-mirabox.dts
--- 2/arch/arm/boot/dts/armada-370-mirabox.dts
+++ b/arch/arm/boot/dts/armada-370-mirabox.dts
@@@ -33,43 -33,6 +33,43 @@@
                        clock-frequency = <600000000>;
                        status = "okay";
                };
 +
 +              pinctrl {
 +                      pwr_led_pin: pwr-led-pin {
 +                              marvell,pins = "mpp63";
 +                              marvell,function = "gpo";
 +                      };
 +
 +                      stat_led_pins: stat-led-pins {
 +                              marvell,pins = "mpp64", "mpp65";
 +                              marvell,function = "gpio";
 +                      };
 +              };
 +
 +              gpio_leds {
 +                      compatible = "gpio-leds";
 +                      pinctrl-names = "default";
 +                      pinctrl-0 = <&pwr_led_pin &stat_led_pins>;
 +
 +                      green_pwr_led {
 +                              label = "mirabox:green:pwr";
 +                              gpios = <&gpio1 31 1>;
 +                              linux,default-trigger = "heartbeat";
 +                      };
 +
 +                      blue_stat_led {
 +                              label = "mirabox:blue:stat";
 +                              gpios = <&gpio2 0 1>;
 +                              linux,default-trigger = "cpu0";
 +                      };
 +
 +                      green_stat_led {
 +                              label = "mirabox:green:stat";
 +                              gpios = <&gpio2 1 1>;
 +                              default-state = "off";
 +                      };
 +              };
 +
                mdio {
                        phy0: ethernet-phy@0 {
                                reg = <0>;
@@@ -91,7 -54,7 +91,7 @@@
                };
  
                mvsdio@d00d4000 {
-                       pinctrl-0 = <&sdio_pins2>;
+                       pinctrl-0 = <&sdio_pins3>;
                        pinctrl-names = "default";
                        status = "okay";
                        /*
@@@ -107,32 -70,5 +107,32 @@@
                usb@d0051000 {
                        status = "okay";
                };
 +
 +              i2c@d0011000 {
 +                      status = "okay";
 +                      clock-frequency = <100000>;
 +                      pca9505: pca9505@25 {
 +                              compatible = "nxp,pca9505";
 +                              gpio-controller;
 +                              #gpio-cells = <2>;
 +                              reg = <0x25>;
 +                      };
 +              };
 +
 +              pcie-controller {
 +                      status = "okay";
 +
 +                      /* Internal mini-PCIe connector */
 +                      pcie@1,0 {
 +                              /* Port 0, Lane 0 */
 +                              status = "okay";
 +                      };
 +
 +                      /* Connected on the PCB to a USB 3.0 XHCI controller */
 +                      pcie@2,0 {
 +                              /* Port 1, Lane 0 */
 +                              status = "okay";
 +                      };
 +              };
        };
  };

diff --combined arch/arm/boot/dts/armada-370-rd.dts
index 0656c815616efd8d074c8fb526fd5d96bb9ba02e,070bba4f25853be236d7b7cd26790283432b5364..516dec31b46900dfb855ae8dd441bf5c30601da3
--- 1/arch/arm/boot/dts/armada-370-rd.dts
--- 2/arch/arm/boot/dts/armada-370-rd.dts
+++ b/arch/arm/boot/dts/armada-370-rd.dts
@@@ -64,16 -64,13 +64,24 @@@
                        status = "okay";
                        /* No CD or WP GPIOs */
                };
+ 
+               usb@d0050000 {
+                       status = "okay";
+               };
+ 
+               usb@d0051000 {
+                       status = "okay";
+               };
        };
 +
 +      gpio-keys {
 +              compatible = "gpio-keys";
 +              #address-cells = <1>;
 +              #size-cells = <0>;
 +              button@1 {
 +                      label = "Software Button";
 +                      linux,code = <116>;
 +                      gpios = <&gpio0 6 1>;
 +              };
 +      };
  };

diff --combined arch/arm/boot/dts/armada-370-xp.dtsi
index 81eb33361964d7ac4d1c8eace8aa228a960ca586,5b708208b607b4b1eeaf7411040c56784fd93df5..758c4ea903446175c76a8ec7a01c91929d2ed0c6
--- 1/arch/arm/boot/dts/armada-370-xp.dtsi
--- 2/arch/arm/boot/dts/armada-370-xp.dtsi
+++ b/arch/arm/boot/dts/armada-370-xp.dtsi
@@@ -31,7 -31,6 +31,6 @@@
        mpic: interrupt-controller@d0020000 {
              compatible = "marvell,mpic";
              #interrupt-cells = <1>;
-             #address-cells = <1>;
              #size-cells = <1>;
              interrupt-controller;
        };
@@@ -54,7 -53,7 +53,7 @@@
                                reg = <0xd0012000 0x100>;
                                reg-shift = <2>;
                                interrupts = <41>;
-                               reg-io-width = <4>;
+                               reg-io-width = <1>;
                                status = "disabled";
                };
                serial@d0012100 {
@@@ -62,7 -61,7 +61,7 @@@
                                reg = <0xd0012100 0x100>;
                                reg-shift = <2>;
                                interrupts = <42>;
-                               reg-io-width = <4>;
+                               reg-io-width = <1>;
                                status = "disabled";
                };
  
@@@ -182,51 -181,6 +181,51 @@@
                        clocks = <&coreclk 0>;
                        status = "disabled";
                };
 +
 +              devbus-bootcs@d0010400 {
 +                      compatible = "marvell,mvebu-devbus";
 +                      reg = <0xd0010400 0x8>;
 +                      #address-cells = <1>;
 +                      #size-cells = <1>;
 +                      clocks = <&coreclk 0>;
 +                      status = "disabled";
 +              };
 +
 +              devbus-cs0@d0010408 {
 +                      compatible = "marvell,mvebu-devbus";
 +                      reg = <0xd0010408 0x8>;
 +                      #address-cells = <1>;
 +                      #size-cells = <1>;
 +                      clocks = <&coreclk 0>;
 +                      status = "disabled";
 +              };
 +
 +              devbus-cs1@d0010410 {
 +                      compatible = "marvell,mvebu-devbus";
 +                      reg = <0xd0010410 0x8>;
 +                      #address-cells = <1>;
 +                      #size-cells = <1>;
 +                      clocks = <&coreclk 0>;
 +                      status = "disabled";
 +              };
 +
 +              devbus-cs2@d0010418 {
 +                      compatible = "marvell,mvebu-devbus";
 +                      reg = <0xd0010418 0x8>;
 +                      #address-cells = <1>;
 +                      #size-cells = <1>;
 +                      clocks = <&coreclk 0>;
 +                      status = "disabled";
 +              };
 +
 +              devbus-cs3@d0010420 {
 +                      compatible = "marvell,mvebu-devbus";
 +                      reg = <0xd0010420 0x8>;
 +                      #address-cells = <1>;
 +                      #size-cells = <1>;
 +                      clocks = <&coreclk 0>;
 +                      status = "disabled";
 +              };
        };
  };
  

diff --combined arch/arm/boot/dts/armada-370.dtsi
index 9cf60b2ce864a17dbc4ab7654c940b40eb695dc2,a195debb67d35297292b43c1a9e7fc45c4908a2c..18f6eb47cc50b492ad8e8cb2b01eb3bc8b3785f9
--- 1/arch/arm/boot/dts/armada-370.dtsi
--- 2/arch/arm/boot/dts/armada-370.dtsi
+++ b/arch/arm/boot/dts/armada-370.dtsi
@@@ -59,6 -59,12 +59,12 @@@
                                             "mpp50", "mpp51", "mpp52";
                              marvell,function = "sd0";
                        };
+ 
+                       sdio_pins3: sdio-pins3 {
+                             marvell,pins = "mpp48", "mpp49", "mpp50",
+                                            "mpp51", "mpp52", "mpp53";
+                             marvell,function = "sd0";
+                       };
                };
  
                gpio0: gpio@d0018100 {
@@@ -153,63 -159,5 +159,63 @@@
                        clocks = <&coreclk 0>;
                };
  
 +              thermal@d0018300 {
 +                      compatible = "marvell,armada370-thermal";
 +                      reg = <0xd0018300 0x4
 +                             0xd0018304 0x4>;
 +                      status = "okay";
 +              };
 +
 +              pcie-controller {
 +                      compatible = "marvell,armada-370-pcie";
 +                      status = "disabled";
 +                      device_type = "pci";
 +
 +                      #address-cells = <3>;
 +                      #size-cells = <2>;
 +
 +                      bus-range = <0x00 0xff>;
 +
 +                      reg = <0xd0040000 0x2000>, <0xd0080000 0x2000>;
 +
 +                      reg-names = "pcie0.0", "pcie1.0";
 +
 +                      ranges = <0x82000000 0 0xd0040000 0xd0040000 0 0x00002000   /* Port 0.0 registers */
 +                                0x82000000 0 0xd0080000 0xd0080000 0 0x00002000   /* Port 1.0 registers */
 +                                0x82000000 0 0xe0000000 0xe0000000 0 0x08000000   /* non-prefetchable memory */
 +                                0x81000000 0 0          0xe8000000 0 0x00100000>; /* downstream I/O */
 +
 +                      pcie@1,0 {
 +                              device_type = "pci";
 +                              assigned-addresses = <0x82000800 0 0xd0040000 0 0x2000>;
 +                              reg = <0x0800 0 0 0 0>;
 +                              #address-cells = <3>;
 +                              #size-cells = <2>;
 +                              #interrupt-cells = <1>;
 +                              ranges;
 +                              interrupt-map-mask = <0 0 0 0>;
 +                              interrupt-map = <0 0 0 0 &mpic 58>;
 +                              marvell,pcie-port = <0>;
 +                              marvell,pcie-lane = <0>;
 +                              clocks = <&gateclk 5>;
 +                              status = "disabled";
 +                      };
 +
 +                      pcie@2,0 {
 +                              device_type = "pci";
 +                              assigned-addresses = <0x82002800 0 0xd0080000 0 0x2000>;
 +                              reg = <0x1000 0 0 0 0>;
 +                              #address-cells = <3>;
 +                              #size-cells = <2>;
 +                              #interrupt-cells = <1>;
 +                              ranges;
 +                              interrupt-map-mask = <0 0 0 0>;
 +                              interrupt-map = <0 0 0 0 &mpic 62>;
 +                              marvell,pcie-port = <1>;
 +                              marvell,pcie-lane = <0>;
 +                              clocks = <&gateclk 9>;
 +                              status = "disabled";
 +                      };
 +              };
        };
  };

diff --combined arch/arm/boot/dts/armada-xp.dtsi
index d85fa6aa69fd205cc88ef1fd457c58761bdd3357,ca00d8326c8746cd127e7c35f3c8e7d3da697c15..29dfeb6d4a2689f5b6a43c7a8b6527142d1d0ad3
--- 1/arch/arm/boot/dts/armada-xp.dtsi
--- 2/arch/arm/boot/dts/armada-xp.dtsi
+++ b/arch/arm/boot/dts/armada-xp.dtsi
@@@ -46,7 -46,7 +46,7 @@@
                                reg = <0xd0012200 0x100>;
                                reg-shift = <2>;
                                interrupts = <43>;
-                               reg-io-width = <4>;
+                               reg-io-width = <1>;
                                status = "disabled";
                };
                serial@d0012300 {
@@@ -54,7 -54,7 +54,7 @@@
                                reg = <0xd0012300 0x100>;
                                reg-shift = <2>;
                                interrupts = <44>;
-                               reg-io-width = <4>;
+                               reg-io-width = <1>;
                                status = "disabled";
                };
  
@@@ -151,11 -151,5 +151,11 @@@
                        status = "disabled";
                };
  
 +              thermal@d00182b0 {
 +                      compatible = "marvell,armadaxp-thermal";
 +                      reg = <0xd00182b0 0x4
 +                             0xd00184d0 0x4>;
 +                      status = "okay";
 +              };
        };
  };

diff --combined arch/arm/boot/dts/dove.dtsi
index 0056214935f4bf15fbc7558e91729b7c6be8a3e4,f7509cafc377a14dc38aa5d77232c264a8d8a301..6cab46849cdb471d44b81ddf21f216999c6baeb4
--- 1/arch/arm/boot/dts/dove.dtsi
--- 2/arch/arm/boot/dts/dove.dtsi
+++ b/arch/arm/boot/dts/dove.dtsi
@@@ -50,11 -50,6 +50,11 @@@
                        #clock-cells = <1>;
                };
  
 +              thermal: thermal@d001c {
 +                      compatible = "marvell,dove-thermal";
 +                      reg = <0xd001c 0x0c>, <0xd005c 0x08>;
 +              };
 +
                uart0: serial@12000 {
                        compatible = "ns16550a";
                        reg = <0x12000 0x100>;
@@@ -202,6 -197,11 +202,11 @@@
                        status = "disabled";
                };
  
+               rtc@d8500 {
+                       compatible = "marvell,orion-rtc";
+                       reg = <0xd8500 0x20>;
+               };
+ 
                crypto: crypto@30000 {
                        compatible = "marvell,orion-crypto";
                        reg = <0x30000 0x10000>,

diff --combined arch/arm/boot/dts/orion5x.dtsi
index f09133fd8105dcae667faac00f7314dfad57ed61,f7bec3b1ba323538c7ef26d3f9b2aa5cd68b00cc..892c64e3f1e1dd697d08f2c58bf6377f05104c2d
--- 1/arch/arm/boot/dts/orion5x.dtsi
--- 2/arch/arm/boot/dts/orion5x.dtsi
+++ b/arch/arm/boot/dts/orion5x.dtsi
@@@ -13,6 -13,9 +13,9 @@@
        compatible = "marvell,orion5x";
        interrupt-parent = <&intc>;
  
+       aliases {
+               gpio0 = &gpio0;
+       };
        intc: interrupt-controller {
                compatible = "marvell,orion-intc", "marvell,intc";
                interrupt-controller;
@@@ -32,7 -35,9 +35,9 @@@
                        #gpio-cells = <2>;
                        gpio-controller;
                        reg = <0x10100 0x40>;
-                       ngpio = <32>;
+                       ngpios = <32>;
+                       interrupt-controller;
+                       #interrupt-cells = <2>;
                        interrupts = <6>, <7>, <8>, <9>;
                };
  
@@@ -69,20 -74,6 +74,20 @@@
                        status = "okay";
                };
  
 +              ehci@50000 {
 +                      compatible = "marvell,orion-ehci";
 +                      reg = <0x50000 0x1000>;
 +                      interrupts = <17>;
 +                      status = "disabled";
 +              };
 +
 +              ehci@a0000 {
 +                      compatible = "marvell,orion-ehci";
 +                      reg = <0xa0000 0x1000>;
 +                      interrupts = <12>;
 +                      status = "disabled";
 +              };
 +
                sata@80000 {
                        compatible = "marvell,orion-sata";
                        reg = <0x80000 0x5000>;
@@@ -100,31 -91,12 +105,31 @@@
                        status = "disabled";
                };
  
 +              xor@60900 {
 +                      compatible = "marvell,orion-xor";
 +                      reg = <0x60900 0x100
 +                             0x60b00 0x100>;
 +                      status = "okay";
 +
 +                      xor00 {
 +                            interrupts = <30>;
 +                            dmacap,memcpy;
 +                            dmacap,xor;
 +                      };
 +                      xor01 {
 +                            interrupts = <31>;
 +                            dmacap,memcpy;
 +                            dmacap,xor;
 +                            dmacap,memset;
 +                      };
 +              };
 +
                crypto@90000 {
                        compatible = "marvell,orion-crypto";
                        reg = <0x90000 0x10000>,
                              <0xf2200000 0x800>;
                        reg-names = "regs", "sram";
-                       interrupts = <22>;
+                       interrupts = <28>;
                        status = "okay";
                };
        };