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

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

[akpm]

From: Jochen Friedrich <jochen@scram.de>

Initialize I2C pins on boards with CPM1/CPM2 controllers.

Signed-off-by: Jochen Friedrich <jochen@scram.de>
Signed-off-by: Andrew Morton <akpm@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@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>;
+			};
 		};
 
 		PIC: interrupt-controller@10c00 {
diff -puN arch/powerpc/boot/dts/mpc866ads.dts~powerpc-add-i2c-pins-to-dts-and-board-setup arch/powerpc/boot/dts/mpc866ads.dts
--- a/arch/powerpc/boot/dts/mpc866ads.dts~powerpc-add-i2c-pins-to-dts-and-board-setup
+++ a/arch/powerpc/boot/dts/mpc866ads.dts
@@ -171,6 +171,16 @@
 				fsl,cpm-command = <0000>;
 				linux,network-index = <1>;
 			};
+
+			i2c@860 {
+				compatible = "fsl,mpc866-i2c",
+					     "fsl,cpm1-i2c",
+					     "fsl,cpm-i2c";
+				reg = <860 20 3c80 30>;
+				interrupts = <10>;
+				interrupt-parent = <&CPM_PIC>;
+				fsl,cpm-command = <0010>;
+			};
 		};
 	};
 
diff -puN arch/powerpc/boot/dts/mpc885ads.dts~powerpc-add-i2c-pins-to-dts-and-board-setup arch/powerpc/boot/dts/mpc885ads.dts
--- a/arch/powerpc/boot/dts/mpc885ads.dts~powerpc-add-i2c-pins-to-dts-and-board-setup
+++ a/arch/powerpc/boot/dts/mpc885ads.dts
@@ -215,6 +215,16 @@
 				fsl,cpm-command = <0x80>;
 				linux,network-index = <2>;
 			};
+
+			i2c@860 {
+				compatible = "fsl,mpc885-i2c",
+					     "fsl,cpm1-i2c",
+					     "fsl,cpm-i2c";
+				reg = <860 20 3c80 30>;
+				interrupts = <10>;
+				interrupt-parent = <&CPM_PIC>;
+				fsl,cpm-command = <0010>;
+			};
 		};
 	};
 
diff -puN arch/powerpc/platforms/82xx/mpc8272_ads.c~powerpc-add-i2c-pins-to-dts-and-board-setup arch/powerpc/platforms/82xx/mpc8272_ads.c
--- a/arch/powerpc/platforms/82xx/mpc8272_ads.c~powerpc-add-i2c-pins-to-dts-and-board-setup
+++ a/arch/powerpc/platforms/82xx/mpc8272_ads.c
@@ -96,6 +96,10 @@ static struct cpm_pin mpc8272_ads_pins[]
 	{1, 31, CPM_PIN_OUTPUT | CPM_PIN_PRIMARY},
 	{2, 16, CPM_PIN_INPUT | CPM_PIN_PRIMARY},
 	{2, 17, CPM_PIN_INPUT | CPM_PIN_PRIMARY},
+
+	/* I2C */
+	{3, 14, CPM_PIN_INPUT | CPM_PIN_SECONDARY | CPM_PIN_OPENDRAIN},
+	{3, 15, CPM_PIN_INPUT | CPM_PIN_SECONDARY | CPM_PIN_OPENDRAIN},
 };
 
 static void __init init_ioports(void)
diff -puN arch/powerpc/platforms/8xx/mpc86xads_setup.c~powerpc-add-i2c-pins-to-dts-and-board-setup arch/powerpc/platforms/8xx/mpc86xads_setup.c
--- a/arch/powerpc/platforms/8xx/mpc86xads_setup.c~powerpc-add-i2c-pins-to-dts-and-board-setup
+++ a/arch/powerpc/platforms/8xx/mpc86xads_setup.c
@@ -65,6 +65,10 @@ static struct cpm_pin mpc866ads_pins[] =
 	{CPM_PORTD, 13, CPM_PIN_OUTPUT},
 	{CPM_PORTD, 14, CPM_PIN_OUTPUT},
 	{CPM_PORTD, 15, CPM_PIN_OUTPUT},
+
+	/* I2C */
+	{CPM_PORTB, 26, CPM_PIN_INPUT | CPM_PIN_OPENDRAIN},
+	{CPM_PORTB, 27, CPM_PIN_INPUT | CPM_PIN_OPENDRAIN},
 };
 
 static void __init init_ioports(void)
diff -puN arch/powerpc/platforms/8xx/mpc885ads_setup.c~powerpc-add-i2c-pins-to-dts-and-board-setup arch/powerpc/platforms/8xx/mpc885ads_setup.c
--- a/arch/powerpc/platforms/8xx/mpc885ads_setup.c~powerpc-add-i2c-pins-to-dts-and-board-setup
+++ a/arch/powerpc/platforms/8xx/mpc885ads_setup.c
@@ -158,6 +158,9 @@ static struct cpm_pin mpc885ads_pins[] =
 	{CPM_PORTE, 28, CPM_PIN_OUTPUT},
 	{CPM_PORTE, 29, CPM_PIN_OUTPUT},
 #endif
+	/* I2C */
+	{CPM_PORTB, 26, CPM_PIN_INPUT | CPM_PIN_OPENDRAIN},
+	{CPM_PORTB, 27, CPM_PIN_INPUT | CPM_PIN_OPENDRAIN},
 };
 
 static void __init init_ioports(void)
_

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

[Scott Wood]

akpm@linux-foundation.org wrote:
> From: Jochen Friedrich <jochen@scram.de>
> 
> Initialize I2C pins on boards with CPM1/CPM2 controllers.
> 
> Signed-off-by: Jochen Friedrich <jochen@scram.de>
> Signed-off-by: Andrew Morton <akpm@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@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.

We also need to document CPM2 i2c as an exception to the normal 
interpretation of the second resource for a CPM device in 
booting-without-of.txt.

-Scott

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

[David Gibson]

On Wed, May 14, 2008 at 06:25:11PM -0500, Scott Wood wrote:
> akpm@linux-foundation.org wrote:
>> From: Jochen Friedrich <jochen@scram.de>
>>
>> Initialize I2C pins on boards with CPM1/CPM2 controllers.
>>
>> Signed-off-by: Jochen Friedrich <jochen@scram.de>
>> Signed-off-by: Andrew Morton <akpm@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@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.

-- 
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

Re: [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@linux-foundation.org wrote:
>>> From: Jochen Friedrich <jochen@scram.de>
>>>
>>> Initialize I2C pins on boards with CPM1/CPM2 controllers.
>>>
>>> Signed-off-by: Jochen Friedrich <jochen@scram.de>
>>> Signed-off-by: Andrew Morton <akpm@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@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

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

[Jochen Friedrich]

Hi David,

>> 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.

Many thanks :). I'll repost a fixed patch later.

Thanks,
Jochen