P1010rdb-pa and p1010rdb-pb have different mtd of nand.
So update dts to adapt to both p1010rdb-pa and p1010rdb-pb.
Signed-off-by: Zhao Qiang <b45...@freescale.com>
---
arch/powerpc/boot/dts/p1010rdb-pa.dts | 40 +++++++++++++++++++++++++++++++
arch/powerpc/boot/dts/p1010rdb-pa_36b.dts | 40 +++++++++++++++++++++++++++++++
arch/powerpc/boot/dts/p1010rdb-pb.dts | 34 ++++++++++++++++++++++++++
arch/powerpc/boot/dts/p1010rdb-pb_36b.dts | 34 ++++++++++++++++++++++++++
arch/powerpc/boot/dts/p1010rdb.dtsi | 40 +------------------------------
5 files changed, 149 insertions(+), 39 deletions(-)
diff --git a/arch/powerpc/boot/dts/p1010rdb-pa.dts
b/arch/powerpc/boot/dts/p1010rdb-pa.dts
index f210ba5..76f252b 100644
--- a/arch/powerpc/boot/dts/p1010rdb-pa.dts
+++ b/arch/powerpc/boot/dts/p1010rdb-pa.dts
@@ -20,6 +20,46 @@
/include/ "p1010rdb.dtsi"
+&ifc_nand {
+ partition@0 {
+ /* This location must not be altered */
+ /* 1MB for u-boot Bootloader Image */
+ reg = <0x0 0x00100000>;
+ label = "NAND U-Boot Image";
+ read-only;
+ };
+
+ partition@100000 {
+ /* 1MB for DTB Image */
+ reg = <0x00100000 0x00100000>;
+ label = "NAND DTB Image";
+ };
+
+ partition@200000 {
+ /* 4MB for Linux Kernel Image */
+ reg = <0x00200000 0x00400000>;
+ label = "NAND Linux Kernel Image";
+ };
+
+ partition@600000 {
+ /* 4MB for Compressed Root file System Image */
+ reg = <0x00600000 0x00400000>;
+ label = "NAND Compressed RFS Image";
+ };
+
+ partition@a00000 {
+ /* 15MB for JFFS2 based Root file System */
+ reg = <0x00a00000 0x00f00000>;
+ label = "NAND JFFS2 Root File System";
+ };
+
+ partition@1900000 {
+ /* 7MB for User Area */
+ reg = <0x01900000 0x00700000>;
+ label = "NAND User area";
+ };
+};
+
&phy0 {
interrupts = <3 1 0 0>;
};
diff --git a/arch/powerpc/boot/dts/p1010rdb-pa_36b.dts
b/arch/powerpc/boot/dts/p1010rdb-pa_36b.dts
index 9740b0c..2961766 100644
--- a/arch/powerpc/boot/dts/p1010rdb-pa_36b.dts
+++ b/arch/powerpc/boot/dts/p1010rdb-pa_36b.dts
@@ -43,6 +43,46 @@
/include/ "p1010rdb.dtsi"
+&ifc_nand {
+ partition@0 {
+ /* This location must not be altered */
+ /* 1MB for u-boot Bootloader Image */
+ reg = <0x0 0x00100000>;
+ label = "NAND U-Boot Image";
+ read-only;
+ };
+
+ partition@100000 {
+ /* 1MB for DTB Image */
+ reg = <0x00100000 0x00100000>;
+ label = "NAND DTB Image";
+ };
+
+ partition@200000 {
+ /* 4MB for Linux Kernel Image */
+ reg = <0x00200000 0x00400000>;
+ label = "NAND Linux Kernel Image";
+ };
+
+ partition@600000 {
+ /* 4MB for Compressed Root file System Image */
+ reg = <0x00600000 0x00400000>;
+ label = "NAND Compressed RFS Image";
+ };
+
+ partition@a00000 {
+ /* 15MB for JFFS2 based Root file System */
+ reg = <0x00a00000 0x00f00000>;
+ label = "NAND JFFS2 Root File System";
+ };
+
+ partition@1900000 {
+ /* 7MB for User Area */
+ reg = <0x01900000 0x00700000>;
+ label = "NAND User area";
+ };
+};
+
&phy0 {
interrupts = <3 1 0 0>;
};
diff --git a/arch/powerpc/boot/dts/p1010rdb-pb.dts
b/arch/powerpc/boot/dts/p1010rdb-pb.dts
index 6eeb7d3..6187e9c 100644
--- a/arch/powerpc/boot/dts/p1010rdb-pb.dts
+++ b/arch/powerpc/boot/dts/p1010rdb-pb.dts
@@ -20,6 +20,40 @@
/include/ "p1010rdb.dtsi"
+&ifc_nand {
+ partition@0 {
+ /* This location must not be altered */
+ /* 2MB for u-boot Image and environment */
+ reg = <0x0 0x00200000>;
+ label = "NAND U-Boot Image and env";
+ read-only;
+ };
+
+ partition@200000 {
+ /* 1MB for DTB Image */
+ reg = <0x00200000 0x00100000>;
+ label = "NAND DTB Image";
+ };
+
+ partition@300000 {
+ /* 5MB for Linux Kernel Image */
+ reg = <0x00300000 0x00500000>;
+ label = "NAND Linux Kernel Image";
+ };
+
+ partition@800000 {
+ /* 56MB for Compressed Root file System Image */
+ reg = <0x00800000 0x03800000>;
+ label = "NAND ROOTFS";
+ };
+
+ partition@4000000 {
+ /* 1984MB for User Area */
+ reg = <0x04000000 0x7c000000>;
+ label = "NAND User area";
+ };
+};
+
&phy0 {
interrupts = <0 1 0 0>;
};
diff --git a/arch/powerpc/boot/dts/p1010rdb-pb_36b.dts
b/arch/powerpc/boot/dts/p1010rdb-pb_36b.dts
index 7ab3c90..75d0c20 100644
--- a/arch/powerpc/boot/dts/p1010rdb-pb_36b.dts
+++ b/arch/powerpc/boot/dts/p1010rdb-pb_36b.dts
@@ -43,6 +43,40 @@
/include/ "p1010rdb.dtsi"
+&ifc_nand {
+ partition@0 {
+ /* This location must not be altered */
+ /* 2MB for u-boot Image and environment */
+ reg = <0x0 0x00200000>;
+ label = "NAND U-Boot Image and env";
+ read-only;
+ };
+
+ partition@200000 {
+ /* 1MB for DTB Image */
+ reg = <0x00200000 0x00100000>;
+ label = "NAND DTB Image";
+ };
+
+ partition@300000 {
+ /* 5MB for Linux Kernel Image */
+ reg = <0x00300000 0x00500000>;
+ label = "NAND Linux Kernel Image";
+ };
+
+ partition@800000 {
+ /* 56MB for Compressed Root file System Image */
+ reg = <0x00800000 0x03800000>;
+ label = "NAND ROOTFS";
+ };
+
+ partition@4000000 {
+ /* 1984MB for User Area */
+ reg = <0x04000000 0x7c000000>;
+ label = "NAND User area";
+ };
+};
+
&phy0 {
interrupts = <0 1 0 0>;
};
diff --git a/arch/powerpc/boot/dts/p1010rdb.dtsi
b/arch/powerpc/boot/dts/p1010rdb.dtsi
index 2433ae4..8b5fa3f 100644
--- a/arch/powerpc/boot/dts/p1010rdb.dtsi
+++ b/arch/powerpc/boot/dts/p1010rdb.dtsi
@@ -69,49 +69,11 @@
};
};
- nand@1,0 {
+ ifc_nand: nand@1,0 {
#address-cells = <1>;
#size-cells = <1>;
compatible = "fsl,ifc-nand";
reg = <0x1 0x0 0x10000>;
-
- partition@0 {
- /* This location must not be altered */
- /* 1MB for u-boot Bootloader Image */
- reg = <0x0 0x00100000>;
- label = "NAND U-Boot Image";
- read-only;
- };
-
- partition@100000 {
- /* 1MB for DTB Image */
- reg = <0x00100000 0x00100000>;
- label = "NAND DTB Image";
- };
-
- partition@200000 {
- /* 4MB for Linux Kernel Image */
- reg = <0x00200000 0x00400000>;
- label = "NAND Linux Kernel Image";
- };
-
- partition@600000 {
- /* 4MB for Compressed Root file System Image */
- reg = <0x00600000 0x00400000>;
- label = "NAND Compressed RFS Image";
- };
-
- partition@a00000 {
- /* 15MB for JFFS2 based Root file System */
- reg = <0x00a00000 0x00f00000>;
- label = "NAND JFFS2 Root File System";
- };
-
- partition@1900000 {
- /* 7MB for User Area */
- reg = <0x01900000 0x00700000>;
- label = "NAND User area";
- };
};
cpld@3,0 {
--
1.8.0
_______________________________________________
Linuxppc-dev mailing list
Linuxppc-dev@lists.ozlabs.org
https://lists.ozlabs.org/listinfo/linuxppc-dev
