From: Stephen Warren <swarren@nvidia.com>
Date: Tue, 19 Mar 2013 17:52:26 +0000 (-0600)
Subject: Merge branch 'for-3.10/dt' into for-next
X-Git-Tag: next-20130320~7^2
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=250266f0b31d9b92e66092fcc6045cb93b04b118;p=karo-tx-linux.git

Merge branch 'for-3.10/dt' into for-next
---

250266f0b31d9b92e66092fcc6045cb93b04b118
diff --cc arch/arm/boot/dts/tegra114.dtsi
index e4ddeddcd437,61745675857c..5302044c1ca9
--- a/arch/arm/boot/dts/tegra114.dtsi
+++ b/arch/arm/boot/dts/tegra114.dtsi
@@@ -98,8 -290,16 +290,16 @@@
  		interrupts = <0 2 0x04>;
  	};
  
+ 	kbc {
+ 		compatible = "nvidia,tegra114-kbc";
+ 		reg = <0x7000e200 0x100>;
+ 		interrupts = <0 85 0x04>;
+ 		clocks = <&tegra_car 36>;
+ 		status = "disabled";
+ 	};
+ 
  	pmc {
 -		compatible = "nvidia,tegra114-pmc", "nvidia,tegra30-pmc";
 +		compatible = "nvidia,tegra114-pmc";
  		reg = <0x7000e400 0x400>;
  	};