Patchwork [U-Boot] Tegra114: fdt: Sync DT nodes with kernel DT files (GPIO, tegra_car)

login
register
mail settings
Submitter Tom Warren
Date Feb. 26, 2013, 10:08 p.m.
Message ID <1361916489-3065-1-git-send-email-twarren@nvidia.com>
Download mbox | patch
Permalink /patch/223416/
State Superseded
Delegated to: Tom Warren
Headers show

Comments

Tom Warren - Feb. 26, 2013, 10:08 p.m.
Minor edit to tegra_car node, add gpio node.

Signed-off-by: Tom Warren <twarren@nvidia.com>
---
 arch/arm/dts/tegra114.dtsi |   21 +++++++++++++++++++--
 1 files changed, 19 insertions(+), 2 deletions(-)
Stephen Warren - Feb. 26, 2013, 10:35 p.m.
On 02/26/2013 03:08 PM, Tom Warren wrote:
> Minor edit to tegra_car node, add gpio node.

> diff --git a/arch/arm/dts/tegra114.dtsi b/arch/arm/dts/tegra114.dtsi

> -		compatible = "nvidia,tegra114-car";
...
> +		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.
Tom Warren - Feb. 27, 2013, 3:48 p.m.
Stephen,

On Tue, Feb 26, 2013 at 3:35 PM, Stephen Warren <swarren@wwwdotorg.org> wrote:
> On 02/26/2013 03:08 PM, Tom Warren wrote:
>> Minor edit to tegra_car node, add gpio node.
>
>> diff --git a/arch/arm/dts/tegra114.dtsi b/arch/arm/dts/tegra114.dtsi
>
>> -             compatible = "nvidia,tegra114-car";
> ...
>> +             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.
OK, car compatible string fixed, V2 on it's way.

Tom

Patch

diff --git a/arch/arm/dts/tegra114.dtsi b/arch/arm/dts/tegra114.dtsi
index f0f82de..6c85fb0 100644
--- a/arch/arm/dts/tegra114.dtsi
+++ b/arch/arm/dts/tegra114.dtsi
@@ -11,12 +11,29 @@ 
 		i2c4 = "/i2c@7000c700";
 	};
 
-	tegra_car: clock@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@7000c000 {
 		compatible = "nvidia,tegra114-i2c";
 		reg = <0x7000c000 0x100>;