From: Jason Cooper <jason@lakedaemon.net>
Date: Mon, 15 Apr 2013 14:54:05 +0000 (+0000)
Subject: Merge tag 'tags/mvebu_fixes_for_v3.9_round3' into mvebu/dt
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=3c76a8a95daeecd881718f88324041f6a5faab86;p=GitHub%2FLineageOS%2Fandroid_kernel_motorola_exynos9610.git

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
---

3c76a8a95daeecd881718f88324041f6a5faab86
diff --cc arch/arm/boot/dts/armada-370-rd.dts
index 0656c815616e,070bba4f2585..516dec31b469
--- a/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>;
 +		};
 +	};
  };