Merge "msm: kgsl: Move graphics device registration for 8960" into msm-3.4
diff --git a/arch/arm/mach-msm/board-8960.c b/arch/arm/mach-msm/board-8960.c
index 6add371..4263cd6 100644
--- a/arch/arm/mach-msm/board-8960.c
+++ b/arch/arm/mach-msm/board-8960.c
@@ -2709,11 +2709,6 @@
&msm_cpudai_auxpcm_tx,
&msm_cpu_fe,
&msm_stub_codec,
- &msm_kgsl_3d0,
-#ifdef CONFIG_MSM_KGSL_2D
- &msm_kgsl_2d0,
- &msm_kgsl_2d1,
-#endif
#ifdef CONFIG_MSM_GEMINI
&msm8960_gemini_device,
#endif
@@ -2773,6 +2768,15 @@
*/
kgsl_3d0_pdata->chipid = ADRENO_CHIPID(2, 2, 0, 6);
}
+
+ /* Register the 3D core */
+ platform_device_register(&msm_kgsl_3d0);
+
+ /* Register the 2D cores if we are not 8960PRO */
+ if (!cpu_is_msm8960ab()) {
+ platform_device_register(&msm_kgsl_2d0);
+ platform_device_register(&msm_kgsl_2d1);
+ }
}
static struct msm_rpmrs_level msm_rpmrs_levels[] = {