[PATCH 0/8] powerpc: mv64x60/prpmc2800 - DTS updates, etc.

[PATCH 0/8] powerpc: mv64x60/prpmc2800 - DTS updates, etc.

[Mark A. Greer]

This is the broken out patch series that equates to the "big blob"
patch (with minor modifications) that was sent here:

http://patchwork.ozlabs.org/linuxppc/patch?id=15382

These patches depend on the following patches to apply cleanly:

http://patchwork.ozlabs.org/linuxppc/patch?id=14397
http://patchwork.ozlabs.org/linuxppc/patch?id=14396
http://patchwork.ozlabs.org/linuxppc/patch?id=14631
http://patchwork.ozlabs.org/linuxppc/patch?id=14632
http://patchwork.ozlabs.org/linuxppc/patch?id=14633
http://patchwork.ozlabs.org/linuxppc/patch?id=15007

Please let me know if you have any issues with these patches.

Thanks,

Mark

[PATCH 1/8] powerpc: prpmc2800 - Convert dts file to v1

[Mark A. Greer]

From: Mark A. Greer <mgreer@mvista.com>

Convert the prpmc2800.dts file to dts-v1.  Basically, this means
converting the numeric constants to be 'C'-like (e.g., hexadecimal
numbers start with '0x').

Signed-off-by: Mark A. Greer <mgreer@mvista.com>
---
 arch/powerpc/boot/dts/prpmc2800.dts |  188 +++++++++++++-------------
 1 file changed, 96 insertions(+), 92 deletions(-)

diff --git a/arch/powerpc/boot/dts/prpmc2800.dts b/arch/powerpc/boot/dts/prpmc2800.dts
index 24944ca..15247a4 100644
--- a/arch/powerpc/boot/dts/prpmc2800.dts
+++ b/arch/powerpc/boot/dts/prpmc2800.dts
@@ -11,6 +11,8 @@
  * if it can determine the exact PrPMC type.
  */
 
+/dts-v1/;
+
 / {
 	#address-cells = <1>;
 	#size-cells = <1>;
@@ -25,64 +27,64 @@
 		PowerPC,7447 {
 			device_type = "cpu";
 			reg = <0>;
-			clock-frequency = <2bb0b140>;	/* Default (733 MHz) */
-			bus-frequency = <7f28155>;	/* 133.333333 MHz */
-			timebase-frequency = <1fca055>;	/* 33.333333 MHz */
-			i-cache-line-size = <20>;
-			d-cache-line-size = <20>;
-			i-cache-size = <8000>;
-			d-cache-size = <8000>;
+			clock-frequency = <733333333>;	/* Default */
+			bus-frequency = <133333333>;
+			timebase-frequency = <33333333>;
+			i-cache-line-size = <0x20>;
+			d-cache-line-size = <0x20>;
+			i-cache-size = <0x8000>;
+			d-cache-size = <0x8000>;
 		};
 	};
 
 	memory {
 		device_type = "memory";
-		reg = <00000000 20000000>;	/* Default (512MB) */
+		reg = <0x00000000 0x20000000>;	/* Default (512MB) */
 	};
 
 	mv64x60@f1000000 { /* Marvell Discovery */
 		#address-cells = <1>;
 		#size-cells = <1>;
 		model = "mv64360";			/* Default */
-		compatible = "marvell,mv64x60";
-		clock-frequency = <7f28155>;		/* 133.333333 MHz */
-		reg = <f1000000 00010000>;
-		virtual-reg = <f1000000>;
-		ranges = <88000000 88000000 01000000	/* PCI 0 I/O Space */
-			  80000000 80000000 08000000	/* PCI 0 MEM Space */
-			  a0000000 a0000000 04000000	/* User FLASH */
-			  00000000 f1000000 00010000	/* Bridge's regs */
-			  f2000000 f2000000 00040000>;	/* Integrated SRAM */
+		compatible = "marvell,mv64360";
+		clock-frequency = <133333333>;
+		reg = <0xf1000000 0x00010000>;
+		virtual-reg = <0xf1000000>;
+		ranges = <0x88000000 0x88000000 0x01000000 /* PCI 0 I/O Space */
+			  0x80000000 0x80000000 0x08000000 /* PCI 0 MEM Space */
+			  0xa0000000 0xa0000000 0x04000000 /* User FLASH */
+			  0x00000000 0xf1000000 0x00010000 /* Bridge's regs */
+			  0xf2000000 0xf2000000 0x00040000>;/* Integrated SRAM*/
 
 		flash@a0000000 {
 			compatible = "cfi-flash";
-			reg = <a0000000 04000000>;
+			reg = <0xa0000000 0x04000000>;
 			bank-width = <4>;
 			device-width = <2>;
 			#address-cells = <1>;
 			#size-cells = <1>;
 			fw@0 {
 				label = "FW Image A";
-				reg = <00000000 00100000>;
+				reg = <0x00000000 0x00100000>;
 				read-only;
 			};
 			cfg@100000 {
 				label = "FW Config Data";	/* RW */
-				reg = <00100000 00040000>;
+				reg = <0x00100000 0x00040000>;
 			};
 			kernel@140000 {
 				label = "Kernel Image";
-				reg = <00140000 00400000>;
+				reg = <0x00140000 0x00400000>;
 				read-only;
 			};
 			fs@540000 {
 				label = "Filesystem";
-				reg = <00540000 039c0000>;
+				reg = <0x00540000 0x039c0000>;
 				read-only;
 			};
 			fw@3f00000 {
 				label = "FW Image B";
-				reg = <03f00000 00100000>;
+				reg = <0x03f00000 0x00100000>;
 				read-only;
 			};
 		};
@@ -95,26 +97,26 @@
 			ethernet-phy@1 {
 				device_type = "ethernet-phy";
 				compatible = "broadcom,bcm5421";
-				interrupts = <4c>;	/* GPP 12 */
+				interrupts = <76>;	/* GPP 12 */
 				interrupt-parent = <&/mv64x60/pic>;
 				reg = <1>;
 			};
 			ethernet-phy@3 {
 				device_type = "ethernet-phy";
 				compatible = "broadcom,bcm5421";
-				interrupts = <4c>;	/* GPP 12 */
+				interrupts = <76>;	/* GPP 12 */
 				interrupt-parent = <&/mv64x60/pic>;
 				reg = <3>;
 			};
 		};
 
 		ethernet@2000 {
-			reg = <2000 2000>;
+			reg = <0x2000 0x2000>;
 			eth0 {
 				device_type = "network";
 				compatible = "marvell,mv64x60-eth";
 				block-index = <0>;
-				interrupts = <20>;
+				interrupts = <32>;
 				interrupt-parent = <&/mv64x60/pic>;
 				phy = <&/mv64x60/mdio/ethernet-phy@1>;
 				local-mac-address = [ 00 00 00 00 00 00 ];
@@ -123,7 +125,7 @@
 				device_type = "network";
 				compatible = "marvell,mv64x60-eth";
 				block-index = <1>;
-				interrupts = <21>;
+				interrupts = <33>;
 				interrupt-parent = <&/mv64x60/pic>;
 				phy = <&/mv64x60/mdio/ethernet-phy@3>;
 				local-mac-address = [ 00 00 00 00 00 00 ];
@@ -133,110 +135,110 @@
 		sdma@4000 {
 			device_type = "dma";
 			compatible = "marvell,mv64x60-sdma";
-			reg = <4000 c18>;
-			virtual-reg = <f1004000>;
+			reg = <0x4000 0xc18>;
+			virtual-reg = <0xf1004000>;
 			interrupt-base = <0>;
-			interrupts = <24>;
+			interrupts = <36>;
 			interrupt-parent = <&/mv64x60/pic>;
 		};
 
 		sdma@6000 {
 			device_type = "dma";
 			compatible = "marvell,mv64x60-sdma";
-			reg = <6000 c18>;
-			virtual-reg = <f1006000>;
+			reg = <0x6000 0xc18>;
+			virtual-reg = <0xf1006000>;
 			interrupt-base = <0>;
-			interrupts = <26>;
+			interrupts = <38>;
 			interrupt-parent = <&/mv64x60/pic>;
 		};
 
 		brg@b200 {
 			compatible = "marvell,mv64x60-brg";
-			reg = <b200 8>;
+			reg = <0xb200 0x8>;
 			clock-src = <8>;
-			clock-frequency = <7ed6b40>;
-			current-speed = <2580>;
+			clock-frequency = <133000000>;
+			current-speed = <9600>;
 			bcr = <0>;
 		};
 
 		brg@b208 {
 			compatible = "marvell,mv64x60-brg";
-			reg = <b208 8>;
+			reg = <0xb208 0x8>;
 			clock-src = <8>;
-			clock-frequency = <7ed6b40>;
-			current-speed = <2580>;
+			clock-frequency = <133000000>;
+			current-speed = <9600>;
 			bcr = <0>;
 		};
 
 		cunit@f200 {
-			reg = <f200 200>;
+			reg = <0xf200 0x200>;
 		};
 
 		mpscrouting@b400 {
-			reg = <b400 c>;
+			reg = <0xb400 0xc>;
 		};
 
 		mpscintr@b800 {
-			reg = <b800 100>;
-			virtual-reg = <f100b800>;
+			reg = <0xb800 0x100>;
+			virtual-reg = <0xf100b800>;
 		};
 
 		mpsc@8000 {
 			device_type = "serial";
 			compatible = "marvell,mpsc";
-			reg = <8000 38>;
-			virtual-reg = <f1008000>;
+			reg = <0x8000 0x38>;
+			virtual-reg = <0xf1008000>;
 			sdma = <&/mv64x60/sdma@4000>;
 			brg = <&/mv64x60/brg@b200>;
 			cunit = <&/mv64x60/cunit@f200>;
 			mpscrouting = <&/mv64x60/mpscrouting@b400>;
 			mpscintr = <&/mv64x60/mpscintr@b800>;
 			block-index = <0>;
-			max_idle = <28>;
+			max_idle = <40>;
 			chr_1 = <0>;
 			chr_2 = <0>;
 			chr_10 = <3>;
 			mpcr = <0>;
-			interrupts = <28>;
+			interrupts = <40>;
 			interrupt-parent = <&/mv64x60/pic>;
 		};
 
 		mpsc@9000 {
 			device_type = "serial";
 			compatible = "marvell,mpsc";
-			reg = <9000 38>;
-			virtual-reg = <f1009000>;
+			reg = <0x9000 0x38>;
+			virtual-reg = <0xf1009000>;
 			sdma = <&/mv64x60/sdma@6000>;
 			brg = <&/mv64x60/brg@b208>;
 			cunit = <&/mv64x60/cunit@f200>;
 			mpscrouting = <&/mv64x60/mpscrouting@b400>;
 			mpscintr = <&/mv64x60/mpscintr@b800>;
 			block-index = <1>;
-			max_idle = <28>;
+			max_idle = <40>;
 			chr_1 = <0>;
 			chr_2 = <0>;
 			chr_10 = <3>;
 			mpcr = <0>;
-			interrupts = <2a>;
+			interrupts = <42>;
 			interrupt-parent = <&/mv64x60/pic>;
 		};
 
 		wdt@b410 {			/* watchdog timer */
 			compatible = "marvell,mv64x60-wdt";
-			reg = <b410 8>;
-			timeout = <a>;		/* wdt timeout in seconds */
+			reg = <0xb410 0x8>;
+			timeout = <10>;		/* wdt timeout in seconds */
 		};
 
 		i2c@c000 {
 			device_type = "i2c";
 			compatible = "marvell,mv64x60-i2c";
-			reg = <c000 20>;
-			virtual-reg = <f100c000>;
+			reg = <0xc000 0x20>;
+			virtual-reg = <0xf100c000>;
 			freq_m = <8>;
 			freq_n = <3>;
-			timeout = <3e8>;		/* 1000 = 1 second */
+			timeout = <1000>;		/* 1000 = 1 second */
 			retries = <1>;
-			interrupts = <25>;
+			interrupts = <37>;
 			interrupt-parent = <&/mv64x60/pic>;
 		};
 
@@ -244,18 +246,18 @@
 			#interrupt-cells = <1>;
 			#address-cells = <0>;
 			compatible = "marvell,mv64x60-pic";
-			reg = <0000 88>;
+			reg = <0x0000 0x88>;
 			interrupt-controller;
 		};
 
 		mpp@f000 {
 			compatible = "marvell,mv64x60-mpp";
-			reg = <f000 10>;
+			reg = <0xf000 0x10>;
 		};
 
 		gpp@f100 {
 			compatible = "marvell,mv64x60-gpp";
-			reg = <f100 20>;
+			reg = <0xf100 0x20>;
 		};
 
 		pci@80000000 {
@@ -264,66 +266,68 @@
 			#interrupt-cells = <1>;
 			device_type = "pci";
 			compatible = "marvell,mv64x60-pci";
-			reg = <0cf8 8>;
-			ranges = <01000000 0        0 88000000 0 01000000
-				  02000000 0 80000000 80000000 0 08000000>;
-			bus-range = <0 ff>;
-			clock-frequency = <3EF1480>;
-			interrupt-pci-iack = <0c34>;
+			reg = <0x0cf8 0x8>;
+			ranges = <0x01000000 0x0 0x0
+					0x88000000 0x0 0x01000000
+				  0x02000000 0x0 0x80000000
+					0x80000000 0x0 0x08000000>;
+			bus-range = <0x0 0xff>;
+			clock-frequency = <66000000>;
+			interrupt-pci-iack = <0x0c34>;
 			interrupt-parent = <&/mv64x60/pic>;
-			interrupt-map-mask = <f800 0 0 7>;
+			interrupt-map-mask = <0xf800 0x0 0x0 0x7>;
 			interrupt-map = <
 				/* IDSEL 0x0a */
-				5000 0 0 1 &/mv64x60/pic 50
-				5000 0 0 2 &/mv64x60/pic 51
-				5000 0 0 3 &/mv64x60/pic 5b
-				5000 0 0 4 &/mv64x60/pic 5d
+				0x5000 0 0 1 &/mv64x60/pic 80
+				0x5000 0 0 2 &/mv64x60/pic 81
+				0x5000 0 0 3 &/mv64x60/pic 91
+				0x5000 0 0 4 &/mv64x60/pic 93
 
 				/* IDSEL 0x0b */
-				5800 0 0 1 &/mv64x60/pic 5b
-				5800 0 0 2 &/mv64x60/pic 5d
-				5800 0 0 3 &/mv64x60/pic 50
-				5800 0 0 4 &/mv64x60/pic 51
+				0x5800 0 0 1 &/mv64x60/pic 91
+				0x5800 0 0 2 &/mv64x60/pic 93
+				0x5800 0 0 3 &/mv64x60/pic 80
+				0x5800 0 0 4 &/mv64x60/pic 81
 
 				/* IDSEL 0x0c */
-				6000 0 0 1 &/mv64x60/pic 5b
-				6000 0 0 2 &/mv64x60/pic 5d
-				6000 0 0 3 &/mv64x60/pic 50
-				6000 0 0 4 &/mv64x60/pic 51
+				0x6000 0 0 1 &/mv64x60/pic 91
+				0x6000 0 0 2 &/mv64x60/pic 93
+				0x6000 0 0 3 &/mv64x60/pic 80
+				0x6000 0 0 4 &/mv64x60/pic 81
 
 				/* IDSEL 0x0d */
-				6800 0 0 1 &/mv64x60/pic 5d
-				6800 0 0 2 &/mv64x60/pic 50
-				6800 0 0 3 &/mv64x60/pic 51
-				6800 0 0 4 &/mv64x60/pic 5b
+				0x6800 0 0 1 &/mv64x60/pic 93
+				0x6800 0 0 2 &/mv64x60/pic 80
+				0x6800 0 0 3 &/mv64x60/pic 81
+				0x6800 0 0 4 &/mv64x60/pic 91
 			>;
 		};
 
 		cpu-error@0070 {
 			compatible = "marvell,mv64x60-cpu-error";
-			reg = <0070 10 0128 28>;
-			interrupts = <03>;
+			reg = <0x0070 0x10 0x0128 0x28>;
+			interrupts = <3>;
 			interrupt-parent = <&/mv64x60/pic>;
 		};
 
 		sram-ctrl@0380 {
 			compatible = "marvell,mv64x60-sram-ctrl";
-			reg = <0380 80>;
-			interrupts = <0d>;
+			reg = <0x0380 0x80>;
+			interrupts = <13>;
 			interrupt-parent = <&/mv64x60/pic>;
 		};
 
 		pci-error@1d40 {
 			compatible = "marvell,mv64x60-pci-error";
-			reg = <1d40 40 0c28 4>;
-			interrupts = <0c>;
+			reg = <0x1d40 0x40 0x0c28 0x4>;
+			interrupts = <12>;
 			interrupt-parent = <&/mv64x60/pic>;
 		};
 
 		mem-ctrl@1400 {
 			compatible = "marvell,mv64x60-mem-ctrl";
-			reg = <1400 60>;
-			interrupts = <11>;
+			reg = <0x1400 0x60>;
+			interrupts = <17>;
 			interrupt-parent = <&/mv64x60/pic>;
 		};
 	};

[PATCH 2/8] powerpc: prpmc2800 - Add labels to dts file

[Mark A. Greer]

From: Mark A. Greer <mgreer@mvista.com>

Add & use labels for dts nodes that are referenced in the prpmc2800.dts
file to improve readability.

Signed-off-by: Mark A. Greer <mgreer@mvista.com>
---
 arch/powerpc/boot/dts/prpmc2800.dts |  104 +++++++++++++-------------
 1 file changed, 52 insertions(+), 52 deletions(-)

diff --git a/arch/powerpc/boot/dts/prpmc2800.dts b/arch/powerpc/boot/dts/prpmc2800.dts
index 15247a4..1657ee6 100644
--- a/arch/powerpc/boot/dts/prpmc2800.dts
+++ b/arch/powerpc/boot/dts/prpmc2800.dts
@@ -94,18 +94,18 @@
 			#size-cells = <0>;
 			device_type = "mdio";
 			compatible = "marvell,mv64x60-mdio";
-			ethernet-phy@1 {
+			PHY0: ethernet-phy@1 {
 				device_type = "ethernet-phy";
 				compatible = "broadcom,bcm5421";
 				interrupts = <76>;	/* GPP 12 */
-				interrupt-parent = <&/mv64x60/pic>;
+				interrupt-parent = <&PIC>;
 				reg = <1>;
 			};
-			ethernet-phy@3 {
+			PHY1: ethernet-phy@3 {
 				device_type = "ethernet-phy";
 				compatible = "broadcom,bcm5421";
 				interrupts = <76>;	/* GPP 12 */
-				interrupt-parent = <&/mv64x60/pic>;
+				interrupt-parent = <&PIC>;
 				reg = <3>;
 			};
 		};
@@ -117,8 +117,8 @@
 				compatible = "marvell,mv64x60-eth";
 				block-index = <0>;
 				interrupts = <32>;
-				interrupt-parent = <&/mv64x60/pic>;
-				phy = <&/mv64x60/mdio/ethernet-phy@1>;
+				interrupt-parent = <&PIC>;
+				phy = <&PHY0>;
 				local-mac-address = [ 00 00 00 00 00 00 ];
 			};
 			eth1 {
@@ -126,33 +126,33 @@
 				compatible = "marvell,mv64x60-eth";
 				block-index = <1>;
 				interrupts = <33>;
-				interrupt-parent = <&/mv64x60/pic>;
-				phy = <&/mv64x60/mdio/ethernet-phy@3>;
+				interrupt-parent = <&PIC>;
+				phy = <&PHY1>;
 				local-mac-address = [ 00 00 00 00 00 00 ];
 			};
 		};
 
-		sdma@4000 {
+		SDMA0: sdma@4000 {
 			device_type = "dma";
 			compatible = "marvell,mv64x60-sdma";
 			reg = <0x4000 0xc18>;
 			virtual-reg = <0xf1004000>;
 			interrupt-base = <0>;
 			interrupts = <36>;
-			interrupt-parent = <&/mv64x60/pic>;
+			interrupt-parent = <&PIC>;
 		};
 
-		sdma@6000 {
+		SDMA1: sdma@6000 {
 			device_type = "dma";
 			compatible = "marvell,mv64x60-sdma";
 			reg = <0x6000 0xc18>;
 			virtual-reg = <0xf1006000>;
 			interrupt-base = <0>;
 			interrupts = <38>;
-			interrupt-parent = <&/mv64x60/pic>;
+			interrupt-parent = <&PIC>;
 		};
 
-		brg@b200 {
+		BRG0: brg@b200 {
 			compatible = "marvell,mv64x60-brg";
 			reg = <0xb200 0x8>;
 			clock-src = <8>;
@@ -161,7 +161,7 @@
 			bcr = <0>;
 		};
 
-		brg@b208 {
+		BRG1: brg@b208 {
 			compatible = "marvell,mv64x60-brg";
 			reg = <0xb208 0x8>;
 			clock-src = <8>;
@@ -170,15 +170,15 @@
 			bcr = <0>;
 		};
 
-		cunit@f200 {
+		CUNIT: cunit@f200 {
 			reg = <0xf200 0x200>;
 		};
 
-		mpscrouting@b400 {
+		MPSCROUTING: mpscrouting@b400 {
 			reg = <0xb400 0xc>;
 		};
 
-		mpscintr@b800 {
+		MPSCINTR: mpscintr@b800 {
 			reg = <0xb800 0x100>;
 			virtual-reg = <0xf100b800>;
 		};
@@ -188,11 +188,11 @@
 			compatible = "marvell,mpsc";
 			reg = <0x8000 0x38>;
 			virtual-reg = <0xf1008000>;
-			sdma = <&/mv64x60/sdma@4000>;
-			brg = <&/mv64x60/brg@b200>;
-			cunit = <&/mv64x60/cunit@f200>;
-			mpscrouting = <&/mv64x60/mpscrouting@b400>;
-			mpscintr = <&/mv64x60/mpscintr@b800>;
+			sdma = <&SDMA0>;
+			brg = <&BRG0>;
+			cunit = <&CUNIT>;
+			mpscrouting = <&MPSCROUTING>;
+			mpscintr = <&MPSCINTR>;
 			block-index = <0>;
 			max_idle = <40>;
 			chr_1 = <0>;
@@ -200,7 +200,7 @@
 			chr_10 = <3>;
 			mpcr = <0>;
 			interrupts = <40>;
-			interrupt-parent = <&/mv64x60/pic>;
+			interrupt-parent = <&PIC>;
 		};
 
 		mpsc@9000 {
@@ -208,11 +208,11 @@
 			compatible = "marvell,mpsc";
 			reg = <0x9000 0x38>;
 			virtual-reg = <0xf1009000>;
-			sdma = <&/mv64x60/sdma@6000>;
-			brg = <&/mv64x60/brg@b208>;
-			cunit = <&/mv64x60/cunit@f200>;
-			mpscrouting = <&/mv64x60/mpscrouting@b400>;
-			mpscintr = <&/mv64x60/mpscintr@b800>;
+			sdma = <&SDMA1>;
+			brg = <&BRG1>;
+			cunit = <&CUNIT>;
+			mpscrouting = <&MPSCROUTING>;
+			mpscintr = <&MPSCINTR>;
 			block-index = <1>;
 			max_idle = <40>;
 			chr_1 = <0>;
@@ -220,7 +220,7 @@
 			chr_10 = <3>;
 			mpcr = <0>;
 			interrupts = <42>;
-			interrupt-parent = <&/mv64x60/pic>;
+			interrupt-parent = <&PIC>;
 		};
 
 		wdt@b410 {			/* watchdog timer */
@@ -239,10 +239,10 @@
 			timeout = <1000>;		/* 1000 = 1 second */
 			retries = <1>;
 			interrupts = <37>;
-			interrupt-parent = <&/mv64x60/pic>;
+			interrupt-parent = <&PIC>;
 		};
 
-		pic {
+		PIC: pic {
 			#interrupt-cells = <1>;
 			#address-cells = <0>;
 			compatible = "marvell,mv64x60-pic";
@@ -274,32 +274,32 @@
 			bus-range = <0x0 0xff>;
 			clock-frequency = <66000000>;
 			interrupt-pci-iack = <0x0c34>;
-			interrupt-parent = <&/mv64x60/pic>;
+			interrupt-parent = <&PIC>;
 			interrupt-map-mask = <0xf800 0x0 0x0 0x7>;
 			interrupt-map = <
 				/* IDSEL 0x0a */
-				0x5000 0 0 1 &/mv64x60/pic 80
-				0x5000 0 0 2 &/mv64x60/pic 81
-				0x5000 0 0 3 &/mv64x60/pic 91
-				0x5000 0 0 4 &/mv64x60/pic 93
+				0x5000 0 0 1 &PIC 80
+				0x5000 0 0 2 &PIC 81
+				0x5000 0 0 3 &PIC 91
+				0x5000 0 0 4 &PIC 93
 
 				/* IDSEL 0x0b */
-				0x5800 0 0 1 &/mv64x60/pic 91
-				0x5800 0 0 2 &/mv64x60/pic 93
-				0x5800 0 0 3 &/mv64x60/pic 80
-				0x5800 0 0 4 &/mv64x60/pic 81
+				0x5800 0 0 1 &PIC 91
+				0x5800 0 0 2 &PIC 93
+				0x5800 0 0 3 &PIC 80
+				0x5800 0 0 4 &PIC 81
 
 				/* IDSEL 0x0c */
-				0x6000 0 0 1 &/mv64x60/pic 91
-				0x6000 0 0 2 &/mv64x60/pic 93
-				0x6000 0 0 3 &/mv64x60/pic 80
-				0x6000 0 0 4 &/mv64x60/pic 81
+				0x6000 0 0 1 &PIC 91
+				0x6000 0 0 2 &PIC 93
+				0x6000 0 0 3 &PIC 80
+				0x6000 0 0 4 &PIC 81
 
 				/* IDSEL 0x0d */
-				0x6800 0 0 1 &/mv64x60/pic 93
-				0x6800 0 0 2 &/mv64x60/pic 80
-				0x6800 0 0 3 &/mv64x60/pic 81
-				0x6800 0 0 4 &/mv64x60/pic 91
+				0x6800 0 0 1 &PIC 93
+				0x6800 0 0 2 &PIC 80
+				0x6800 0 0 3 &PIC 81
+				0x6800 0 0 4 &PIC 91
 			>;
 		};
 
@@ -307,28 +307,28 @@
 			compatible = "marvell,mv64x60-cpu-error";
 			reg = <0x0070 0x10 0x0128 0x28>;
 			interrupts = <3>;
-			interrupt-parent = <&/mv64x60/pic>;
+			interrupt-parent = <&PIC>;
 		};
 
 		sram-ctrl@0380 {
 			compatible = "marvell,mv64x60-sram-ctrl";
 			reg = <0x0380 0x80>;
 			interrupts = <13>;
-			interrupt-parent = <&/mv64x60/pic>;
+			interrupt-parent = <&PIC>;
 		};
 
 		pci-error@1d40 {
 			compatible = "marvell,mv64x60-pci-error";
 			reg = <0x1d40 0x40 0x0c28 0x4>;
 			interrupts = <12>;
-			interrupt-parent = <&/mv64x60/pic>;
+			interrupt-parent = <&PIC>;
 		};
 
 		mem-ctrl@1400 {
 			compatible = "marvell,mv64x60-mem-ctrl";
 			reg = <0x1400 0x60>;
 			interrupts = <17>;
-			interrupt-parent = <&/mv64x60/pic>;
+			interrupt-parent = <&PIC>;
 		};
 	};
 

[PATCH 3/8] powerpc: mv64x60 - Replace marvell, mv64x60 with marvell, mv64360

[Mark A. Greer]

From: Mark A. Greer <mgreer@mvista.com>

Compatible property names like "marvell,mv64x60..." are not acceptable
so replace them with name like "marvell,mv64360..."

Signed-off-by: Mark A. Greer <mgreer@mvista.com>
---
 arch/powerpc/boot/dts/prpmc2800.dts            |   34 +++++++--------
 arch/powerpc/platforms/embedded6xx/prpmc2800.c |    4 -
 arch/powerpc/sysdev/mv64x60_dev.c              |    6 +-
 arch/powerpc/sysdev/mv64x60_pci.c              |    6 +-
 arch/powerpc/sysdev/mv64x60_pic.c              |    4 -
 5 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/arch/powerpc/boot/dts/prpmc2800.dts b/arch/powerpc/boot/dts/prpmc2800.dts
index 1657ee6..a4a3622 100644
--- a/arch/powerpc/boot/dts/prpmc2800.dts
+++ b/arch/powerpc/boot/dts/prpmc2800.dts
@@ -93,7 +93,7 @@
 			#address-cells = <1>;
 			#size-cells = <0>;
 			device_type = "mdio";
-			compatible = "marvell,mv64x60-mdio";
+			compatible = "marvell,mv64360-mdio";
 			PHY0: ethernet-phy@1 {
 				device_type = "ethernet-phy";
 				compatible = "broadcom,bcm5421";
@@ -114,7 +114,7 @@
 			reg = <0x2000 0x2000>;
 			eth0 {
 				device_type = "network";
-				compatible = "marvell,mv64x60-eth";
+				compatible = "marvell,mv64360-eth";
 				block-index = <0>;
 				interrupts = <32>;
 				interrupt-parent = <&PIC>;
@@ -123,7 +123,7 @@
 			};
 			eth1 {
 				device_type = "network";
-				compatible = "marvell,mv64x60-eth";
+				compatible = "marvell,mv64360-eth";
 				block-index = <1>;
 				interrupts = <33>;
 				interrupt-parent = <&PIC>;
@@ -134,7 +134,7 @@
 
 		SDMA0: sdma@4000 {
 			device_type = "dma";
-			compatible = "marvell,mv64x60-sdma";
+			compatible = "marvell,mv64360-sdma";
 			reg = <0x4000 0xc18>;
 			virtual-reg = <0xf1004000>;
 			interrupt-base = <0>;
@@ -144,7 +144,7 @@
 
 		SDMA1: sdma@6000 {
 			device_type = "dma";
-			compatible = "marvell,mv64x60-sdma";
+			compatible = "marvell,mv64360-sdma";
 			reg = <0x6000 0xc18>;
 			virtual-reg = <0xf1006000>;
 			interrupt-base = <0>;
@@ -153,7 +153,7 @@
 		};
 
 		BRG0: brg@b200 {
-			compatible = "marvell,mv64x60-brg";
+			compatible = "marvell,mv64360-brg";
 			reg = <0xb200 0x8>;
 			clock-src = <8>;
 			clock-frequency = <133000000>;
@@ -162,7 +162,7 @@
 		};
 
 		BRG1: brg@b208 {
-			compatible = "marvell,mv64x60-brg";
+			compatible = "marvell,mv64360-brg";
 			reg = <0xb208 0x8>;
 			clock-src = <8>;
 			clock-frequency = <133000000>;
@@ -224,14 +224,14 @@
 		};
 
 		wdt@b410 {			/* watchdog timer */
-			compatible = "marvell,mv64x60-wdt";
+			compatible = "marvell,mv64360-wdt";
 			reg = <0xb410 0x8>;
 			timeout = <10>;		/* wdt timeout in seconds */
 		};
 
 		i2c@c000 {
 			device_type = "i2c";
-			compatible = "marvell,mv64x60-i2c";
+			compatible = "marvell,mv64360-i2c";
 			reg = <0xc000 0x20>;
 			virtual-reg = <0xf100c000>;
 			freq_m = <8>;
@@ -245,18 +245,18 @@
 		PIC: pic {
 			#interrupt-cells = <1>;
 			#address-cells = <0>;
-			compatible = "marvell,mv64x60-pic";
+			compatible = "marvell,mv64360-pic";
 			reg = <0x0000 0x88>;
 			interrupt-controller;
 		};
 
 		mpp@f000 {
-			compatible = "marvell,mv64x60-mpp";
+			compatible = "marvell,mv64360-mpp";
 			reg = <0xf000 0x10>;
 		};
 
 		gpp@f100 {
-			compatible = "marvell,mv64x60-gpp";
+			compatible = "marvell,mv64360-gpp";
 			reg = <0xf100 0x20>;
 		};
 
@@ -265,7 +265,7 @@
 			#size-cells = <2>;
 			#interrupt-cells = <1>;
 			device_type = "pci";
-			compatible = "marvell,mv64x60-pci";
+			compatible = "marvell,mv64360-pci";
 			reg = <0x0cf8 0x8>;
 			ranges = <0x01000000 0x0 0x0
 					0x88000000 0x0 0x01000000
@@ -304,28 +304,28 @@
 		};
 
 		cpu-error@0070 {
-			compatible = "marvell,mv64x60-cpu-error";
+			compatible = "marvell,mv64360-cpu-error";
 			reg = <0x0070 0x10 0x0128 0x28>;
 			interrupts = <3>;
 			interrupt-parent = <&PIC>;
 		};
 
 		sram-ctrl@0380 {
-			compatible = "marvell,mv64x60-sram-ctrl";
+			compatible = "marvell,mv64360-sram-ctrl";
 			reg = <0x0380 0x80>;
 			interrupts = <13>;
 			interrupt-parent = <&PIC>;
 		};
 
 		pci-error@1d40 {
-			compatible = "marvell,mv64x60-pci-error";
+			compatible = "marvell,mv64360-pci-error";
 			reg = <0x1d40 0x40 0x0c28 0x4>;
 			interrupts = <12>;
 			interrupt-parent = <&PIC>;
 		};
 
 		mem-ctrl@1400 {
-			compatible = "marvell,mv64x60-mem-ctrl";
+			compatible = "marvell,mv64360-mem-ctrl";
 			reg = <0x1400 0x60>;
 			interrupts = <17>;
 			interrupt-parent = <&PIC>;
diff --git a/arch/powerpc/platforms/embedded6xx/prpmc2800.c b/arch/powerpc/platforms/embedded6xx/prpmc2800.c
index a01e219..1a1baf9 100644
--- a/arch/powerpc/platforms/embedded6xx/prpmc2800.c
+++ b/arch/powerpc/platforms/embedded6xx/prpmc2800.c
@@ -50,13 +50,13 @@ static void __init prpmc2800_setup_arch(void)
 	 * ioremap mpp and gpp registers in case they are later
 	 * needed by prpmc2800_reset_board().
 	 */
-	np = of_find_compatible_node(NULL, NULL, "marvell,mv64x60-mpp");
+	np = of_find_compatible_node(NULL, NULL, "marvell,mv64360-mpp");
 	reg = of_get_property(np, "reg", NULL);
 	paddr = of_translate_address(np, reg);
 	of_node_put(np);
 	mv64x60_mpp_reg_base = ioremap(paddr, reg[1]);
 
-	np = of_find_compatible_node(NULL, NULL, "marvell,mv64x60-gpp");
+	np = of_find_compatible_node(NULL, NULL, "marvell,mv64360-gpp");
 	reg = of_get_property(np, "reg", NULL);
 	paddr = of_translate_address(np, reg);
 	of_node_put(np);
diff --git a/arch/powerpc/sysdev/mv64x60_dev.c b/arch/powerpc/sysdev/mv64x60_dev.c
index 304056c..dca205f 100644
--- a/arch/powerpc/sysdev/mv64x60_dev.c
+++ b/arch/powerpc/sysdev/mv64x60_dev.c
@@ -457,17 +457,17 @@ static int __init mv64x60_device_setup(void)
 			goto error;
 
 	id = 0;
-	for_each_compatible_node(np, "network", "marvell,mv64x60-eth")
+	for_each_compatible_node(np, "network", "marvell,mv64360-eth")
 		if ((err = mv64x60_eth_device_setup(np, id++)))
 			goto error;
 
 	id = 0;
-	for_each_compatible_node(np, "i2c", "marvell,mv64x60-i2c")
+	for_each_compatible_node(np, "i2c", "marvell,mv64360-i2c")
 		if ((err = mv64x60_i2c_device_setup(np, id++)))
 			goto error;
 
 	/* support up to one watchdog timer */
-	np = of_find_compatible_node(np, NULL, "marvell,mv64x60-wdt");
+	np = of_find_compatible_node(np, NULL, "marvell,mv64360-wdt");
 	if (np) {
 		if ((err = mv64x60_wdt_device_setup(np, id)))
 			goto error;
diff --git a/arch/powerpc/sysdev/mv64x60_pci.c b/arch/powerpc/sysdev/mv64x60_pci.c
index d21ab8f..1456015 100644
--- a/arch/powerpc/sysdev/mv64x60_pci.c
+++ b/arch/powerpc/sysdev/mv64x60_pci.c
@@ -86,14 +86,14 @@ static int __init mv64x60_sysfs_init(void)
 	struct platform_device *pdev;
 	const unsigned int *prop;
 
-	np = of_find_compatible_node(NULL, NULL, "marvell,mv64x60");
+	np = of_find_compatible_node(NULL, NULL, "marvell,mv64360");
 	if (!np)
 		return 0;
 
 	prop = of_get_property(np, "hs_reg_valid", NULL);
 	of_node_put(np);
 
-	pdev = platform_device_register_simple("marvell,mv64x60", 0, NULL, 0);
+	pdev = platform_device_register_simple("marvell,mv64360", 0, NULL, 0);
 	if (IS_ERR(pdev))
 		return PTR_ERR(pdev);
 
@@ -166,6 +166,6 @@ void __init mv64x60_pci_init(void)
 {
 	struct device_node *np;
 
-	for_each_compatible_node(np, "pci", "marvell,mv64x60-pci")
+	for_each_compatible_node(np, "pci", "marvell,mv64360-pci")
 		mv64x60_add_bridge(np);
 }
diff --git a/arch/powerpc/sysdev/mv64x60_pic.c b/arch/powerpc/sysdev/mv64x60_pic.c
index 19e6ef2..2aa4ed0 100644
--- a/arch/powerpc/sysdev/mv64x60_pic.c
+++ b/arch/powerpc/sysdev/mv64x60_pic.c
@@ -238,13 +238,13 @@ void __init mv64x60_init_irq(void)
 	const unsigned int *reg;
 	unsigned long flags;
 
-	np = of_find_compatible_node(NULL, NULL, "marvell,mv64x60-gpp");
+	np = of_find_compatible_node(NULL, NULL, "marvell,mv64360-gpp");
 	reg = of_get_property(np, "reg", &size);
 	paddr = of_translate_address(np, reg);
 	mv64x60_gpp_reg_base = ioremap(paddr, reg[1]);
 	of_node_put(np);
 
-	np = of_find_compatible_node(NULL, NULL, "marvell,mv64x60-pic");
+	np = of_find_compatible_node(NULL, NULL, "marvell,mv64360-pic");
 	reg = of_get_property(np, "reg", &size);
 	paddr = of_translate_address(np, reg);
 	mv64x60_irq_reg_base = ioremap(paddr, reg[1]);

[PATCH 4/8] powerpc: mv64x60 - Update ethernet DTS nodes

[Mark A. Greer]

From: Mark A. Greer <mgreer@mvista.com>

DTS entries for mv64360 ethernet controllers should use 'reg' property
instead of the 'block-index' property.  Also, use 'multiethernet'
instead of 'ethernet' for parent node and use 'ethernet@?' instead of
'eth?' for subnodes.

Signed-off-by: Mark A. Greer <mgreer@mvista.com>
---
 arch/powerpc/boot/dts/prpmc2800.dts |   10 +++++-----
 arch/powerpc/sysdev/mv64x60_dev.c   |    2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/arch/powerpc/boot/dts/prpmc2800.dts b/arch/powerpc/boot/dts/prpmc2800.dts
index a4a3622..1447faa 100644
--- a/arch/powerpc/boot/dts/prpmc2800.dts
+++ b/arch/powerpc/boot/dts/prpmc2800.dts
@@ -110,21 +110,21 @@
 			};
 		};
 
-		ethernet@2000 {
+		multiethernet@2000 {
 			reg = <0x2000 0x2000>;
-			eth0 {
+			ethernet@0 {
 				device_type = "network";
 				compatible = "marvell,mv64360-eth";
-				block-index = <0>;
+				reg = <0>;
 				interrupts = <32>;
 				interrupt-parent = <&PIC>;
 				phy = <&PHY0>;
 				local-mac-address = [ 00 00 00 00 00 00 ];
 			};
-			eth1 {
+			ethernet@1 {
 				device_type = "network";
 				compatible = "marvell,mv64360-eth";
-				block-index = <1>;
+				reg = <1>;
 				interrupts = <33>;
 				interrupt-parent = <&PIC>;
 				phy = <&PHY1>;
diff --git a/arch/powerpc/sysdev/mv64x60_dev.c b/arch/powerpc/sysdev/mv64x60_dev.c
index dca205f..20cd5e3 100644
--- a/arch/powerpc/sysdev/mv64x60_dev.c
+++ b/arch/powerpc/sysdev/mv64x60_dev.c
@@ -248,7 +248,7 @@ static int __init mv64x60_eth_device_setup(struct device_node *np, int id)
 
 	memset(&pdata, 0, sizeof(pdata));
 
-	prop = of_get_property(np, "block-index", NULL);
+	prop = of_get_property(np, "reg", NULL);
 	if (!prop)
 		return -ENODEV;
 	pdata.port_number = *prop;

[PATCH 5/8] powerpc: MPSC - Update DTS entries

[Mark A. Greer]

From: Mark A. Greer <mgreer@mvista.com>

MPSC DTS nodes should use 'cell-index' to distinguish between MPSC
controllers (just like all the other DTS files).  Also, rename the
compatible property from 'marvell,mpsc' to 'marvell,mv64360-mpsc'
for consistency.

Signed-off-by: Mark A. Greer <mgreer@mvista.com>
---
 arch/powerpc/boot/dts/prpmc2800.dts |    8 ++++----
 arch/powerpc/boot/mpsc.c            |    2 +-
 arch/powerpc/boot/serial.c          |    2 +-
 arch/powerpc/sysdev/mv64x60_dev.c   |    8 ++++----
 arch/powerpc/sysdev/mv64x60_udbg.c  |    4 ++--
 5 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/arch/powerpc/boot/dts/prpmc2800.dts b/arch/powerpc/boot/dts/prpmc2800.dts
index 1447faa..e670e3f 100644
--- a/arch/powerpc/boot/dts/prpmc2800.dts
+++ b/arch/powerpc/boot/dts/prpmc2800.dts
@@ -185,7 +185,7 @@
 
 		mpsc@8000 {
 			device_type = "serial";
-			compatible = "marvell,mpsc";
+			compatible = "marvell,mv64360-mpsc";
 			reg = <0x8000 0x38>;
 			virtual-reg = <0xf1008000>;
 			sdma = <&SDMA0>;
@@ -193,7 +193,7 @@
 			cunit = <&CUNIT>;
 			mpscrouting = <&MPSCROUTING>;
 			mpscintr = <&MPSCINTR>;
-			block-index = <0>;
+			cell-index = <0>;
 			max_idle = <40>;
 			chr_1 = <0>;
 			chr_2 = <0>;
@@ -205,7 +205,7 @@
 
 		mpsc@9000 {
 			device_type = "serial";
-			compatible = "marvell,mpsc";
+			compatible = "marvell,mv64360-mpsc";
 			reg = <0x9000 0x38>;
 			virtual-reg = <0xf1009000>;
 			sdma = <&SDMA1>;
@@ -213,7 +213,7 @@
 			cunit = <&CUNIT>;
 			mpscrouting = <&MPSCROUTING>;
 			mpscintr = <&MPSCINTR>;
-			block-index = <1>;
+			cell-index = <1>;
 			max_idle = <40>;
 			chr_1 = <0>;
 			chr_2 = <0>;
diff --git a/arch/powerpc/boot/mpsc.c b/arch/powerpc/boot/mpsc.c
index 802ea53..425ad88 100644
--- a/arch/powerpc/boot/mpsc.c
+++ b/arch/powerpc/boot/mpsc.c
@@ -141,7 +141,7 @@ int mpsc_console_init(void *devp, struct serial_console_data *scdp)
 	if (mpscintr_base == NULL)
 		goto err_out;
 
-	n = getprop(devp, "block-index", &v, sizeof(v));
+	n = getprop(devp, "cell-index", &v, sizeof(v));
 	if (n != sizeof(v))
 		goto err_out;
 	reg_set = (int)v;
diff --git a/arch/powerpc/boot/serial.c b/arch/powerpc/boot/serial.c
index cafeece..cbcbb20 100644
--- a/arch/powerpc/boot/serial.c
+++ b/arch/powerpc/boot/serial.c
@@ -119,7 +119,7 @@ int serial_console_init(void)
 
 	if (dt_is_compatible(devp, "ns16550"))
 		rc = ns16550_console_init(devp, &serial_cd);
-	else if (dt_is_compatible(devp, "marvell,mpsc"))
+	else if (dt_is_compatible(devp, "marvell,mv64360-mpsc"))
 		rc = mpsc_console_init(devp, &serial_cd);
 	else if (dt_is_compatible(devp, "fsl,cpm1-scc-uart") ||
 	         dt_is_compatible(devp, "fsl,cpm1-smc-uart") ||
diff --git a/arch/powerpc/sysdev/mv64x60_dev.c b/arch/powerpc/sysdev/mv64x60_dev.c
index 20cd5e3..587c40f 100644
--- a/arch/powerpc/sysdev/mv64x60_dev.c
+++ b/arch/powerpc/sysdev/mv64x60_dev.c
@@ -127,7 +127,7 @@ static int __init mv64x60_mpsc_device_setup(struct device_node *np, int id)
 	if (err)
 		return err;
 
-	prop = of_get_property(np, "block-index", NULL);
+	prop = of_get_property(np, "cell-index", NULL);
 	if (!prop)
 		return -ENODEV;
 	port_number = *(int *)prop;
@@ -452,7 +452,7 @@ static int __init mv64x60_device_setup(void)
 	int err;
 
 	id = 0;
-	for_each_compatible_node(np, "serial", "marvell,mpsc")
+	for_each_compatible_node(np, "serial", "marvell,mv64360-mpsc")
 		if ((err = mv64x60_mpsc_device_setup(np, id++)))
 			goto error;
 
@@ -495,10 +495,10 @@ static int __init mv64x60_add_mpsc_console(void)
 	if (!np)
 		goto not_mpsc;
 
-	if (!of_device_is_compatible(np, "marvell,mpsc"))
+	if (!of_device_is_compatible(np, "marvell,mv64360-mpsc"))
 		goto not_mpsc;
 
-	prop = of_get_property(np, "block-index", NULL);
+	prop = of_get_property(np, "cell-index", NULL);
 	if (!prop)
 		goto not_mpsc;
 
diff --git a/arch/powerpc/sysdev/mv64x60_udbg.c b/arch/powerpc/sysdev/mv64x60_udbg.c
index 35c77c7..2792dc8 100644
--- a/arch/powerpc/sysdev/mv64x60_udbg.c
+++ b/arch/powerpc/sysdev/mv64x60_udbg.c
@@ -85,7 +85,7 @@ static void mv64x60_udbg_init(void)
 	if (!stdout)
 		return;
 
-	for_each_compatible_node(np, "serial", "marvell,mpsc") {
+	for_each_compatible_node(np, "serial", "marvell,mv64360-mpsc") {
 		if (np == stdout)
 			break;
 	}
@@ -94,7 +94,7 @@ static void mv64x60_udbg_init(void)
 	if (!np)
 		return;
 
-	block_index = of_get_property(np, "block-index", NULL);
+	block_index = of_get_property(np, "cell-index", NULL);
 	if (!block_index)
 		goto error;
 

[PATCH 6/8] powerpc: mv64x60 - Update i2c DTS properties

[Mark A. Greer]

From: Mark A. Greer <mgreer@mvista.com>

DTS files should not specify the default timeout value for the
mv64360 i2c controller.  Also, remove deprecated 'retries' property.

Signed-off-by: Mark A. Greer <mgreer@mvista.com>
---
FYI, the 'retries' property use and related platform_data will be
removed in a patch that is working its way through the i2c community.

 arch/powerpc/boot/dts/prpmc2800.dts |    2 --
 arch/powerpc/sysdev/mv64x60_dev.c   |    6 +-----
 2 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/arch/powerpc/boot/dts/prpmc2800.dts b/arch/powerpc/boot/dts/prpmc2800.dts
index e670e3f..b608e6c 100644
--- a/arch/powerpc/boot/dts/prpmc2800.dts
+++ b/arch/powerpc/boot/dts/prpmc2800.dts
@@ -236,8 +236,6 @@
 			virtual-reg = <0xf100c000>;
 			freq_m = <8>;
 			freq_n = <3>;
-			timeout = <1000>;		/* 1000 = 1 second */
-			retries = <1>;
 			interrupts = <37>;
 			interrupt-parent = <&PIC>;
 		};
diff --git a/arch/powerpc/sysdev/mv64x60_dev.c b/arch/powerpc/sysdev/mv64x60_dev.c
index 587c40f..e0244d8 100644
--- a/arch/powerpc/sysdev/mv64x60_dev.c
+++ b/arch/powerpc/sysdev/mv64x60_dev.c
@@ -355,11 +355,7 @@ static int __init mv64x60_i2c_device_setup(struct device_node *np, int id)
 		return -ENODEV;
 	pdata.freq_n = *prop;
 
-	prop = of_get_property(np, "timeout", NULL);
-	if (prop)
-		pdata.timeout = *prop;
-	else
-		pdata.timeout = 1000;	/* 1 second */
+	pdata.timeout = 1000;	/* 1 second */
 
 	prop = of_get_property(np, "retries", NULL);
 	if (prop)

[PATCH 7/8] powerpc: mv64x60 - Remove timeout property for WDT

[Mark A. Greer]

From: Mark A. Greer <mgreer@mvista.com>

Remove support for the DTS timeout property that's currently there for
the watchdog timer on mv64x60 hostbridges.  The platform_data remains
and can be modified by platform-specific code when necessary.

Signed-off-by: Mark A. Greer <mgreer@mvista.com>
---
 arch/powerpc/boot/dts/prpmc2800.dts |    1 -
 arch/powerpc/sysdev/mv64x60_dev.c   |    5 +----
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/arch/powerpc/boot/dts/prpmc2800.dts b/arch/powerpc/boot/dts/prpmc2800.dts
index b608e6c..054f028 100644
--- a/arch/powerpc/boot/dts/prpmc2800.dts
+++ b/arch/powerpc/boot/dts/prpmc2800.dts
@@ -226,7 +226,6 @@
 		wdt@b410 {			/* watchdog timer */
 			compatible = "marvell,mv64360-wdt";
 			reg = <0xb410 0x8>;
-			timeout = <10>;		/* wdt timeout in seconds */
 		};
 
 		i2c@c000 {
diff --git a/arch/powerpc/sysdev/mv64x60_dev.c b/arch/powerpc/sysdev/mv64x60_dev.c
index e0244d8..f998330 100644
--- a/arch/powerpc/sysdev/mv64x60_dev.c
+++ b/arch/powerpc/sysdev/mv64x60_dev.c
@@ -403,10 +403,7 @@ static int __init mv64x60_wdt_device_setup(struct device_node *np, int id)
 
 	memset(&pdata, 0, sizeof(pdata));
 
-	prop = of_get_property(np, "timeout", NULL);
-	if (!prop)
-		return -ENODEV;
-	pdata.timeout = *prop;
+	pdata.timeout = 10;	/* Default: 10 seconds */
 
 	np = of_get_parent(np);
 	if (!np)

[PATCH 8/8] powerpc: prpmc2800 - Miscellaneous DTS file fixups

[Mark A. Greer]

From: Mark A. Greer <mgreer@mvista.com>

Remove unnecessary device_type properties and leading zeroes in node names.

Signed-off-by: Mark A. Greer <mgreer@mvista.com>
---
 arch/powerpc/boot/dts/prpmc2800.dts |    6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/arch/powerpc/boot/dts/prpmc2800.dts b/arch/powerpc/boot/dts/prpmc2800.dts
index 054f028..6af5a3a 100644
--- a/arch/powerpc/boot/dts/prpmc2800.dts
+++ b/arch/powerpc/boot/dts/prpmc2800.dts
@@ -133,7 +133,6 @@
 		};
 
 		SDMA0: sdma@4000 {
-			device_type = "dma";
 			compatible = "marvell,mv64360-sdma";
 			reg = <0x4000 0xc18>;
 			virtual-reg = <0xf1004000>;
@@ -143,7 +142,6 @@
 		};
 
 		SDMA1: sdma@6000 {
-			device_type = "dma";
 			compatible = "marvell,mv64360-sdma";
 			reg = <0x6000 0xc18>;
 			virtual-reg = <0xf1006000>;
@@ -300,14 +298,14 @@
 			>;
 		};
 
-		cpu-error@0070 {
+		cpu-error@70 {
 			compatible = "marvell,mv64360-cpu-error";
 			reg = <0x0070 0x10 0x0128 0x28>;
 			interrupts = <3>;
 			interrupt-parent = <&PIC>;
 		};
 
-		sram-ctrl@0380 {
+		sram-ctrl@380 {
 			compatible = "marvell,mv64360-sram-ctrl";
 			reg = <0x0380 0x80>;
 			interrupts = <13>;

Re: [PATCH 1/8] powerpc: prpmc2800 - Convert dts file to v1

[David Gibson]

On Mon, Dec 10, 2007 at 05:37:38PM -0700, Mark A. Greer wrote:
> From: Mark A. Greer <mgreer@mvista.com>
> 
> Convert the prpmc2800.dts file to dts-v1.  Basically, this means
> converting the numeric constants to be 'C'-like (e.g., hexadecimal
> numbers start with '0x').

[snip]
>  				interrupt-parent = <&/mv64x60/pic>;

If you're converting to dts-v1, you should also convert any path
references like this to &{/mv64x60/pic} or else use a label.  Yes,
some early dts-v1 supporting dtc versions supported these as is, but
the idea is to try to forget that they existed and always require the
{} quoting in dts-v1.

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

Re: [PATCH 1/8] powerpc: prpmc2800 - Convert dts file to v1

[Mark A. Greer]

On Sat, Dec 15, 2007 at 09:03:35AM +1100, David Gibson wrote:
> On Mon, Dec 10, 2007 at 05:37:38PM -0700, Mark A. Greer wrote:
> > From: Mark A. Greer <mgreer@mvista.com>
> > 
> > Convert the prpmc2800.dts file to dts-v1.  Basically, this means
> > converting the numeric constants to be 'C'-like (e.g., hexadecimal
> > numbers start with '0x').
> 
> [snip]
> >  				interrupt-parent = <&/mv64x60/pic>;
> 
> If you're converting to dts-v1, you should also convert any path
> references like this to &{/mv64x60/pic} or else use a label.  Yes,
> some early dts-v1 supporting dtc versions supported these as is, but
> the idea is to try to forget that they existed and always require the
> {} quoting in dts-v1.

I did convert to use labels in a later patch but it uses <&label> as
well.  I can change them to &{label} that it appears you are suggesting
(I haven't tested to see that they work yet though).

Mark

Re: [PATCH 1/8] powerpc: prpmc2800 - Convert dts file to v1

[David Gibson]

On Tue, Dec 18, 2007 at 02:35:06PM -0700, Mark A. Greer wrote:
> On Sat, Dec 15, 2007 at 09:03:35AM +1100, David Gibson wrote:
> > On Mon, Dec 10, 2007 at 05:37:38PM -0700, Mark A. Greer wrote:
> > > From: Mark A. Greer <mgreer@mvista.com>
> > > 
> > > Convert the prpmc2800.dts file to dts-v1.  Basically, this means
> > > converting the numeric constants to be 'C'-like (e.g., hexadecimal
> > > numbers start with '0x').
> > 
> > [snip]
> > >  				interrupt-parent = <&/mv64x60/pic>;
> > 
> > If you're converting to dts-v1, you should also convert any path
> > references like this to &{/mv64x60/pic} or else use a label.  Yes,
> > some early dts-v1 supporting dtc versions supported these as is, but
> > the idea is to try to forget that they existed and always require the
> > {} quoting in dts-v1.
> 
> I did convert to use labels in a later patch but it uses <&label> as
> well.  I can change them to &{label} that it appears you are suggesting
> (I haven't tested to see that they work yet though).

&label is fine, it's just &/full/path that needs changing.

I realised you removed all the &/full/path things in a later patch, so
the series as a whole will work.  But this patch alleges to convert to
dts-v1 of itself, but because it fails to requote the path references,
it doesn't.

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