Merge tag 'tags/mvebu_fixes_for_v3.9_round3' into mvebu/dt
authorJason Cooper <jason@lakedaemon.net>
Mon, 15 Apr 2013 14:54:05 +0000 (14:54 +0000)
committerJason Cooper <jason@lakedaemon.net>
Mon, 15 Apr 2013 14:54:05 +0000 (14:54 +0000)
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

1  2 
arch/arm/boot/dts/armada-370-mirabox.dts
arch/arm/boot/dts/armada-370-rd.dts
arch/arm/boot/dts/armada-370-xp.dtsi
arch/arm/boot/dts/armada-370.dtsi
arch/arm/boot/dts/armada-xp.dtsi
arch/arm/boot/dts/dove.dtsi
arch/arm/boot/dts/orion5x.dtsi

index 0656c815616efd8d074c8fb526fd5d96bb9ba02e,070bba4f25853be236d7b7cd26790283432b5364..516dec31b46900dfb855ae8dd441bf5c30601da3
                        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>;
 +              };
 +      };
  };
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge