diff options
| author | Daniel Hillenbrand <codeworkx@cyanogenmod.org> | 2013-06-04 01:33:22 +0200 |
|---|---|---|
| committer | Daniel Hillenbrand <codeworkx@cyanogenmod.org> | 2013-06-04 12:54:26 +0200 |
| commit | 55bb2048feb59f2190f704c2a4df81b557b55c7a (patch) | |
| tree | cbb680a60770fb762e5b27c502ad71c2366bf604 /arch | |
| parent | 3d8b293a4f5042cd9fdc4009a40f6483371cd489 (diff) | |
| download | kernel_samsung_smdk4412-55bb2048feb59f2190f704c2a4df81b557b55c7a.zip kernel_samsung_smdk4412-55bb2048feb59f2190f704c2a4df81b557b55c7a.tar.gz kernel_samsung_smdk4412-55bb2048feb59f2190f704c2a4df81b557b55c7a.tar.bz2 | |
smdk4412: bulk update from i9300 update 9
Change-Id: Icd3e7b601f3f4c8b3dcf053fed5819fb7caf5296
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/mach-exynos/mach-midas.c | 22 | ||||
| -rw-r--r-- | arch/arm/mach-exynos/midas-sound.c | 7 |
2 files changed, 11 insertions, 18 deletions
diff --git a/arch/arm/mach-exynos/mach-midas.c b/arch/arm/mach-exynos/mach-midas.c index f462c8a..c2de56b 100644 --- a/arch/arm/mach-exynos/mach-midas.c +++ b/arch/arm/mach-exynos/mach-midas.c @@ -835,9 +835,10 @@ static struct s3c_mshci_platdata exynos4_mshc_pdata __initdata = { MMC_CAP_UHS_DDR50 | MMC_CAP_CMD23, #ifdef CONFIG_MMC_MSHCI_ENABLE_CACHE .host_caps2 = MMC_CAP2_ADAPT_PACKED | MMC_CAP2_PACKED_CMD | - MMC_CAP2_CACHE_CTRL, + MMC_CAP2_CACHE_CTRL | MMC_CAP2_POWEROFF_NOTIFY, #else - .host_caps2 = MMC_CAP2_ADAPT_PACKED | MMC_CAP2_PACKED_CMD, + .host_caps2 = MMC_CAP2_ADAPT_PACKED | MMC_CAP2_PACKED_CMD | + MMC_CAP2_POWEROFF_NOTIFY, #endif #elif defined(CONFIG_EXYNOS4_MSHC_8BIT) .max_width = 8, @@ -3430,29 +3431,16 @@ static void __init exynos4_reserve(void) .start = 0x65800000, .reserved = 1, }; - + if (cma_early_region_register(&fimc_reg)) pr_err("S5P/CMA: Failed to register '%s'\n", - fimc_reg.name); + fimc_reg.name); } #endif #if defined(CONFIG_USE_MFC_CMA) && defined(CONFIG_MACH_M0) ret = dma_declare_contiguous(&s5p_device_mfc.dev, 0x02800000, 0x5C800000, 0); - - if (ret == 0) { - static struct cma_region mfc_reg = { - .name = "mfc", - .size = 0x02800000, - .start = 0x5C800000, - .reserved = 1, - }; - - if (cma_early_region_register(&mfc_reg)) - pr_err("S5P/CMA: Failed to register '%s'\n", - mfc_reg.name); - } #endif if (ret != 0) printk(KERN_ERR "%s Fail\n", __func__); diff --git a/arch/arm/mach-exynos/midas-sound.c b/arch/arm/mach-exynos/midas-sound.c index 28c7cbd..32ab866 100644 --- a/arch/arm/mach-exynos/midas-sound.c +++ b/arch/arm/mach-exynos/midas-sound.c @@ -331,11 +331,16 @@ struct platform_device s3c_device_fm34 = { defined(CONFIG_FM_SI4705_MODULE) static void fmradio_power(int on) { + int err; #if defined(CONFIG_MACH_M0) || defined(CONFIG_MACH_M0_CTC) gpio_set_value(si47xx_data.gpio_sw, GPIO_LEVEL_HIGH); #endif if (on) { - gpio_request(GPIO_FM_INT, "GPC1"); + err = gpio_request(GPIO_FM_INT, "GPC1"); + if (err) { + pr_err(KERN_ERR "GPIO_FM_INT GPIO set error!\n"); + return; + } gpio_direction_output(GPIO_FM_INT, 1); gpio_set_value(si47xx_data.gpio_rst, GPIO_LEVEL_LOW); gpio_set_value(GPIO_FM_INT, GPIO_LEVEL_LOW); |