Skip to contentSkip to conversation

Tegra114: fdt: Sync DT nodes with kernel DT files (GPIO, tegra_car)

PATCH New Tom Warren 2 participants 3 messages Feb 26, 2013 – Feb 27, 2013

Subsystems (2)
lore
Share & tools
lore

Tom Warren

author
#0 lore raw

PATCH 1/1 Tegra114: fdt: Sync DT nodes with kernel DT files (GPIO, tegra_car)

Minor edit to tegra_car node, add gpio node.

---
 arch/arm/dts/tegra114.dtsi |   21 +++++++++++++++++++--
 1 files changed, 19 insertions(+), 2 deletions(-)
arch/arm/dts/tegra114.dtsi +19 -2
index f0f82de..6c85fb0 100644
@@ -11,12 +11,29 @@
 		i2c4 = "/i2c at 7000c700";
 	};
 
-	tegra_car: clock at 60006000 {
-		compatible = "nvidia,tegra114-car";
+	tegra_car: clock {
+		compatible = "nvidia,tegra114-car", "nvidia,tegra30-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 at 7000c000 {
 		compatible = "nvidia,tegra114-i2c";
 		reg = <0x7000c000 0x100>;
Signature · 1 line
1.7.0.4
#1 lore raw

PATCH 1/1 Tegra114: fdt: Sync DT nodes with kernel DT files (GPIO, tegra_car)

Quoted 5 lines · Tom Warren

Minor edit to tegra_car node, add gpio node.

arch/arm/dts/tegra114.dtsi +0 -1
 
-		compatible = "nvidia,tegra114-car";

...

arch/arm/dts/tegra114.dtsi line 15

Quoted 1 line
arch/arm/dts/tegra114.dtsi +1 -0
+		compatible = "nvidia,tegra114-car", "nvidia,tegra30-car";

The former is actually correct; the kernel DT is wrong here (the bug was actually needed to temporarily work around not having a Tegra114 clock driver), and a patch will be applied to fix this as soon as I can start applying patches for 3.10. It's part of:

http://patchwork.ozlabs.org/patch/220736/

The GPIO change looks fine.

author
#2 lore raw

PATCH 1/1 Tegra114: fdt: Sync DT nodes with kernel DT files (GPIO, tegra_car)

Stephen,

Quoted 9 lines · Stephen Warren
Quoted 5 lines · Tom Warren

Minor edit to tegra_car node, add gpio node.

arch/arm/dts/tegra114.dtsi +0 -1
 
-             compatible = "nvidia,tegra114-car";

...

Quoted 1 line

+ compatible = "nvidia,tegra114-car", "nvidia,tegra30-car";

Quoted 8 lines

The former is actually correct; the kernel DT is wrong here (the bug was actually needed to temporarily work around not having a Tegra114 clock driver), and a patch will be applied to fix this as soon as I can start applying patches for 3.10. It's part of:

http://patchwork.ozlabs.org/patch/220736/

The GPIO change looks fine.

OK, car compatible string fixed, V2 on it's way.

Tom