diff options
author | Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> | 2015-07-16 04:42:37 -0400 |
---|---|---|
committer | Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> | 2015-10-19 18:33:21 -0400 |
commit | f3bda362b5fcab97509001dc51e64a99e30e6fb7 (patch) | |
tree | 2b389192bd0014a4023b12d1210c3ee8a37edd8c | |
parent | d519432c8529efe65174cb683b3fb2f31faecffa (diff) |
drm: rcar-du: Add dependency on OF
The driver requires OF support, add a dependency in Kconfig and remove
the platform_device_id table that isn't used anymore.
Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Acked-by: Geert Uytterhoeven <geert+renesas@glider.be>
-rw-r--r-- | drivers/gpu/drm/rcar-du/Kconfig | 2 | ||||
-rw-r--r-- | drivers/gpu/drm/rcar-du/rcar_du_drv.c | 11 |
2 files changed, 2 insertions, 11 deletions
diff --git a/drivers/gpu/drm/rcar-du/Kconfig b/drivers/gpu/drm/rcar-du/Kconfig index 11485a4a16ae..d4e0a39568f6 100644 --- a/drivers/gpu/drm/rcar-du/Kconfig +++ b/drivers/gpu/drm/rcar-du/Kconfig | |||
@@ -1,6 +1,6 @@ | |||
1 | config DRM_RCAR_DU | 1 | config DRM_RCAR_DU |
2 | tristate "DRM Support for R-Car Display Unit" | 2 | tristate "DRM Support for R-Car Display Unit" |
3 | depends on DRM && ARM && HAVE_DMA_ATTRS | 3 | depends on DRM && ARM && HAVE_DMA_ATTRS && OF |
4 | depends on ARCH_SHMOBILE || COMPILE_TEST | 4 | depends on ARCH_SHMOBILE || COMPILE_TEST |
5 | select DRM_KMS_HELPER | 5 | select DRM_KMS_HELPER |
6 | select DRM_KMS_CMA_HELPER | 6 | select DRM_KMS_CMA_HELPER |
diff --git a/drivers/gpu/drm/rcar-du/rcar_du_drv.c b/drivers/gpu/drm/rcar-du/rcar_du_drv.c index a8dfca5575c8..355d1e79c5d7 100644 --- a/drivers/gpu/drm/rcar-du/rcar_du_drv.c +++ b/drivers/gpu/drm/rcar-du/rcar_du_drv.c | |||
@@ -106,13 +106,6 @@ static const struct rcar_du_device_info rcar_du_r8a7791_info = { | |||
106 | .num_lvds = 1, | 106 | .num_lvds = 1, |
107 | }; | 107 | }; |
108 | 108 | ||
109 | static const struct platform_device_id rcar_du_id_table[] = { | ||
110 | { "rcar-du-r8a7779", (kernel_ulong_t)&rcar_du_r8a7779_info }, | ||
111 | { } | ||
112 | }; | ||
113 | |||
114 | MODULE_DEVICE_TABLE(platform, rcar_du_id_table); | ||
115 | |||
116 | static const struct of_device_id rcar_du_of_table[] = { | 109 | static const struct of_device_id rcar_du_of_table[] = { |
117 | { .compatible = "renesas,du-r8a7779", .data = &rcar_du_r8a7779_info }, | 110 | { .compatible = "renesas,du-r8a7779", .data = &rcar_du_r8a7779_info }, |
118 | { .compatible = "renesas,du-r8a7790", .data = &rcar_du_r8a7790_info }, | 111 | { .compatible = "renesas,du-r8a7790", .data = &rcar_du_r8a7790_info }, |
@@ -165,8 +158,7 @@ static int rcar_du_load(struct drm_device *dev, unsigned long flags) | |||
165 | init_waitqueue_head(&rcdu->commit.wait); | 158 | init_waitqueue_head(&rcdu->commit.wait); |
166 | 159 | ||
167 | rcdu->dev = &pdev->dev; | 160 | rcdu->dev = &pdev->dev; |
168 | rcdu->info = np ? of_match_device(rcar_du_of_table, rcdu->dev)->data | 161 | rcdu->info = of_match_device(rcar_du_of_table, rcdu->dev)->data; |
169 | : (void *)platform_get_device_id(pdev)->driver_data; | ||
170 | rcdu->ddev = dev; | 162 | rcdu->ddev = dev; |
171 | dev->dev_private = rcdu; | 163 | dev->dev_private = rcdu; |
172 | 164 | ||
@@ -338,7 +330,6 @@ static struct platform_driver rcar_du_platform_driver = { | |||
338 | .pm = &rcar_du_pm_ops, | 330 | .pm = &rcar_du_pm_ops, |
339 | .of_match_table = rcar_du_of_table, | 331 | .of_match_table = rcar_du_of_table, |
340 | }, | 332 | }, |
341 | .id_table = rcar_du_id_table, | ||
342 | }; | 333 | }; |
343 | 334 | ||
344 | module_platform_driver(rcar_du_platform_driver); | 335 | module_platform_driver(rcar_du_platform_driver); |