diff options
| author | Linus Walleij <linus.walleij@linaro.org> | 2011-06-09 11:08:47 +0200 |
|---|---|---|
| committer | Grant Likely <grant.likely@secretlab.ca> | 2011-06-09 15:03:38 -0600 |
| commit | 33d78647dc409784c18aa71995346e6955802fe0 (patch) | |
| tree | ff985ac37ffe3dd49ca9aa64349874ac286fb752 /arch/arm | |
| parent | c226feb013ce81a18512fb4827bf7c2352d8b470 (diff) | |
| download | op-kernel-dev-33d78647dc409784c18aa71995346e6955802fe0.zip op-kernel-dev-33d78647dc409784c18aa71995346e6955802fe0.tar.gz | |
gpio/nomadik: fix sleepmode for elder Nomadik
The mach-nomadik machine did not compile properly due to bad
ux500-specific functions being called. Introduce new state
variables to fix this up.
Reported-by: Axel Lin <axel.lin@gmail.com>
Cc: Alessandro Rubini <rubini@unipv.it>
Cc: Prafulla Wadaskar <prafulla.wadaskar@st.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/mach-ux500/cpu-db8500.c | 3 | ||||
| -rw-r--r-- | arch/arm/plat-nomadik/include/plat/gpio.h | 1 |
2 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm/mach-ux500/cpu-db8500.c b/arch/arm/mach-ux500/cpu-db8500.c index c3c4176..4598b06 100644 --- a/arch/arm/mach-ux500/cpu-db8500.c +++ b/arch/arm/mach-ux500/cpu-db8500.c @@ -159,6 +159,9 @@ static void __init db8500_add_gpios(void) /* No custom data yet */ }; + if (cpu_is_u8500v2()) + pdata.supports_sleepmode = true; + dbx500_add_gpios(ARRAY_AND_SIZE(db8500_gpio_base), IRQ_DB8500_GPIO0, &pdata); } diff --git a/arch/arm/plat-nomadik/include/plat/gpio.h b/arch/arm/plat-nomadik/include/plat/gpio.h index ea19a5b..d5d7e65 100644 --- a/arch/arm/plat-nomadik/include/plat/gpio.h +++ b/arch/arm/plat-nomadik/include/plat/gpio.h @@ -90,6 +90,7 @@ struct nmk_gpio_platform_data { int num_gpio; u32 (*get_secondary_status)(unsigned int bank); void (*set_ioforce)(bool enable); + bool supports_sleepmode; }; #endif /* __ASM_PLAT_GPIO_H */ |
