From 02d571e96d41e475ad809326a94a1b3beb3b104e Mon Sep 17 00:00:00 2001
From: Alison Wang <b18965@freescale.com>
Date: Fri, 29 May 2015 13:39:20 +0800
Subject: ls102xa: nor: Adjust the partition for NOR flash according to the new
 mapping table

According to the new mapping table, the partition for NOR flash
is adjusted.

Signed-off-by: Alison Wang <alison.wang@freescale.com>
Change-Id: Id535115a4ac53aeadd4c144425800fc566ab76b8
Reviewed-on: http://git.am.freescale.net:8181/37068
Tested-by: Review Code-CDREVIEW <CDREVIEW@freescale.com>
Reviewed-by: Zhengxiong Jin <Jason.Jin@freescale.com>

diff --git a/arch/arm/boot/dts/ls1021a-twr.dts b/arch/arm/boot/dts/ls1021a-twr.dts
index f1da2f0..611433c 100755
--- a/arch/arm/boot/dts/ls1021a-twr.dts
+++ b/arch/arm/boot/dts/ls1021a-twr.dts
@@ -161,17 +161,11 @@
 			device-width = <1>;
 
 			partition@0 {
-				/* 128KB for rcw */
-				reg = <0x00000000 0x0020000>;
+				/* 128KB for bank0 RCW */
+				reg = <0x00000000 0x00020000>;
 				label = "NOR bank0 RCW Image";
 			};
 
-			partition@20000 {
-				/* 896KB for DTB */
-				reg = <0x00020000 0x000e0000>;
-				label = "NOR DTB Image";
-			};
-
 			partition@100000 {
 				/* 1MB for bank0 u-boot Image */
 				reg = <0x00100000 0x00100000>;
@@ -179,19 +173,25 @@
 			};
 
 			partition@200000 {
-				/* 8 MB for Linux Kernel Image */
-				reg = <0x00200000 0x00800000>;
-				label = "NOR Linux Kernel Image";
+				/* 1MB for bank0 DTB */
+				reg = <0x00200000 0x00100000>;
+				label = "NOR bank0 DTB Image";
+			};
+
+			partition@300000 {
+				/* 7MB for bank0 Linux Kernel */
+				reg = <0x00300000 0x00700000>;
+				label = "NOR bank0 Linux Kernel Image";
 			};
 
 			partition@a00000 {
-				/* 54MB for Ramdisk Root File System */
+				/* 54MB for bank0 Ramdisk Root File System */
 				reg = <0x00a00000 0x03600000>;
-				label = "NOR Ramdisk Root File System Image";
+				label = "NOR bank0 Ramdisk Root File System Image";
 			};
 
 			partition@4000000 {
-				/* 128KB for bank4 RCW Image */
+				/* 128KB for bank4 RCW */
 				reg = <0x04000000 0x00020000>;
 				label = "NOR bank4 RCW Image";
 			};
@@ -199,13 +199,25 @@
 			partition@4100000 {
 				/* 1MB for bank4 u-boot Image */
 				reg = <0x04100000 0x00100000>;
-				label = "NOR bank0 u-boot Image";
+				label = "NOR bank4 u-boot Image";
 			};
 
 			partition@4200000 {
-				/* 62MB JFFS2 ROOT File System Image */
-				reg = <0x04200000 0x03e00000>;
-				label = "NOR JFFS2 ROOT File System Image";
+				/* 1MB for bank4 DTB */
+				reg = <0x04200000 0x00100000>;
+				label = "NOR bank4 DTB Image";
+			};
+
+			partition@4300000 {
+				/* 7MB for bank4 Linux Kernel */
+				reg = <0x04300000 0x00700000>;
+				label = "NOR bank4 Linux Kernel Image";
+			};
+
+			partition@4a00000 {
+				/* 54MB for bank4 Ramdisk Root File System */
+				reg = <0x04a00000 0x03600000>;
+				label = "NOR bank4 Ramdisk Root File System Image";
 			};
 		};
 
-- 
cgit v0.10.2