From: Olof Johansson <olof@lixom.net>
Date: Thu, 18 Apr 2013 06:24:18 +0000 (-0700)
Subject: Merge tag 'dt-3.10-3' of git://git.infradead.org/users/jcooper/linux into next/dt
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=7fa7ed8e1c93dda575021f177a3f6957dc98b28f;p=linux-beck.git

Merge tag 'dt-3.10-3' of git://git.infradead.org/users/jcooper/linux into next/dt

From Jason Cooper:
mvebu dt for v3.10 round 3

 - mvebu PCIe DT support

from round 2 (no pr was sent):
 - 64bit dts skeleton
 - mvebu devicebus additions
 - mvebu thermal nodes
 - mirabox gpio leds
 - orion5x xor and ehci
 - use mvsdio on guruplug dt

* tag 'dt-3.10-3' of git://git.infradead.org/users/jcooper/linux:
  arm: mvebu: PCIe Device Tree informations for Armada XP GP
  arm: mvebu: PCIe Device Tree informations for Armada 370 DB
  arm: mvebu: PCIe Device Tree informations for Armada 370 Mirabox
  arm: mvebu: PCIe Device Tree informations for Armada XP DB
  arm: mvebu: PCIe Device Tree informations for OpenBlocks AX3-4
  arm: mvebu: add PCIe Device Tree informations for Armada XP
  arm: mvebu: add PCIe Device Tree informations for Armada 370
  ARM: dts: Add a 64 bits version of the skeleton device tree
  ARM: mvebu: Add Device Bus and CFI flash memory support to defconfig
  ARM: mvebu: Add support for NOR flash device on Openblocks AX3 board
  ARM: mvebu: Add support for NOR flash device on Armada XP-GP board
  ARM: mvebu: Add Device Bus support for Armada 370/XP SoC
  ARM: configs: Update mvebu defconfig for thermal
  ARM: mvebu: Add thermal support to Armada 370 device tree
  ARM: mvebu: Add thermal support to Armada XP device tree
  arm: mvebu: Add GPIO LEDs to Mirabox board
  arm: orion5x: enable xor for orion5x platform
  arm: orion5x: add ehci bindings to dtsi
  ARM: kirkwood: make use of DT mvsdio on guruplug board
  ARM: mvebu: Add button on Armada 370 Reference Design board
---

7fa7ed8e1c93dda575021f177a3f6957dc98b28f
diff --cc arch/arm/boot/dts/armada-370-rd.dts
index 070bba4f2585,0656c815616e..516dec31b469
--- a/arch/arm/boot/dts/armada-370-rd.dts
+++ b/arch/arm/boot/dts/armada-370-rd.dts
@@@ -64,13 -64,16 +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>;
+ 		};
+ 	};
  };