linux-yocto-tiny-kexecboot: collie: resync patches with linux-yocto_3.10
PATCH 1/1 linux-yocto-tiny-kexecboot: collie: resync patches with linux-yocto_3.10
Signed-off-by Andrea Adami <[email protected]>
--- .../collie/collie-tiny.scc | 15 +++ .../patches-locomo/locomo-fix-SCL-SDA.patch | 28 +++++ .../patches-mtd/collie-cfi-probe-again.patch | 29 ++++++ .../patches-mtd/collie-fixup-strataflash.patch | 27 +++++ .../patches/patches-mtd/collie-force-cfi.patch | 30 ++++++ .../patches/patches-mtd/collie-force-unlock.patch | 22 ++++ .../patches/patches-mtd/collie-mtd-resize.patch | 41 ++++++++ .../patches-sa1100/arm-sa1100-add-cpu-clock.patch | 95 +++++++++++++++++ .../patches-sa1100/collie-add-bootblock.patch | 29 ++++++ .../patches/patches-sa1100/collie-irda.patch | 88 ++++++++++++++++ .../fbdev-sa1100fb-make-use-of-device-clock.patch | 115 +++++++++++++++++++++ .../patches-sa1100/pcmcia-clock-alias-sa1111.patch | 31 ++++++ .../pcmcia-sa1100-device-clock.patch | 100 ++++++++++++++++++ .../pcmcia-sa1111-device-clock.patch | 44 ++++++++ 14 files changed, 694 insertions(+) create mode 100644 recipes-kernel/linux/linux-yocto-tiny-kexecboot-3.10/patches/patches-locomo/locomo-fix-SCL-SDA.patch create mode 100644 recipes-kernel/linux/linux-yocto-tiny-kexecboot-3.10/patches/patches-mtd/collie-cfi-probe-again.patch create mode 100644 recipes-kernel/linux/linux-yocto-tiny-kexecboot-3.10/patches/patches-mtd/collie-fixup-strataflash.patch create mode 100644 recipes-kernel/linux/linux-yocto-tiny-kexecboot-3.10/patches/patches-mtd/collie-force-cfi.patch create mode 100644 recipes-kernel/linux/linux-yocto-tiny-kexecboot-3.10/patches/patches-mtd/collie-force-unlock.patch create mode 100644 recipes-kernel/linux/linux-yocto-tiny-kexecboot-3.10/patches/patches-mtd/collie-mtd-resize.patch create mode 100644 recipes-kernel/linux/linux-yocto-tiny-kexecboot-3.10/patches/patches-sa1100/arm-sa1100-add-cpu-clock.patch create mode 100644 recipes-kernel/linux/linux-yocto-tiny-kexecboot-3.10/patches/patches-sa1100/collie-add-bootblock.patch create mode 100644 recipes-kernel/linux/linux-yocto-tiny-kexecboot-3.10/patches/patches-sa1100/collie-irda.patch create mode 100644 recipes-kernel/linux/linux-yocto-tiny-kexecboot-3.10/patches/patches-sa1100/fbdev-sa1100fb-make-use-of-device-clock.patch create mode 100644 recipes-kernel/linux/linux-yocto-tiny-kexecboot-3.10/patches/patches-sa1100/pcmcia-clock-alias-sa1111.patch create mode 100644 recipes-kernel/linux/linux-yocto-tiny-kexecboot-3.10/patches/patches-sa1100/pcmcia-sa1100-device-clock.patch create mode 100644 recipes-kernel/linux/linux-yocto-tiny-kexecboot-3.10/patches/patches-sa1100/pcmcia-sa1111-device-clock.patch
recipes-kernel/linux/linux-yocto-tiny-kexecboot-3.10/collie/collie-tiny.scc +15 -0
@@ -12,4 +12,19 @@ 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 +// 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 +patch ../patches/patches-mtd/collie-fixup-strataflash.patch +patch ../patches/patches-sa1100/collie-irda.patch +patch ../patches/patches-sa1100/collie-add-bootblock.patch +patch ../patches/patches-sa1100/arm-sa1100-add-cpu-clock.patch +patch ../patches/patches-sa1100/fbdev-sa1100fb-make-use-of-device-clock.patch +patch ../patches/patches-sa1100/pcmcia-sa1100-device-clock.patch +patch ../patches/patches-sa1100/pcmcia-clock-alias-sa1111.patch +patch ../patches/patches-sa1100/pcmcia-sa1111-device-clock.patch +patch ../patches/patches-locomo/locomo-fix-SCL-SDA.patch +// linux-yocto-specific patch ../patches/revert-check-on-console-device.patch
recipes-kernel/linux/linux-yocto-tiny-kexecboot-3.10/patches/patches-locomo/locomo-fix-SCL-SDA.patch new file +28 -0
@@ -0,0 +1,28 @@ +From acc2f94781ab11bead994bb3faaad149f9187bd4 Mon Sep 17 00:00:00 2001 +From: Andrea Adami <[email protected]> +Date: Tue, 12 Nov 2013 22:21:20 +0100 +Subject: [PATCH 631/631] linux-yocto: collie: locomo.c: fix SCL line instead + of SDA + +Signed-off-by: Dmitry Eremin-Solenikov <[email protected]> +Signed-off-by: Andrea Adami <[email protected]> +--- + arch/arm/common/locomo.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/arch/arm/common/locomo.c b/arch/arm/common/locomo.c +index b55c362..d827bcb 100644 +--- a/arch/arm/common/locomo.c ++++ b/arch/arm/common/locomo.c +@@ -629,7 +629,7 @@ static void locomo_m62332_sendbit(void *mapbase, int bit) + unsigned int r; + + r = locomo_readl(mapbase + LOCOMO_DAC); +- r &= ~(LOCOMO_DAC_SCLOEB); ++ r &= ~(LOCOMO_DAC_SDAOEB); + locomo_writel(r, mapbase + LOCOMO_DAC); + udelay(DAC_LOW_SETUP_TIME); /* 300 nsec */ + udelay(DAC_DATA_HOLD_TIME); /* 300 nsec */ +-- +1.8.1.5 +
recipes-kernel/linux/linux-yocto-tiny-kexecboot-3.10/patches/patches-mtd/collie-cfi-probe-again.patch new file +29 -0
@@ -0,0 +1,29 @@ +From 35957eda21bdd2f22c84fa269c1b856f5039c308 Mon Sep 17 00:00:00 2001 +From: Andrea Adami <[email protected]> +Date: Tue, 12 Nov 2013 22:32:26 +0100 +Subject: [PATCH 633/633] 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 <[email protected]> +--- + 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 +
recipes-kernel/linux/linux-yocto-tiny-kexecboot-3.10/patches/patches-mtd/collie-fixup-strataflash.patch new file +27 -0
@@ -0,0 +1,27 @@ +From 64fab473fe31b5c8a76000d7e82df7f6cdd751ba Mon Sep 17 00:00:00 2001 +From: Andrea Adami <[email protected]> +Date: Tue, 12 Nov 2013 01:28:18 +0100 +Subject: [PATCH 627/627] linux-yocto: collie: add MTD fixup like for Intel + Strataflash + +Signed-off-by: Andrea Adami <[email protected]> +--- + drivers/mtd/chips/cfi_cmdset_0001.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/drivers/mtd/chips/cfi_cmdset_0001.c b/drivers/mtd/chips/cfi_cmdset_0001.c +index d9d6f0e..eedb60b 100644 +--- a/drivers/mtd/chips/cfi_cmdset_0001.c ++++ b/drivers/mtd/chips/cfi_cmdset_0001.c +@@ -36,7 +36,7 @@ + #include <linux/mtd/mtd.h> + #include <linux/mtd/cfi.h> + +-/* #define CMDSET0001_DISABLE_ERASE_SUSPEND_ON_WRITE */ ++#define CMDSET0001_DISABLE_ERASE_SUSPEND_ON_WRITE + /* #define CMDSET0001_DISABLE_WRITE_SUSPEND */ + + // debugging, turns off buffer write mode if set to 1 +-- +1.8.1.5 +
recipes-kernel/linux/linux-yocto-tiny-kexecboot-3.10/patches/patches-mtd/collie-force-cfi.patch new file +30 -0
@@ -0,0 +1,30 @@ +From c39115ed52359eb5f0475ea2b4a2e71acb5da54b Mon Sep 17 00:00:00 2001 +From: Andrea Adami <[email protected]> +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 <[email protected]> +--- + 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 +
recipes-kernel/linux/linux-yocto-tiny-kexecboot-3.10/patches/patches-mtd/collie-force-unlock.patch new file +22 -0
@@ -0,0 +1,22 @@ +From c39115ed52359eb5f0475ea2b4a2e71acb5da54b Mon Sep 17 00:00:00 2001 +From: Andrea Adami <[email protected]> +Date: Thu, 7 Nov 2013 23:17:36 +0100 +Subject: [PATCH] collie: force flash unlock on boot + +Signed-off-by: Andrea Adami <[email protected]> +--- + 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 } + }; +
recipes-kernel/linux/linux-yocto-tiny-kexecboot-3.10/patches/patches-mtd/collie-mtd-resize.patch new file +41 -0
41 lines not on this page · raw message
recipes-kernel/linux/linux-yocto-tiny-kexecboot-3.10/patches/patches-sa1100/arm-sa1100-add-cpu-clock.patch new file +95 -0
95 lines not on this page · raw message
recipes-kernel/linux/linux-yocto-tiny-kexecboot-3.10/patches/patches-sa1100/collie-add-bootblock.patch new file +29 -0
@@ -0,0 +1,29 @@ +From 0b6559d7a3e28c89c3093fd193076a5d7d7c699b Mon Sep 17 00:00:00 2001 +From: Andrea Adami <[email protected]> +Date: Sat, 9 Nov 2013 16:30:01 +0100 +Subject: [PATCH] linux-yocto: collie: add top boot partition + +Signed-off-by: Andrea Adami <[email protected]> +--- + 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 946fa71..2785e6e 100644 +--- a/arch/arm/mach-sa1100/collie.c ++++ b/arch/arm/mach-sa1100/collie.c +@@ -294,6 +294,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.8.1.5 +
recipes-kernel/linux/linux-yocto-tiny-kexecboot-3.10/patches/patches-sa1100/collie-irda.patch new file +88 -0
88 lines not on this page · raw message
recipes-kernel/linux/linux-yocto-tiny-kexecboot-3.10/patches/patches-sa1100/fbdev-sa1100fb-make-use-of-device-clock.patch new file +115 -0
115 lines not on this page · raw message
recipes-kernel/linux/linux-yocto-tiny-kexecboot-3.10/patches/patches-sa1100/pcmcia-clock-alias-sa1111.patch new file +31 -0
@@ -0,0 +1,31 @@ +From patchwork Tue Nov 12 03:32:11 2013 +Content-Type: text/plain; charset="utf-8" +MIME-Version: 1.0 +Content-Transfer-Encoding: 7bit +Subject: [4/5] arm: sa1100: add a clock alias for sa1111 pcmcia device +From: Dmitry Eremin-Solenikov <[email protected]> +X-Patchwork-Id: 3170631 +Message-Id: <[email protected]> +To: [email protected] +Cc: [email protected], [email protected], + Russell King <[email protected]> +Date: Tue, 12 Nov 2013 07:32:11 +0400 + +Signed-off-by: Dmitry Eremin-Solenikov <[email protected]> + +--- +arch/arm/mach-sa1100/clock.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/arch/arm/mach-sa1100/clock.c b/arch/arm/mach-sa1100/clock.c +index abf1dc1..cd4762d 100644 +--- a/arch/arm/mach-sa1100/clock.c ++++ b/arch/arm/mach-sa1100/clock.c +@@ -124,6 +124,7 @@ static struct clk_lookup sa11xx_clkregs[] = { + CLKDEV_INIT("sa1100-rtc", NULL, NULL), + CLKDEV_INIT("sa11x0-fb", NULL, &clk_cpu), + CLKDEV_INIT("sa11x0-pcmcia", NULL, &clk_cpu), ++ CLKDEV_INIT("1600", NULL, &clk_cpu), /* sa1111 pcmcia */ + }; + + static int __init sa11xx_clk_init(void)
recipes-kernel/linux/linux-yocto-tiny-kexecboot-3.10/patches/patches-sa1100/pcmcia-sa1100-device-clock.patch new file +100 -0
100 lines not on this page · raw message
recipes-kernel/linux/linux-yocto-tiny-kexecboot-3.10/patches/patches-sa1100/pcmcia-sa1111-device-clock.patch new file +44 -0
44 lines not on this page · raw message
Signature · 1 line
1.8.1.5