* [PATCH 3.1-rc3] gpio/omap: fix build error with certain OMAP1 configs
@ 2011-08-23 11:42 Janusz Krzysztofik
2011-08-23 17:11 ` Kevin Hilman
2011-10-13 17:47 ` Grant Likely
0 siblings, 2 replies; 6+ messages in thread
From: Janusz Krzysztofik @ 2011-08-23 11:42 UTC (permalink / raw)
To: Grant Likely; +Cc: linux-kernel, linux-omap, Kevin Hilman
With commit f64ad1a0e21a, "gpio/omap: cleanup _set_gpio_wakeup(), remove
ifdefs", access to build time conditionally omitted 'suspend_wakeup'
member of the 'gpio_bank' structure has been placed unconditionally in
function _set_gpio_wakeup(), which is always built. This resulted in the
driver compilation broken for certain OMAP1, i.e., non-OMAP16xx,
configurations.
Really required or not in previously excluded cases, define this
structure member unconditionally as a fix.
Tested with a custom OMAP1510 only configuration.
Signed-off-by: Janusz Krzysztofik <jkrzyszt@tis.icnet.pl>
---
drivers/gpio/gpio-omap.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- git/drivers/gpio/gpio-omap.c.orig 2011-08-22 08:34:02.000000000 +0200
+++ git/drivers/gpio/gpio-omap.c 2011-08-23 12:47:36.000000000 +0200
@@ -34,8 +34,8 @@ struct gpio_bank {
u16 irq;
u16 virtual_irq_start;
int method;
-#if defined(CONFIG_ARCH_OMAP16XX) || defined(CONFIG_ARCH_OMAP2PLUS)
u32 suspend_wakeup;
+#if defined(CONFIG_ARCH_OMAP16XX) || defined(CONFIG_ARCH_OMAP2PLUS)
u32 saved_wakeup;
#endif
u32 non_wakeup_gpios;
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PATCH 3.1-rc3] gpio/omap: fix build error with certain OMAP1 configs
2011-08-23 11:42 [PATCH 3.1-rc3] gpio/omap: fix build error with certain OMAP1 configs Janusz Krzysztofik
@ 2011-08-23 17:11 ` Kevin Hilman
2011-10-07 12:30 ` Janusz Krzysztofik
2011-10-13 17:47 ` Grant Likely
1 sibling, 1 reply; 6+ messages in thread
From: Kevin Hilman @ 2011-08-23 17:11 UTC (permalink / raw)
To: Janusz Krzysztofik; +Cc: Grant Likely, linux-kernel, linux-omap
Janusz Krzysztofik <jkrzyszt@tis.icnet.pl> writes:
> With commit f64ad1a0e21a, "gpio/omap: cleanup _set_gpio_wakeup(), remove
> ifdefs", access to build time conditionally omitted 'suspend_wakeup'
> member of the 'gpio_bank' structure has been placed unconditionally in
> function _set_gpio_wakeup(), which is always built. This resulted in the
> driver compilation broken for certain OMAP1, i.e., non-OMAP16xx,
> configurations.
>
> Really required or not in previously excluded cases, define this
> structure member unconditionally as a fix.
>
> Tested with a custom OMAP1510 only configuration.
>
> Signed-off-by: Janusz Krzysztofik <jkrzyszt@tis.icnet.pl>
Verified that this fixes a build problem when building for OMAP1
(730/850 only)
Acked-by: Kevin Hilman <khilman@ti.com>
Grant, can you queue this as a fix for 3.1-rc?
Thanks,
Kevin
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 3.1-rc3] gpio/omap: fix build error with certain OMAP1 configs
2011-08-23 17:11 ` Kevin Hilman
@ 2011-10-07 12:30 ` Janusz Krzysztofik
2011-10-10 21:12 ` Aaro Koskinen
0 siblings, 1 reply; 6+ messages in thread
From: Janusz Krzysztofik @ 2011-10-07 12:30 UTC (permalink / raw)
To: Kevin Hilman; +Cc: Grant Likely, linux-kernel, linux-omap
Dnia wtorek, 23 sierpnia 2011 o 19:11:47 Kevin Hilman napisał(a):
> Janusz Krzysztofik <jkrzyszt@tis.icnet.pl> writes:
>
> > With commit f64ad1a0e21a, "gpio/omap: cleanup _set_gpio_wakeup(), remove
> > ifdefs", access to build time conditionally omitted 'suspend_wakeup'
> > member of the 'gpio_bank' structure has been placed unconditionally in
> > function _set_gpio_wakeup(), which is always built. This resulted in the
> > driver compilation broken for certain OMAP1, i.e., non-OMAP16xx,
> > configurations.
> >
> > Really required or not in previously excluded cases, define this
> > structure member unconditionally as a fix.
> >
> > Tested with a custom OMAP1510 only configuration.
> >
> > Signed-off-by: Janusz Krzysztofik <jkrzyszt@tis.icnet.pl>
>
> Verified that this fixes a build problem when building for OMAP1
> (730/850 only)
>
> Acked-by: Kevin Hilman <khilman@ti.com>
>
> Grant, can you queue this as a fix for 3.1-rc?
Hi,
Sorry for being so late with checking this, but it looks like this patch
never got into 3.1-rc, as it should, leaving the issue not fixed.
Any chance for it still being pushed into 3.1?
Thanks,
Janusz
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 3.1-rc3] gpio/omap: fix build error with certain OMAP1 configs
2011-10-07 12:30 ` Janusz Krzysztofik
@ 2011-10-10 21:12 ` Aaro Koskinen
[not found] ` <87fwiz8okk.fsf@ti.com>
0 siblings, 1 reply; 6+ messages in thread
From: Aaro Koskinen @ 2011-10-10 21:12 UTC (permalink / raw)
To: Janusz Krzysztofik
Cc: Kevin Hilman, Grant Likely, linux-kernel, linux-omap, tony
[-- Attachment #1: Type: TEXT/PLAIN, Size: 1375 bytes --]
Hi,
On Fri, 7 Oct 2011, Janusz Krzysztofik wrote:
> Dnia wtorek, 23 sierpnia 2011 o 19:11:47 Kevin Hilman napisał(a):
>> Janusz Krzysztofik <jkrzyszt@tis.icnet.pl> writes:
>>> With commit f64ad1a0e21a, "gpio/omap: cleanup _set_gpio_wakeup(), remove
>>> ifdefs", access to build time conditionally omitted 'suspend_wakeup'
>>> member of the 'gpio_bank' structure has been placed unconditionally in
>>> function _set_gpio_wakeup(), which is always built. This resulted in the
>>> driver compilation broken for certain OMAP1, i.e., non-OMAP16xx,
>>> configurations.
>>>
>>> Really required or not in previously excluded cases, define this
>>> structure member unconditionally as a fix.
>>>
>>> Tested with a custom OMAP1510 only configuration.
>>>
>>> Signed-off-by: Janusz Krzysztofik <jkrzyszt@tis.icnet.pl>
>>
>> Verified that this fixes a build problem when building for OMAP1
>> (730/850 only)
>>
>> Acked-by: Kevin Hilman <khilman@ti.com>
Tested-by: Aaro Koskinen <aaro.koskinen@iki.fi>
>> Grant, can you queue this as a fix for 3.1-rc?
>
> Sorry for being so late with checking this, but it looks like this patch
> never got into 3.1-rc, as it should, leaving the issue not fixed.
> Any chance for it still being pushed into 3.1?
This patch is one-liner, and still needed to get 3.1-rc9 compiled and
running on e.g. Amstrad E3, so I think it should get into 3.1.
A.
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 3.1-rc3] gpio/omap: fix build error with certain OMAP1 configs
2011-08-23 11:42 [PATCH 3.1-rc3] gpio/omap: fix build error with certain OMAP1 configs Janusz Krzysztofik
2011-08-23 17:11 ` Kevin Hilman
@ 2011-10-13 17:47 ` Grant Likely
1 sibling, 0 replies; 6+ messages in thread
From: Grant Likely @ 2011-10-13 17:47 UTC (permalink / raw)
To: Janusz Krzysztofik; +Cc: linux-kernel, linux-omap, Kevin Hilman
On Tue, Aug 23, 2011 at 01:42:24PM +0200, Janusz Krzysztofik wrote:
> With commit f64ad1a0e21a, "gpio/omap: cleanup _set_gpio_wakeup(), remove
> ifdefs", access to build time conditionally omitted 'suspend_wakeup'
> member of the 'gpio_bank' structure has been placed unconditionally in
> function _set_gpio_wakeup(), which is always built. This resulted in the
> driver compilation broken for certain OMAP1, i.e., non-OMAP16xx,
> configurations.
>
> Really required or not in previously excluded cases, define this
> structure member unconditionally as a fix.
>
> Tested with a custom OMAP1510 only configuration.
>
> Signed-off-by: Janusz Krzysztofik <jkrzyszt@tis.icnet.pl>
Applied, thanks.
g.
> ---
> drivers/gpio/gpio-omap.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> --- git/drivers/gpio/gpio-omap.c.orig 2011-08-22 08:34:02.000000000 +0200
> +++ git/drivers/gpio/gpio-omap.c 2011-08-23 12:47:36.000000000 +0200
> @@ -34,8 +34,8 @@ struct gpio_bank {
> u16 irq;
> u16 virtual_irq_start;
> int method;
> -#if defined(CONFIG_ARCH_OMAP16XX) || defined(CONFIG_ARCH_OMAP2PLUS)
> u32 suspend_wakeup;
> +#if defined(CONFIG_ARCH_OMAP16XX) || defined(CONFIG_ARCH_OMAP2PLUS)
> u32 saved_wakeup;
> #endif
> u32 non_wakeup_gpios;
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2011-10-13 17:47 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-08-23 11:42 [PATCH 3.1-rc3] gpio/omap: fix build error with certain OMAP1 configs Janusz Krzysztofik
2011-08-23 17:11 ` Kevin Hilman
2011-10-07 12:30 ` Janusz Krzysztofik
2011-10-10 21:12 ` Aaro Koskinen
[not found] ` <87fwiz8okk.fsf@ti.com>
2011-10-13 17:42 ` Grant Likely
2011-10-13 17:47 ` Grant Likely
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox