[meta-handheld][PATCH 0/6] fixes for Zaurus collie

[meta-handheld][PATCH 0/6] fixes for Zaurus collie

[Andrea Adami]

This set of patches fixes the CFI MTD detection so that the
NOR flash is unlocked on boot.
Still investigating about the cause of the misdetection...

Flash was Read Only with jedec detection, now booting from flash
is possible again.

Andrea Adami (6):
  linux-yocto: remove POWER_SUPPLY_DEBUG as default
  linux-yocto: collie: set MTD geometry
  linux-yocto: collie: revert jedec_probe patch
  linux-yocto: collie: force CFI detection (temporary HACK)
  linux-yocto: collie: resize MTD to SZ_16M
  linux-yocto: collie: force flash unlock on boot

 .../linux/linux-yocto-3.10/collie/collie.cfg       | 14 +++++++-
 .../linux/linux-yocto-3.10/collie/collie.scc       |  5 ++-
 .../patches/patches-mtd/collie-force-cfi.patch     | 30 ++++++++++++++++
 .../patches/patches-mtd/collie-force-unlock.patch  | 22 ++++++++++++
 .../patches/patches-mtd/collie-mtd-resize.patch    | 41 ++++++++++++++++++++++
 .../linux/linux-yocto-3.10/zaurus-hardware.cfg     |  1 -
 6 files changed, 110 insertions(+), 3 deletions(-)
 create mode 100644 recipes-kernel/linux/linux-yocto-3.10/patches/patches-mtd/collie-force-cfi.patch
 create mode 100644 recipes-kernel/linux/linux-yocto-3.10/patches/patches-mtd/collie-force-unlock.patch
 create mode 100644 recipes-kernel/linux/linux-yocto-3.10/patches/patches-mtd/collie-mtd-resize.patch

-- 
1.8.1.5

[meta-handheld][PATCH 1/6] linux-yocto: remove POWER_SUPPLY_DEBUG as default

[Andrea Adami]

Signed-off-by: Andrea Adami <andrea.adami@gmail.com>
---
 recipes-kernel/linux/linux-yocto-3.10/zaurus-hardware.cfg | 1 -
 1 file changed, 1 deletion(-)

diff --git a/recipes-kernel/linux/linux-yocto-3.10/zaurus-hardware.cfg b/recipes-kernel/linux/linux-yocto-3.10/zaurus-hardware.cfg
index 9973944..903b810 100644
--- a/recipes-kernel/linux/linux-yocto-3.10/zaurus-hardware.cfg
+++ b/recipes-kernel/linux/linux-yocto-3.10/zaurus-hardware.cfg
@@ -148,7 +148,6 @@ CONFIG_GPIO_SYSFS=y
 # MODULbus GPIO expanders:
 #
 CONFIG_POWER_SUPPLY=y
-CONFIG_POWER_SUPPLY_DEBUG=y
 CONFIG_PDA_POWER=y
 CONFIG_APM_POWER=y
 CONFIG_HWMON=y
-- 
1.8.1.5

[meta-handheld][PATCH 2/6] linux-yocto: collie: set MTD geometry

[Andrea Adami]

Explicitly disable unwanted mtd geometry options
Add OTP support (warning!)

Signed-off-by: Andrea Adami <andrea.adami@gmail.com>
---
 recipes-kernel/linux/linux-yocto-3.10/collie/collie.cfg | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/recipes-kernel/linux/linux-yocto-3.10/collie/collie.cfg b/recipes-kernel/linux/linux-yocto-3.10/collie/collie.cfg
index c334774..5238c69 100644
--- a/recipes-kernel/linux/linux-yocto-3.10/collie/collie.cfg
+++ b/recipes-kernel/linux/linux-yocto-3.10/collie/collie.cfg
@@ -53,16 +53,28 @@ CONFIG_CMDLINE="console=ttySA0,115200n8 console=tty1 mem=64M fbcon=rotate:1 logl
 # RAM/ROM/Flash chip drivers
 #
 CONFIG_MTD_CFI=y
-CONFIG_MTD_JEDECPROBE=y
+# CONFIG_MTD_JEDECPROBE is not set
 CONFIG_MTD_GEN_PROBE=y
 CONFIG_MTD_CFI_ADV_OPTIONS=y
 CONFIG_MTD_CFI_NOSWAP=y
 CONFIG_MTD_CFI_GEOMETRY=y
+
+# CONFIG_MTD_MAP_BANK_WIDTH_1 is not set
+# CONFIG_MTD_MAP_BANK_WIDTH_2 is not set
 CONFIG_MTD_MAP_BANK_WIDTH_4=y
+# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set
+# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set
+# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set
+
+# CONFIG_MTD_CFI_I1 is not set
 CONFIG_MTD_CFI_I2=y
+# CONFIG_MTD_CFI_I4 is not set
+# CONFIG_MTD_CFI_I8 is not set
 CONFIG_MTD_CFI_INTELEXT=y
 CONFIG_MTD_CFI_UTIL=y
 
+CONFIG_MTD_OTP=y
+
 #
 # Mapping drivers for chip access
 #
-- 
1.8.1.5

[meta-handheld][PATCH 3/6] linux-yocto: collie: revert jedec_probe patch

[Andrea Adami]

Signed-off-by: Andrea Adami <andrea.adami@gmail.com>
---
 recipes-kernel/linux/linux-yocto-3.10/collie/collie.scc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/recipes-kernel/linux/linux-yocto-3.10/collie/collie.scc b/recipes-kernel/linux/linux-yocto-3.10/collie/collie.scc
index 2ce8650..4f60d81 100644
--- a/recipes-kernel/linux/linux-yocto-3.10/collie/collie.scc
+++ b/recipes-kernel/linux/linux-yocto-3.10/collie/collie.scc
@@ -6,5 +6,5 @@ patch ../patches/patches-locomokbd/locomo_kbd_tweak-r2.patch
 patch ../patches/patches-power/collie_battery-dev-pm.patch
 patch ../patches/patches-mfd/mcp-device.patch
 patch ../patches/patches-mfd/ucb1x00-device.patch
-patch ../patches/patches-mtd/collie-jedec-probe.patch
+//patch ../patches/patches-mtd/collie-jedec-probe.patch
 patch ../patches/patches-mtd/collie-eraseinfo.patch
-- 
1.8.1.5

[meta-handheld][PATCH 4/6] linux-yocto: collie: force CFI detection (temporary HACK)

[Andrea Adami]

The CFI detection fails but all other reads can be done correctly
Enjoy this hack until the (mis)detection is fixed.

Signed-off-by: Andrea Adami <andrea.adami@gmail.com>
---
 .../linux/linux-yocto-3.10/collie/collie.scc       |  1 +
 .../patches/patches-mtd/collie-force-cfi.patch     | 30 ++++++++++++++++++++++
 2 files changed, 31 insertions(+)
 create mode 100644 recipes-kernel/linux/linux-yocto-3.10/patches/patches-mtd/collie-force-cfi.patch

diff --git a/recipes-kernel/linux/linux-yocto-3.10/collie/collie.scc b/recipes-kernel/linux/linux-yocto-3.10/collie/collie.scc
index 4f60d81..536f4b1 100644
--- a/recipes-kernel/linux/linux-yocto-3.10/collie/collie.scc
+++ b/recipes-kernel/linux/linux-yocto-3.10/collie/collie.scc
@@ -8,3 +8,4 @@ patch ../patches/patches-mfd/mcp-device.patch
 patch ../patches/patches-mfd/ucb1x00-device.patch
 //patch ../patches/patches-mtd/collie-jedec-probe.patch
 patch ../patches/patches-mtd/collie-eraseinfo.patch
+patch ../patches/patches-mtd/collie-force-cfi.patch
diff --git a/recipes-kernel/linux/linux-yocto-3.10/patches/patches-mtd/collie-force-cfi.patch b/recipes-kernel/linux/linux-yocto-3.10/patches/patches-mtd/collie-force-cfi.patch
new file mode 100644
index 0000000..958fce7
--- /dev/null
+++ b/recipes-kernel/linux/linux-yocto-3.10/patches/patches-mtd/collie-force-cfi.patch
@@ -0,0 +1,30 @@
+From c39115ed52359eb5f0475ea2b4a2e71acb5da54b Mon Sep 17 00:00:00 2001
+From: Andrea Adami <andrea.adami@gmail.com>
+Date: Thu, 7 Nov 2013 23:17:36 +0100
+Subject: [PATCH] cfi_util.c: force CFI detection even if Q R Y test
+ fails
+
+Signed-off-by: Andrea Adami <andrea.adami@gmail.com>
+---
+ drivers/mtd/chips/cfi_util.c | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/drivers/mtd/chips/cfi_util.c b/drivers/mtd/chips/cfi_util.c
+index f992418..bdee7b9 100644
+--- a/drivers/mtd/chips/cfi_util.c
++++ b/drivers/mtd/chips/cfi_util.c
+@@ -85,7 +85,10 @@ int __xipram cfi_qry_mode_on(uint32_t base, struct map_info *map,
+ 	if (cfi_qry_present(map, base, cfi))
+ 		return 1;
+ 	/* QRY not found */
+-	return 0;
++/*	return 0; */
++
++/*	FIXME: UGLY HACK: FORCE DETECTION */
++	return 1;
+ }
+ EXPORT_SYMBOL_GPL(cfi_qry_mode_on);
+ 
+-- 
+1.8.1.5
+
-- 
1.8.1.5

[meta-handheld][PATCH 5/6] linux-yocto: collie: resize MTD to SZ_16M

[Andrea Adami]

Signed-off-by: Andrea Adami <andrea.adami@gmail.com>
---
 .../linux/linux-yocto-3.10/collie/collie.scc       |  1 +
 .../patches/patches-mtd/collie-mtd-resize.patch    | 41 ++++++++++++++++++++++
 2 files changed, 42 insertions(+)
 create mode 100644 recipes-kernel/linux/linux-yocto-3.10/patches/patches-mtd/collie-mtd-resize.patch

diff --git a/recipes-kernel/linux/linux-yocto-3.10/collie/collie.scc b/recipes-kernel/linux/linux-yocto-3.10/collie/collie.scc
index 536f4b1..fb904ed 100644
--- a/recipes-kernel/linux/linux-yocto-3.10/collie/collie.scc
+++ b/recipes-kernel/linux/linux-yocto-3.10/collie/collie.scc
@@ -9,3 +9,4 @@ patch ../patches/patches-mfd/ucb1x00-device.patch
 //patch ../patches/patches-mtd/collie-jedec-probe.patch
 patch ../patches/patches-mtd/collie-eraseinfo.patch
 patch ../patches/patches-mtd/collie-force-cfi.patch
+patch ../patches/patches-mtd/collie-mtd-resize.patch
diff --git a/recipes-kernel/linux/linux-yocto-3.10/patches/patches-mtd/collie-mtd-resize.patch b/recipes-kernel/linux/linux-yocto-3.10/patches/patches-mtd/collie-mtd-resize.patch
new file mode 100644
index 0000000..ba52d2f
--- /dev/null
+++ b/recipes-kernel/linux/linux-yocto-3.10/patches/patches-mtd/collie-mtd-resize.patch
@@ -0,0 +1,41 @@
+From 85f5a57b9bdd94fa7a20280c31f4f8b148368215 Mon Sep 17 00:00:00 2001
+From: Andrea Adami <andrea.adami@gmail.com>
+Date: Thu, 7 Nov 2013 23:00:31 +0100
+Subject: ARM: SA1100: resize collie mtd to SZ_16M
+
+The end-user models have all 2x8 = 16 Megabytes of NOR.
+It seems that only some dev models/prototype had 32M.
+With current code, giving size of 32M can confuse the detection.
+
+JEDEC:
+sa1100-0: Found 2 x16 devices at 0x0 in 32-bit bank
+sa1100-0: Found different chip or no chip at all (mfr 0x4, id 0x3001) at 0x1000000
+SA1100 flash: CFI device at 0x00000000, 16MiB, 32-bit
+
+CFI:
+sa1100-0: Found 2 x16 devices at 0x0 in 32-bit bank. Manufacturer ID 0x0000b0 Chip ID 0x0000b0
+sa1100-0: Found 2 x16 devices at 0x1000000 in 32-bit bank
+Intel/Sharp Extended Query Table at 0x0039
+...
+sa1100-0: 2 set(s) of 2 interleaved chips --> 2 partitions of 16384 KiB
+SA1100 flash: CFI device at 0x00000000, 32MiB, 32-bit
+
+
+Signed-off-by: Andrea Adami <andrea.adami@gmail.com>
+---
+ arch/arm/mach-sa1100/collie.c             |      2 +-
+ 2 files changed, 230404 insertions(+), 1604 deletions(-)
+
+diff --git a/arch/arm/mach-sa1100/collie.c b/arch/arm/mach-sa1100/collie.c
+index 7fb96eb..c1005ef 100644
+--- a/arch/arm/mach-sa1100/collie.c
++++ b/arch/arm/mach-sa1100/collie.c
+@@ -298,7 +298,7 @@ static struct flash_platform_data collie_flash_data = {
+ };
+ 
+ static struct resource collie_flash_resources[] = {
+-	DEFINE_RES_MEM(SA1100_CS0_PHYS, SZ_32M),
++	DEFINE_RES_MEM(SA1100_CS0_PHYS, SZ_16M),
+ };
+ 
+ static struct sa1100fb_mach_info collie_lcd_info = {
-- 
1.8.1.5

[meta-handheld][PATCH 6/6] linux-yocto: collie: force flash unlock on boot

[Andrea Adami]

Signed-off-by: Andrea Adami <andrea.adami@gmail.com>
---
 .../linux/linux-yocto-3.10/collie/collie.scc       |  1 +
 .../patches/patches-mtd/collie-force-unlock.patch  | 22 ++++++++++++++++++++++
 2 files changed, 23 insertions(+)
 create mode 100644 recipes-kernel/linux/linux-yocto-3.10/patches/patches-mtd/collie-force-unlock.patch

diff --git a/recipes-kernel/linux/linux-yocto-3.10/collie/collie.scc b/recipes-kernel/linux/linux-yocto-3.10/collie/collie.scc
index fb904ed..3b9b55a 100644
--- a/recipes-kernel/linux/linux-yocto-3.10/collie/collie.scc
+++ b/recipes-kernel/linux/linux-yocto-3.10/collie/collie.scc
@@ -10,3 +10,4 @@ patch ../patches/patches-mfd/ucb1x00-device.patch
 patch ../patches/patches-mtd/collie-eraseinfo.patch
 patch ../patches/patches-mtd/collie-force-cfi.patch
 patch ../patches/patches-mtd/collie-mtd-resize.patch
+patch ../patches/patches-mtd/collie-force-unlock.patch
diff --git a/recipes-kernel/linux/linux-yocto-3.10/patches/patches-mtd/collie-force-unlock.patch b/recipes-kernel/linux/linux-yocto-3.10/patches/patches-mtd/collie-force-unlock.patch
new file mode 100644
index 0000000..d599d1d
--- /dev/null
+++ b/recipes-kernel/linux/linux-yocto-3.10/patches/patches-mtd/collie-force-unlock.patch
@@ -0,0 +1,22 @@
+From c39115ed52359eb5f0475ea2b4a2e71acb5da54b Mon Sep 17 00:00:00 2001
+From: Andrea Adami <andrea.adami@gmail.com>
+Date: Thu, 7 Nov 2013 23:17:36 +0100
+Subject: [PATCH] collie: force flash unlock on boot
+
+Signed-off-by: Andrea Adami <andrea.adami@gmail.com>
+---
+ drivers/mtd/chips/cfi_cmdset_0001.c | 1 +
+ 1 file changed, 1 insertions(+), 0 deletion(-)
+
+diff --git a/drivers/mtd/chips/cfi_cmdset_0001.c b/drivers/mtd/chips/cfi_cmdset_0001.c
+index 7751443..d9d6f0e 100644
+--- a/drivers/mtd/chips/cfi_cmdset_0001.c
++++ b/drivers/mtd/chips/cfi_cmdset_0001.c
+@@ -310,6 +310,7 @@ static struct cfi_fixup cfi_fixup_table[] = {
+ 	{ CFI_MFR_ST, 0x00ba, /* M28W320CT */ fixup_st_m28w320ct },
+ 	{ CFI_MFR_ST, 0x00bb, /* M28W320CB */ fixup_st_m28w320cb },
+ 	{ CFI_MFR_INTEL, CFI_ID_ANY, fixup_unlock_powerup_lock },
++	{ CFI_MFR_SHARP, 0x00b0, fixup_unlock_powerup_lock },
+ 	{ 0, 0, NULL }
+ };
+ 
-- 
1.8.1.5