Merge branch 'master' of git://git.denx.de/u-boot-usb

[karo-tx-uboot.git] / arch / arm / dts / tegra114.dtsi

diff --git a/arch/arm/dts/tegra114.dtsi b/arch/arm/dts/tegra114.dtsi
index 0655b4d52399fdf0bb16cd62b9eb254cec428b75..701c0f9aff6ef3b1f7fe2461018ca502c79e4a18 100644 (file)
--- a/arch/arm/dts/tegra114.dtsi
+++ b/arch/arm/dts/tegra114.dtsi
@@ -1,22 +1,31 @@
-/include/ "skeleton.dtsi"
+#include "skeleton.dtsi"
 
 / {
        compatible = "nvidia,tegra114";
 
-       aliases {
-               i2c0 = "/i2c@7000d000";
-               i2c1 = "/i2c@7000c000";
-               i2c2 = "/i2c@7000c400";
-               i2c3 = "/i2c@7000c500";
-               i2c4 = "/i2c@7000c700";
-       };
-
-       tegra_car: clock@60006000 {
+       tegra_car: clock {
                compatible = "nvidia,tegra114-car";
                reg = <0x60006000 0x1000>;
                #clock-cells = <1>;
        };
 
+       gpio: gpio {
+               compatible = "nvidia,tegra114-gpio", "nvidia,tegra30-gpio";
+               reg = <0x6000d000 0x1000>;
+               interrupts = <0 32 0x04
+                             0 33 0x04
+                             0 34 0x04
+                             0 35 0x04
+                             0 55 0x04
+                             0 87 0x04
+                             0 89 0x04
+                             0 125 0x04>;
+               #gpio-cells = <2>;
+               gpio-controller;
+               #interrupt-cells = <2>;
+               interrupt-controller;
+       };
+
        i2c@7000c000 {
                compatible = "nvidia,tegra114-i2c";
                reg = <0x7000c000 0x100>;