diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-06-12 18:03:29 (GMT) |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-06-12 18:03:29 (GMT) |
| commit | 08d63aac436b2ad35d9e864b9ebb05bc8b9bb653 (patch) | |
| tree | c72495139623f39b870fddab0aa366db79988b6d /arch/arm | |
| parent | 152b92db7ad2c6d6c11c8eab07e90b73a90c8b76 (diff) | |
| parent | e5ea3f12d41d96edf4ad9374db2b1725e457acec (diff) | |
| download | linux-08d63aac436b2ad35d9e864b9ebb05bc8b9bb653.tar.xz | |
Merge branch 'gpio/merge' of git://git.secretlab.ca/git/linux-2.6
* 'gpio/merge' of git://git.secretlab.ca/git/linux-2.6:
gpio/basic_mmio: add missing include of spinlock_types.h
gpio/nomadik: fix sleepmode for elder Nomadik
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 */ |