diff options
| author | Olof Johansson <olof@lixom.net> | 2012-05-10 00:21:11 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2012-05-10 00:23:17 -0700 |
| commit | caafc71b1a25096ef74904adb19d37e5c6a282dc (patch) | |
| tree | 17f0602c6e04fdec78c50a1c2cbd70a0303ed2c6 /arch/arm/mach-s5pv210/mach-goni.c | |
| parent | af568679f51de779d0e9ad7d8360dc7727da546d (diff) | |
| parent | bcd59b0f0c14b0584c1213ee3b53d5f84517c419 (diff) | |
| download | blackbird-op-linux-caafc71b1a25096ef74904adb19d37e5c6a282dc.tar.gz blackbird-op-linux-caafc71b1a25096ef74904adb19d37e5c6a282dc.zip | |
Merge tag 'v3.5-soc' of git://gitorious.org/linux-davinci/linux-davinci into next/drivers
DaVinci SoC updates for v3.5
This pull request updates the DaVinci SoC support to implement DEBUG_LL port
choice and optimizes the DMA ISR by removing unnecessary register reads.
* tag 'v3.5-soc' of git://gitorious.org/linux-davinci/linux-davinci:
ARM: davinci: optimize the DMA ISR
ARM: davinci: implement DEBUG_LL port choice
+ sync with Linux 3.4-rc6
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/mach-s5pv210/mach-goni.c')
| -rw-r--r-- | arch/arm/mach-s5pv210/mach-goni.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/mach-s5pv210/mach-goni.c b/arch/arm/mach-s5pv210/mach-goni.c index a8933de3d627..32395664e879 100644 --- a/arch/arm/mach-s5pv210/mach-goni.c +++ b/arch/arm/mach-s5pv210/mach-goni.c @@ -25,6 +25,7 @@ #include <linux/gpio_keys.h> #include <linux/input.h> #include <linux/gpio.h> +#include <linux/mmc/host.h> #include <linux/interrupt.h> #include <asm/hardware/vic.h> @@ -765,6 +766,7 @@ static void __init goni_pmic_init(void) /* MoviNAND */ static struct s3c_sdhci_platdata goni_hsmmc0_data __initdata = { .max_width = 4, + .host_caps2 = MMC_CAP2_BROKEN_VOLTAGE, .cd_type = S3C_SDHCI_CD_PERMANENT, }; |
