Skip to contentSkip to conversation

Some PM-related patches for galak/powerpc.git next

PATCH Applied Anton Vorontsov 3 participants 10 messages Mar 19, 2009 – Mar 24, 2009

Subsystems (4)
lore
Share & tools
lore
#0 lore raw

v4 cover Some PM-related patches for galak/powerpc.git next

Quoted 7 lines · Scott Wood
Quoted 5 lines · Anton Vorontsov
Quoted 1 line · Scott Wood

Hmm, would that imply that the mdio underneath it is disabled as well?

Technically, yes. In practice, MDIO and MAC drivers are probed separately.

Quoted 7 lines

Currently, yes, but that may not always be the case.

Quoted 2 lines

I don't see any better solution, should I just leave the core1's mdio node intact?

Probably. It's not as if core1 is going to be putting ethernet@24000 to sleep.

OK, so the updated patches no longer touch mpc8572ds_camp_core1.dts.

Other changes:

- Now the patch set depends on
"fsl_pq_mdio: Use proper address translation"
http://patchwork.ozlabs.org/patch/24698/

- Newly added gef_ppc9a board converted as well.

Signature · 3 lines
Anton Vorontsov
email: [email protected]
irc://irc.freenode.net/bd2
#1 lore raw

PATCH v4 1/4 powerpc/83xx: Add power management support for MPC837x boards

This patch adds pmc nodes to the device tree files so that the boards will able to use standby capability of MPC837x processors. The MPC837x PMC controllers are compatible with MPC8349 ones (i.e. no deep sleep).

sleep = <> properties are used to specify SCCR masks as described in "Specifying Device Power Management Information (sleep property)" chapter in Documentation/powerpc/booting-without-of.txt.

Since I2C1 and eSDHC controllers share the same clock source, they are now placed under sleep-nexus nodes.

A processor is able to wakeup the boards on LAN events (Wake-On-Lan), console events (with no_console_suspend kernel command line), GPIO events and external IRQs (IRQ1 and IRQ2).

The processor can also wakeup the boards by the fourth general purpose timer in GTM1 block, but the GTM wakeup support isn't yet implemented (it's tested to work, but it's unclear how can we use the quite short GTM timers, and how do we want to expose the GTM to userspace).

---
 arch/powerpc/boot/dts/mpc8377_mds.dts |   68 ++++++++++++++++-------
 arch/powerpc/boot/dts/mpc8377_rdb.dts |   98 +++++++++++++++++++++------------
 arch/powerpc/boot/dts/mpc8378_mds.dts |   66 +++++++++++++++-------
 arch/powerpc/boot/dts/mpc8378_rdb.dts |   96 ++++++++++++++++++++------------
 arch/powerpc/boot/dts/mpc8379_mds.dts |   68 ++++++++++++++++-------
 arch/powerpc/boot/dts/mpc8379_rdb.dts |   98 +++++++++++++++++++++------------
 6 files changed, 323 insertions(+), 171 deletions(-)
arch/powerpc/boot/dts/mpc8377_mds.dts +47 -21
index 3e3ec8f..cebfc50 100644
@@ -129,21 +129,38 @@
 			reg = <0x200 0x100>;
 		};
 
-		i2c@3000 {
+		sleep-nexus {
 			#address-cells = <1>;
-			#size-cells = <0>;
-			cell-index = <0>;
-			compatible = "fsl-i2c";
-			reg = <0x3000 0x100>;
-			interrupts = <14 0x8>;
-			interrupt-parent = <&ipic>;
-			dfsrr;
+			#size-cells = <1>;
+			compatible = "simple-bus";
+			sleep = <&pmc 0x0c000000>;
+			ranges;
 
-			rtc@68 {
-				compatible = "dallas,ds1374";
-				reg = <0x68>;
-				interrupts = <19 0x8>;
+			i2c@3000 {
+				#address-cells = <1>;
+				#size-cells = <0>;
+				cell-index = <0>;
+				compatible = "fsl-i2c";
+				reg = <0x3000 0x100>;
+				interrupts = <14 0x8>;
 				interrupt-parent = <&ipic>;
+				dfsrr;
+
+				rtc@68 {
+					compatible = "dallas,ds1374";
+					reg = <0x68>;
+					interrupts = <19 0x8>;
+					interrupt-parent = <&ipic>;
+				};
+			};
+
+			sdhci@2e000 {
+				compatible = "fsl,mpc8377-esdhc", "fsl,mpc8379-esdhc";
+				reg = <0x2e000 0x1000>;
+				interrupts = <42 0x8>;
+				interrupt-parent = <&ipic>;
+				/* Filled in by U-Boot */
+				clock-frequency = <0>;
 			};
 		};
 
@@ -176,6 +193,7 @@
 			interrupts = <38 0x8>;
 			dr_mode = "host";
 			phy_type = "ulpi";
+			sleep = <&pmc 0x00c00000>;
 		};
 
 		mdio@24520 {
@@ -226,6 +244,8 @@
 			interrupt-parent = <&ipic>;
 			tbi-handle = <&tbi0>;
 			phy-handle = <&phy2>;
+			sleep = <&pmc 0xc0000000>;
+			fsl,magic-packet;
 		};
 
 		enet1: ethernet@25000 {
@@ -240,6 +260,8 @@
 			interrupt-parent = <&ipic>;
 			tbi-handle = <&tbi1>;
 			phy-handle = <&phy3>;
+			sleep = <&pmc 0x30000000>;
+			fsl,magic-packet;
 		};
 
 		serial0: serial@4500 {
@@ -311,15 +333,7 @@
 			fsl,channel-fifo-len = <24>;
 			fsl,exec-units-mask = <0x9fe>;
 			fsl,descriptor-types-mask = <0x3ab0ebf>;
-		};
-
-		sdhci@2e000 {
-			compatible = "fsl,mpc8377-esdhc", "fsl,mpc8379-esdhc";
-			reg = <0x2e000 0x1000>;
-			interrupts = <42 0x8>;
-			interrupt-parent = <&ipic>;
-			/* Filled in by U-Boot */
-			clock-frequency = <0>;
+			sleep = <&pmc 0x03000000>;
 		};
 
 		sata@18000 {
@@ -327,6 +341,7 @@
 			reg = <0x18000 0x1000>;
 			interrupts = <44 0x8>;
 			interrupt-parent = <&ipic>;
+			sleep = <&pmc 0x000000c0>;
 		};
 
 		sata@19000 {
@@ -334,6 +349,7 @@
 			reg = <0x19000 0x1000>;
 			interrupts = <45 0x8>;
 			interrupt-parent = <&ipic>;
+			sleep = <&pmc 0x00000030>;
 		};
 
 		/* IPIC
@@ -349,6 +365,13 @@
 			#interrupt-cells = <2>;
 			reg = <0x700 0x100>;
 		};
+
+		pmc: power@b00 {
+			compatible = "fsl,mpc8377-pmc", "fsl,mpc8349-pmc";
+			reg = <0xb00 0x100 0xa00 0x100>;
+			interrupts = <80 0x8>;
+			interrupt-parent = <&ipic>;
+		};
 	};
 
 	pci0: pci@e0008500 {
@@ -403,6 +426,7 @@
 		ranges = <0x02000000 0x0 0x90000000 0x90000000 0x0 0x10000000
 		          0x42000000 0x0 0x80000000 0x80000000 0x0 0x10000000
 		          0x01000000 0x0 0x00000000 0xe0300000 0x0 0x00100000>;
+		sleep = <&pmc 0x00010000>;
 		clock-frequency = <0>;
 		#interrupt-cells = <1>;
 		#size-cells = <2>;
@@ -428,6 +452,7 @@
 				 0 0 0 2 &ipic 1 8
 				 0 0 0 3 &ipic 1 8
 				 0 0 0 4 &ipic 1 8>;
+		sleep = <&pmc 0x00300000>;
 		clock-frequency = <0>;
 
 		pcie@0 {
@@ -459,6 +484,7 @@
 				 0 0 0 2 &ipic 2 8
 				 0 0 0 3 &ipic 2 8
 				 0 0 0 4 &ipic 2 8>;
+		sleep = <&pmc 0x000c0000>;
 		clock-frequency = <0>;
 
 		pcie@0 {
arch/powerpc/boot/dts/mpc8377_rdb.dts +62 -36

168 lines not on this page · raw message

arch/powerpc/boot/dts/mpc8378_mds.dts +45 -21

123 lines not on this page · raw message

arch/powerpc/boot/dts/mpc8378_rdb.dts +60 -36

154 lines not on this page · raw message

arch/powerpc/boot/dts/mpc8379_mds.dts +47 -21

137 lines not on this page · raw message

arch/powerpc/boot/dts/mpc8379_rdb.dts +62 -36

168 lines not on this page · raw message

Signature · 1 line
1.5.6.5
#3 lore raw

PATCH v4 2/4 powerpc/83xx: Move gianfar mdio nodes under the ethernet nodes

In reply to Anton Vorontsov

Currently it doesn't matter where the mdio nodes are placed, but with power management support (i.e. when sleep = <> properties will take effect), mdio nodes placement will become important: mdio controller is a part of the ethernet block, so the mdio nodes should be placed correctly. Otherwise we may wrongly assume that MDIO controllers are available during sleep.

---
 arch/powerpc/boot/dts/asp834x-redboot.dts |   82 +++++++++++++++-------------
 arch/powerpc/boot/dts/mpc8315erdb.dts     |   80 +++++++++++++++-------------
 arch/powerpc/boot/dts/mpc8349emitx.dts    |   69 +++++++++++++-----------
 arch/powerpc/boot/dts/mpc8349emitxgp.dts  |   42 ++++++++-------
 arch/powerpc/boot/dts/mpc834x_mds.dts     |   81 +++++++++++++++-------------
 arch/powerpc/boot/dts/mpc8377_mds.dts     |   80 +++++++++++++++-------------
 arch/powerpc/boot/dts/mpc8377_rdb.dts     |   67 +++++++++++++-----------
 arch/powerpc/boot/dts/mpc8378_mds.dts     |   80 +++++++++++++++-------------
 arch/powerpc/boot/dts/mpc8378_rdb.dts     |   69 ++++++++++++++-----------
 arch/powerpc/boot/dts/mpc8379_mds.dts     |   79 +++++++++++++++------------
 arch/powerpc/boot/dts/mpc8379_rdb.dts     |   66 +++++++++++++----------
 arch/powerpc/boot/dts/sbc8349.dts         |   80 +++++++++++++++-------------
 arch/powerpc/platforms/83xx/asp834x.c     |    1 +
 arch/powerpc/platforms/83xx/mpc834x_itx.c |    1 +
 arch/powerpc/platforms/83xx/mpc834x_mds.c |    1 +
 arch/powerpc/platforms/83xx/mpc837x_mds.c |    1 +
 arch/powerpc/platforms/83xx/mpc837x_rdb.c |    1 +
 arch/powerpc/platforms/83xx/sbc834x.c     |    1 +
 18 files changed, 488 insertions(+), 393 deletions(-)
arch/powerpc/boot/dts/asp834x-redboot.dts +44 -38
index 524af7e..7da84fd 100644
@@ -181,70 +181,76 @@
 			phy_type = "ulpi";
 		};
 
-		mdio@24520 {
-			#address-cells = <1>;
-			#size-cells = <0>;
-			compatible = "fsl,gianfar-mdio";
-			reg = <0x24520 0x20>;
-
-			phy0: ethernet-phy@0 {
-				interrupt-parent = <&ipic>;
-				interrupts = <17 0x8>;
-				reg = <0x1>;
-				device_type = "ethernet-phy";
-			};
-			phy1: ethernet-phy@1 {
-				interrupt-parent = <&ipic>;
-				interrupts = <18 0x8>;
-				reg = <0x2>;
-				device_type = "ethernet-phy";
-			};
-
-			tbi0: tbi-phy@11 {
-				reg = <0x11>;
-				device_type = "tbi-phy";
-			};
-		};
-
-		mdio@25520 {
-			#address-cells = <1>;
-			#size-cells = <0>;
-			compatible = "fsl,gianfar-tbi";
-			reg = <0x25520 0x20>;
-
-			tbi1: tbi-phy@11 {
-				reg = <0x11>;
-				device_type = "tbi-phy";
-			};
-		};
-
-
 		enet0: ethernet@24000 {
+			#address-cells = <1>;
+			#size-cells = <1>;
 			cell-index = <0>;
 			device_type = "network";
 			model = "TSEC";
 			compatible = "gianfar";
 			reg = <0x24000 0x1000>;
+			ranges = <0x0 0x24000 0x1000>;
 			local-mac-address = [ 00 08 e5 11 32 33 ];
 			interrupts = <32 0x8 33 0x8 34 0x8>;
 			interrupt-parent = <&ipic>;
 			tbi-handle = <&tbi0>;
 			phy-handle = <&phy0>;
 			linux,network-index = <0>;
+
+			mdio@520 {
+				#address-cells = <1>;
+				#size-cells = <0>;
+				compatible = "fsl,gianfar-mdio";
+				reg = <0x520 0x20>;
+
+				phy0: ethernet-phy@0 {
+					interrupt-parent = <&ipic>;
+					interrupts = <17 0x8>;
+					reg = <0x1>;
+					device_type = "ethernet-phy";
+				};
+
+				phy1: ethernet-phy@1 {
+					interrupt-parent = <&ipic>;
+					interrupts = <18 0x8>;
+					reg = <0x2>;
+					device_type = "ethernet-phy";
+				};
+
+				tbi0: tbi-phy@11 {
+					reg = <0x11>;
+					device_type = "tbi-phy";
+				};
+			};
 		};
 
 		enet1: ethernet@25000 {
+			#address-cells = <1>;
+			#size-cells = <1>;
 			cell-index = <1>;
 			device_type = "network";
 			model = "TSEC";
 			compatible = "gianfar";
 			reg = <0x25000 0x1000>;
+			ranges = <0x0 0x25000 0x1000>;
 			local-mac-address = [ 00 08 e5 11 32 34 ];
 			interrupts = <35 0x8 36 0x8 37 0x8>;
 			interrupt-parent = <&ipic>;
 			tbi-handle = <&tbi1>;
 			phy-handle = <&phy1>;
 			linux,network-index = <1>;
+
+			mdio@520 {
+				#address-cells = <1>;
+				#size-cells = <0>;
+				compatible = "fsl,gianfar-tbi";
+				reg = <0x520 0x20>;
+
+				tbi1: tbi-phy@11 {
+					reg = <0x11>;
+					device_type = "tbi-phy";
+				};
+			};
 		};
 
 		serial0: serial@4500 {
arch/powerpc/boot/dts/mpc8315erdb.dts +44 -36

110 lines not on this page · raw message

arch/powerpc/boot/dts/mpc8349emitx.dts +38 -31

101 lines not on this page · raw message

arch/powerpc/boot/dts/mpc8349emitxgp.dts +23 -19

60 lines not on this page · raw message

arch/powerpc/boot/dts/mpc834x_mds.dts +44 -37

113 lines not on this page · raw message

arch/powerpc/boot/dts/mpc8377_mds.dts +44 -36

112 lines not on this page · raw message

arch/powerpc/boot/dts/mpc8377_rdb.dts +37 -30

99 lines not on this page · raw message

arch/powerpc/boot/dts/mpc8378_mds.dts +44 -36

112 lines not on this page · raw message

arch/powerpc/boot/dts/mpc8378_rdb.dts +39 -30

103 lines not on this page · raw message

arch/powerpc/boot/dts/mpc8379_mds.dts +44 -35

111 lines not on this page · raw message

arch/powerpc/boot/dts/mpc8379_rdb.dts +37 -29

98 lines not on this page · raw message

arch/powerpc/boot/dts/sbc8349.dts +44 -36

112 lines not on this page · raw message

arch/powerpc/platforms/83xx/asp834x.c +1 -0
index bb30d67..aa0d84d 100644
@@ -58,6 +58,7 @@ static struct __initdata of_device_id asp8347_ids[] = {
 	{ .type = "soc", },
 	{ .compatible = "soc", },
 	{ .compatible = "simple-bus", },
+	{ .compatible = "gianfar", },
 	{},
 };
 
arch/powerpc/platforms/83xx/mpc834x_itx.c +1 -0
index 76092d3..81e44fa 100644
@@ -42,6 +42,7 @@
 static struct of_device_id __initdata mpc834x_itx_ids[] = {
 	{ .compatible = "fsl,pq2pro-localbus", },
 	{ .compatible = "simple-bus", },
+	{ .compatible = "gianfar", },
 	{},
 };
 
arch/powerpc/platforms/83xx/mpc834x_mds.c +1 -0
index fc3f2ed..d0a634b 100644
@@ -112,6 +112,7 @@ static struct of_device_id mpc834x_ids[] = {
 	{ .type = "soc", },
 	{ .compatible = "soc", },
 	{ .compatible = "simple-bus", },
+	{ .compatible = "gianfar", },
 	{},
 };
 
arch/powerpc/platforms/83xx/mpc837x_mds.c +1 -0
index 634785c..51df7e7 100644
@@ -96,6 +96,7 @@ static struct of_device_id mpc837x_ids[] = {
 	{ .type = "soc", },
 	{ .compatible = "soc", },
 	{ .compatible = "simple-bus", },
+	{ .compatible = "gianfar", },
 	{},
 };
 
arch/powerpc/platforms/83xx/mpc837x_rdb.c +1 -0
index 3d7b953..76f3b32 100644
@@ -48,6 +48,7 @@ static struct of_device_id mpc837x_ids[] = {
 	{ .type = "soc", },
 	{ .compatible = "soc", },
 	{ .compatible = "simple-bus", },
+	{ .compatible = "gianfar", },
 	{},
 };
 
arch/powerpc/platforms/83xx/sbc834x.c +1 -0
index 156c4e2..49023db 100644
@@ -84,6 +84,7 @@ static struct __initdata of_device_id sbc834x_ids[] = {
 	{ .type = "soc", },
 	{ .compatible = "soc", },
 	{ .compatible = "simple-bus", },
+	{ .compatible = "gianfar", },
 	{},
 };
 
Signature · 1 line
1.5.6.5
#5 lore raw

PATCH v4 3/4 powerpc/85xx: Move gianfar mdio nodes under the ethernet nodes

In reply to Anton Vorontsov

Currently it doesn't matter where the mdio nodes are placed, but with power management support (i.e. when sleep = <> properties will take effect), mdio nodes placement will become important: mdio controller is a part of the ethernet block, so the mdio nodes should be placed correctly. Otherwise we may wrongly assume that MDIO controllers are available during sleep.

---
 arch/powerpc/boot/dts/ksi8560.dts              |   79 ++++++-----
 arch/powerpc/boot/dts/mpc8536ds.dts            |   78 ++++++-----
 arch/powerpc/boot/dts/mpc8540ads.dts           |  117 +++++++++--------
 arch/powerpc/boot/dts/mpc8541cds.dts           |   78 ++++++-----
 arch/powerpc/boot/dts/mpc8544ds.dts            |   81 ++++++------
 arch/powerpc/boot/dts/mpc8548cds.dts           |  156 ++++++++++++----------
 arch/powerpc/boot/dts/mpc8555cds.dts           |   78 ++++++-----
 arch/powerpc/boot/dts/mpc8560ads.dts           |  102 ++++++++-------
 arch/powerpc/boot/dts/mpc8568mds.dts           |  102 ++++++++-------
 arch/powerpc/boot/dts/mpc8572ds.dts            |  150 ++++++++++++----------
 arch/powerpc/boot/dts/mpc8572ds_36b.dts        |  150 ++++++++++++----------
 arch/powerpc/boot/dts/mpc8572ds_camp_core0.dts |   39 +++---
 arch/powerpc/boot/dts/sbc8548.dts              |   78 ++++++-----
 arch/powerpc/boot/dts/sbc8560.dts              |  100 ++++++++-------
 arch/powerpc/boot/dts/stx_gp3_8560.dts         |   78 ++++++-----
 arch/powerpc/boot/dts/tqm8540.dts              |  117 +++++++++--------
 arch/powerpc/boot/dts/tqm8541.dts              |   90 +++++++------
 arch/powerpc/boot/dts/tqm8548-bigflash.dts     |  168 +++++++++++++-----------
 arch/powerpc/boot/dts/tqm8548.dts              |  168 +++++++++++++-----------
 arch/powerpc/boot/dts/tqm8555.dts              |   90 +++++++------
 arch/powerpc/boot/dts/tqm8560.dts              |   90 +++++++------
 arch/powerpc/platforms/85xx/ksi8560.c          |    1 +
 arch/powerpc/platforms/85xx/mpc8536_ds.c       |    1 +
 arch/powerpc/platforms/85xx/mpc85xx_ads.c      |    1 +
 arch/powerpc/platforms/85xx/mpc85xx_cds.c      |    1 +
 arch/powerpc/platforms/85xx/mpc85xx_ds.c       |    1 +
 arch/powerpc/platforms/85xx/mpc85xx_mds.c      |    1 +
 arch/powerpc/platforms/85xx/sbc8548.c          |    1 +
 arch/powerpc/platforms/85xx/sbc8560.c          |    1 +
 arch/powerpc/platforms/85xx/stx_gp3.c          |    1 +
 arch/powerpc/platforms/85xx/tqm85xx.c          |    1 +
 31 files changed, 1183 insertions(+), 1016 deletions(-)
arch/powerpc/boot/dts/ksi8560.dts +42 -37
index 3bfff47..308fe7c 100644
@@ -124,67 +124,72 @@
 			};
 		};
 
-		mdio@24520 {					/* For TSECs */
-			#address-cells = <1>;
-			#size-cells = <0>;
-			compatible = "fsl,gianfar-mdio";
-			reg = <0x24520 0x20>;
-
-			PHY1: ethernet-phy@1 {
-				interrupt-parent = <&mpic>;
-				reg = <0x1>;
-				device_type = "ethernet-phy";
-			};
-
-			PHY2: ethernet-phy@2 {
-				interrupt-parent = <&mpic>;
-				reg = <0x2>;
-				device_type = "ethernet-phy";
-			};
-
-			tbi0: tbi-phy@11 {
-				reg = <0x11>;
-				device_type = "tbi-phy";
-			};
-		};
-
-		mdio@25520 {
-			#address-cells = <1>;
-			#size-cells = <0>;
-			compatible = "fsl,gianfar-tbi";
-			reg = <0x25520 0x20>;
-
-			tbi1: tbi-phy@11 {
-				reg = <0x11>;
-				device_type = "tbi-phy";
-			};
-		};
-
-
 		enet0: ethernet@24000 {
+			#address-cells = <1>;
+			#size-cells = <1>;
 			device_type = "network";
 			model = "TSEC";
 			compatible = "gianfar";
 			reg = <0x24000 0x1000>;
+			ranges = <0x0 0x24000 0x1000>;
 			/* Mac address filled in by bootwrapper */
 			local-mac-address = [ 00 00 00 00 00 00 ];
 			interrupts = <0x1d 0x2 0x1e 0x2 0x22 0x2>;
 			interrupt-parent = <&mpic>;
 			tbi-handle = <&tbi0>;
 			phy-handle = <&PHY1>;
+
+			mdio@520 {					/* For TSECs */
+				#address-cells = <1>;
+				#size-cells = <0>;
+				compatible = "fsl,gianfar-mdio";
+				reg = <0x520 0x20>;
+
+				PHY1: ethernet-phy@1 {
+					interrupt-parent = <&mpic>;
+					reg = <0x1>;
+					device_type = "ethernet-phy";
+				};
+
+				PHY2: ethernet-phy@2 {
+					interrupt-parent = <&mpic>;
+					reg = <0x2>;
+					device_type = "ethernet-phy";
+				};
+
+				tbi0: tbi-phy@11 {
+					reg = <0x11>;
+					device_type = "tbi-phy";
+				};
+			};
 		};
 
 		enet1: ethernet@25000 {
+			#address-cells = <1>;
+			#size-cells = <1>;
 			device_type = "network";
 			model = "TSEC";
 			compatible = "gianfar";
 			reg = <0x25000 0x1000>;
+			ranges = <0x0 0x25000 0x1000>;
 			/* Mac address filled in by bootwrapper */
 			local-mac-address = [ 00 00 00 00 00 00 ];
 			interrupts = <0x23 0x2 0x24 0x2 0x28 0x2>;
 			interrupt-parent = <&mpic>;
 			tbi-handle = <&tbi1>;
 			phy-handle = <&PHY2>;
+
+			mdio@520 {
+				#address-cells = <1>;
+				#size-cells = <0>;
+				compatible = "fsl,gianfar-tbi";
+				reg = <0x520 0x20>;
+
+				tbi1: tbi-phy@11 {
+					reg = <0x11>;
+					device_type = "tbi-phy";
+				};
+			};
 		};
 
 		mpic: pic@40000 {
arch/powerpc/boot/dts/mpc8536ds.dts +42 -36

115 lines not on this page · raw message

arch/powerpc/boot/dts/mpc8540ads.dts +63 -54

160 lines not on this page · raw message

arch/powerpc/boot/dts/mpc8541cds.dts +42 -36

108 lines not on this page · raw message

arch/powerpc/boot/dts/mpc8544ds.dts +43 -38

118 lines not on this page · raw message

arch/powerpc/boot/dts/mpc8548cds.dts +84 -72

213 lines not on this page · raw message

arch/powerpc/boot/dts/mpc8555cds.dts +42 -36

108 lines not on this page · raw message

arch/powerpc/boot/dts/mpc8560ads.dts +54 -48

132 lines not on this page · raw message

arch/powerpc/boot/dts/mpc8568mds.dts +54 -48

132 lines not on this page · raw message

arch/powerpc/boot/dts/mpc8572ds.dts +81 -69

210 lines not on this page · raw message

arch/powerpc/boot/dts/mpc8572ds_36b.dts +81 -69

210 lines not on this page · raw message

arch/powerpc/boot/dts/mpc8572ds_camp_core0.dts +21 -18
index 32178bf..2bc0c71 100644
@@ -148,35 +148,38 @@
 			};
 		};
 
-		mdio@24520 {
-			#address-cells = <1>;
-			#size-cells = <0>;
-			compatible = "fsl,gianfar-mdio";
-			reg = <0x24520 0x20>;
-
-			phy0: ethernet-phy@0 {
-				interrupt-parent = <&mpic>;
-				interrupts = <10 1>;
-				reg = <0x0>;
-			};
-			phy1: ethernet-phy@1 {
-				interrupt-parent = <&mpic>;
-				interrupts = <10 1>;
-				reg = <0x1>;
-			};
-		};
-
 		enet0: ethernet@24000 {
+			#address-cells = <1>;
+			#size-cells = <1>;
 			cell-index = <0>;
 			device_type = "network";
 			model = "eTSEC";
 			compatible = "gianfar";
 			reg = <0x24000 0x1000>;
+			ranges = <0x0 0x24000 0x1000>;
 			local-mac-address = [ 00 00 00 00 00 00 ];
 			interrupts = <29 2 30 2 34 2>;
 			interrupt-parent = <&mpic>;
 			phy-handle = <&phy0>;
 			phy-connection-type = "rgmii-id";
+
+			mdio@520 {
+				#address-cells = <1>;
+				#size-cells = <0>;
+				compatible = "fsl,gianfar-mdio";
+				reg = <0x520 0x20>;
+
+				phy0: ethernet-phy@0 {
+					interrupt-parent = <&mpic>;
+					interrupts = <10 1>;
+					reg = <0x0>;
+				};
+				phy1: ethernet-phy@1 {
+					interrupt-parent = <&mpic>;
+					interrupts = <10 1>;
+					reg = <0x1>;
+				};
+			};
 		};
 
 		enet1: ethernet@25000 {
arch/powerpc/boot/dts/sbc8548.dts +42 -36

108 lines not on this page · raw message

arch/powerpc/boot/dts/sbc8560.dts +53 -47

130 lines not on this page · raw message

arch/powerpc/boot/dts/stx_gp3_8560.dts +42 -36

108 lines not on this page · raw message

arch/powerpc/boot/dts/tqm8540.dts +63 -54

157 lines not on this page · raw message

arch/powerpc/boot/dts/tqm8541.dts +48 -42

120 lines not on this page · raw message

arch/powerpc/boot/dts/tqm8548-bigflash.dts +90 -78

224 lines not on this page · raw message

arch/powerpc/boot/dts/tqm8548.dts +90 -78

224 lines not on this page · raw message

arch/powerpc/boot/dts/tqm8555.dts +48 -42

120 lines not on this page · raw message

arch/powerpc/boot/dts/tqm8560.dts +48 -42

120 lines not on this page · raw message

arch/powerpc/platforms/85xx/ksi8560.c +1 -0
index 66f2923..f4d36b5 100644
@@ -219,6 +219,7 @@ static struct of_device_id __initdata of_bus_ids[] = {
 	{ .type = "simple-bus", },
 	{ .name = "cpm", },
 	{ .name = "localbus", },
+	{ .compatible = "gianfar", },
 	{},
 };
 
arch/powerpc/platforms/85xx/mpc8536_ds.c +1 -0
index 1bf5aef..63efca2 100644
@@ -92,6 +92,7 @@ static struct of_device_id __initdata mpc8536_ds_ids[] = {
 	{ .type = "soc", },
 	{ .compatible = "soc", },
 	{ .compatible = "simple-bus", },
+	{ .compatible = "gianfar", },
 	{},
 };
 
arch/powerpc/platforms/85xx/mpc85xx_ads.c +1 -0
index 21f0090..9438a89 100644
@@ -226,6 +226,7 @@ static struct of_device_id __initdata of_bus_ids[] = {
 	{ .name = "cpm", },
 	{ .name = "localbus", },
 	{ .compatible = "simple-bus", },
+	{ .compatible = "gianfar", },
[… more lines in the raw message]

Lines of this file are not shown. View the raw message.

arch/powerpc/platforms/85xx/mpc85xx_cds.c +1 -0
index aeb6a5b..0a9e491 100644

Lines of this file are not shown. View the raw message.

arch/powerpc/platforms/85xx/mpc85xx_ds.c +1 -0
index 7326d90..de66de7 100644

Lines of this file are not shown. View the raw message.

arch/powerpc/platforms/85xx/mpc85xx_mds.c +1 -0
index 658a36f..7dd0290 100644

Lines of this file are not shown. View the raw message.

arch/powerpc/platforms/85xx/sbc8548.c +1 -0
index 7ec77ce..ecdd8c0 100644

Lines of this file are not shown. View the raw message.

arch/powerpc/platforms/85xx/sbc8560.c +1 -0
index 472f254..cc27807 100644

Lines of this file are not shown. View the raw message.

arch/powerpc/platforms/85xx/stx_gp3.c +1 -0
index 0cca8f5..f559918 100644

Lines of this file are not shown. View the raw message.

arch/powerpc/platforms/85xx/tqm85xx.c +1 -0
index 2933a8e..5b0ab99 100644

Lines of this file are not shown. View the raw message.

The rest of this diff is not shown. View the raw message.

Signature · 1 line
1.5.6.5

Part of the diff is not shown here. View the raw message.

#7 lore raw

PATCH v4 4/4 powerpc/86xx: Move gianfar mdio nodes under the ethernet nodes

In reply to Anton Vorontsov

Currently it doesn't matter where the mdio nodes are placed, but with power management support (i.e. when sleep = <> properties will take effect), mdio nodes placement will become important: mdio controller is a part of the ethernet block, so the mdio nodes should be placed correctly. Otherwise we may wrongly assume that MDIO controllers are available during sleep.

---
 arch/powerpc/boot/dts/gef_ppc9a.dts        |   39 ++++---
 arch/powerpc/boot/dts/gef_sbc310.dts       |   39 ++++---
 arch/powerpc/boot/dts/gef_sbc610.dts       |   39 ++++---
 arch/powerpc/boot/dts/mpc8641_hpcn.dts     |  157 +++++++++++++++-------------
 arch/powerpc/boot/dts/sbc8641d.dts         |  156 +++++++++++++++-------------
 arch/powerpc/platforms/86xx/gef_ppc9a.c    |    1 +
 arch/powerpc/platforms/86xx/gef_sbc310.c   |    1 +
 arch/powerpc/platforms/86xx/gef_sbc610.c   |    1 +
 arch/powerpc/platforms/86xx/mpc8610_hpcd.c |    1 +
 arch/powerpc/platforms/86xx/mpc86xx_hpcn.c |    1 +
 arch/powerpc/platforms/86xx/sbc8641d.c     |    1 +
 11 files changed, 237 insertions(+), 199 deletions(-)
arch/powerpc/boot/dts/gef_ppc9a.dts +21 -18
index 0ddfdfc..d47ad07 100644
@@ -247,34 +247,37 @@
 			};
 		};
 
-		mdio@24520 {
-			#address-cells = <1>;
-			#size-cells = <0>;
-			compatible = "fsl,gianfar-mdio";
-			reg = <0x24520 0x20>;
-
-			phy0: ethernet-phy@0 {
-				interrupt-parent = <&gef_pic>;
-				interrupts = <0x9 0x4>;
-				reg = <1>;
-			};
-			phy2: ethernet-phy@2 {
-				interrupt-parent = <&gef_pic>;
-				interrupts = <0x8 0x4>;
-				reg = <3>;
-			};
-		};
-
 		enet0: ethernet@24000 {
+			#address-cells = <1>;
+			#size-cells = <1>;
 			device_type = "network";
 			model = "eTSEC";
 			compatible = "gianfar";
 			reg = <0x24000 0x1000>;
+			ranges = <0x0 0x24000 0x1000>;
 			local-mac-address = [ 00 00 00 00 00 00 ];
 			interrupts = <0x1d 0x2 0x1e 0x2 0x22 0x2>;
 			interrupt-parent = <&mpic>;
 			phy-handle = <&phy0>;
 			phy-connection-type = "gmii";
+
+			mdio@520 {
+				#address-cells = <1>;
+				#size-cells = <0>;
+				compatible = "fsl,gianfar-mdio";
+				reg = <0x520 0x20>;
+
+				phy0: ethernet-phy@0 {
+					interrupt-parent = <&gef_pic>;
+					interrupts = <0x9 0x4>;
+					reg = <1>;
+				};
+				phy2: ethernet-phy@2 {
+					interrupt-parent = <&gef_pic>;
+					interrupts = <0x8 0x4>;
+					reg = <3>;
+				};
+			};
 		};
 
 		enet1: ethernet@26000 {
arch/powerpc/boot/dts/gef_sbc310.dts +21 -18
index 09eeb43..1569117 100644
@@ -247,34 +247,37 @@
 			};
 		};
 
-		mdio@24520 {
-			#address-cells = <1>;
-			#size-cells = <0>;
-			compatible = "fsl,gianfar-mdio";
-			reg = <0x24520 0x20>;
-
-			phy0: ethernet-phy@0 {
-				interrupt-parent = <&gef_pic>;
-				interrupts = <0x9 0x4>;
-				reg = <1>;
-			};
-			phy2: ethernet-phy@2 {
-				interrupt-parent = <&gef_pic>;
-				interrupts = <0x8 0x4>;
-				reg = <3>;
-			};
-		};
-
 		enet0: ethernet@24000 {
+			#address-cells = <1>;
+			#size-cells = <1>;
 			device_type = "network";
 			model = "eTSEC";
 			compatible = "gianfar";
 			reg = <0x24000 0x1000>;
+			ranges = <0x0 0x24000 0x1000>;
 			local-mac-address = [ 00 00 00 00 00 00 ];
 			interrupts = <0x1d 0x2 0x1e 0x2 0x22 0x2>;
 			interrupt-parent = <&mpic>;
 			phy-handle = <&phy0>;
 			phy-connection-type = "gmii";
+
+			mdio@520 {
+				#address-cells = <1>;
+				#size-cells = <0>;
+				compatible = "fsl,gianfar-mdio";
+				reg = <0x520 0x20>;
+
+				phy0: ethernet-phy@0 {
+					interrupt-parent = <&gef_pic>;
+					interrupts = <0x9 0x4>;
+					reg = <1>;
+				};
+				phy2: ethernet-phy@2 {
+					interrupt-parent = <&gef_pic>;
+					interrupts = <0x8 0x4>;
+					reg = <3>;
+				};
+			};
 		};
 
 		enet1: ethernet@26000 {
arch/powerpc/boot/dts/gef_sbc610.dts +21 -18
index 714175c..6582dbd 100644
@@ -202,34 +202,37 @@
 			};
 		};
 
-		mdio@24520 {
-			#address-cells = <1>;
-			#size-cells = <0>;
-			compatible = "fsl,gianfar-mdio";
-			reg = <0x24520 0x20>;
-
-			phy0: ethernet-phy@0 {
-				interrupt-parent = <&gef_pic>;
-				interrupts = <0x9 0x4>;
-				reg = <1>;
-			};
-			phy2: ethernet-phy@2 {
-				interrupt-parent = <&gef_pic>;
-				interrupts = <0x8 0x4>;
-				reg = <3>;
-			};
-		};
-
 		enet0: ethernet@24000 {
+			#address-cells = <1>;
+			#size-cells = <1>;
 			device_type = "network";
 			model = "eTSEC";
 			compatible = "gianfar";
 			reg = <0x24000 0x1000>;
+			ranges = <0x0 0x24000 0x1000>;
 			local-mac-address = [ 00 00 00 00 00 00 ];
 			interrupts = <0x1d 0x2 0x1e 0x2 0x22 0x2>;
 			interrupt-parent = <&mpic>;
 			phy-handle = <&phy0>;
 			phy-connection-type = "gmii";
+
+			mdio@520 {
+				#address-cells = <1>;
+				#size-cells = <0>;
+				compatible = "fsl,gianfar-mdio";
+				reg = <0x520 0x20>;
+
+				phy0: ethernet-phy@0 {
+					interrupt-parent = <&gef_pic>;
+					interrupts = <0x9 0x4>;
+					reg = <1>;
+				};
+				phy2: ethernet-phy@2 {
+					interrupt-parent = <&gef_pic>;
+					interrupts = <0x8 0x4>;
+					reg = <3>;
+				};
+			};
 		};
 
 		enet1: ethernet@26000 {
arch/powerpc/boot/dts/mpc8641_hpcn.dts +84 -73

217 lines not on this page · raw message

arch/powerpc/boot/dts/sbc8641d.dts +84 -72

216 lines not on this page · raw message

arch/powerpc/platforms/86xx/gef_ppc9a.c +1 -0
index 830fd9a..d791046 100644
@@ -194,6 +194,7 @@ static long __init mpc86xx_time_init(void)
 
 static __initdata struct of_device_id of_bus_ids[] = {
 	{ .compatible = "simple-bus", },
+	{ .compatible = "gianfar", },
 	{},
 };
 
arch/powerpc/platforms/86xx/gef_sbc310.c +1 -0
index ba3ce43..af14f85 100644
@@ -205,6 +205,7 @@ static long __init mpc86xx_time_init(void)
 
 static __initdata struct of_device_id of_bus_ids[] = {
 	{ .compatible = "simple-bus", },
+	{ .compatible = "gianfar", },
 	{},
 };
 
arch/powerpc/platforms/86xx/gef_sbc610.c +1 -0
index d6b772b..ea23606 100644
@@ -194,6 +194,7 @@ static long __init mpc86xx_time_init(void)
 
 static __initdata struct of_device_id of_bus_ids[] = {
 	{ .compatible = "simple-bus", },
+	{ .compatible = "gianfar", },
 	{},
 };
 
arch/powerpc/platforms/86xx/mpc8610_hpcd.c +1 -0
index e8d54ac..3f49a6f 100644
@@ -46,6 +46,7 @@ static unsigned char *pixis_bdcfg0, *pixis_arch;
 static struct of_device_id __initdata mpc8610_ids[] = {
 	{ .compatible = "fsl,mpc8610-immr", },
 	{ .compatible = "simple-bus", },
+	{ .compatible = "gianfar", },
 	{}
 };
 
arch/powerpc/platforms/86xx/mpc86xx_hpcn.c +1 -0
index 27e0e68..c4ec49b 100644
@@ -148,6 +148,7 @@ mpc86xx_time_init(void)
 static __initdata struct of_device_id of_bus_ids[] = {
 	{ .compatible = "simple-bus", },
 	{ .compatible = "fsl,rapidio-delta", },
+	{ .compatible = "gianfar", },
 	{},
 };
 
arch/powerpc/platforms/86xx/sbc8641d.c +1 -0
index 5fd7ed4..2886a36 100644
@@ -103,6 +103,7 @@ mpc86xx_time_init(void)
 
 static __initdata struct of_device_id of_bus_ids[] = {
 	{ .compatible = "simple-bus", },
+	{ .compatible = "gianfar", },
 	{},
 };
 
Signature · 1 line
1.5.6.5
Tested-by on v4 4/4
#8 lore raw

Re: [PATCH 4/4] powerpc/86xx: Move gianfar mdio nodes under the ethernet nodes

Quoted 10 lines · Anton Vorontsov

Currently it doesn't matter where the mdio nodes are placed, but with power management support (i.e. when sleep = <> properties will take effect), mdio nodes placement will become important: mdio controller is a part of the ethernet block, so the mdio nodes should be placed correctly. Otherwise we may wrongly assume that MDIO controllers are available during sleep.

Quoted 14 lines
---
 arch/powerpc/boot/dts/gef_ppc9a.dts        |   39 ++++---
 arch/powerpc/boot/dts/gef_sbc310.dts       |   39 ++++---
 arch/powerpc/boot/dts/gef_sbc610.dts       |   39 ++++---
 arch/powerpc/boot/dts/mpc8641_hpcn.dts     |  157 +++++++++++++++-------------
 arch/powerpc/boot/dts/sbc8641d.dts         |  156 +++++++++++++++-------------
 arch/powerpc/platforms/86xx/gef_ppc9a.c    |    1 +
 arch/powerpc/platforms/86xx/gef_sbc310.c   |    1 +
 arch/powerpc/platforms/86xx/gef_sbc610.c   |    1 +
 arch/powerpc/platforms/86xx/mpc8610_hpcd.c |    1 +
 arch/powerpc/platforms/86xx/mpc86xx_hpcn.c |    1 +
 arch/powerpc/platforms/86xx/sbc8641d.c     |    1 +
 11 files changed, 237 insertions(+), 199 deletions(-)

Tested on ppc9a. Other GE Fanuc boards look sane.

Martyn

Signature · 4 lines
Martyn Welch MEng MPhil MIET (Principal Software Engineer)   T:+44(0)1327322748
GE Fanuc Intelligent Platforms Ltd,        |Registered in England and Wales
Tove Valley Business Park, Towcester,      |(3828642) at 100 Barbirolli Square,
Northants, NN12 6PF, UK T:+44(0)1327359444 |Manchester,M2 3AB  VAT:GB 729849476
Applied
#2 lore raw

Re: [PATCH 1/4] powerpc/83xx: Add power management support for MPC837x boards

In reply to Anton Vorontsov
Quoted 22 lines · Anton Vorontsov

This patch adds pmc nodes to the device tree files so that the boards will able to use standby capability of MPC837x processors. The MPC837x PMC controllers are compatible with MPC8349 ones (i.e. no deep sleep).

sleep = <> properties are used to specify SCCR masks as described in "Specifying Device Power Management Information (sleep property)" chapter in Documentation/powerpc/booting-without-of.txt.

Since I2C1 and eSDHC controllers share the same clock source, they are now placed under sleep-nexus nodes.

A processor is able to wakeup the boards on LAN events (Wake-On-Lan), console events (with no_console_suspend kernel command line), GPIO events and external IRQs (IRQ1 and IRQ2).

The processor can also wakeup the boards by the fourth general purpose timer in GTM1 block, but the GTM wakeup support isn't yet implemented (it's tested to work, but it's unclear how can we use the quite short GTM timers, and how do we want to expose the GTM to userspace).

---

Quoted 10 lines
arch/powerpc/boot/dts/mpc8377_mds.dts |   68 ++++++++++++++++-------
arch/powerpc/boot/dts/mpc8377_rdb.dts |   98 ++++++++++++++++++++ 
+------------
arch/powerpc/boot/dts/mpc8378_mds.dts |   66 +++++++++++++++-------
arch/powerpc/boot/dts/mpc8378_rdb.dts |   96 +++++++++++++++++++ 
+------------
arch/powerpc/boot/dts/mpc8379_mds.dts |   68 ++++++++++++++++-------
arch/powerpc/boot/dts/mpc8379_rdb.dts |   98 ++++++++++++++++++++ 
+------------
6 files changed, 323 insertions(+), 171 del

applied to next

- k

Applied
#4 lore raw

Re: [PATCH 2/4] powerpc/83xx: Move gianfar mdio nodes under the ethernet nodes

In reply to Anton Vorontsov
Quoted 32 lines · Anton Vorontsov

Currently it doesn't matter where the mdio nodes are placed, but with power management support (i.e. when sleep = <> properties will take effect), mdio nodes placement will become important: mdio controller is a part of the ethernet block, so the mdio nodes should be placed correctly. Otherwise we may wrongly assume that MDIO controllers are available during sleep.

---
arch/powerpc/boot/dts/asp834x-redboot.dts | 82 ++++++++++++++

+-------------
arch/powerpc/boot/dts/mpc8315erdb.dts     |   80 ++++++++++++++ 
+-------------
arch/powerpc/boot/dts/mpc8349emitx.dts    |   69 ++++++++++++ 
+-----------
arch/powerpc/boot/dts/mpc8349emitxgp.dts  |   42 ++++++++-------
arch/powerpc/boot/dts/mpc834x_mds.dts     |   81 ++++++++++++++ 
+-------------
arch/powerpc/boot/dts/mpc8377_mds.dts     |   80 ++++++++++++++ 
+-------------
arch/powerpc/boot/dts/mpc8377_rdb.dts     |   67 ++++++++++++ 
+-----------
arch/powerpc/boot/dts/mpc8378_mds.dts     |   80 ++++++++++++++ 
+-------------
arch/powerpc/boot/dts/mpc8378_rdb.dts     |   69 +++++++++++++ 
+-----------
arch/powerpc/boot/dts/mpc8379_mds.dts     |   79 ++++++++++++++ 
+------------
arch/powerpc/boot/dts/mpc8379_rdb.dts     |   66 ++++++++++++ 
+----------
arch/powerpc/boot/dts/sbc8349.dts         |   80 ++++++++++++++ 
Quoted 8 lines
+-------------
arch/powerpc/platforms/83xx/asp834x.c     |    1 +
arch/powerpc/platforms/83xx/mpc834x_itx.c |    1 +
arch/powerpc/platforms/83xx/mpc834x_mds.c |    1 +
arch/powerpc/platforms/83xx/mpc837x_mds.c |    1 +
arch/powerpc/platforms/83xx/mpc837x_rdb.c |    1 +
arch/powerpc/platforms/83xx/sbc834x.c     |    1 +
18 files changed, 488 insertions(+), 393 deletions(-)

applied to next

- k

Applied
#6 lore raw

Re: [PATCH 3/4] powerpc/85xx: Move gianfar mdio nodes under the ethernet nodes

In reply to Anton Vorontsov
Quoted 42 lines · Anton Vorontsov

Currently it doesn't matter where the mdio nodes are placed, but with power management support (i.e. when sleep = <> properties will take effect), mdio nodes placement will become important: mdio controller is a part of the ethernet block, so the mdio nodes should be placed correctly. Otherwise we may wrongly assume that MDIO controllers are available during sleep.

---

arch/powerpc/boot/dts/ksi8560.dts              |   79 ++++++-----
arch/powerpc/boot/dts/mpc8536ds.dts            |   78 ++++++-----
arch/powerpc/boot/dts/mpc8540ads.dts           |  117 ++++++++ 
+--------
arch/powerpc/boot/dts/mpc8541cds.dts           |   78 ++++++-----
arch/powerpc/boot/dts/mpc8544ds.dts            |   81 ++++++------
arch/powerpc/boot/dts/mpc8548cds.dts           |  156 +++++++++++ 
+----------
arch/powerpc/boot/dts/mpc8555cds.dts           |   78 ++++++-----
arch/powerpc/boot/dts/mpc8560ads.dts           |  102 ++++++++-------
arch/powerpc/boot/dts/mpc8568mds.dts           |  102 ++++++++-------
arch/powerpc/boot/dts/mpc8572ds.dts            |  150 +++++++++++ 
+----------
arch/powerpc/boot/dts/mpc8572ds_36b.dts        |  150 +++++++++++ 
+----------
arch/powerpc/boot/dts/mpc8572ds_camp_core0.dts |   39 +++---
arch/powerpc/boot/dts/sbc8548.dts              |   78 ++++++-----
arch/powerpc/boot/dts/sbc8560.dts              |  100 ++++++++-------
arch/powerpc/boot/dts/stx_gp3_8560.dts         |   78 ++++++-----
arch/powerpc/boot/dts/tqm8540.dts              |  117 ++++++++ 
+--------
arch/powerpc/boot/dts/tqm8541.dts              |   90 +++++++------
arch/powerpc/boot/dts/tqm8548-bigflash.dts     |  168 ++++++++++++ 
+-----------
arch/powerpc/boot/dts/tqm8548.dts              |  168 ++++++++++++ 
+-----------
arch/powerpc/boot/dts/tqm8555.dts              |   90 +++++++------
arch/powerpc/boot/dts/tqm8560.dts              |   90 +++++++------
arch/powerpc/platforms/85xx/ksi8560.c          |    1 +
arch/powerpc/platforms/85xx/mpc8536_ds.c       |    1 +
arch/powerpc/platforms/85xx/mpc85xx_ads.c      |    1 +
Quoted 8 lines
arch/powerpc/platforms/85xx/mpc85xx_cds.c      |    1 +
arch/powerpc/platforms/85xx/mpc85xx_ds.c       |    1 +
arch/powerpc/platforms/85xx/mpc85xx_mds.c      |    1 +
arch/powerpc/platforms/85xx/sbc8548.c          |    1 +
arch/powerpc/platforms/85xx/sbc8560.c          |    1 +
arch/powerpc/platforms/85xx/stx_gp3.c          |    1 +
arch/powerpc/platforms/85xx/tqm85xx.c          |    1 +
31 files changed, 1183 insertions(+), 1016 deletions(-)

applied to next

- k

Applied
#9 lore raw

Re: [PATCH 4/4] powerpc/86xx: Move gianfar mdio nodes under the ethernet nodes

In reply to Anton Vorontsov
Quoted 11 lines · Anton Vorontsov

Currently it doesn't matter where the mdio nodes are placed, but with power management support (i.e. when sleep = <> properties will take effect), mdio nodes placement will become important: mdio controller is a part of the ethernet block, so the mdio nodes should be placed correctly. Otherwise we may wrongly assume that MDIO controllers are available during sleep.

---

Quoted 14 lines
arch/powerpc/boot/dts/gef_ppc9a.dts        |   39 ++++---
arch/powerpc/boot/dts/gef_sbc310.dts       |   39 ++++---
arch/powerpc/boot/dts/gef_sbc610.dts       |   39 ++++---
arch/powerpc/boot/dts/mpc8641_hpcn.dts     |  157 ++++++++++++++ 
+-------------
arch/powerpc/boot/dts/sbc8641d.dts         |  156 ++++++++++++++ 
+-------------
arch/powerpc/platforms/86xx/gef_ppc9a.c    |    1 +
arch/powerpc/platforms/86xx/gef_sbc310.c   |    1 +
arch/powerpc/platforms/86xx/gef_sbc610.c   |    1 +
arch/powerpc/platforms/86xx/mpc8610_hpcd.c |    1 +
arch/powerpc/platforms/86xx/mpc86xx_hpcn.c |    1 +
arch/powerpc/platforms/86xx/sbc8641d.c     |    1 +
11 files changed, 237 insertions(+), 199 deletions(-)

applied to next

- k