[PATCH 0/2] ARM: sa1100: collie mtd fixes

[PATCH 0/2] ARM: sa1100: collie mtd fixes

[Andrea Adami]

After having extensivly tested three different units (2 Zaurus SL-5500,
1 SL-5500G) I finally send this small patches fixing collie's mtd.

The background is the improved support for the specific chips, see pending:
"mtd: cfi_cmdset_0001.c: add support for Sharp LH28F640BF NOR" for linux-mtd.

The most important is the first one reverting to cfi_probe
(the test-unit had broken CFI rom and CFI query was not matched).

The second one exposes the nor bootblock (in a read-only manner).
Sharp decided to put there just a few bytes, the sharpls_param
(COMADJ, UUID, TOUCH, AD, PHAD) set in the Diagnostic Menu.

Andrea Adami (2):
  arm: sa1100: collie: revert back to cfi_probe
  arm: sa1100: collie: add top boot mtd partition

 arch/arm/mach-sa1100/collie.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

-- 
1.9.1

[PATCH 1/2] arm: sa1100: collie: revert back to cfi_probe

[Andrea Adami]

Reverts commit d26b17edafc45187c30cae134a5e5429d58ad676
ARM: sa1100: collie.c: fall back to jedec_probe flash detection

Unfortunately the detection was challenged on the defective unit used for tests:
one of the NOR chips did not respond to the CFI query.
Moreover that bad device needed extra delays on erase-suspend/resume cycles.

Tested personally on 3 different units and with feedback of two other users.

Signed-off-by: Andrea Adami <andrea.adami@gmail.com>
---
 arch/arm/mach-sa1100/collie.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm/mach-sa1100/collie.c b/arch/arm/mach-sa1100/collie.c
index f9874ba..f26aeea 100644
--- a/arch/arm/mach-sa1100/collie.c
+++ b/arch/arm/mach-sa1100/collie.c
@@ -356,7 +356,7 @@ static void collie_flash_exit(void)
 }
 
 static struct flash_platform_data collie_flash_data = {
-	.map_name	= "jedec_probe",
+	.map_name	= "cfi_probe",
 	.init		= collie_flash_init,
 	.set_vpp	= collie_set_vpp,
 	.exit		= collie_flash_exit,
-- 
1.9.1

[PATCH 2/2] arm: sa1100: collie: add top boot mtd partition

[Andrea Adami]

The CFI mapping is now perfect so we can expose the top block, read only.
There isn't much to read, though, just the sharpsl_params values.

Signed-off-by: Andrea Adami <andrea.adami@gmail.com>
---
 arch/arm/mach-sa1100/collie.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/arch/arm/mach-sa1100/collie.c b/arch/arm/mach-sa1100/collie.c
index f26aeea..3f449b0 100644
--- a/arch/arm/mach-sa1100/collie.c
+++ b/arch/arm/mach-sa1100/collie.c
@@ -329,6 +329,11 @@ static struct mtd_partition collie_partitions[] = {
 		.name		= "rootfs",
 		.offset 	= MTDPART_OFS_APPEND,
 		.size		= 0x00e20000,
+	}, {
+		.name		= "bootblock",
+		.offset		= MTDPART_OFS_APPEND,
+		.size		= 0x00020000,
+		.mask_flags	= MTD_WRITEABLE
 	}
 };
 
-- 
1.9.1