Merge "msm: board-8960: Don't add modem devices on APQ targets"
diff --git a/arch/arm/mach-msm/board-8960.c b/arch/arm/mach-msm/board-8960.c
index b552108..8deb648 100644
--- a/arch/arm/mach-msm/board-8960.c
+++ b/arch/arm/mach-msm/board-8960.c
@@ -2748,8 +2748,6 @@
static struct platform_device *cdp_devices[] __initdata = {
&msm_8960_q6_lpass,
- &msm_8960_q6_mss_fw,
- &msm_8960_q6_mss_sw,
&msm_8960_riva,
&msm_pil_tzapps,
&msm_pil_dsps,
@@ -3239,6 +3237,11 @@
msm8960_add_vidc_device();
msm8960_pm8921_gpio_mpp_init();
+ /* Don't add modem devices on APQ targets */
+ if (socinfo_get_id() != 124) {
+ platform_device_register(&msm_8960_q6_mss_fw);
+ platform_device_register(&msm_8960_q6_mss_sw);
+ }
platform_add_devices(cdp_devices, ARRAY_SIZE(cdp_devices));
msm8960_init_smsc_hub();
msm8960_init_hsic();