msm: kgsl: Move graphics device registration for 8960
Move all graphics device registration to one location. Always register
the 3D core. Register the 2D cores if they are present on the device.
Change-Id: Id92685950bb98f47725a33a931ea00eb1385d138
Signed-off-by: Carter Cooper <ccooper@codeaurora.org>
(cherry picked from commit 25555d8d29aff405bbd89076f8dd3538b8c24b80)
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[] = {