[oe] [meta-handheld][PATCH] linux-yocto_3.8: remove patch already upstream

[Andrea Adami]

On Sun, Apr 14, 2013 at 8:40 PM, Martin Jansa <martin.jansa at gmail.com> wrote:
> On Sun, Apr 14, 2013 at 07:50:31PM +0200, Andrea Adami wrote:
>> * the spitz_pm patch was pushed upstream with commit
>> * id 510fcb0d331f314cd20d0067d56f29302846f47b
>> *
>> * remove it to unbreak do_patch
>
> Now it builds with latest oe-core, but still doesn't boot for me.

There is an outstanding regression due to the power regulators rework:
boot from SD/CF card is atm impossible on pxa Zaurus (and on collie
too, until refresh of thesing's locomo_spi patch). We are working on
it.

Thanks for your testings

Cheers

Andrea

>
>> Signed-off-by: Andrea Adami <andrea.adami at gmail.com>
>> ---
>>  .../linux/linux-yocto-3.8/akita/akita.scc          |  1 -
>>  .../linux/linux-yocto-3.8/spitz/spitz.scc          |  1 -
>>  .../linux/linux-yocto-3.8/spitz_pm.patch           | 53 ----------------------
>>  3 files changed, 55 deletions(-)
>>  delete mode 100644 recipes-kernel/linux/linux-yocto-3.8/spitz_pm.patch
>>
>> diff --git a/recipes-kernel/linux/linux-yocto-3.8/akita/akita.scc b/recipes-kernel/linux/linux-yocto-3.8/akita/akita.scc
>> index e1549ef..bad38c4 100644
>> --- a/recipes-kernel/linux/linux-yocto-3.8/akita/akita.scc
>> +++ b/recipes-kernel/linux/linux-yocto-3.8/akita/akita.scc
>> @@ -6,6 +6,5 @@ include ../zaurus-common.scc
>>  include ../zaurus-usb-host.scc
>>
>>  patch sharpsl_param.patch
>> -patch spitz_pm.patch
>>  patch pxa27x-sa1100-rtc.patch
>>  patch spi-pxa2xx-fix-mem.patch
>> diff --git a/recipes-kernel/linux/linux-yocto-3.8/spitz/spitz.scc b/recipes-kernel/linux/linux-yocto-3.8/spitz/spitz.scc
>> index fe6aac8..f9f9381 100644
>> --- a/recipes-kernel/linux/linux-yocto-3.8/spitz/spitz.scc
>> +++ b/recipes-kernel/linux/linux-yocto-3.8/spitz/spitz.scc
>> @@ -5,6 +5,5 @@ include ../zaurus-common.scc
>>  include ../zaurus-usb-host.scc
>>
>>  patch sharpsl_param.patch
>> -patch spitz_pm.patch
>>  patch pxa27x-sa1100-rtc.patch
>>  patch spi-pxa2xx-fix-mem.patch
>> diff --git a/recipes-kernel/linux/linux-yocto-3.8/spitz_pm.patch b/recipes-kernel/linux/linux-yocto-3.8/spitz_pm.patch
>> deleted file mode 100644
>> index 34bcb9d..0000000
>> --- a/recipes-kernel/linux/linux-yocto-3.8/spitz_pm.patch
>> +++ /dev/null
>> @@ -1,53 +0,0 @@
>> -Subject: [PATCH] [ARM] pxa/spitz_pm.c: Fix hang under certain conditions when resuming from STR.
>> -
>> -Devices that use spitz_pm.c will fail to resume
>> -from STR (Suspend To Ram) when the charger plug is inserted
>> -or removed when a device is in STR mode. The culprit is
>> -a misconfigured gpio line - GPIO18. GPIO18 should be configured as a
>> -regular GPIO input but it gets configured as an alternate function
>> -GPIO18_RDY. And then later in postsuspend() it gets configured as
>> -a regular GPIO18 input line.
>> -
>> -Fix this by removing the GPIO18_RDY configuration so that GPIO18
>> -only gets configured as a regular gpio input.
>> -
>> -Signed-off-by: Marko Katic <dromede at gmail.com>
>> ----
>> - arch/arm/mach-pxa/spitz_pm.c |    8 ++------
>> - 1 files changed, 2 insertions(+), 6 deletions(-)
>> -
>> -diff --git a/arch/arm/mach-pxa/spitz_pm.c b/arch/arm/mach-pxa/spitz_pm.c
>> -index 438f02f..842596d 100644
>> ---- a/arch/arm/mach-pxa/spitz_pm.c
>> -+++ b/arch/arm/mach-pxa/spitz_pm.c
>> -@@ -86,10 +86,7 @@ static void spitz_discharge1(int on)
>> -     gpio_set_value(SPITZ_GPIO_LED_GREEN, on);
>> - }
>> -
>> --static unsigned long gpio18_config[] = {
>> --    GPIO18_RDY,
>> --    GPIO18_GPIO,
>> --};
>> -+static unsigned long gpio18_config = GPIO18_GPIO;
>> -
>> - static void spitz_presuspend(void)
>> - {
>> -@@ -112,7 +109,7 @@ static void spitz_presuspend(void)
>> -     PGSR3 &= ~SPITZ_GPIO_G3_STROBE_BIT;
>> -     PGSR2 |= GPIO_bit(SPITZ_GPIO_KEY_STROBE0);
>> -
>> --    pxa2xx_mfp_config(&gpio18_config[0], 1);
>> -+    pxa2xx_mfp_config(&gpio18_config, 1);
>> -     gpio_request_one(18, GPIOF_OUT_INIT_HIGH, "Unknown");
>> -     gpio_free(18);
>> -
>> -@@ -131,7 +128,6 @@ static void spitz_presuspend(void)
>> -
>> - static void spitz_postsuspend(void)
>> - {
>> --    pxa2xx_mfp_config(&gpio18_config[1], 1);
>> - }
>> -
>> - static int spitz_should_wakeup(unsigned int resume_on_alarm)
>> ---
>> -1.7.4.1
>> --
>> 1.8.1.5
>>
>>
>> _______________________________________________
>> Openembedded-devel mailing list
>> Openembedded-devel at lists.openembedded.org
>> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
>
> --
> Martin 'JaMa' Jansa     jabber: Martin.Jansa at gmail.com
>
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel at lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
>