diff options
Diffstat (limited to 'arch/arm/mach-exynos/mdm_device.c')
| -rw-r--r-- | arch/arm/mach-exynos/mdm_device.c | 39 |
1 files changed, 11 insertions, 28 deletions
diff --git a/arch/arm/mach-exynos/mdm_device.c b/arch/arm/mach-exynos/mdm_device.c index 620936e..20cf664 100644 --- a/arch/arm/mach-exynos/mdm_device.c +++ b/arch/arm/mach-exynos/mdm_device.c @@ -56,14 +56,6 @@ static struct resource mdm_resources[] = { .name = "AP2MDM_WAKEUP", .flags = IORESOURCE_IO, }, -#ifdef CONFIG_HSIC_EURONLY_APPLY - { - .start = GPIO_MDM2AP_HSIC_READY, - .end = GPIO_MDM2AP_HSIC_READY, - .name = "MDM2AP_HSIC_READY", - .flags = IORESOURCE_IO, - }, -#endif #ifdef CONFIG_SIM_DETECT { .start = GPIO_SIM_DETECT, @@ -127,9 +119,14 @@ static struct mdm_platform_data mdm_platform_data = { .peripheral_platform_device_ohci = &s5p_device_ohci, #endif .ramdump_timeout_ms = 120000, -#if defined(CONFIG_SIM_DETECT) +#if (defined(CONFIG_MACH_P4NOTE) || defined(CONFIG_MACH_SP7160LTE) || defined(CONFIG_MACH_TAB3)) && defined(CONFIG_QC_MODEM) \ + && defined(CONFIG_SIM_DETECT) .sim_polarity = 0, #endif +#if (defined(CONFIG_MACH_GC1_USA_VZW) || defined(CONFIG_TARGET_LOCALE_EUR)) \ + && defined(CONFIG_QC_MODEM) && defined(CONFIG_SIM_DETECT) + .sim_polarity = 1, +#endif }; static int exynos_frequency_lock(struct device *dev) @@ -228,30 +225,16 @@ static int __init init_mdm_modem(void) return ret; } #endif - #if defined(CONFIG_MACH_P4NOTE) && defined(CONFIG_QC_MODEM) \ && defined(CONFIG_SIM_DETECT) mdm_platform_data.sim_polarity = 0; #endif - -#if (defined(CONFIG_MACH_GC1_USA_VZW) || defined(CONFIG_TARGET_LOCALE_EUR)) \ - && defined(CONFIG_QC_MODEM) && defined(CONFIG_SIM_DETECT) - mdm_platform_data.sim_polarity = 1; -#endif - -#if defined(CONFIG_MACH_KONA) && defined(CONFIG_QC_MODEM) \ +#if defined(CONFIG_MACH_KONALTE_USA_ATT) && defined(CONFIG_QC_MODEM) \ && defined(CONFIG_SIM_DETECT) -#if defined(CONFIG_MACH_KONALTE_USA_ATT) - if (system_rev >= 1) - mdm_platform_data.sim_polarity = 0; - else - mdm_platform_data.sim_polarity = 1; -#else - if (system_rev >= 1) - mdm_platform_data.sim_polarity = 1; - else - mdm_platform_data.sim_polarity = 0; -#endif + if (system_rev != 9 && system_rev >= 1) + mdm_platform_data.sim_polarity = 0; + else + mdm_platform_data.sim_polarity = 1; #endif mdm_device.dev.platform_data = &mdm_platform_data; ret = platform_device_register(&mdm_device); |