diff options
Diffstat (limited to 'arch/powerpc')
-rw-r--r-- | arch/powerpc/boot/dts/mpc8272ads.dts | 11 | ||||
-rw-r--r-- | arch/powerpc/boot/dts/mpc866ads.dts | 11 | ||||
-rw-r--r-- | arch/powerpc/boot/dts/mpc885ads.dts | 11 | ||||
-rw-r--r-- | arch/powerpc/platforms/82xx/mpc8272_ads.c | 4 | ||||
-rw-r--r-- | arch/powerpc/platforms/8xx/mpc86xads_setup.c | 4 | ||||
-rw-r--r-- | arch/powerpc/platforms/8xx/mpc885ads_setup.c | 3 |
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 @@ | |||
217 | linux,network-index = <1>; | 217 | linux,network-index = <1>; |
218 | fsl,cpm-command = <0x16200300>; | 218 | fsl,cpm-command = <0x16200300>; |
219 | }; | 219 | }; |
220 | |||
221 | i2c@11860 { | ||
222 | compatible = "fsl,mpc8272-i2c", | ||
223 | "fsl,cpm2-i2c"; | ||
224 | reg = <0x11860 0x20 0x8afc 0x2>; | ||
225 | interrupts = <1 8>; | ||
226 | interrupt-parent = <&PIC>; | ||
227 | fsl,cpm-command = <0x29600000>; | ||
228 | #address-cells = <1>; | ||
229 | #size-cells = <0>; | ||
230 | }; | ||
220 | }; | 231 | }; |
221 | 232 | ||
222 | PIC: interrupt-controller@10c00 { | 233 | 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 @@ | |||
171 | fsl,cpm-command = <0000>; | 171 | fsl,cpm-command = <0000>; |
172 | linux,network-index = <1>; | 172 | linux,network-index = <1>; |
173 | }; | 173 | }; |
174 | |||
175 | i2c@860 { | ||
176 | compatible = "fsl,mpc866-i2c", | ||
177 | "fsl,cpm1-i2c"; | ||
178 | reg = <0x860 0x20 0x3c80 0x30>; | ||
179 | interrupts = <16>; | ||
180 | interrupt-parent = <&CPM_PIC>; | ||
181 | fsl,cpm-command = <0x10>; | ||
182 | #address-cells = <1>; | ||
183 | #size-cells = <0>; | ||
184 | }; | ||
174 | }; | 185 | }; |
175 | }; | 186 | }; |
176 | 187 | ||
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 @@ | |||
215 | fsl,cpm-command = <0x80>; | 215 | fsl,cpm-command = <0x80>; |
216 | linux,network-index = <2>; | 216 | linux,network-index = <2>; |
217 | }; | 217 | }; |
218 | |||
219 | i2c@860 { | ||
220 | compatible = "fsl,mpc885-i2c", | ||
221 | "fsl,cpm1-i2c"; | ||
222 | reg = <0x860 0x20 0x3c80 0x30>; | ||
223 | interrupts = <16>; | ||
224 | interrupt-parent = <&CPM_PIC>; | ||
225 | fsl,cpm-command = <0x10>; | ||
226 | #address-cells = <1>; | ||
227 | #size-cells = <0>; | ||
228 | }; | ||
218 | }; | 229 | }; |
219 | }; | 230 | }; |
220 | 231 | ||
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[] = { | |||
96 | {1, 31, CPM_PIN_OUTPUT | CPM_PIN_PRIMARY}, | 96 | {1, 31, CPM_PIN_OUTPUT | CPM_PIN_PRIMARY}, |
97 | {2, 16, CPM_PIN_INPUT | CPM_PIN_PRIMARY}, | 97 | {2, 16, CPM_PIN_INPUT | CPM_PIN_PRIMARY}, |
98 | {2, 17, CPM_PIN_INPUT | CPM_PIN_PRIMARY}, | 98 | {2, 17, CPM_PIN_INPUT | CPM_PIN_PRIMARY}, |
99 | |||
100 | /* I2C */ | ||
101 | {3, 14, CPM_PIN_INPUT | CPM_PIN_SECONDARY | CPM_PIN_OPENDRAIN}, | ||
102 | {3, 15, CPM_PIN_INPUT | CPM_PIN_SECONDARY | CPM_PIN_OPENDRAIN}, | ||
99 | }; | 103 | }; |
100 | 104 | ||
101 | static void __init init_ioports(void) | 105 | 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[] = { | |||
65 | {CPM_PORTD, 13, CPM_PIN_OUTPUT}, | 65 | {CPM_PORTD, 13, CPM_PIN_OUTPUT}, |
66 | {CPM_PORTD, 14, CPM_PIN_OUTPUT}, | 66 | {CPM_PORTD, 14, CPM_PIN_OUTPUT}, |
67 | {CPM_PORTD, 15, CPM_PIN_OUTPUT}, | 67 | {CPM_PORTD, 15, CPM_PIN_OUTPUT}, |
68 | |||
69 | /* I2C */ | ||
70 | {CPM_PORTB, 26, CPM_PIN_INPUT | CPM_PIN_OPENDRAIN}, | ||
71 | {CPM_PORTB, 27, CPM_PIN_INPUT | CPM_PIN_OPENDRAIN}, | ||
68 | }; | 72 | }; |
69 | 73 | ||
70 | static void __init init_ioports(void) | 74 | 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[] = { | |||
158 | {CPM_PORTE, 28, CPM_PIN_OUTPUT}, | 158 | {CPM_PORTE, 28, CPM_PIN_OUTPUT}, |
159 | {CPM_PORTE, 29, CPM_PIN_OUTPUT}, | 159 | {CPM_PORTE, 29, CPM_PIN_OUTPUT}, |
160 | #endif | 160 | #endif |
161 | /* I2C */ | ||
162 | {CPM_PORTB, 26, CPM_PIN_INPUT | CPM_PIN_OPENDRAIN}, | ||
163 | {CPM_PORTB, 27, CPM_PIN_INPUT | CPM_PIN_OPENDRAIN}, | ||
161 | }; | 164 | }; |
162 | 165 | ||
163 | static void __init init_ioports(void) | 166 | static void __init init_ioports(void) |