drm: rcar-du: Add dependency on OF
authorLaurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Thu, 16 Jul 2015 08:42:37 +0000 (11:42 +0300)
committerLaurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Mon, 19 Oct 2015 22:33:21 +0000 (01:33 +0300)
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>
drivers/gpu/drm/rcar-du/Kconfig
drivers/gpu/drm/rcar-du/rcar_du_drv.c

index 11485a4a16ae1bf1106a4391589394ab58944760..d4e0a39568f699c63112ab36d451c2371d0b987f 100644 (file)
@@ -1,6 +1,6 @@
 config DRM_RCAR_DU
        tristate "DRM Support for R-Car Display Unit"
-       depends on DRM && ARM && HAVE_DMA_ATTRS
+       depends on DRM && ARM && HAVE_DMA_ATTRS && OF
        depends on ARCH_SHMOBILE || COMPILE_TEST
        select DRM_KMS_HELPER
        select DRM_KMS_CMA_HELPER
index a8dfca5575c8f4f52b837705188006729efbbbb5..355d1e79c5d74b9fce90e42c819cfc7be92ca0df 100644 (file)
@@ -106,13 +106,6 @@ static const struct rcar_du_device_info rcar_du_r8a7791_info = {
        .num_lvds = 1,
 };
 
-static const struct platform_device_id rcar_du_id_table[] = {
-       { "rcar-du-r8a7779", (kernel_ulong_t)&rcar_du_r8a7779_info },
-       { }
-};
-
-MODULE_DEVICE_TABLE(platform, rcar_du_id_table);
-
 static const struct of_device_id rcar_du_of_table[] = {
        { .compatible = "renesas,du-r8a7779", .data = &rcar_du_r8a7779_info },
        { .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)
        init_waitqueue_head(&rcdu->commit.wait);
 
        rcdu->dev = &pdev->dev;
-       rcdu->info = np ? of_match_device(rcar_du_of_table, rcdu->dev)->data
-                  : (void *)platform_get_device_id(pdev)->driver_data;
+       rcdu->info = of_match_device(rcar_du_of_table, rcdu->dev)->data;
        rcdu->ddev = dev;
        dev->dev_private = rcdu;
 
@@ -338,7 +330,6 @@ static struct platform_driver rcar_du_platform_driver = {
                .pm     = &rcar_du_pm_ops,
                .of_match_table = rcar_du_of_table,
        },
-       .id_table       = rcar_du_id_table,
 };
 
 module_platform_driver(rcar_du_platform_driver);