[patch 2/4] powerpc: add i2c pins to dts and board setup

[Kumar Gala]

On May 15, 2008, at 1:47 AM, David Gibson wrote:

> On Wed, May 14, 2008 at 06:25:11PM -0500, Scott Wood wrote:
>> akpm at linux-foundation.org wrote:
>>> From: Jochen Friedrich <jochen at scram.de>
>>>
>>> Initialize I2C pins on boards with CPM1/CPM2 controllers.
>>>
>>> Signed-off-by: Jochen Friedrich <jochen at scram.de>
>>> Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
>>> ---
>>>
>>> arch/powerpc/boot/dts/mpc8272ads.dts         |   10 ++++++++++
>>> arch/powerpc/boot/dts/mpc866ads.dts          |   10 ++++++++++
>>> arch/powerpc/boot/dts/mpc885ads.dts          |   10 ++++++++++
>>> arch/powerpc/platforms/82xx/mpc8272_ads.c    |    4 ++++
>>> arch/powerpc/platforms/8xx/mpc86xads_setup.c |    4 ++++
>>> arch/powerpc/platforms/8xx/mpc885ads_setup.c |    3 +++
>>> 6 files changed, 41 insertions(+)
>>>
>>> diff -puN arch/powerpc/boot/dts/mpc8272ads.dts~powerpc-add-i2c- 
>>> pins-to-dts-and-board-setup arch/powerpc/boot/dts/mpc8272ads.dts
>>> --- a/arch/powerpc/boot/dts/mpc8272ads.dts~powerpc-add-i2c-pins-to- 
>>> dts-and-board-setup
>>> +++ a/arch/powerpc/boot/dts/mpc8272ads.dts
>>> @@ -217,6 +217,16 @@
>>> 				linux,network-index = <1>;
>>> 				fsl,cpm-command = <0x16200300>;
>>> 			};
>>> +
>>> +			i2c at 11860 {
>>> +				compatible = "fsl,mpc8272-i2c",
>>> +					     "fsl,cpm2-i2c",
>>> +					     "fsl,cpm-i2c";
>>> +				reg = <11860 20 8afc 2>;
>>> +				interrupts = <1 8>;
>>> +				interrupt-parent = <&PIC>;
>>> +				fsl,cpm-command = <29600000>;
>>> +			};
>>
>> As I pointed out earlier, this patch is sticking dts-v0 style  
>> constants
>> into a dts-v1 file.  It will not work.
>
> Enough of this.  *Sends patch converting all remaining dts files to
> v1*.  With any luck we can merge that soon, and forget about the
> mistakes of v0 forever.

The problem isn't that, its this patch is out of date with mainline  
and needs to be respun.  All the .dts it touches have already been  
converted to v1.

- k