diff options
-rw-r--r-- | recipes-kernel/linux/linux-yocto-tiny-kexecboot-3.10/akita/akita-tiny.scc (renamed from recipes-kernel/linux/linux-yocto-tiny-kexecboot-3.8/akita/akita-tiny.scc) | 2 | ||||
-rw-r--r-- | recipes-kernel/linux/linux-yocto-tiny-kexecboot-3.10/akita/akita.cfg (renamed from recipes-kernel/linux/linux-yocto-tiny-kexecboot-3.8/akita/akita.cfg) | 0 | ||||
-rw-r--r-- | recipes-kernel/linux/linux-yocto-tiny-kexecboot-3.10/c7x0/c7x0-kexecboot.cfg (renamed from recipes-kernel/linux/linux-yocto-tiny-kexecboot-3.8/c7x0/c7x0-kexecboot.cfg) | 0 | ||||
-rw-r--r-- | recipes-kernel/linux/linux-yocto-tiny-kexecboot-3.10/c7x0/c7x0-tiny.scc (renamed from recipes-kernel/linux/linux-yocto-tiny-kexecboot-3.8/c7x0/c7x0-tiny.scc) | 1 | ||||
-rw-r--r-- | recipes-kernel/linux/linux-yocto-tiny-kexecboot-3.10/collie/collie-kexecboot.cfg (renamed from recipes-kernel/linux/linux-yocto-tiny-kexecboot-3.8/collie/collie-kexecboot.cfg) | 0 | ||||
-rw-r--r-- | recipes-kernel/linux/linux-yocto-tiny-kexecboot-3.10/collie/collie-tiny.scc (renamed from recipes-kernel/linux/linux-yocto-tiny-kexecboot-3.8/collie/collie-tiny.scc) | 0 | ||||
-rw-r--r-- | recipes-kernel/linux/linux-yocto-tiny-kexecboot-3.10/feature-top.scc (renamed from recipes-kernel/linux/linux-yocto-tiny-kexecboot-3.8/feature-top.scc) | 0 | ||||
-rw-r--r-- | recipes-kernel/linux/linux-yocto-tiny-kexecboot-3.10/patches/patches-locomokbd/locomo_kbd_tweak-r2.patch (renamed from recipes-kernel/linux/linux-yocto-tiny-kexecboot-3.8/patches/patches-locomokbd/locomo_kbd_tweak-r2.patch) | 0 | ||||
-rw-r--r-- | recipes-kernel/linux/linux-yocto-tiny-kexecboot-3.10/patches/patches-mfd/mcp-device.patch (renamed from recipes-kernel/linux/linux-yocto-tiny-kexecboot-3.8/patches/patches-mfd/mcp-device.patch) | 0 | ||||
-rw-r--r-- | recipes-kernel/linux/linux-yocto-tiny-kexecboot-3.10/patches/patches-mfd/ucb1x00-device.patch (renamed from recipes-kernel/linux/linux-yocto-tiny-kexecboot-3.8/patches/patches-mfd/ucb1x00-device.patch) | 0 | ||||
-rw-r--r-- | recipes-kernel/linux/linux-yocto-tiny-kexecboot-3.10/patches/patches-mtd/collie-eraseinfo.patch (renamed from recipes-kernel/linux/linux-yocto-tiny-kexecboot-3.8/patches/patches-mtd/collie-eraseinfo.patch) | 0 | ||||
-rw-r--r-- | recipes-kernel/linux/linux-yocto-tiny-kexecboot-3.10/patches/patches-mtd/collie-jedec-probe.patch (renamed from recipes-kernel/linux/linux-yocto-tiny-kexecboot-3.8/patches/patches-mtd/collie-jedec-probe.patch) | 0 | ||||
-rw-r--r-- | recipes-kernel/linux/linux-yocto-tiny-kexecboot-3.10/patches/patches-power/collie_battery-dev-pm.patch (renamed from recipes-kernel/linux/linux-yocto-tiny-kexecboot-3.8/patches/patches-power/collie_battery-dev-pm.patch) | 0 | ||||
-rw-r--r-- | recipes-kernel/linux/linux-yocto-tiny-kexecboot-3.10/patches/patches-power/tosa_battery_irq_to_gpio.patch (renamed from recipes-kernel/linux/linux-yocto-tiny-kexecboot-3.8/patches/patches-power/tosa_battery_irq_to_gpio.patch) | 0 | ||||
-rw-r--r-- | recipes-kernel/linux/linux-yocto-tiny-kexecboot-3.10/patches/patches-pxa/sharpsl_param.patch (renamed from recipes-kernel/linux/linux-yocto-tiny-kexecboot-3.8/patches/patches-pxa/sharpsl_param.patch) | 0 | ||||
-rw-r--r-- | recipes-kernel/linux/linux-yocto-tiny-kexecboot-3.10/patches/revert-check-on-console-device.patch (renamed from recipes-kernel/linux/linux-yocto-tiny-kexecboot-3.8/patches/revert-check-on-console-device.patch) | 0 | ||||
-rw-r--r-- | recipes-kernel/linux/linux-yocto-tiny-kexecboot-3.10/poodle/poodle-kexecboot.cfg (renamed from recipes-kernel/linux/linux-yocto-tiny-kexecboot-3.8/poodle/poodle-kexecboot.cfg) | 0 | ||||
-rw-r--r-- | recipes-kernel/linux/linux-yocto-tiny-kexecboot-3.10/poodle/poodle-tiny.scc (renamed from recipes-kernel/linux/linux-yocto-tiny-kexecboot-3.8/poodle/poodle-tiny.scc) | 1 | ||||
-rw-r--r-- | recipes-kernel/linux/linux-yocto-tiny-kexecboot-3.10/spitz/3200-mtd.patch (renamed from recipes-kernel/linux/linux-yocto-tiny-kexecboot-3.8/spitz/3200-mtd.patch) | 0 | ||||
-rw-r--r-- | recipes-kernel/linux/linux-yocto-tiny-kexecboot-3.10/spitz/spitz-kexecboot.cfg (renamed from recipes-kernel/linux/linux-yocto-tiny-kexecboot-3.8/spitz/spitz-kexecboot.cfg) | 0 | ||||
-rw-r--r-- | recipes-kernel/linux/linux-yocto-tiny-kexecboot-3.10/spitz/spitz-tiny.scc (renamed from recipes-kernel/linux/linux-yocto-tiny-kexecboot-3.8/spitz/spitz-tiny.scc) | 2 | ||||
-rw-r--r-- | recipes-kernel/linux/linux-yocto-tiny-kexecboot-3.10/tosa/tosa-kexecboot.cfg (renamed from recipes-kernel/linux/linux-yocto-tiny-kexecboot-3.8/tosa/tosa-kexecboot.cfg) | 0 | ||||
-rw-r--r-- | recipes-kernel/linux/linux-yocto-tiny-kexecboot-3.10/tosa/tosa-tiny.scc (renamed from recipes-kernel/linux/linux-yocto-tiny-kexecboot-3.8/tosa/tosa-tiny.scc) | 1 | ||||
-rw-r--r-- | recipes-kernel/linux/linux-yocto-tiny-kexecboot-3.8/patches/patches-pxa/pxa27x-sa1100-rtc.patch | 32 | ||||
-rw-r--r-- | recipes-kernel/linux/linux-yocto-tiny-kexecboot-3.8/patches/patches-pxa/pxamci-regulator.patch | 147 | ||||
-rw-r--r-- | recipes-kernel/linux/linux-yocto-tiny-kexecboot_3.10.bbappend (renamed from recipes-kernel/linux/linux-yocto-tiny-kexecboot_3.8.bbappend) | 2 |
26 files changed, 1 insertions, 187 deletions
diff --git a/recipes-kernel/linux/linux-yocto-tiny-kexecboot-3.8/akita/akita-tiny.scc b/recipes-kernel/linux/linux-yocto-tiny-kexecboot-3.10/akita/akita-tiny.scc index 50959de..ba06735 100644 --- a/recipes-kernel/linux/linux-yocto-tiny-kexecboot-3.8/akita/akita-tiny.scc +++ b/recipes-kernel/linux/linux-yocto-tiny-kexecboot-3.10/akita/akita-tiny.scc @@ -8,6 +8,4 @@ kconf hardware ../spitz/spitz-kexecboot.cfg kconf hardware akita.cfg patch ../patches/patches-pxa/sharpsl_param.patch -patch ../patches/patches-pxa/pxa27x-sa1100-rtc.patch -patch ../patches/patches-pxa/pxamci-regulator.patch patch ../patches/revert-check-on-console-device.patch diff --git a/recipes-kernel/linux/linux-yocto-tiny-kexecboot-3.8/akita/akita.cfg b/recipes-kernel/linux/linux-yocto-tiny-kexecboot-3.10/akita/akita.cfg index f6eb8f2..f6eb8f2 100644 --- a/recipes-kernel/linux/linux-yocto-tiny-kexecboot-3.8/akita/akita.cfg +++ b/recipes-kernel/linux/linux-yocto-tiny-kexecboot-3.10/akita/akita.cfg diff --git a/recipes-kernel/linux/linux-yocto-tiny-kexecboot-3.8/c7x0/c7x0-kexecboot.cfg b/recipes-kernel/linux/linux-yocto-tiny-kexecboot-3.10/c7x0/c7x0-kexecboot.cfg index ffd7b37..ffd7b37 100644 --- a/recipes-kernel/linux/linux-yocto-tiny-kexecboot-3.8/c7x0/c7x0-kexecboot.cfg +++ b/recipes-kernel/linux/linux-yocto-tiny-kexecboot-3.10/c7x0/c7x0-kexecboot.cfg diff --git a/recipes-kernel/linux/linux-yocto-tiny-kexecboot-3.8/c7x0/c7x0-tiny.scc b/recipes-kernel/linux/linux-yocto-tiny-kexecboot-3.10/c7x0/c7x0-tiny.scc index 221ed1a..4a0c05e 100644 --- a/recipes-kernel/linux/linux-yocto-tiny-kexecboot-3.8/c7x0/c7x0-tiny.scc +++ b/recipes-kernel/linux/linux-yocto-tiny-kexecboot-3.10/c7x0/c7x0-tiny.scc @@ -7,5 +7,4 @@ include ktypes/tiny/tiny.scc kconf hardware c7x0-kexecboot.cfg patch ../patches/patches-pxa/sharpsl_param.patch -patch ../patches/patches-pxa/pxamci-regulator.patch patch ../patches/revert-check-on-console-device.patch diff --git a/recipes-kernel/linux/linux-yocto-tiny-kexecboot-3.8/collie/collie-kexecboot.cfg b/recipes-kernel/linux/linux-yocto-tiny-kexecboot-3.10/collie/collie-kexecboot.cfg index 1c9b325..1c9b325 100644 --- a/recipes-kernel/linux/linux-yocto-tiny-kexecboot-3.8/collie/collie-kexecboot.cfg +++ b/recipes-kernel/linux/linux-yocto-tiny-kexecboot-3.10/collie/collie-kexecboot.cfg diff --git a/recipes-kernel/linux/linux-yocto-tiny-kexecboot-3.8/collie/collie-tiny.scc b/recipes-kernel/linux/linux-yocto-tiny-kexecboot-3.10/collie/collie-tiny.scc index cc1264d..cc1264d 100644 --- a/recipes-kernel/linux/linux-yocto-tiny-kexecboot-3.8/collie/collie-tiny.scc +++ b/recipes-kernel/linux/linux-yocto-tiny-kexecboot-3.10/collie/collie-tiny.scc diff --git a/recipes-kernel/linux/linux-yocto-tiny-kexecboot-3.8/feature-top.scc b/recipes-kernel/linux/linux-yocto-tiny-kexecboot-3.10/feature-top.scc index fdffa2a..fdffa2a 100644 --- a/recipes-kernel/linux/linux-yocto-tiny-kexecboot-3.8/feature-top.scc +++ b/recipes-kernel/linux/linux-yocto-tiny-kexecboot-3.10/feature-top.scc diff --git a/recipes-kernel/linux/linux-yocto-tiny-kexecboot-3.8/patches/patches-locomokbd/locomo_kbd_tweak-r2.patch b/recipes-kernel/linux/linux-yocto-tiny-kexecboot-3.10/patches/patches-locomokbd/locomo_kbd_tweak-r2.patch index 441e3dc..441e3dc 100644 --- a/recipes-kernel/linux/linux-yocto-tiny-kexecboot-3.8/patches/patches-locomokbd/locomo_kbd_tweak-r2.patch +++ b/recipes-kernel/linux/linux-yocto-tiny-kexecboot-3.10/patches/patches-locomokbd/locomo_kbd_tweak-r2.patch diff --git a/recipes-kernel/linux/linux-yocto-tiny-kexecboot-3.8/patches/patches-mfd/mcp-device.patch b/recipes-kernel/linux/linux-yocto-tiny-kexecboot-3.10/patches/patches-mfd/mcp-device.patch index a3523b0..a3523b0 100644 --- a/recipes-kernel/linux/linux-yocto-tiny-kexecboot-3.8/patches/patches-mfd/mcp-device.patch +++ b/recipes-kernel/linux/linux-yocto-tiny-kexecboot-3.10/patches/patches-mfd/mcp-device.patch diff --git a/recipes-kernel/linux/linux-yocto-tiny-kexecboot-3.8/patches/patches-mfd/ucb1x00-device.patch b/recipes-kernel/linux/linux-yocto-tiny-kexecboot-3.10/patches/patches-mfd/ucb1x00-device.patch index 76c4d97..76c4d97 100644 --- a/recipes-kernel/linux/linux-yocto-tiny-kexecboot-3.8/patches/patches-mfd/ucb1x00-device.patch +++ b/recipes-kernel/linux/linux-yocto-tiny-kexecboot-3.10/patches/patches-mfd/ucb1x00-device.patch diff --git a/recipes-kernel/linux/linux-yocto-tiny-kexecboot-3.8/patches/patches-mtd/collie-eraseinfo.patch b/recipes-kernel/linux/linux-yocto-tiny-kexecboot-3.10/patches/patches-mtd/collie-eraseinfo.patch index 0a8ebac..0a8ebac 100644 --- a/recipes-kernel/linux/linux-yocto-tiny-kexecboot-3.8/patches/patches-mtd/collie-eraseinfo.patch +++ b/recipes-kernel/linux/linux-yocto-tiny-kexecboot-3.10/patches/patches-mtd/collie-eraseinfo.patch diff --git a/recipes-kernel/linux/linux-yocto-tiny-kexecboot-3.8/patches/patches-mtd/collie-jedec-probe.patch b/recipes-kernel/linux/linux-yocto-tiny-kexecboot-3.10/patches/patches-mtd/collie-jedec-probe.patch index bae540a..bae540a 100644 --- a/recipes-kernel/linux/linux-yocto-tiny-kexecboot-3.8/patches/patches-mtd/collie-jedec-probe.patch +++ b/recipes-kernel/linux/linux-yocto-tiny-kexecboot-3.10/patches/patches-mtd/collie-jedec-probe.patch diff --git a/recipes-kernel/linux/linux-yocto-tiny-kexecboot-3.8/patches/patches-power/collie_battery-dev-pm.patch b/recipes-kernel/linux/linux-yocto-tiny-kexecboot-3.10/patches/patches-power/collie_battery-dev-pm.patch index 4792c32..4792c32 100644 --- a/recipes-kernel/linux/linux-yocto-tiny-kexecboot-3.8/patches/patches-power/collie_battery-dev-pm.patch +++ b/recipes-kernel/linux/linux-yocto-tiny-kexecboot-3.10/patches/patches-power/collie_battery-dev-pm.patch diff --git a/recipes-kernel/linux/linux-yocto-tiny-kexecboot-3.8/patches/patches-power/tosa_battery_irq_to_gpio.patch b/recipes-kernel/linux/linux-yocto-tiny-kexecboot-3.10/patches/patches-power/tosa_battery_irq_to_gpio.patch index 9951d3a..9951d3a 100644 --- a/recipes-kernel/linux/linux-yocto-tiny-kexecboot-3.8/patches/patches-power/tosa_battery_irq_to_gpio.patch +++ b/recipes-kernel/linux/linux-yocto-tiny-kexecboot-3.10/patches/patches-power/tosa_battery_irq_to_gpio.patch diff --git a/recipes-kernel/linux/linux-yocto-tiny-kexecboot-3.8/patches/patches-pxa/sharpsl_param.patch b/recipes-kernel/linux/linux-yocto-tiny-kexecboot-3.10/patches/patches-pxa/sharpsl_param.patch index 934cdca..934cdca 100644 --- a/recipes-kernel/linux/linux-yocto-tiny-kexecboot-3.8/patches/patches-pxa/sharpsl_param.patch +++ b/recipes-kernel/linux/linux-yocto-tiny-kexecboot-3.10/patches/patches-pxa/sharpsl_param.patch diff --git a/recipes-kernel/linux/linux-yocto-tiny-kexecboot-3.8/patches/revert-check-on-console-device.patch b/recipes-kernel/linux/linux-yocto-tiny-kexecboot-3.10/patches/revert-check-on-console-device.patch index b8b699d..b8b699d 100644 --- a/recipes-kernel/linux/linux-yocto-tiny-kexecboot-3.8/patches/revert-check-on-console-device.patch +++ b/recipes-kernel/linux/linux-yocto-tiny-kexecboot-3.10/patches/revert-check-on-console-device.patch diff --git a/recipes-kernel/linux/linux-yocto-tiny-kexecboot-3.8/poodle/poodle-kexecboot.cfg b/recipes-kernel/linux/linux-yocto-tiny-kexecboot-3.10/poodle/poodle-kexecboot.cfg index cfb0a5d..cfb0a5d 100644 --- a/recipes-kernel/linux/linux-yocto-tiny-kexecboot-3.8/poodle/poodle-kexecboot.cfg +++ b/recipes-kernel/linux/linux-yocto-tiny-kexecboot-3.10/poodle/poodle-kexecboot.cfg diff --git a/recipes-kernel/linux/linux-yocto-tiny-kexecboot-3.8/poodle/poodle-tiny.scc b/recipes-kernel/linux/linux-yocto-tiny-kexecboot-3.10/poodle/poodle-tiny.scc index 1015b42..12c3ccf 100644 --- a/recipes-kernel/linux/linux-yocto-tiny-kexecboot-3.8/poodle/poodle-tiny.scc +++ b/recipes-kernel/linux/linux-yocto-tiny-kexecboot-3.10/poodle/poodle-tiny.scc @@ -8,5 +8,4 @@ kconf hardware poodle-kexecboot.cfg patch ../patches/patches-locomokbd/locomo_kbd_tweak-r2.patch patch ../patches/patches-pxa/sharpsl_param.patch -patch ../patches/patches-pxa/pxamci-regulator.patch patch ../patches/revert-check-on-console-device.patch diff --git a/recipes-kernel/linux/linux-yocto-tiny-kexecboot-3.8/spitz/3200-mtd.patch b/recipes-kernel/linux/linux-yocto-tiny-kexecboot-3.10/spitz/3200-mtd.patch index 4b2a968..4b2a968 100644 --- a/recipes-kernel/linux/linux-yocto-tiny-kexecboot-3.8/spitz/3200-mtd.patch +++ b/recipes-kernel/linux/linux-yocto-tiny-kexecboot-3.10/spitz/3200-mtd.patch diff --git a/recipes-kernel/linux/linux-yocto-tiny-kexecboot-3.8/spitz/spitz-kexecboot.cfg b/recipes-kernel/linux/linux-yocto-tiny-kexecboot-3.10/spitz/spitz-kexecboot.cfg index 5aa5586..5aa5586 100644 --- a/recipes-kernel/linux/linux-yocto-tiny-kexecboot-3.8/spitz/spitz-kexecboot.cfg +++ b/recipes-kernel/linux/linux-yocto-tiny-kexecboot-3.10/spitz/spitz-kexecboot.cfg diff --git a/recipes-kernel/linux/linux-yocto-tiny-kexecboot-3.8/spitz/spitz-tiny.scc b/recipes-kernel/linux/linux-yocto-tiny-kexecboot-3.10/spitz/spitz-tiny.scc index 0a1fc30..17c3088 100644 --- a/recipes-kernel/linux/linux-yocto-tiny-kexecboot-3.8/spitz/spitz-tiny.scc +++ b/recipes-kernel/linux/linux-yocto-tiny-kexecboot-3.10/spitz/spitz-tiny.scc @@ -10,6 +10,4 @@ kconf hardware spitz-kexecboot.cfg patch 3200-mtd.patch patch ../patches/patches-pxa/sharpsl_param.patch -patch ../patches/patches-pxa/pxa27x-sa1100-rtc.patch -patch ../patches/patches-pxa/pxamci-regulator.patch patch ../patches/revert-check-on-console-device.patch diff --git a/recipes-kernel/linux/linux-yocto-tiny-kexecboot-3.8/tosa/tosa-kexecboot.cfg b/recipes-kernel/linux/linux-yocto-tiny-kexecboot-3.10/tosa/tosa-kexecboot.cfg index 9e3b9e5..9e3b9e5 100644 --- a/recipes-kernel/linux/linux-yocto-tiny-kexecboot-3.8/tosa/tosa-kexecboot.cfg +++ b/recipes-kernel/linux/linux-yocto-tiny-kexecboot-3.10/tosa/tosa-kexecboot.cfg diff --git a/recipes-kernel/linux/linux-yocto-tiny-kexecboot-3.8/tosa/tosa-tiny.scc b/recipes-kernel/linux/linux-yocto-tiny-kexecboot-3.10/tosa/tosa-tiny.scc index 7c41b5c..50e36f1 100644 --- a/recipes-kernel/linux/linux-yocto-tiny-kexecboot-3.8/tosa/tosa-tiny.scc +++ b/recipes-kernel/linux/linux-yocto-tiny-kexecboot-3.10/tosa/tosa-tiny.scc @@ -8,5 +8,4 @@ kconf hardware tosa-kexecboot.cfg patch ../patches/patches-pxa/sharpsl_param.patch patch ../patches/patches-power/tosa_battery_irq_to_gpio.patch -patch ../patches/patches-pxa/pxamci-regulator.patch patch ../patches/revert-check-on-console-device.patch diff --git a/recipes-kernel/linux/linux-yocto-tiny-kexecboot-3.8/patches/patches-pxa/pxa27x-sa1100-rtc.patch b/recipes-kernel/linux/linux-yocto-tiny-kexecboot-3.8/patches/patches-pxa/pxa27x-sa1100-rtc.patch deleted file mode 100644 index d878ea1..0000000 --- a/recipes-kernel/linux/linux-yocto-tiny-kexecboot-3.8/patches/patches-pxa/pxa27x-sa1100-rtc.patch +++ /dev/null @@ -1,32 +0,0 @@ -From fcee0050f8ce5296e8007ed7ed17d98f334a8f38 Mon Sep 17 00:00:00 2001 -From: Andrea Adami <andrea.adami@gmail.com> -Date: Fri, 23 Nov 2012 23:07:20 +0100 -Subject: [PATCH] ARM: pxa: pxa27x.c: add dummy SA1100 rtc clock - -* Using pxa27x you could now build both RTC_DRV_PXA and RTC_DRV_SA1100. -* Make sure you don't use both together: link /dev/rtc0 or /dev/rtc1 -* to /dev/rtc according to your requirement. - -Signed-off-by: Andrea Adami <andrea.adami@gmail.com> -Acked-by: Robert Jarzmik <robert.jarzmik@free.fr> -Signed-off-by: Haojian Zhuang <haojian.zhuang@gmail.com> - -Upstream-Status: Accepted -Committed in v3.9-rc1 with commit id -495b21dc0e488b784ab1d4007d00db1ca2a95c98 ---- - arch/arm/mach-pxa/pxa27x.c | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -diff --git a/arch/arm/mach-pxa/pxa27x.c b/arch/arm/mach-pxa/pxa27x.c -index 8047ee0..5970ebc 100644 ---- a/arch/arm/mach-pxa/pxa27x.c -+++ b/arch/arm/mach-pxa/pxa27x.c -@@ -230,6 +230,7 @@ static struct clk_lookup pxa27x_clkregs[] = { - INIT_CLKREG(&clk_pxa27x_memc, NULL, "MEMCLK"), - INIT_CLKREG(&clk_pxa27x_mem, "pxa2xx-pcmcia", NULL), - INIT_CLKREG(&clk_dummy, "pxa-gpio", NULL), -+ INIT_CLKREG(&clk_dummy, "sa1100-rtc", NULL), - }; - - #ifdef CONFIG_PM diff --git a/recipes-kernel/linux/linux-yocto-tiny-kexecboot-3.8/patches/patches-pxa/pxamci-regulator.patch b/recipes-kernel/linux/linux-yocto-tiny-kexecboot-3.8/patches/patches-pxa/pxamci-regulator.patch deleted file mode 100644 index 66351f3..0000000 --- a/recipes-kernel/linux/linux-yocto-tiny-kexecboot-3.8/patches/patches-pxa/pxamci-regulator.patch +++ /dev/null @@ -1,147 +0,0 @@ -From 04e7345a49a7ab2eb725f8ee2569c49b9ea697bb Mon Sep 17 00:00:00 2001 -From: Marko Katic <dromede@gmail.com> -Date: Mon, 15 Jul 2013 00:55:13 +0200 -Subject: [PATCH] pxamci: Refactor regulator support - -Here's an interesting scenario. The spitz machine has an -Intersil 6271A voltage regulator and an ADS7846 touchscreen -controller. - -The ADS7846 driver _requires_ the use of a voltage regulator -or if not present, CONFIG_REGULATOR_DUMMY should be used for proper operation. -This was made mandatory by the following commit: - -======================================== -91143379b01b2020d8878d627ebe9dfb9d6eb4c8 -Input: ads7846 - add regulator support - -The ADS7846/TSC2046 touchscreen controllers can (and usually are) -connected to various regulators for power, so add regulator support. - -Valid regulator will now be required, so boards without complete -regulator setup should either disable regulator framework or enable -CONFIG_REGULATOR_DUMMY. -======================================== - -The ADS7846 in spitz machines is not connected to -any power regulator so it needs CONFIG_REGULATOR_DUMMY enabled. -So to support both the Intersil 6271A regulator and -the ADS7846 controller, CONFIG_REGULATOR and CONFIG_REGULATOR_DUMMY have -to be defined. - -However, enabling CONFIG_REGULATOR and CONFIG_REGULATOR_DUMMY -will break pxamci driver and cause the following error output: - -pxa2xx-mci.0 supply vmmc not found, using dummy regulator -pxa2xx-mci pxa2xx-mci.0: ocr_mask/setpower will not be used -pxa2xx-mci pxa2xx-mci.0: could not set regulator OCR (-22) -pxa2xx-mci pxa2xx-mci.0: unable to set power -pxa2xx-mci pxa2xx-mci.0: could not set regulator OCR (-22) -pxa2xx-mci pxa2xx-mci.0: unable to set power - -Above failures occur in two functions; -pxamci_init_ocr() and pxamci_set_power(). - -Regulator support in pxamci_init_ocr() is not -written with the existence of the dummy regulator driver in -mind. It does not check the return value of mmc_regulator_get_ocrmask() -and it will only fall back to platform data if no regulator was found. - -pxamci_set_power() fails because it does not even try to fall back -to platform data if mmc_regulator_set_ocr() fails. It -expects a proper regulator or no regulator at all. It will -only fall back to platform data if no regulator was found. It does -not properly handle the possible existence of the dummy regulator. - -This patch refactors pxamci_init_ocr() and pxamci_set_power() regulator -support to be more modular, to do more checks and to always fall back -to platform data. - -Signed-off-by: Marko Katic <dromede@gmail.com> - -Upstream-Status: Submitted -https://patchwork.kernel.org/patch/1875561/ ---- - drivers/mmc/host/pxamci.c | 40 +++++++++++++++++++++++++++------------- - 1 file changed, 27 insertions(+), 13 deletions(-) - -diff --git a/drivers/mmc/host/pxamci.c b/drivers/mmc/host/pxamci.c -index 2b2f65a..341d5dc 100644 ---- a/drivers/mmc/host/pxamci.c -+++ b/drivers/mmc/host/pxamci.c -@@ -83,18 +83,26 @@ struct pxamci_host { - static inline void pxamci_init_ocr(struct pxamci_host *host) - { - #ifdef CONFIG_REGULATOR -+ int ocr_mask; - host->vcc = regulator_get(mmc_dev(host->mmc), "vmmc"); - - if (IS_ERR(host->vcc)) - host->vcc = NULL; - else { -- host->mmc->ocr_avail = mmc_regulator_get_ocrmask(host->vcc); -- if (host->pdata && host->pdata->ocr_mask) -+ ocr_mask = mmc_regulator_get_ocrmask(host->vcc); -+ if (ocr_mask <= 0) -+ host->mmc->ocr_avail = 0; -+ else -+ host->mmc->ocr_avail = ocr_mask; -+ -+ if (host->pdata && -+ host->pdata->ocr_mask && -+ host->mmc->ocr_avail) - dev_warn(mmc_dev(host->mmc), - "ocr_mask/setpower will not be used\n"); - } - #endif -- if (host->vcc == NULL) { -+ if (host->vcc == NULL || host->mmc->ocr_avail == 0) { - /* fall-back to platform data */ - host->mmc->ocr_avail = host->pdata ? - host->pdata->ocr_mask : -@@ -108,26 +116,32 @@ static inline int pxamci_set_power(struct pxamci_host *host, - { - int on; - -+#ifdef CONFIG_REGULATOR - if (host->vcc) { -- int ret; -+ int ret = 0; - -- if (power_mode == MMC_POWER_UP) { -+ if (power_mode == MMC_POWER_UP) - ret = mmc_regulator_set_ocr(host->mmc, host->vcc, vdd); -- if (ret) -- return ret; -- } else if (power_mode == MMC_POWER_OFF) { -+ -+ if (power_mode == MMC_POWER_OFF) - ret = mmc_regulator_set_ocr(host->mmc, host->vcc, 0); -- if (ret) -- return ret; -- } -+ -+ if (ret == 0) -+ return 0; -+ else -+ dev_warn(mmc_dev(host->mmc), -+ "mmc_regulator_set_ocr failed, " -+ "falling back to platform data\n"); - } -- if (!host->vcc && host->pdata && -+#endif -+ -+ if (host->pdata && - gpio_is_valid(host->pdata->gpio_power)) { - on = ((1 << vdd) & host->pdata->ocr_mask); - gpio_set_value(host->pdata->gpio_power, - !!on ^ host->pdata->gpio_power_invert); - } -- if (!host->vcc && host->pdata && host->pdata->setpower) -+ if (host->pdata && host->pdata->setpower) - host->pdata->setpower(mmc_dev(host->mmc), vdd); - - return 0; --- -1.8.1.5 - diff --git a/recipes-kernel/linux/linux-yocto-tiny-kexecboot_3.8.bbappend b/recipes-kernel/linux/linux-yocto-tiny-kexecboot_3.10.bbappend index eb02812..2ca53cb 100644 --- a/recipes-kernel/linux/linux-yocto-tiny-kexecboot_3.8.bbappend +++ b/recipes-kernel/linux/linux-yocto-tiny-kexecboot_3.10.bbappend @@ -1,4 +1,4 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}-3.8:${THISDIR}/${PN}:${THISDIR}/files:" +FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}-3.10:${THISDIR}/${PN}:${THISDIR}/files:" # Zaurus machines need kernel size-check. KERNEL_IMAGE_MAXSIZE_akita = "1294336" |