ARM: dts: Fix up SQ201 flash access

[ Upstream commit d88b11ef91b15d0af9c0676cbf4f441a0dff0c56 ]

This sets the partition information on the SQ201 to be read
out from the RedBoot partition table, removes the static
partition table and sets our boot options to mount root from
/dev/mtdblock2 where the squashfs+JFFS2 resides.

Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/arch/arm/boot/dts/gemini-sq201.dts b/arch/arm/boot/dts/gemini-sq201.dts
index 3787cf3763c41f50e4edc474aeba9de49503c6bc..e9e4a8a02600b913c50779810e32d089ada29c3d 100644 (file)
--- a/arch/arm/boot/dts/gemini-sq201.dts
+++ b/arch/arm/boot/dts/gemini-sq201.dts
@@ -20,7 +20,7 @@
        };
 
        chosen {
-               bootargs = "console=ttyS0,115200n8";
+               bootargs = "console=ttyS0,115200n8 root=/dev/mtdblock2 rw rootfstype=squashfs,jffs2 rootwait";
                stdout-path = &uart0;
        };
 
@@ -138,37 +138,10 @@
                        /* 16MB of flash */
                        reg = <0x30000000 0x01000000>;
 
-                       partition@0 {
-                               label = "RedBoot";
-                               reg = <0x00000000 0x00120000>;
-                               read-only;
-                       };
-                       partition@120000 {
-                               label = "Kernel";
-                               reg = <0x00120000 0x00200000>;
-                       };
-                       partition@320000 {
-                               label = "Ramdisk";
-                               reg = <0x00320000 0x00600000>;
-                       };
-                       partition@920000 {
-                               label = "Application";
-                               reg = <0x00920000 0x00600000>;
-                       };
-                       partition@f20000 {
-                               label = "VCTL";
-                               reg = <0x00f20000 0x00020000>;
-                               read-only;
-                       };
-                       partition@f40000 {
-                               label = "CurConf";
-                               reg = <0x00f40000 0x000a0000>;
-                               read-only;
-                       };
-                       partition@fe0000 {
-                               label = "FIS directory";
-                               reg = <0x00fe0000 0x00020000>;
-                               read-only;
+                       partitions {
+                               compatible = "redboot-fis";
+                               /* Eraseblock at 0xfe0000 */
+                               fis-index-block = <0x1fc>;
                        };
                };