Re: [PATCH v2 1/2] 82xx, mgcoge: updates for 2.6.32
On Aug 3, 2009, at 2:34 AM, Heiko Schocher wrote: [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 applied to next - k ___ Linuxppc-dev mailing list Linuxppc-dev@lists.ozlabs.org https://lists.ozlabs.org/listinfo/linuxppc-dev
[PATCH v2 1/2] 82xx, mgcoge: updates for 2.6.32
[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
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
---
- based on 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, 531 lines checked
0001-82xx-mgcoge-updates-for-2.6.32.patch has no obvious style problems and is
ready for submission.
$
BTW: Who is PPC82XX Maintainer? I couldn;t find such an entry
in the MAINTAINERS file ...
arch/powerpc/boot/dts/mgcoge.dts | 56 ++
arch/powerpc/configs/mgcoge_defconfig | 178 +---
arch/powerpc/platforms/82xx/mgcoge.c | 69 +++--
3 files changed, 255 insertions(+), 48 deletions(-)
diff --git a/arch/powerpc/boot/dts/mgcoge.dts b/arch/powerpc/boot/dts/mgcoge.dts
index 633255a..a2efc36 100644
--- a/arch/powerpc/boot/dts/mgcoge.dts
+++ b/arch/powerpc/boot/dts/mgcoge.dts
@@ -162,6 +162,62 @@
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 {
+ device_type = mdio;
+ 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;
+ device_type = ethernet-phy;
+ };
+
+ phy1: ethernet-...@1 {
+ reg = 0x1;
+ device_type = ethernet-phy;
+ };
+ };
+
+ /* 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/configs/mgcoge_defconfig
b/arch/powerpc/configs/mgcoge_defconfig
index 31e1df6..a6fe6b0 100644
--- a/arch/powerpc/configs/mgcoge_defconfig
+++ b/arch/powerpc/configs/mgcoge_defconfig
@@ -1,25 +1,27 @@
#
# Automatically generated make config: don't edit
-# Linux kernel version: 2.6.30-rc3
-# Wed May 13 17:21:55 2009
+# Linux kernel version: 2.6.31-rc4
+# Wed Jul 29 08:57:10 2009
#
# CONFIG_PPC64 is not set
#
# Processor support
#
-CONFIG_6xx=y
+CONFIG_PPC_BOOK3S_32=y
# CONFIG_PPC_85xx is not set
# CONFIG_PPC_8xx is not set
# CONFIG_40x is not set
# CONFIG_44x is not set
# CONFIG_E200 is not set
CONFIG_PPC_BOOK3S=y
+CONFIG_6xx=y
CONFIG_PPC_FPU=y
# CONFIG_ALTIVEC is not set
CONFIG_PPC_STD_MMU=y
CONFIG_PPC_STD_MMU_32=y
# CONFIG_PPC_MM_SLICES is not set
+CONFIG_PPC_HAVE_PMU_SUPPORT=y
# CONFIG_SMP is not set
CONFIG_PPC32=y
CONFIG_WORD_SIZE=32
@@ -30,15 +32,16 @@ CONFIG_GENERIC_TIME=y
CONFIG_GENERIC_TIME_VSYSCALL=y
CONFIG_GENERIC_CLOCKEVENTS=y
CONFIG_GENERIC_HARDIRQS=y
+CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
Re: 82xx, mgcoge: updates for 2.6.32
On Wed, Jul 29, 2009 at 10:32:30AM +0200, Heiko Schocher wrote:
[snip]
+ m...@10d40 {
+ device_type = mdio;
Drop this device_type.
+ 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;
+ device_type = ethernet-phy;
And this one, too.
+ };
+
+ phy1: ethernet-...@1 {
+ reg = 0x1;
+ device_type = ethernet-phy;
+ };
+ };
--
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
___
Linuxppc-dev mailing list
Linuxppc-dev@lists.ozlabs.org
https://lists.ozlabs.org/listinfo/linuxppc-dev
Re: 82xx, mgcoge: updates for 2.6.32
On Jul 29, 2009, at 3:32 AM, Heiko Schocher wrote: - add I2C support - add FCC1 and FCC2 support - fix bogus gpio numbering in plattformcode Signed-off-by: Heiko Schocher h...@denx.de --- - based on 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, 531 lines checked 0001-82xx-mgcoge-updates-for-2.6.32.patch has no obvious style problems and is ready for submission. $ BTW: Who is PPC82XX Maintainer? I couldn;t find such an entry in the MAINTAINERS file ... its me. arch/powerpc/boot/dts/mgcoge.dts | 56 ++ arch/powerpc/configs/mgcoge_defconfig | 178 +--- Can we hold off or pull the defconfig update into a separate patch. I normally update defconfigs in a late -rc series and that will probably generate merge conflicts. arch/powerpc/platforms/82xx/mgcoge.c | 69 +++-- 3 files changed, 255 insertions(+), 48 deletions(-) - k ___ Linuxppc-dev mailing list Linuxppc-dev@lists.ozlabs.org https://lists.ozlabs.org/listinfo/linuxppc-dev
Re: 82xx, mgcoge: updates for 2.6.32
Hello David,
David Gibson wrote:
On Wed, Jul 29, 2009 at 10:32:30AM +0200, Heiko Schocher wrote:
[snip]
+m...@10d40 {
+device_type = mdio;
Drop this device_type.
Done.
+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;
+device_type = ethernet-phy;
And this one, too.
Done.
+};
+
+phy1: ethernet-...@1 {
+reg = 0x1;
+device_type = ethernet-phy;
+};
+};
I collect more comments, then the patch follows.
Thanks
bye
Heiko
--
DENX Software Engineering GmbH, MD: Wolfgang Denk Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
___
Linuxppc-dev mailing list
Linuxppc-dev@lists.ozlabs.org
https://lists.ozlabs.org/listinfo/linuxppc-dev
Re: 82xx, mgcoge: updates for 2.6.32
Hello Kumar, Kumar Gala wrote: On Jul 29, 2009, at 3:32 AM, Heiko Schocher wrote: - add I2C support - add FCC1 and FCC2 support - fix bogus gpio numbering in plattformcode Signed-off-by: Heiko Schocher h...@denx.de --- - based on 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, 531 lines checked 0001-82xx-mgcoge-updates-for-2.6.32.patch has no obvious style problems and is ready for submission. $ BTW: Who is PPC82XX Maintainer? I couldn;t find such an entry in the MAINTAINERS file ... its me. Ah, thought it, but I wasn;t sure ... Hmm, maybe you can update the MAINTAINERS entry? arch/powerpc/boot/dts/mgcoge.dts | 56 ++ arch/powerpc/configs/mgcoge_defconfig | 178 +--- Can we hold off or pull the defconfig update into a separate patch. I normally update defconfigs in a late -rc series and that will probably generate merge conflicts. I make a seperate patch for the defconfig. Thanks. I wait for more comments, before I post the next version of this patch. bye Heiko -- DENX Software Engineering GmbH, MD: Wolfgang Denk Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany ___ Linuxppc-dev mailing list Linuxppc-dev@lists.ozlabs.org https://lists.ozlabs.org/listinfo/linuxppc-dev
