diff options
| author |   Andrea Adami <andrea.adami@gmail.com> | 2013-11-12 22:36:14 +0100 |
|---|---|---|
| committer | Andrea Adami <andrea.adami@gmail.com> | 2013-11-13 18:03:14 +0100 |
| commit | 77849c2c1f459e92d30716f2078bdfc1674bdd00 (patch) | |
| tree | deed16a77609b9d2d7cfb18cd21aaca6aeda34e8 /recipes-kernel | |
| parent | 63a92820121a4d51ea9a1d150bc3fcaa891bfcdd (diff) | |
| download | meta-handheld-77849c2c1f459e92d30716f2078bdfc1674bdd00.tar.gz | |
linux-yocto: collie: properly readd cfi_probe
Signed-off-by: Andrea Adami <andrea.adami@gmail.com>
Diffstat (limited to 'recipes-kernel')
| -rw-r--r-- | recipes-kernel/linux/linux-yocto-3.10/collie/collie.scc | 3 | ||||
| -rw-r--r-- | recipes-kernel/linux/linux-yocto-3.10/patches/patches-mtd/collie-cfi-probe-again.patch | 29 |
2 files changed, 31 insertions, 1 deletions
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 3bd8f5f..f8298ff 100644 --- a/recipes-kernel/linux/linux-yocto-3.10/collie/collie.scc +++ b/recipes-kernel/linux/linux-yocto-3.10/collie/collie.scc @@ -6,9 +6,10 @@ 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 // for 3.12 +patch ../patches/patches-mtd/collie-cfi-probe-again.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-cfi-probe-again.patch b/recipes-kernel/linux/linux-yocto-3.10/patches/patches-mtd/collie-cfi-probe-again.patch new file mode 100644 index 0000000..3054106 --- /dev/null +++ b/recipes-kernel/linux/linux-yocto-3.10/patches/patches-mtd/collie-cfi-probe-again.patch @@ -0,0 +1,29 @@ +From 35957eda21bdd2f22c84fa269c1b856f5039c308 Mon Sep 17 00:00:00 2001 +From: Andrea Adami <andrea.adami@gmail.com> +Date: Tue, 12 Nov 2013 22:32:26 +0100 +Subject: [PATCH] sa1100: collie: detect NOR again with cfi_probe + +Ehile the detection is still forced we switch away from jedec: +the CFI code allows us to set the necessary fixups. + +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 799902d..8c088cc 100644 +--- a/arch/arm/mach-sa1100/collie.c ++++ b/arch/arm/mach-sa1100/collie.c +@@ -326,7 +326,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.8.1.5 + |