Patchwork [U-Boot] tegra: fdt: add back missing host1x node

login
register
mail settings
Submitter Allen Martin
Date Jan. 25, 2013, 6:46 p.m.
Message ID <1359139608-29659-1-git-send-email-amartin@nvidia.com>
Download mbox | patch
Permalink /patch/215831/
State Accepted
Delegated to: Tom Warren
Headers show

Comments

Allen Martin - Jan. 25, 2013, 6:46 p.m.
Add back host1x node to seaboard dts file.  This got dropped during
the tegra fdt sort.

Signed-off-by: Allen Martin <amartin@nvidia.com>
---
 board/nvidia/dts/tegra20-seaboard.dts |   11 +++++++++++
 1 file changed, 11 insertions(+)
Allen Martin - Jan. 26, 2013, 12:51 a.m.
On Fri, Jan 25, 2013 at 10:46:47AM -0800, Allen Martin wrote:
> Add back host1x node to seaboard dts file.  This got dropped during
> the tegra fdt sort.
> 
> Signed-off-by: Allen Martin <amartin@nvidia.com>
> ---

Hi Albert, would it be possible for you to apply this directly to your
u-boot-arm repository?  It fixes a regression introduced by my
previous patch:

b7723f3 tegra: fdt: sort dts files

So I wanted to make sure it gets applied before that previous patch
makes it to u-boot/master, and Tom's not ready to do another tegra
pull request yet.

-Allen

>  board/nvidia/dts/tegra20-seaboard.dts |   11 +++++++++++
>  1 file changed, 11 insertions(+)
> 
> diff --git a/board/nvidia/dts/tegra20-seaboard.dts b/board/nvidia/dts/tegra20-seaboard.dts
> index 9cb9b5b..527a296 100644
> --- a/board/nvidia/dts/tegra20-seaboard.dts
> +++ b/board/nvidia/dts/tegra20-seaboard.dts
> @@ -27,6 +27,17 @@
>  		reg = < 0x00000000 0x40000000 >;
>  	};
>  
> +	host1x {
> +		status = "okay";
> +		dc@54200000 {
> +			status = "okay";
> +			rgb {
> +				status = "okay";
> +				nvidia,panel = <&lcd_panel>;
> +			};
> +		};
> +	};
> +
>  	/* This is not used in U-Boot, but is expected to be in kernel .dts */
>  	i2c@7000d000 {
>  		clock-frequency = <100000>;
> -- 
> 1.7.10.4
>
Albert ARIBAUD - Jan. 26, 2013, 10:57 a.m.
Hi Allen,

On Fri, 25 Jan 2013 16:51:09 -0800, Allen Martin <amartin@nvidia.com>
wrote:

> Hi Albert, would it be possible for you to apply this directly to your
> u-boot-arm repository?  It fixes a regression introduced by my
> previous patch:
> 
> b7723f3 tegra: fdt: sort dts files
> 
> So I wanted to make sure it gets applied before that previous patch
> makes it to u-boot/master, and Tom's not ready to do another tegra
> pull request yet.
> 
> -Allen

Actually, I did not take Tom's PR as it caused some warnings. Maybe
your fix can get in the TI tree before a fixed PR is sent out?

Amicalement,
Albert ARIBAUD - Jan. 28, 2013, 6:14 p.m.
Hi Tom,

On Mon, 28 Jan 2013 08:35:25 -0800, Tom Warren <TWarren@nvidia.com>
wrote:

> Albert,
> 
> > -----Original Message-----
> > From: Albert ARIBAUD [mailto:albert.u.boot@aribaud.net]
> > Sent: Saturday, January 26, 2013 3:57 AM
> > To: Allen Martin
> > Cc: Tom Warren; swarren@wwwdotorg.org; u-boot@lists.denx.de
> > Subject: Re: [PATCH] tegra: fdt: add back missing host1x node
> > 
> > Hi Allen,
> > 
> > On Fri, 25 Jan 2013 16:51:09 -0800, Allen Martin <amartin@nvidia.com>
> > wrote:
> > 
> > > Hi Albert, would it be possible for you to apply this directly to your
> > > u-boot-arm repository?  It fixes a regression introduced by my
> > > previous patch:
> > >
> > > b7723f3 tegra: fdt: sort dts files
> > >
> > > So I wanted to make sure it gets applied before that previous patch
> > > makes it to u-boot/master, and Tom's not ready to do another tegra
> > > pull request yet.
> > >
> > > -Allen
> > 
> > Actually, I did not take Tom's PR as it caused some warnings. Maybe your fix
> > can get in the TI tree before a fixed PR is sent out?
> 
> Have you got the right Tom? This is for the Tegra tree (u-boot-tegra), not TI, Tom Warren, not Tom Rini.
> 
> My PR *has* been taken into the ARM/master branch, AFAICT, and I never release PRs with warnings or errors that aren't already pre-existing in other ARM builds (VCMA9 and smdk2410, for instance).
> 
> Allen's fix is for a Tegra DT file, not for any TI board/SoC/etc.

My bad -- I've indeed mixed up Toms here.

> Thanks,
> 
> Tom

Amicalement,
Allen Martin - Jan. 28, 2013, 10:51 p.m.
> > Have you got the right Tom? This is for the Tegra tree (u-boot-tegra), not TI, Tom Warren, not Tom Rini.
> > 
> > My PR *has* been taken into the ARM/master branch, AFAICT, and I never release PRs with warnings or errors that aren't already pre-existing in other ARM builds (VCMA9 and smdk2410, for instance).
> > 
> > Allen's fix is for a Tegra DT file, not for any TI board/SoC/etc.
> 
> My bad -- I've indeed mixed up Toms here.
> 

No worries, so would it be ok to take this patch in through the arm
tree so the regression doesn't make it up into Wolfgang's tree?


-Allen

Patch

diff --git a/board/nvidia/dts/tegra20-seaboard.dts b/board/nvidia/dts/tegra20-seaboard.dts
index 9cb9b5b..527a296 100644
--- a/board/nvidia/dts/tegra20-seaboard.dts
+++ b/board/nvidia/dts/tegra20-seaboard.dts
@@ -27,6 +27,17 @@ 
 		reg = < 0x00000000 0x40000000 >;
 	};
 
+	host1x {
+		status = "okay";
+		dc@54200000 {
+			status = "okay";
+			rgb {
+				status = "okay";
+				nvidia,panel = <&lcd_panel>;
+			};
+		};
+	};
+
 	/* This is not used in U-Boot, but is expected to be in kernel .dts */
 	i2c@7000d000 {
 		clock-frequency = <100000>;