diff options
| author | Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de> | 2015-12-06 17:07:15 +0100 |
|---|---|---|
| committer | Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de> | 2015-12-06 17:07:15 +0100 |
| commit | 68ee93f3d058ff58f994d08be00d3aad9ec20970 (patch) | |
| tree | 5fb2d14340332062e416246c5759adcaa64a2340 /arch/arm/mach-exynos/mdm_device.c | |
| parent | 17021fd920fb5bc97a8c81a20b208c5b38f1b0e8 (diff) | |
| parent | b99374450c03bf5081b88995d91d34fb9b2fd040 (diff) | |
| download | kernel_samsung_smdk4412-68ee93f3d058ff58f994d08be00d3aad9ec20970.zip kernel_samsung_smdk4412-68ee93f3d058ff58f994d08be00d3aad9ec20970.tar.gz kernel_samsung_smdk4412-68ee93f3d058ff58f994d08be00d3aad9ec20970.tar.bz2 | |
Merge branch 'master' of fossencdi.org:kernel_samsung_smdk4412
Diffstat (limited to 'arch/arm/mach-exynos/mdm_device.c')
| -rw-r--r-- | arch/arm/mach-exynos/mdm_device.c | 36 |
1 files changed, 34 insertions, 2 deletions
diff --git a/arch/arm/mach-exynos/mdm_device.c b/arch/arm/mach-exynos/mdm_device.c index 6c41e46..620936e 100644 --- a/arch/arm/mach-exynos/mdm_device.c +++ b/arch/arm/mach-exynos/mdm_device.c @@ -56,6 +56,14 @@ 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, @@ -119,8 +127,7 @@ static struct mdm_platform_data mdm_platform_data = { .peripheral_platform_device_ohci = &s5p_device_ohci, #endif .ramdump_timeout_ms = 120000, -#if defined(CONFIG_MACH_P4NOTE) && defined(CONFIG_QC_MODEM) \ - && defined(CONFIG_SIM_DETECT) +#if defined(CONFIG_SIM_DETECT) .sim_polarity = 0, #endif }; @@ -221,6 +228,31 @@ 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) \ + && 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 +#endif mdm_device.dev.platform_data = &mdm_platform_data; ret = platform_device_register(&mdm_device); if (ret < 0) { |