Patch landed upstream in 3.17.3 (commit id 255a8e963ea7d9d856d224a76b8a2fb99f0682fe)
Signed-off-by: Andrea Adami <[email protected]> --- .../linux/linux-yocto-3.17/collie/mtd-resume.patch | 34 ---------------------- .../linux/linux-yocto-tiny-kexecboot_3.17.bbappend | 1 - recipes-kernel/linux/linux-yocto_3.17.bbappend | 3 +- 3 files changed, 1 insertion(+), 37 deletions(-) delete mode 100644 recipes-kernel/linux/linux-yocto-3.17/collie/mtd-resume.patch diff --git a/recipes-kernel/linux/linux-yocto-3.17/collie/mtd-resume.patch b/recipes-kernel/linux/linux-yocto-3.17/collie/mtd-resume.patch deleted file mode 100644 index 3cee9b3..0000000 --- a/recipes-kernel/linux/linux-yocto-3.17/collie/mtd-resume.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 6d34f776e8dba9cba5520db7d27a31102238f66e Mon Sep 17 00:00:00 2001 -From: Andrea Adami <[email protected]> -Date: Sun, 12 Oct 2014 12:31:36 +0200 -Subject: [PATCH 1130/1130] mtd: cfi_cmdset_0001.c: fix resume for LH28F640BF - chips - -After '#echo mem > /sys/power/state' the device can not be resumed -because apparently the Partition Configuration Register has been reset -to default. This should only happen after cold/boot or hard reset but -the behavior is confirmed on 2 different end-user devices. - -Tested on zaurus collie with kernel 3.17-rc7 - -Signed-off-by: Dmitry Eremin-Solenikov <[email protected]> ---- - drivers/mtd/chips/cfi_cmdset_0001.c | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/drivers/mtd/chips/cfi_cmdset_0001.c b/drivers/mtd/chips/cfi_cmdset_0001.c -index a7543ba..59e2355 100644 ---- a/drivers/mtd/chips/cfi_cmdset_0001.c -+++ b/drivers/mtd/chips/cfi_cmdset_0001.c -@@ -2590,6 +2590,8 @@ static void cfi_intelext_resume(struct mtd_info *mtd) - - /* Go to known state. Chip may have been power cycled */ - if (chip->state == FL_PM_SUSPENDED) { -+ /* Refresh LH28F640BF Partition Configuration Register */ -+ fixup_LH28F640BF(mtd); - map_write(map, CMD(0xFF), cfi->chips[i].start); - chip->oldstate = chip->state = FL_READY; - wake_up(&chip->wq); --- -1.9.1 - diff --git a/recipes-kernel/linux/linux-yocto-tiny-kexecboot_3.17.bbappend b/recipes-kernel/linux/linux-yocto-tiny-kexecboot_3.17.bbappend index 909d66e..11d7f11 100644 --- a/recipes-kernel/linux/linux-yocto-tiny-kexecboot_3.17.bbappend +++ b/recipes-kernel/linux/linux-yocto-tiny-kexecboot_3.17.bbappend @@ -54,7 +54,6 @@ SRC_URI_append_collie = " \ file://locomolcd-suspend-resume.patch \ \ file://collie-use-gpio-charger.patch \ - file://mtd-resume.patch \ \ " diff --git a/recipes-kernel/linux/linux-yocto_3.17.bbappend b/recipes-kernel/linux/linux-yocto_3.17.bbappend index 54747d0..eda4061 100644 --- a/recipes-kernel/linux/linux-yocto_3.17.bbappend +++ b/recipes-kernel/linux/linux-yocto_3.17.bbappend @@ -53,9 +53,8 @@ SRC_URI_append_collie = " \ file://locomolcd-suspend-resume.patch \ \ file://collie-use-gpio-charger.patch \ - file://mtd-resume.patch \ - \ " + SRC_URI_append_h3600 = " \ file://defconfig \ file://OE-qvga-logo.patch \ -- 1.9.1 -- _______________________________________________ Openembedded-devel mailing list [email protected] http://lists.openembedded.org/mailman/listinfo/openembedded-devel
