[PATCH] powerpc: Fix whitespace merge in mpc8641 hpcn device tree

[PATCH] powerpc: Fix whitespace merge in mpc8641 hpcn device tree

[Kumar Gala]

When we coverted the .dts to v1 we lost a space between the irq
and its polarity/sense information.  This causes a bit of chaos
as the reset of the blob is off by one cell.

This was noticed by booting and getting errors w/ATA due to
lock of interrupts.

Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
---

in my for-2.6.27 branch

 arch/powerpc/boot/dts/mpc8641_hpcn.dts |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/arch/powerpc/boot/dts/mpc8641_hpcn.dts b/arch/powerpc/boot/dts/mpc8641_hpcn.dts
index ae08761..d665e76 100644
--- a/arch/powerpc/boot/dts/mpc8641_hpcn.dts
+++ b/arch/powerpc/boot/dts/mpc8641_hpcn.dts
@@ -411,7 +411,7 @@
 			0xe000 0 0 1 &i8259 12 2
 			0xe100 0 0 2 &i8259 9 2
 			0xe200 0 0 3 &i8259 10 2
-			0xe300 0 0 4 &i8259 112
+			0xe300 0 0 4 &i8259 11 2

 			// IDSEL 0x1d  Audio
 			0xe800 0 0 1 &i8259 6 2
-- 
1.5.5.1

Re: [PATCH] powerpc: Fix whitespace merge in mpc8641 hpcn device tree

[Jon Loeliger]

Kumar Gala wrote:
> When we coverted the .dts to v1 we lost a space between the irq
> and its polarity/sense information.  This causes a bit of chaos
> as the reset of the blob is off by one cell.
>
> 
> diff --git a/arch/powerpc/boot/dts/mpc8641_hpcn.dts b/arch/powerpc/boot/dts/mpc8641_hpcn.dts
> index ae08761..d665e76 100644
> --- a/arch/powerpc/boot/dts/mpc8641_hpcn.dts
> +++ b/arch/powerpc/boot/dts/mpc8641_hpcn.dts
> @@ -411,7 +411,7 @@
>  			0xe000 0 0 1 &i8259 12 2
>  			0xe100 0 0 2 &i8259 9 2
>  			0xe200 0 0 3 &i8259 10 2
> -			0xe300 0 0 4 &i8259 112
> +			0xe300 0 0 4 &i8259 11 2
> 

Ouch.  That was probably my typo and fault.

Apologies.

jdl

Re: [PATCH] powerpc: Fix whitespace merge in mpc8641 hpcn device tree

[Kumar Gala]

On Jul 31, 2008, at 5:18 PM, Jon Loeliger wrote:

> Kumar Gala wrote:
>> When we coverted the .dts to v1 we lost a space between the irq
>> and its polarity/sense information.  This causes a bit of chaos
>> as the reset of the blob is off by one cell.
>>
>> diff --git a/arch/powerpc/boot/dts/mpc8641_hpcn.dts b/arch/powerpc/ 
>> boot/dts/mpc8641_hpcn.dts
>> index ae08761..d665e76 100644
>> --- a/arch/powerpc/boot/dts/mpc8641_hpcn.dts
>> +++ b/arch/powerpc/boot/dts/mpc8641_hpcn.dts
>> @@ -411,7 +411,7 @@
>> 			0xe000 0 0 1 &i8259 12 2
>> 			0xe100 0 0 2 &i8259 9 2
>> 			0xe200 0 0 3 &i8259 10 2
>> -			0xe300 0 0 4 &i8259 112
>> +			0xe300 0 0 4 &i8259 11 2
>
> Ouch.  That was probably my typo and fault.
>
> Apologies.

np.  It would be nice to see dtc warn about it, but that would  
probably be a bit difficult.

- k

Re: [PATCH] powerpc: Fix whitespace merge in mpc8641 hpcn device tree

[Scott Wood]

Kumar Gala wrote:
> np.  It would be nice to see dtc warn about it, but that would probably 
> be a bit difficult.

One thing that macros may bring besides clarity and elimination of 
redundancy is the ability to put some semantic checks in the macro 
itself (rather than hardcoding it into dtc).  At the very least, this 
particular bug would show up as the wrong number of arguments to a macro.

-Scott

Re: [PATCH] powerpc: Fix whitespace merge in mpc8641 hpcn device tree

[David Gibson]

On Thu, Jul 31, 2008 at 05:28:09PM -0500, Kumar Gala wrote:
>
> On Jul 31, 2008, at 5:18 PM, Jon Loeliger wrote:
>
>> Kumar Gala wrote:
>>> When we coverted the .dts to v1 we lost a space between the irq
>>> and its polarity/sense information.  This causes a bit of chaos
>>> as the reset of the blob is off by one cell.
>>>
>>> diff --git a/arch/powerpc/boot/dts/mpc8641_hpcn.dts b/arch/powerpc/ 
>>> boot/dts/mpc8641_hpcn.dts
>>> index ae08761..d665e76 100644
>>> --- a/arch/powerpc/boot/dts/mpc8641_hpcn.dts
>>> +++ b/arch/powerpc/boot/dts/mpc8641_hpcn.dts
>>> @@ -411,7 +411,7 @@
>>> 			0xe000 0 0 1 &i8259 12 2
>>> 			0xe100 0 0 2 &i8259 9 2
>>> 			0xe200 0 0 3 &i8259 10 2
>>> -			0xe300 0 0 4 &i8259 112
>>> +			0xe300 0 0 4 &i8259 11 2
>>
>> Ouch.  That was probably my typo and fault.
>>
>> Apologies.
>
> np.  It would be nice to see dtc warn about it, but that would probably 
> be a bit difficult.

It shouldn't be that hard to make a rudimentary interrupt-map checker
that would catch at least an error as basic as this.  Just no-one's
implemented it yet.  Patches welcome ;-)

-- 
David Gibson			| I'll have my music baroque, and my code
david AT gibson.dropbear.id.au	| minimalist, thank you.  NOT _the_ _other_
				| _way_ _around_!
http://www.ozlabs.org/~dgibson