[PATCH 1/2] powerpc/85xx: Change style of partition nodes in dts for MPC8572DS

Signed-off-by: Jin Qing <redacted>
Signed-off-by: Jia Hongtao <redacted>
Signed-off-by: Li Yang <redacted>
---
 arch/powerpc/boot/dts/mpc8572ds.dtsi |   44 ++++++++++++++++++++--------------
 1 files changed, 26 insertions(+), 18 deletions(-)

diff --git a/arch/powerpc/boot/dts/mpc8572ds.dtsi b/arch/powerpc/boot/dts/mpc8572ds.dtsi
index c3d4fac..e10fa61 100644
--- a/arch/powerpc/boot/dts/mpc8572ds.dtsi
+++ b/arch/powerpc/boot/dts/mpc8572ds.dtsi

@@ -41,37 +41,41 @@
 		bank-width = <2>;
 		device-width = <1>;
 
-		ramdisk@0 {
+		partition@0 {
 			reg = <0x0 0x03000000>;
-			read-only;
+			label = "ramdisk-nor";
 		};
 
-		diagnostic@3000000 {
+		partition@3000000 {
 			reg = <0x03000000 0x00e00000>;
+			label = "diagnostic-nor";
 			read-only;
 		};
 
-		dink@3e00000 {
+		partition@3e00000 {
 			reg = <0x03e00000 0x00200000>;
+			label = "dink-nor";
 			read-only;
 		};
 
-		kernel@4000000 {
+		partition@4000000 {
 			reg = <0x04000000 0x00400000>;
-			read-only;
+			label = "kernel-nor";
 		};
 
-		jffs2@4400000 {
+		partition@4400000 {
 			reg = <0x04400000 0x03b00000>;
+			label = "fs-nor";
 		};
 
-		dtb@7f00000 {
+		partition@7f00000 {
 			reg = <0x07f00000 0x00080000>;
-			read-only;
+			label = "dtb-nor";
 		};
 
-		u-boot@7f80000 {
+		partition@7f80000 {
 			reg = <0x07f80000 0x00080000>;
+			label = "u-boot-nor";
 			read-only;
 		};
 	};

@@ -83,31 +87,35 @@
 			     "fsl,elbc-fcm-nand";
 		reg = <0x2 0x0 0x40000>;
 
-		u-boot@0 {
+		partition@0 {
 			reg = <0x0 0x02000000>;
+			label = "u-boot-nand";
 			read-only;
 		};
 
-		jffs2@2000000 {
+		partition@2000000 {
 			reg = <0x02000000 0x10000000>;
+			label = "fs-nand";
 		};
 
-		ramdisk@12000000 {
+		partition@12000000 {
 			reg = <0x12000000 0x08000000>;
-			read-only;
+			label = "ramdisk-nand";
 		};
 
-		kernel@1a000000 {
+		partition@1a000000 {
 			reg = <0x1a000000 0x04000000>;
+			label = "kernel-nand";
 		};
 
-		dtb@1e000000 {
+		partition@1e000000 {
 			reg = <0x1e000000 0x01000000>;
-			read-only;
+			label = "dtb-nand";
 		};
 
-		empty@1f000000 {
+		partition@1f000000 {
 			reg = <0x1f000000 0x21000000>;
+			label = "empty-nand";
 		};
 	};
 

-- 
1.7.5.1

Add sec3.1 support

Signed-off-by: Jin Qing <redacted>
Signed-off-by: Zhao Chenhui <redacted>
Signed-off-by: Jia Hongtao <redacted>
Signed-off-by: Li Yang <redacted>
---
 arch/powerpc/boot/dts/fsl/mpc8572si-post.dtsi |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/arch/powerpc/boot/dts/fsl/mpc8572si-post.dtsi b/arch/powerpc/boot/dts/fsl/mpc8572si-post.dtsi
index d44e25a..cdda34f 100644
--- a/arch/powerpc/boot/dts/fsl/mpc8572si-post.dtsi
+++ b/arch/powerpc/boot/dts/fsl/mpc8572si-post.dtsi

@@ -184,7 +184,7 @@
 /include/ "pq3-etsec1-1.dtsi"
 /include/ "pq3-etsec1-2.dtsi"
 /include/ "pq3-etsec1-3.dtsi"
-/include/ "pq3-sec3.0-0.dtsi"
+/include/ "pq3-sec3.1-0.dtsi"
 /include/ "pq3-mpic.dtsi"
 /include/ "pq3-mpic-timer-B.dtsi"
 

-- 
1.7.5.1

Jia Hongtao wrote:

-			read-only;
+			label = "ramdisk-nor";

This is not a "style change".  Please explain this patch better.

-- 
Timur Tabi
Linux kernel developer at Freescale

Jia Hongtao wrote:

This is not "adding SEC 3.1 support".  This patch is saying that the 8572
DTS was using the *wrong* SEC version.  If that's true, you need to
explain why it was wrong.

-- 
Timur Tabi
Linux kernel developer at Freescale

On Wed, 8 Feb 2012 10:39:43 -0600
Timur Tabi [off-list ref] wrote:

Jia Hongtao wrote:

quoted

-/include/ "pq3-sec3.0-0.dtsi"
+/include/ "pq3-sec3.1-0.dtsi"

This is not "adding SEC 3.1 support".  This patch is saying that the 8572
DTS was using the *wrong* SEC version.  If that's true, you need to
explain why it was wrong.

especially since, and according to "MPC8572E PowerQUICCTM III
Integrated Host Processor Family Reference Manual, Rev. 2", the 8572
has a SEC 3.0.

Kim

You are right, I copied the patch from 2.6 without doing confirm.
I will remove this patch.

Thanks.

-----Original Message-----
From: Phillips Kim-R1AAHA=20
Sent: Thursday, February 09, 2012 2:53 AM
To: Tabi Timur-B04825
Cc: Jia Hongtao-B38951; linuxppc-dev@lists.ozlabs.org
Subject: Re: [linuxppc-release] [PATCH 2/2] powerpc/85xx: update SEC node i=
n dts for MPC8572DS

On Wed, 8 Feb 2012 10:39:43 -0600
Timur Tabi [off-list ref] wrote:

Jia Hongtao wrote:

quoted

-/include/ "pq3-sec3.0-0.dtsi"
+/include/ "pq3-sec3.1-0.dtsi"

=20
This is not "adding SEC 3.1 support".  This patch is saying that the=20
8572 DTS was using the *wrong* SEC version.  If that's true, you need=20
to explain why it was wrong.

especially since, and according to "MPC8572E PowerQUICCTM III Integrated Ho=
st Processor Family Reference Manual, Rev. 2", the 8572 has a SEC 3.0.

Kim