7 files changed, 344 insertions, 106 deletions

diff --git a/drivers/gpu/drm/rcar-du/rcar_du_drv.c b/drivers/gpu/drm/rcar-du/rcar_du_drv.c
index 941d422fc410..d212efa6a495 100644
--- a/drivers/gpu/drm/rcar-du/rcar_du_drv.c
+++ b/drivers/gpu/drm/rcar-du/rcar_du_drv.c
@@ -15,6 +15,7 @@
 #include <linux/io.h>
 #include <linux/mm.h>
 #include <linux/module.h>
+#include <linux/of_device.h>
 #include <linux/platform_device.h>
 #include <linux/pm.h>
 #include <linux/slab.h>
@@ -30,6 +31,97 @@
 #include "rcar_du_regs.h"
 
 /* -----------------------------------------------------------------------------
+ * Device Information
+ */
+
+static const struct rcar_du_device_info rcar_du_r8a7779_info = {
+        .features = 0,
+        .num_crtcs = 2,
+        .routes = {
+                /* R8A7779 has two RGB outputs and one (currently unsupported)
+                 * TCON output.
+                 */
+                [RCAR_DU_OUTPUT_DPAD0] = {
+                        .possible_crtcs = BIT(0),
+                        .encoder_type = DRM_MODE_ENCODER_NONE,
+                        .port = 0,
+                },
+                [RCAR_DU_OUTPUT_DPAD1] = {
+                        .possible_crtcs = BIT(1) | BIT(0),
+                        .encoder_type = DRM_MODE_ENCODER_NONE,
+                        .port = 1,
+                },
+        },
+        .num_lvds = 0,
+};
+
+static const struct rcar_du_device_info rcar_du_r8a7790_info = {
+        .features = RCAR_DU_FEATURE_CRTC_IRQ_CLOCK | RCAR_DU_FEATURE_DEFR8,
+        .quirks = RCAR_DU_QUIRK_ALIGN_128B | RCAR_DU_QUIRK_LVDS_LANES,
+        .num_crtcs = 3,
+        .routes = {
+                /* R8A7790 has one RGB output, two LVDS outputs and one
+                 * (currently unsupported) TCON output.
+                 */
+                [RCAR_DU_OUTPUT_DPAD0] = {
+                        .possible_crtcs = BIT(2) | BIT(1) | BIT(0),
+                        .encoder_type = DRM_MODE_ENCODER_NONE,
+                        .port = 0,
+                },
+                [RCAR_DU_OUTPUT_LVDS0] = {
+                        .possible_crtcs = BIT(0),
+                        .encoder_type = DRM_MODE_ENCODER_LVDS,
+                        .port = 1,
+                },
+                [RCAR_DU_OUTPUT_LVDS1] = {
+                        .possible_crtcs = BIT(2) | BIT(1),
+                        .encoder_type = DRM_MODE_ENCODER_LVDS,
+                        .port = 2,
+                },
+        },
+        .num_lvds = 2,
+};
+
+static const struct rcar_du_device_info rcar_du_r8a7791_info = {
+        .features = RCAR_DU_FEATURE_CRTC_IRQ_CLOCK | RCAR_DU_FEATURE_DEFR8,
+        .num_crtcs = 2,
+        .routes = {
+                /* R8A7791 has one RGB output, one LVDS output and one
+                 * (currently unsupported) TCON output.
+                 */
+                [RCAR_DU_OUTPUT_DPAD0] = {
+                        .possible_crtcs = BIT(1),
+                        .encoder_type = DRM_MODE_ENCODER_NONE,
+                        .port = 0,
+                },
+                [RCAR_DU_OUTPUT_LVDS0] = {
+                        .possible_crtcs = BIT(0),
+                        .encoder_type = DRM_MODE_ENCODER_LVDS,
+                        .port = 1,
+                },
+        },
+        .num_lvds = 1,
+};
+
+static const struct platform_device_id rcar_du_id_table[] = {
+        { "rcar-du-r8a7779", (kernel_ulong_t)&rcar_du_r8a7779_info },
+        { "rcar-du-r8a7790", (kernel_ulong_t)&rcar_du_r8a7790_info },
+        { "rcar-du-r8a7791", (kernel_ulong_t)&rcar_du_r8a7791_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 },
+        { .compatible = "renesas,du-r8a7791", .data = &rcar_du_r8a7791_info },
+        { }
+};
+
+MODULE_DEVICE_TABLE(of, rcar_du_of_table);
+
+/* -----------------------------------------------------------------------------
  * DRM operations
  */
 
@@ -53,12 +145,13 @@ static int rcar_du_unload(struct drm_device *dev)
 static int rcar_du_load(struct drm_device *dev, unsigned long flags)
 {
         struct platform_device *pdev = dev->platformdev;
+        struct device_node *np = pdev->dev.of_node;
         struct rcar_du_platform_data *pdata = pdev->dev.platform_data;
         struct rcar_du_device *rcdu;
         struct resource *mem;
         int ret;
 
-        if (pdata == NULL) {
+        if (pdata == NULL && np == NULL) {
                 dev_err(dev->dev, "no platform data\n");
                 return -ENODEV;
         }
@@ -71,7 +164,8 @@ static int rcar_du_load(struct drm_device *dev, unsigned long flags)
 
         rcdu->dev = &pdev->dev;
         rcdu->pdata = pdata;
-        rcdu->info = (struct rcar_du_device_info *)pdev->id_entry->driver_data;
+        rcdu->info = np ? of_match_device(rcar_du_of_table, rcdu->dev)->data
+                   : (void *)platform_get_device_id(pdev)->driver_data;
         rcdu->ddev = dev;
         dev->dev_private = rcdu;
 
@@ -232,77 +326,6 @@ static int rcar_du_remove(struct platform_device *pdev)
         return 0;
 }
 
-static const struct rcar_du_device_info rcar_du_r8a7779_info = {
-        .features = 0,
-        .num_crtcs = 2,
-        .routes = {
-                /* R8A7779 has two RGB outputs and one (currently unsupported)
-                 * TCON output.
-                 */
-                [RCAR_DU_OUTPUT_DPAD0] = {
-                        .possible_crtcs = BIT(0),
-                        .encoder_type = DRM_MODE_ENCODER_NONE,
-                },
-                [RCAR_DU_OUTPUT_DPAD1] = {
-                        .possible_crtcs = BIT(1) | BIT(0),
-                        .encoder_type = DRM_MODE_ENCODER_NONE,
-                },
-        },
-        .num_lvds = 0,
-};
-
-static const struct rcar_du_device_info rcar_du_r8a7790_info = {
-        .features = RCAR_DU_FEATURE_CRTC_IRQ_CLOCK | RCAR_DU_FEATURE_DEFR8,
-        .quirks = RCAR_DU_QUIRK_ALIGN_128B | RCAR_DU_QUIRK_LVDS_LANES,
-        .num_crtcs = 3,
-        .routes = {
-                /* R8A7790 has one RGB output, two LVDS outputs and one
-                 * (currently unsupported) TCON output.
-                 */
-                [RCAR_DU_OUTPUT_DPAD0] = {
-                        .possible_crtcs = BIT(2) | BIT(1) | BIT(0),
-                        .encoder_type = DRM_MODE_ENCODER_NONE,
-                },
-                [RCAR_DU_OUTPUT_LVDS0] = {
-                        .possible_crtcs = BIT(0),
-                        .encoder_type = DRM_MODE_ENCODER_LVDS,