powerpc/CPM: Add i2c pins to dts and board setup

Initialize I2C pins on boards with CPM1/CPM2 controllers and document the
i2c bus in booting-without-of.

The boards don't have any I2C chips connected to the I2C bus, so unless
some external chips are connected to the boards, this code is just an
example of setting everything else up.

Signed-off-by: Jochen Friedrich <jochen@scram.de>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>

6 files changed, 44 insertions, 0 deletions

diff --git a/arch/powerpc/boot/dts/mpc8272ads.dts b/arch/powerpc/boot/dts/mpc8272ads.dts
index 46e2da30c3dd..d27f8a73c24a 100644
--- a/arch/powerpc/boot/dts/mpc8272ads.dts
+++ b/arch/powerpc/boot/dts/mpc8272ads.dts
@@ -217,6 +217,17 @@
                                 linux,network-index = <1>;
                                 fsl,cpm-command = <0x16200300>;
                         };
+
+                        i2c@11860 {
+                                compatible = "fsl,mpc8272-i2c",
+                                             "fsl,cpm2-i2c";
+                                reg = <0x11860 0x20 0x8afc 0x2>;
+                                interrupts = <1 8>;
+                                interrupt-parent = <&PIC>;
+                                fsl,cpm-command = <0x29600000>;
+                                #address-cells = <1>;
+                                #size-cells = <0>;
+                        };
                 };
 
                 PIC: interrupt-controller@10c00 {
diff --git a/arch/powerpc/boot/dts/mpc866ads.dts b/arch/powerpc/boot/dts/mpc866ads.dts
index 765e43c997da..bd700651f360 100644
--- a/arch/powerpc/boot/dts/mpc866ads.dts
+++ b/arch/powerpc/boot/dts/mpc866ads.dts
@@ -171,6 +171,17 @@
                                 fsl,cpm-command = <0000>;
                                 linux,network-index = <1>;
                         };
+
+                        i2c@860 {
+                                compatible = "fsl,mpc866-i2c",
+                                             "fsl,cpm1-i2c";
+                                reg = <0x860 0x20 0x3c80 0x30>;
+                                interrupts = <16>;
+                                interrupt-parent = <&CPM_PIC>;
+                                fsl,cpm-command = <0x10>;
+                                #address-cells = <1>;
+                                #size-cells = <0>;
+                        };
                 };
         };
 
diff --git a/arch/powerpc/boot/dts/mpc885ads.dts b/arch/powerpc/boot/dts/mpc885ads.dts
index 9895043722b9..b123e9f7a5a8 100644
--- a/arch/powerpc/boot/dts/mpc885ads.dts
+++ b/arch/powerpc/boot/dts/mpc885ads.dts
@@ -215,6 +215,17 @@
                                 fsl,cpm-command = <0x80>;
                                 linux,network-index = <2>;
                         };
+
+                        i2c@860 {
+                                compatible = "fsl,mpc885-i2c",
+                                             "fsl,cpm1-i2c";
+                                reg = <0x860 0x20 0x3c80 0x30>;
+                                interrupts = <16>;
+                                interrupt-parent = <&CPM_PIC>;
+                                fsl,cpm-command = <0x10>;
+                                #address-cells = <1>;
+                                #size-cells = <0>;
+                        };
                 };
         };
 
diff --git a/arch/powerpc/platforms/82xx/mpc8272_ads.c b/arch/powerpc/platforms/82xx/mpc8272_ads.c
index 7d3018751988..8054c685d323 100644
--- a/arch/powerpc/platforms/82xx/mpc8272_ads.c
+++ b/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 --git a/arch/powerpc/platforms/8xx/mpc86xads_setup.c b/arch/powerpc/platforms/8xx/mpc86xads_setup.c
index c028a5b71bbb..caaec29796b7 100644
--- a/arch/powerpc/platforms/8xx/mpc86xads_setup.c
+++ b/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 --git a/arch/powerpc/platforms/8xx/mpc885ads_setup.c b/arch/powerpc/platforms/8xx/mpc885ads_setup.c
index 6e7ded0233f6..45ed6cdc1310 100644
--- a/arch/powerpc/platforms/8xx/mpc885ads_setup.c
+++ b/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)