aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/exynos/exynos_drm_drv.c
diff options
context:
space:
mode:
authorRahul Sharma <rahul.sharma@samsung.com>2012-10-15 20:20:13 -0400
committerInki Dae <daeinki@gmail.com>2012-12-13 09:05:43 -0500
commitae9dace2903db86b27f19d40c1d1b21a6f712895 (patch)
tree5e6530ef34e5b3e66bf17cd38e77a9104834bf96 /drivers/gpu/drm/exynos/exynos_drm_drv.c
parent422bd00ea640b9aacb6bdd3903b76f69e72fba8d (diff)
drm: exynos: moved exynos drm hdmi device registration to drm driver
This patch moved the exynos-drm-hdmi platform device registration to the drm driver. When DT is enabled, platform devices needs to be registered within the driver code. This patch fits the requirement of both DT and Non DT based drm drivers. Signed-off-by: Rahul Sharma <rahul.sharma@samsung.com> Signed-off-by: Inki Dae <inki.dae@samsung.com> Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
Diffstat (limited to 'drivers/gpu/drm/exynos/exynos_drm_drv.c')
-rw-r--r--drivers/gpu/drm/exynos/exynos_drm_drv.c9
1 files changed, 8 insertions, 1 deletions
diff --git a/drivers/gpu/drm/exynos/exynos_drm_drv.c b/drivers/gpu/drm/exynos/exynos_drm_drv.c
index 068381337d4f..4a1168d3e907 100644
--- a/drivers/gpu/drm/exynos/exynos_drm_drv.c
+++ b/drivers/gpu/drm/exynos/exynos_drm_drv.c
@@ -345,6 +345,10 @@ static int __init exynos_drm_init(void)
345 ret = platform_driver_register(&exynos_drm_common_hdmi_driver); 345 ret = platform_driver_register(&exynos_drm_common_hdmi_driver);
346 if (ret < 0) 346 if (ret < 0)
347 goto out_common_hdmi; 347 goto out_common_hdmi;
348
349 ret = exynos_platform_device_hdmi_register();
350 if (ret < 0)
351 goto out_common_hdmi_dev;
348#endif 352#endif
349 353
350#ifdef CONFIG_DRM_EXYNOS_VIDI 354#ifdef CONFIG_DRM_EXYNOS_VIDI
@@ -382,11 +386,13 @@ out_g2d:
382#endif 386#endif
383 387
384#ifdef CONFIG_DRM_EXYNOS_VIDI 388#ifdef CONFIG_DRM_EXYNOS_VIDI
385out_vidi:
386 platform_driver_unregister(&vidi_driver); 389 platform_driver_unregister(&vidi_driver);
390out_vidi:
387#endif 391#endif
388 392
389#ifdef CONFIG_DRM_EXYNOS_HDMI 393#ifdef CONFIG_DRM_EXYNOS_HDMI
394 exynos_platform_device_hdmi_unregister();
395out_common_hdmi_dev:
390 platform_driver_unregister(&exynos_drm_common_hdmi_driver); 396 platform_driver_unregister(&exynos_drm_common_hdmi_driver);
391out_common_hdmi: 397out_common_hdmi:
392 platform_driver_unregister(&mixer_driver); 398 platform_driver_unregister(&mixer_driver);
@@ -415,6 +421,7 @@ static void __exit exynos_drm_exit(void)
415#endif 421#endif
416 422
417#ifdef CONFIG_DRM_EXYNOS_HDMI 423#ifdef CONFIG_DRM_EXYNOS_HDMI
424 exynos_platform_device_hdmi_unregister();
418 platform_driver_unregister(&exynos_drm_common_hdmi_driver); 425 platform_driver_unregister(&exynos_drm_common_hdmi_driver);
419 platform_driver_unregister(&mixer_driver); 426 platform_driver_unregister(&mixer_driver);
420 platform_driver_unregister(&hdmi_driver); 427 platform_driver_unregister(&hdmi_driver);