Skip to contentSkip to conversation

82xx, mgcoge: updates for 2.6.32

PATCH Applied Heiko Schocher 3 participants 7 messages Jul 29, 2009 – Aug 7, 2009

Subsystems (2)
Device tree bindings PowerPC

v2 of 3 Applied Latest is v3 →

lore
Share & tools
lore

Heiko Schocher

author
#0 lore raw

- add I2C support
- add FCC1 and FCC2 support
- fix bogus gpio numbering in plattformcode

Signed-off-by Heiko Schocher <[email protected]>

---
- 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(-)
arch/powerpc/boot/dts/mgcoge.dts +56 -0
index 633255a..a2efc36 100644
@@ -162,6 +162,62 @@
 				fixed-link = <0 0 10 0 0>;
 			};
 
+			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>;
+			};
+
+			mdio@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-phy@0 {
+					reg = <0x0>;
+					device_type = "ethernet-phy";
+				};
+
+				phy1: ethernet-phy@1 {
+					reg = <0x1>;
+					device_type = "ethernet-phy";
+				};
+			};
+
+			/* FCC1 management to switch */
+			ethernet@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 */
+			ethernet@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-controller@10c00 {
arch/powerpc/configs/mgcoge_defconfig +139 -39

381 lines not on this page · raw message

arch/powerpc/platforms/82xx/mgcoge.c +60 -9

88 lines not on this page · raw message

Signature · 5 lines
1.6.0.6

-- 
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
#1 lore raw

On Wed, Jul 29, 2009 at 10:32:30AM +0200, Heiko Schocher wrote:

[snip]

arch/powerpc/boot/dts/mgcoge.dts line 177

Quoted 2 lines
arch/powerpc/boot/dts/mgcoge.dts +2 -0
+			mdio@10d40 {
+				device_type = "mdio";

Drop this device_type.

arch/powerpc/boot/dts/mgcoge.dts line 187

Quoted 10 lines
arch/powerpc/boot/dts/mgcoge.dts +10 -0
+				compatible = "fsl,cpm2-mdio-bitbang";
+				reg = <0x10d00 0x14>;
+				#address-cells = <1>;
+				#size-cells = <0>;
+				fsl,mdio-pin = <12>;
+				fsl,mdc-pin = <13>;
+
+				phy0: ethernet-phy@0 {
+					reg = <0x0>;
+					device_type = "ethernet-phy";

And this one, too.

Quoted 7 lines
arch/powerpc/boot/dts/mgcoge.dts +7 -0
+				};
+
+				phy1: ethernet-phy@1 {
+					reg = <0x1>;
+					device_type = "ethernet-phy";
+				};
+			};
Signature · 4 lines
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
author
#2 lore raw

Hello David,

Quoted 7 lines · David Gibson

On Wed, Jul 29, 2009 at 10:32:30AM +0200, Heiko Schocher wrote:

[snip]

arch/powerpc/boot/dts/mgcoge.dts line 177

Quoted 2 lines
arch/powerpc/boot/dts/mgcoge.dts +2 -0
+			mdio@10d40 {
+				device_type = "mdio";

Drop this device_type.

Done.

Quoted 4 lines
Quoted 4 lines
arch/powerpc/boot/dts/mgcoge.dts +4 -0
+				compatible = "fsl,cpm2-mdio-bitbang";
+				reg = <0x10d00 0x14>;
+				#address-cells = <1>;
+				#size-cells = <0>;
Quoted 8 lines

arch/powerpc/boot/dts/mgcoge.dts line 187

Quoted 6 lines
arch/powerpc/boot/dts/mgcoge.dts +6 -0
+				fsl,mdio-pin = <12>;
+				fsl,mdc-pin = <13>;
+
+				phy0: ethernet-phy@0 {
+					reg = <0x0>;
+					device_type = "ethernet-phy";

And this one, too.

Done.

Quoted 8 lines

arch/powerpc/boot/dts/mgcoge.dts line 194

Quoted 7 lines
arch/powerpc/boot/dts/mgcoge.dts +7 -0
+				};
+
+				phy1: ethernet-phy@1 {
+					reg = <0x1>;
+					device_type = "ethernet-phy";
+				};
+			};

I collect more comments, then the patch follows.
Thanks
bye
Heiko

Signature · 2 lines
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
author
#3 lore raw

PATCH v2 1/2 82xx, mgcoge: updates for 2.6.32

In reply to David Gibson

[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 <[email protected]>

---
- 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(-)
arch/powerpc/boot/dts/mgcoge.dts +53 -0
index 633255a..0ce9664 100644
@@ -162,6 +162,59 @@
 				fixed-link = <0 0 10 0 0>;
 			};
 
+			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>;
+			};
+
+			mdio@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-phy@0 {
+					reg = <0x0>;
+				};
+
+				phy1: ethernet-phy@1 {
+					reg = <0x1>;
+				};
+			};
+
+			/* FCC1 management to switch */
+			ethernet@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 */
+			ethernet@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-controller@10c00 {
arch/powerpc/platforms/82xx/mgcoge.c +60 -9

88 lines not on this page · raw message

Signature · 5 lines
1.6.0.6

-- 
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Applied
#4 lore raw
Quoted 6 lines · Heiko Schocher

[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

Quoted 8 lines
Signed-off-by Heiko Schocher <[email protected]>

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

#5 lore raw
In reply to Heiko Schocher
Quoted 10 lines · Heiko Schocher

- add I2C support
- add FCC1 and FCC2 support
- fix bogus gpio numbering in plattformcode

Signed-off-by Heiko Schocher <[email protected]>

---
- based on git://git.kernel.org/pub/scm/linux/kernel/git/benh/
powerpc.git
next branch
- checked with checkpatch.pl:

Quoted 8 lines
$ ./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.

Quoted 3 lines

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.

Quoted 3 lines

arch/powerpc/platforms/82xx/mgcoge.c | 69 +++++++++++--

3 files changed, 255 insertions(+), 48 deletions(-)

- k

author
#6 lore raw

Hello Kumar,

Quoted 15 lines · Kumar Gala
Quoted 12 lines · Heiko Schocher

- add I2C support
- add FCC1 and FCC2 support
- fix bogus gpio numbering in plattformcode

Signed-off-by Heiko Schocher <[email protected]>

---
- 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
Quoted 8 lines
Quoted 6 lines

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?

Quoted 7 lines
Quoted 3 lines

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

Signature · 2 lines
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany