Patchwork powerpc/dts: fix syntax bugs in bluestone.dts

login
register
mail settings
Submitter Grant Likely
Date Jan. 3, 2011, 9:07 p.m.
Message ID <20110103210715.10427.56175.stgit@localhost6.localdomain6>
Download mbox | patch
Permalink /patch/77345/
State Not Applicable
Headers show

Comments

Grant Likely - Jan. 3, 2011, 9:07 p.m.
Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
---

I'm picking this one up immediately into my next-devicetree branch

g.

 arch/powerpc/boot/dts/bluestone.dts |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)
Josh Boyer - Jan. 4, 2011, 1:59 p.m.
On Mon, Jan 03, 2011 at 02:07:40PM -0700, Grant Likely wrote:
>Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
>---
>
>I'm picking this one up immediately into my next-devicetree branch

Hm.  So these are of course correct, and with that:

Acked-by: Josh Boyer <jwboyer@linux.vnet.ibm.com>

but I do wonder how you noticed them?  DTC didn't throw an error when I
built this originally.  Either way, more diligence on my part would be
appropriate, but knowing how you came across these might teach me
something.

Nit: C++ comments still make me get queasy.  Maybe just remove the
properties that point to lables that don't exist?

josh
Grant Likely - Jan. 4, 2011, 2:30 p.m.
On Tue, Jan 04, 2011 at 08:59:31AM -0500, Josh Boyer wrote:
> On Mon, Jan 03, 2011 at 02:07:40PM -0700, Grant Likely wrote:
> >Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
> >---
> >
> >I'm picking this one up immediately into my next-devicetree branch
> 
> Hm.  So these are of course correct, and with that:
> 
> Acked-by: Josh Boyer <jwboyer@linux.vnet.ibm.com>
> 
> but I do wonder how you noticed them?  DTC didn't throw an error when I
> built this originally.  Either way, more diligence on my part would be
> appropriate, but knowing how you came across these might teach me
> something.

I updated the copy of dtc in the kernel and rebuilt all the .dts files.

g.
Josh Boyer - Jan. 4, 2011, 2:31 p.m.
On Tue, Jan 04, 2011 at 07:30:30AM -0700, Grant Likely wrote:
>On Tue, Jan 04, 2011 at 08:59:31AM -0500, Josh Boyer wrote:
>> On Mon, Jan 03, 2011 at 02:07:40PM -0700, Grant Likely wrote:
>> >Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
>> >---
>> >
>> >I'm picking this one up immediately into my next-devicetree branch
>> 
>> Hm.  So these are of course correct, and with that:
>> 
>> Acked-by: Josh Boyer <jwboyer@linux.vnet.ibm.com>
>> 
>> but I do wonder how you noticed them?  DTC didn't throw an error when I
>> built this originally.  Either way, more diligence on my part would be
>> appropriate, but knowing how you came across these might teach me
>> something.
>
>I updated the copy of dtc in the kernel and rebuilt all the .dts files.

Are you going to push that DTC update into the kernel as well?

josh
Grant Likely - Jan. 4, 2011, 6:38 p.m.
On Tue, Jan 04, 2011 at 09:31:32AM -0500, Josh Boyer wrote:
> On Tue, Jan 04, 2011 at 07:30:30AM -0700, Grant Likely wrote:
> >On Tue, Jan 04, 2011 at 08:59:31AM -0500, Josh Boyer wrote:
> >> On Mon, Jan 03, 2011 at 02:07:40PM -0700, Grant Likely wrote:
> >> >Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
> >> >---
> >> >
> >> >I'm picking this one up immediately into my next-devicetree branch
> >> 
> >> Hm.  So these are of course correct, and with that:
> >> 
> >> Acked-by: Josh Boyer <jwboyer@linux.vnet.ibm.com>
> >> 
> >> but I do wonder how you noticed them?  DTC didn't throw an error when I
> >> built this originally.  Either way, more diligence on my part would be
> >> appropriate, but knowing how you came across these might teach me
> >> something.
> >
> >I updated the copy of dtc in the kernel and rebuilt all the .dts files.
> 
> Are you going to push that DTC update into the kernel as well?

Yes, that's what I mean by updating dtc.  It is in my next-devicetree branch.

g.

Patch

diff --git a/arch/powerpc/boot/dts/bluestone.dts b/arch/powerpc/boot/dts/bluestone.dts
index 9bb3d72..2a56a0d 100644
--- a/arch/powerpc/boot/dts/bluestone.dts
+++ b/arch/powerpc/boot/dts/bluestone.dts
@@ -33,7 +33,7 @@ 
 	aliases {
 		ethernet0 = &EMAC0;
 		serial0 = &UART0;
-		serial1 = &UART1;
+		//serial1 = &UART1; --gcl missing UART1 label
 	};
 
 	cpus {
@@ -52,7 +52,7 @@ 
 			d-cache-size = <32768>;
 			dcr-controller;
 			dcr-access-method = "native";
-			next-level-cache = <&L2C0>;
+			//next-level-cache = <&L2C0>; --gcl missing L2C0 label
 		};
 	};
 
@@ -142,7 +142,7 @@ 
 					/*RXEOB*/ 0x7 0x4
 					/*SERR*/  0x3 0x4
 					/*TXDE*/  0x4 0x4
-					/*RXDE*/  0x5 0x4
+					/*RXDE*/  0x5 0x4>;
 		};
 
 		POB0: opb {
@@ -182,7 +182,7 @@ 
 						reg = <0x001a0000 0x00060000>;
 					};
 				};
-			}
+			};
 
 			UART0: serial@ef600300 {
 				device_type = "serial";