[PATCH v2 1/2] 82xx, mgcoge: updates for 2.6.32
- add I2C support
- add FCC1 and FCC2 support
- fix bogus gpio numbering in plattformcode
Signed-off-by: Heiko Schocher h...@denx.de
---
- against git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc.git
next branch
- checked with checkpatch.pl:
$ ./scripts/checkpatch.pl 0001-82xx-mgcoge-updates-for-2.6.32.patch
total: 0 errors, 0 warnings, 147 lines checked
0001-82xx-mgcoge-updates-for-2.6.32.patch has no obvious style problems and is
ready for submission.
$
- changes since v1
- Add comments from David Gibson
removed 2 device_type entries
- Add comment from Kumar Gala
splittet into 2 patches (seperated defconfig patch)
arch/powerpc/boot/dts/mgcoge.dts | 53 ++
arch/powerpc/platforms/82xx/mgcoge.c | 69 +
2 files changed, 113 insertions(+), 9 deletions(-)
diff --git a/arch/powerpc/boot/dts/mgcoge.dts b/arch/powerpc/boot/dts/mgcoge.dts
index 633255a..0ce9664 100644
--- a/arch/powerpc/boot/dts/mgcoge.dts
+++ b/arch/powerpc/boot/dts/mgcoge.dts
@@ -162,6 +162,59 @@
fixed-link = 0 0 10 0 0;
};
+ i...@11860 {
+ compatible = fsl,mpc8272-i2c,
+fsl,cpm2-i2c;
+ reg = 0x11860 0x20 0x8afc 0x2;
+ interrupts = 1 8;
+ interrupt-parent = PIC;
+ fsl,cpm-command = 0x2960;
+ #address-cells = 1;
+ #size-cells = 0;
+ };
+
+ m...@10d40 {
+ compatible = fsl,cpm2-mdio-bitbang;
+ reg = 0x10d00 0x14;
+ #address-cells = 1;
+ #size-cells = 0;
+ fsl,mdio-pin = 12;
+ fsl,mdc-pin = 13;
+
+ phy0: ethernet-...@0 {
+ reg = 0x0;
+ };
+
+ phy1: ethernet-...@1 {
+ reg = 0x1;
+ };
+ };
+
+ /* FCC1 management to switch */
+ ether...@11300 {
+ device_type = network;
+ compatible = fsl,cpm2-fcc-enet;
+ reg = 0x11300 0x20 0x8400 0x100 0x11390 0x1;
+ local-mac-address = [ 00 01 02 03 04 07 ];
+ interrupts = 32 8;
+ interrupt-parent = PIC;
+ phy-handle = phy0;
+ linux,network-index = 1;
+ fsl,cpm-command = 0x12000300;
+ };
+
+ /* FCC2 to redundant core unit over backplane */
+ ether...@11320 {
+ device_type = network;
+ compatible = fsl,cpm2-fcc-enet;
+ reg = 0x11320 0x20 0x8500 0x100 0x113b0 0x1;
+ local-mac-address = [ 00 01 02 03 04 08 ];
+ interrupts = 33 8;
+ interrupt-parent = PIC;
+ phy-handle = phy1;
+ linux,network-index = 2;
+ fsl,cpm-command = 0x16200300;
+ };
};
PIC: interrupt-control...@10c00 {
diff --git a/arch/powerpc/platforms/82xx/mgcoge.c
b/arch/powerpc/platforms/82xx/mgcoge.c
index c2af169..7a5de9e 100644
--- a/arch/powerpc/platforms/82xx/mgcoge.c
+++ b/arch/powerpc/platforms/82xx/mgcoge.c
@@ -50,16 +50,63 @@ struct cpm_pin {
static __initdata struct cpm_pin mgcoge_pins[] = {
/* SMC2 */
- {1, 8, CPM_PIN_INPUT | CPM_PIN_PRIMARY},
- {1, 9, CPM_PIN_OUTPUT | CPM_PIN_PRIMARY},
+ {0, 8, CPM_PIN_INPUT | CPM_PIN_PRIMARY},
+ {0, 9, CPM_PIN_OUTPUT | CPM_PIN_PRIMARY},
/* SCC4 */
- {3, 25, CPM_PIN_INPUT | CPM_PIN_PRIMARY},
- {3, 24, CPM_PIN_INPUT | CPM_PIN_PRIMARY},
- {3, 9, CPM_PIN_INPUT | CPM_PIN_PRIMARY},
- {3, 8, CPM_PIN_INPUT | CPM_PIN_PRIMARY},
- {4, 22, CPM_PIN_INPUT | CPM_PIN_PRIMARY},
- {4, 21, CPM_PIN_OUTPUT | CPM_PIN_PRIMARY},
+ {2, 25, CPM_PIN_INPUT | CPM_PIN_PRIMARY},
+ {2, 24, CPM_PIN_INPUT | CPM_PIN_PRIMARY},
+ {2, 9, CPM_PIN_INPUT | CPM_PIN_PRIMARY},
+ {2, 8, CPM_PIN_INPUT | CPM_PIN_PRIMARY},
+ {3, 22, CPM_PIN_INPUT | CPM_PIN_PRIMARY},
+ {3, 21, CPM_PIN_OUTPUT | CPM_PIN_PRIMARY},
+
+ /* FCC1 */
+ {0, 14
