OSDN Git Service

drm: rcar-du: Drop LVDS device tree backward compatibility
authorLaurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Wed, 26 Jan 2022 20:13:23 +0000 (22:13 +0200)
committerLaurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Thu, 3 Mar 2022 09:26:35 +0000 (11:26 +0200)
The rcar-du driver goes to great lengths to preserve device tree
backward compatibility for the LVDS encoders by patching old device
trees at runtime.

The last R-Car Gen2 platform was converted to the new bindings commit
edb0c3affe5214a2 ("ARM: dts: r8a7793: Convert to new LVDS DT bindings"),
in v4.17, and the last RZ/G1 platform converted in commit
6a6a797625b5fe85 ("ARM: dts: r8a7743: Convert to new LVDS DT bindings"),
in v5.0. Both are older than commit 58256143cff7c2e0 ("clk: renesas:
Remove R-Car Gen2 legacy DT clock support"), in v5.5, which removes
support for legacy bindings for clocks. The LVDS compatibility code is
thus not needed anymore. Drop it.

Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Reviewed-by: Kieran Bingham <kieran.bingham+renesas@ideasonboard.com>
drivers/gpu/drm/rcar-du/Makefile
drivers/gpu/drm/rcar-du/rcar_du_drv.c
drivers/gpu/drm/rcar-du/rcar_du_of.c [deleted file]
drivers/gpu/drm/rcar-du/rcar_du_of.h [deleted file]
drivers/gpu/drm/rcar-du/rcar_du_of_lvds_r8a7790.dts [deleted file]
drivers/gpu/drm/rcar-du/rcar_du_of_lvds_r8a7791.dts [deleted file]
drivers/gpu/drm/rcar-du/rcar_du_of_lvds_r8a7793.dts [deleted file]
drivers/gpu/drm/rcar-du/rcar_du_of_lvds_r8a7795.dts [deleted file]
drivers/gpu/drm/rcar-du/rcar_du_of_lvds_r8a7796.dts [deleted file]

index 286bc81..e7275b5 100644 (file)
@@ -6,12 +6,6 @@ rcar-du-drm-y := rcar_du_crtc.o \
                 rcar_du_kms.o \
                 rcar_du_plane.o \
 
-rcar-du-drm-$(CONFIG_DRM_RCAR_LVDS)    += rcar_du_of.o \
-                                          rcar_du_of_lvds_r8a7790.dtb.o \
-                                          rcar_du_of_lvds_r8a7791.dtb.o \
-                                          rcar_du_of_lvds_r8a7793.dtb.o \
-                                          rcar_du_of_lvds_r8a7795.dtb.o \
-                                          rcar_du_of_lvds_r8a7796.dtb.o
 rcar-du-drm-$(CONFIG_DRM_RCAR_VSP)     += rcar_du_vsp.o
 rcar-du-drm-$(CONFIG_DRM_RCAR_WRITEBACK) += rcar_du_writeback.o
 
index 982e450..957ea97 100644 (file)
@@ -28,7 +28,6 @@
 
 #include "rcar_du_drv.h"
 #include "rcar_du_kms.h"
-#include "rcar_du_of.h"
 #include "rcar_du_regs.h"
 
 /* -----------------------------------------------------------------------------
@@ -634,6 +633,9 @@ static int rcar_du_probe(struct platform_device *pdev)
        unsigned int mask;
        int ret;
 
+       if (drm_firmware_drivers_only())
+               return -ENODEV;
+
        /* Allocate and initialize the R-Car device structure. */
        rcdu = devm_drm_dev_alloc(&pdev->dev, &rcar_du_driver,
                                  struct rcar_du_device, ddev);
@@ -699,22 +701,7 @@ static struct platform_driver rcar_du_platform_driver = {
        },
 };
 
-static int __init rcar_du_init(void)
-{
-       if (drm_firmware_drivers_only())
-               return -ENODEV;
-
-       rcar_du_of_init(rcar_du_of_table);
-
-       return platform_driver_register(&rcar_du_platform_driver);
-}
-module_init(rcar_du_init);
-
-static void __exit rcar_du_exit(void)
-{
-       platform_driver_unregister(&rcar_du_platform_driver);
-}
-module_exit(rcar_du_exit);
+module_platform_driver(rcar_du_platform_driver);
 
 MODULE_AUTHOR("Laurent Pinchart <laurent.pinchart@ideasonboard.com>");
 MODULE_DESCRIPTION("Renesas R-Car Display Unit DRM Driver");
diff --git a/drivers/gpu/drm/rcar-du/rcar_du_of.c b/drivers/gpu/drm/rcar-du/rcar_du_of.c
deleted file mode 100644 (file)
index afef696..0000000
+++ /dev/null
@@ -1,323 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0
-/*
- * rcar_du_of.c - Legacy DT bindings compatibility
- *
- * Copyright (C) 2018 Laurent Pinchart <laurent.pinchart@ideasonboard.com>
- *
- * Based on work from Jyri Sarha <jsarha@ti.com>
- * Copyright (C) 2015 Texas Instruments
- */
-
-#include <linux/init.h>
-#include <linux/kernel.h>
-#include <linux/of.h>
-#include <linux/of_address.h>
-#include <linux/of_fdt.h>
-#include <linux/of_graph.h>
-#include <linux/slab.h>
-
-#include "rcar_du_crtc.h"
-#include "rcar_du_drv.h"
-#include "rcar_du_of.h"
-
-/* -----------------------------------------------------------------------------
- * Generic Overlay Handling
- */
-
-struct rcar_du_of_overlay {
-       const char *compatible;
-       void *begin;
-       void *end;
-};
-
-#define RCAR_DU_OF_DTB(type, soc)                                      \
-       extern char __dtb_rcar_du_of_##type##_##soc##_begin[];          \
-       extern char __dtb_rcar_du_of_##type##_##soc##_end[]
-
-#define RCAR_DU_OF_OVERLAY(type, soc)                                  \
-       {                                                               \
-               .compatible = "renesas,du-" #soc,                       \
-               .begin = __dtb_rcar_du_of_##type##_##soc##_begin,       \
-               .end = __dtb_rcar_du_of_##type##_##soc##_end,           \
-       }
-
-static int __init rcar_du_of_apply_overlay(const struct rcar_du_of_overlay *dtbs,
-                                          const char *compatible)
-{
-       const struct rcar_du_of_overlay *dtb = NULL;
-       unsigned int i;
-       int ovcs_id;
-
-       for (i = 0; dtbs[i].compatible; ++i) {
-               if (!strcmp(dtbs[i].compatible, compatible)) {
-                       dtb = &dtbs[i];
-                       break;
-               }
-       }
-
-       if (!dtb)
-               return -ENODEV;
-
-       ovcs_id = 0;
-       return of_overlay_fdt_apply(dtb->begin, dtb->end - dtb->begin,
-                                   &ovcs_id);
-}
-
-static int __init rcar_du_of_add_property(struct of_changeset *ocs,
-                                         struct device_node *np,
-                                         const char *name, const void *value,
-                                         int length)
-{
-       struct property *prop;
-       int ret = -ENOMEM;
-
-       prop = kzalloc(sizeof(*prop), GFP_KERNEL);
-       if (!prop)
-               return -ENOMEM;
-
-       prop->name = kstrdup(name, GFP_KERNEL);
-       if (!prop->name)
-               goto out_err;
-
-       prop->value = kmemdup(value, length, GFP_KERNEL);
-       if (!prop->value)
-               goto out_err;
-
-       of_property_set_flag(prop, OF_DYNAMIC);
-
-       prop->length = length;
-
-       ret = of_changeset_add_property(ocs, np, prop);
-       if (!ret)
-               return 0;
-
-out_err:
-       kfree(prop->value);
-       kfree(prop->name);
-       kfree(prop);
-       return ret;
-}
-
-/* -----------------------------------------------------------------------------
- * LVDS Overlays
- */
-
-RCAR_DU_OF_DTB(lvds, r8a7790);
-RCAR_DU_OF_DTB(lvds, r8a7791);
-RCAR_DU_OF_DTB(lvds, r8a7793);
-RCAR_DU_OF_DTB(lvds, r8a7795);
-RCAR_DU_OF_DTB(lvds, r8a7796);
-
-static const struct rcar_du_of_overlay rcar_du_lvds_overlays[] __initconst = {
-       RCAR_DU_OF_OVERLAY(lvds, r8a7790),
-       RCAR_DU_OF_OVERLAY(lvds, r8a7791),
-       RCAR_DU_OF_OVERLAY(lvds, r8a7793),
-       RCAR_DU_OF_OVERLAY(lvds, r8a7795),
-       RCAR_DU_OF_OVERLAY(lvds, r8a7796),
-       { /* Sentinel */ },
-};
-
-static struct of_changeset rcar_du_lvds_changeset;
-
-static void __init rcar_du_of_lvds_patch_one(struct device_node *lvds,
-                                            const struct of_phandle_args *clk,
-                                            struct device_node *local,
-                                            struct device_node *remote)
-{
-       unsigned int psize;
-       unsigned int i;
-       __be32 value[4];
-       int ret;
-
-       /*
-        * Set the LVDS clocks property. This can't be performed by the overlay
-        * as the structure of the clock specifier has changed over time, and we
-        * don't know at compile time which binding version the system we will
-        * run on uses.
-        */
-       if (clk->args_count >= ARRAY_SIZE(value) - 1)
-               return;
-
-       of_changeset_init(&rcar_du_lvds_changeset);
-
-       value[0] = cpu_to_be32(clk->np->phandle);
-       for (i = 0; i < clk->args_count; ++i)
-               value[i + 1] = cpu_to_be32(clk->args[i]);
-
-       psize = (clk->args_count + 1) * 4;
-       ret = rcar_du_of_add_property(&rcar_du_lvds_changeset, lvds,
-                                     "clocks", value, psize);
-       if (ret < 0)
-               goto done;
-
-       /*
-        * Insert the node in the OF graph: patch the LVDS ports remote-endpoint
-        * properties to point to the endpoints of the sibling nodes in the
-        * graph. This can't be performed by the overlay: on the input side the
-        * overlay would contain a phandle for the DU LVDS output port that
-        * would clash with the system DT, and on the output side the connection
-        * is board-specific.
-        */
-       value[0] = cpu_to_be32(local->phandle);
-       value[1] = cpu_to_be32(remote->phandle);
-
-       for (i = 0; i < 2; ++i) {
-               struct device_node *endpoint;
-
-               endpoint = of_graph_get_endpoint_by_regs(lvds, i, 0);
-               if (!endpoint) {
-                       ret = -EINVAL;
-                       goto done;
-               }
-
-               ret = rcar_du_of_add_property(&rcar_du_lvds_changeset,
-                                             endpoint, "remote-endpoint",
-                                             &value[i], sizeof(value[i]));
-               of_node_put(endpoint);
-               if (ret < 0)
-                       goto done;
-       }
-
-       ret = of_changeset_apply(&rcar_du_lvds_changeset);
-
-done:
-       if (ret < 0)
-               of_changeset_destroy(&rcar_du_lvds_changeset);
-}
-
-struct lvds_of_data {
-       struct resource res;
-       struct of_phandle_args clkspec;
-       struct device_node *local;
-       struct device_node *remote;
-};
-
-static void __init rcar_du_of_lvds_patch(const struct of_device_id *of_ids)
-{
-       const struct rcar_du_device_info *info;
-       const struct of_device_id *match;
-       struct lvds_of_data lvds_data[2] = { };
-       struct device_node *lvds_node;
-       struct device_node *soc_node;
-       struct device_node *du_node;
-       char compatible[22];
-       const char *soc_name;
-       unsigned int i;
-       int ret;
-
-       /* Get the DU node and exit if not present or disabled. */
-       du_node = of_find_matching_node_and_match(NULL, of_ids, &match);
-       if (!du_node || !of_device_is_available(du_node)) {
-               of_node_put(du_node);
-               return;
-       }
-
-       info = match->data;
-       soc_node = of_get_parent(du_node);
-
-       if (WARN_ON(info->num_lvds > ARRAY_SIZE(lvds_data)))
-               goto done;
-
-       /*
-        * Skip if the LVDS nodes already exists.
-        *
-        * The nodes are searched based on the compatible string, which we
-        * construct from the SoC name found in the DU compatible string. As a
-        * match has been found we know the compatible string matches the
-        * expected format and can thus skip some of the string manipulation
-        * normal safety checks.
-        */
-       soc_name = strchr(match->compatible, '-') + 1;
-       sprintf(compatible, "renesas,%s-lvds", soc_name);
-       lvds_node = of_find_compatible_node(NULL, NULL, compatible);
-       if (lvds_node) {
-               of_node_put(lvds_node);
-               return;
-       }
-
-       /*
-        * Parse the DU node and store the register specifier, the clock
-        * specifier and the local and remote endpoint of the LVDS link for
-        * later use.
-        */
-       for (i = 0; i < info->num_lvds; ++i) {
-               struct lvds_of_data *lvds = &lvds_data[i];
-               unsigned int port;
-               char name[7];
-               int index;
-
-               sprintf(name, "lvds.%u", i);
-               index = of_property_match_string(du_node, "clock-names", name);
-               if (index < 0)
-                       continue;
-
-               ret = of_parse_phandle_with_args(du_node, "clocks",
-                                                "#clock-cells", index,
-                                                &lvds->clkspec);
-               if (ret < 0)
-                       continue;
-
-               port = info->routes[RCAR_DU_OUTPUT_LVDS0 + i].port;
-
-               lvds->local = of_graph_get_endpoint_by_regs(du_node, port, 0);
-               if (!lvds->local)
-                       continue;
-
-               lvds->remote = of_graph_get_remote_endpoint(lvds->local);
-               if (!lvds->remote)
-                       continue;
-
-               index = of_property_match_string(du_node, "reg-names", name);
-               if (index < 0)
-                       continue;
-
-               of_address_to_resource(du_node, index, &lvds->res);
-       }
-
-       /* Parse and apply the overlay. This will resolve phandles. */
-       ret = rcar_du_of_apply_overlay(rcar_du_lvds_overlays,
-                                      match->compatible);
-       if (ret < 0)
-               goto done;
-
-       /* Patch the newly created LVDS encoder nodes. */
-       for_each_child_of_node(soc_node, lvds_node) {
-               struct resource res;
-
-               if (!of_device_is_compatible(lvds_node, compatible))
-                       continue;
-
-               /* Locate the lvds_data entry based on the resource start. */
-               ret = of_address_to_resource(lvds_node, 0, &res);
-               if (ret < 0)
-                       continue;
-
-               for (i = 0; i < ARRAY_SIZE(lvds_data); ++i) {
-                       if (lvds_data[i].res.start == res.start)
-                               break;
-               }
-
-               if (i == ARRAY_SIZE(lvds_data))
-                       continue;
-
-               /* Patch the LVDS encoder. */
-               rcar_du_of_lvds_patch_one(lvds_node, &lvds_data[i].clkspec,
-                                         lvds_data[i].local,
-                                         lvds_data[i].remote);
-       }
-
-done:
-       for (i = 0; i < info->num_lvds; ++i) {
-               of_node_put(lvds_data[i].clkspec.np);
-               of_node_put(lvds_data[i].local);
-               of_node_put(lvds_data[i].remote);
-       }
-
-       of_node_put(soc_node);
-       of_node_put(du_node);
-}
-
-void __init rcar_du_of_init(const struct of_device_id *of_ids)
-{
-       rcar_du_of_lvds_patch(of_ids);
-}
diff --git a/drivers/gpu/drm/rcar-du/rcar_du_of.h b/drivers/gpu/drm/rcar-du/rcar_du_of.h
deleted file mode 100644 (file)
index 8dd3fbe..0000000
+++ /dev/null
@@ -1,20 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0 */
-/*
- * rcar_du_of.h - Legacy DT bindings compatibility
- *
- * Copyright (C) 2018 Laurent Pinchart <laurent.pinchart@ideasonboard.com>
- */
-#ifndef __RCAR_DU_OF_H__
-#define __RCAR_DU_OF_H__
-
-#include <linux/init.h>
-
-struct of_device_id;
-
-#if IS_ENABLED(CONFIG_DRM_RCAR_LVDS)
-void __init rcar_du_of_init(const struct of_device_id *of_ids);
-#else
-static inline void rcar_du_of_init(const struct of_device_id *of_ids) { }
-#endif /* CONFIG_DRM_RCAR_LVDS */
-
-#endif /* __RCAR_DU_OF_H__ */
diff --git a/drivers/gpu/drm/rcar-du/rcar_du_of_lvds_r8a7790.dts b/drivers/gpu/drm/rcar-du/rcar_du_of_lvds_r8a7790.dts
deleted file mode 100644 (file)
index 8bee4e7..0000000
+++ /dev/null
@@ -1,69 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0
-/*
- * rcar_du_of_lvds_r8a7790.dts - Legacy LVDS DT bindings conversion for R8A7790
- *
- * Copyright (C) 2018 Laurent Pinchart <laurent.pinchart@ideasonboard.com>
- */
-
-/dts-v1/;
-/plugin/;
-
-&{/} {
-       #address-cells = <2>;
-       #size-cells = <2>;
-
-       lvds@feb90000 {
-               compatible = "renesas,r8a7790-lvds";
-               reg = <0 0xfeb90000 0 0x1c>;
-
-               ports {
-                       #address-cells = <1>;
-                       #size-cells = <0>;
-
-                       port@0 {
-                               reg = <0>;
-                               lvds0_input: endpoint {
-                               };
-                       };
-                       port@1 {
-                               reg = <1>;
-                               lvds0_out: endpoint {
-                               };
-                       };
-               };
-       };
-
-       lvds@feb94000 {
-               compatible = "renesas,r8a7790-lvds";
-               reg = <0 0xfeb94000 0 0x1c>;
-
-               ports {
-                       #address-cells = <1>;
-                       #size-cells = <0>;
-
-                       port@0 {
-                               reg = <0>;
-                               lvds1_input: endpoint {
-                               };
-                       };
-                       port@1 {
-                               reg = <1>;
-                               lvds1_out: endpoint {
-                               };
-                       };
-               };
-       };
-};
-
-&{/display@feb00000/ports} {
-       port@1 {
-               endpoint {
-                       remote-endpoint = <&lvds0_input>;
-               };
-       };
-       port@2 {
-               endpoint {
-                       remote-endpoint = <&lvds1_input>;
-               };
-       };
-};
diff --git a/drivers/gpu/drm/rcar-du/rcar_du_of_lvds_r8a7791.dts b/drivers/gpu/drm/rcar-du/rcar_du_of_lvds_r8a7791.dts
deleted file mode 100644 (file)
index 92c0509..0000000
+++ /dev/null
@@ -1,43 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0
-/*
- * rcar_du_of_lvds_r8a7791.dts - Legacy LVDS DT bindings conversion for R8A7791
- *
- * Copyright (C) 2018 Laurent Pinchart <laurent.pinchart@ideasonboard.com>
- */
-
-/dts-v1/;
-/plugin/;
-
-&{/} {
-       #address-cells = <2>;
-       #size-cells = <2>;
-
-       lvds@feb90000 {
-               compatible = "renesas,r8a7791-lvds";
-               reg = <0 0xfeb90000 0 0x1c>;
-
-               ports {
-                       #address-cells = <1>;
-                       #size-cells = <0>;
-
-                       port@0 {
-                               reg = <0>;
-                               lvds0_input: endpoint {
-                               };
-                       };
-                       port@1 {
-                               reg = <1>;
-                               lvds0_out: endpoint {
-                               };
-                       };
-               };
-       };
-};
-
-&{/display@feb00000/ports} {
-       port@1 {
-               endpoint {
-                       remote-endpoint = <&lvds0_input>;
-               };
-       };
-};
diff --git a/drivers/gpu/drm/rcar-du/rcar_du_of_lvds_r8a7793.dts b/drivers/gpu/drm/rcar-du/rcar_du_of_lvds_r8a7793.dts
deleted file mode 100644 (file)
index c8b93f2..0000000
+++ /dev/null
@@ -1,43 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0
-/*
- * rcar_du_of_lvds_r8a7793.dts - Legacy LVDS DT bindings conversion for R8A7793
- *
- * Copyright (C) 2018 Laurent Pinchart <laurent.pinchart@ideasonboard.com>
- */
-
-/dts-v1/;
-/plugin/;
-
-&{/} {
-       #address-cells = <2>;
-       #size-cells = <2>;
-
-       lvds@feb90000 {
-               compatible = "renesas,r8a7793-lvds";
-               reg = <0 0xfeb90000 0 0x1c>;
-
-               ports {
-                       #address-cells = <1>;
-                       #size-cells = <0>;
-
-                       port@0 {
-                               reg = <0>;
-                               lvds0_input: endpoint {
-                               };
-                       };
-                       port@1 {
-                               reg = <1>;
-                               lvds0_out: endpoint {
-                               };
-                       };
-               };
-       };
-};
-
-&{/display@feb00000/ports} {
-       port@1 {
-               endpoint {
-                       remote-endpoint = <&lvds0_input>;
-               };
-       };
-};
diff --git a/drivers/gpu/drm/rcar-du/rcar_du_of_lvds_r8a7795.dts b/drivers/gpu/drm/rcar-du/rcar_du_of_lvds_r8a7795.dts
deleted file mode 100644 (file)
index 16c2d03..0000000
+++ /dev/null
@@ -1,43 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0
-/*
- * rcar_du_of_lvds_r8a7795.dts - Legacy LVDS DT bindings conversion for R8A7795
- *
- * Copyright (C) 2018 Laurent Pinchart <laurent.pinchart@ideasonboard.com>
- */
-
-/dts-v1/;
-/plugin/;
-
-&{/soc} {
-       #address-cells = <2>;
-       #size-cells = <2>;
-
-       lvds@feb90000 {
-               compatible = "renesas,r8a7795-lvds";
-               reg = <0 0xfeb90000 0 0x14>;
-
-               ports {
-                       #address-cells = <1>;
-                       #size-cells = <0>;
-
-                       port@0 {
-                               reg = <0>;
-                               lvds0_input: endpoint {
-                               };
-                       };
-                       port@1 {
-                               reg = <1>;
-                               lvds0_out: endpoint {
-                               };
-                       };
-               };
-       };
-};
-
-&{/soc/display@feb00000/ports} {
-       port@3 {
-               endpoint {
-                       remote-endpoint = <&lvds0_input>;
-               };
-       };
-};
diff --git a/drivers/gpu/drm/rcar-du/rcar_du_of_lvds_r8a7796.dts b/drivers/gpu/drm/rcar-du/rcar_du_of_lvds_r8a7796.dts
deleted file mode 100644 (file)
index 680e923..0000000
+++ /dev/null
@@ -1,43 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0
-/*
- * rcar_du_of_lvds_r8a7796.dts - Legacy LVDS DT bindings conversion for R8A7796
- *
- * Copyright (C) 2018 Laurent Pinchart <laurent.pinchart@ideasonboard.com>
- */
-
-/dts-v1/;
-/plugin/;
-
-&{/soc} {
-       #address-cells = <2>;
-       #size-cells = <2>;
-
-       lvds@feb90000 {
-               compatible = "renesas,r8a7796-lvds";
-               reg = <0 0xfeb90000 0 0x14>;
-
-               ports {
-                       #address-cells = <1>;
-                       #size-cells = <0>;
-
-                       port@0 {
-                               reg = <0>;
-                               lvds0_input: endpoint {
-                               };
-                       };
-                       port@1 {
-                               reg = <1>;
-                               lvds0_out: endpoint {
-                               };
-                       };
-               };
-       };
-};
-
-&{/soc/display@feb00000/ports} {
-       port@3 {
-               endpoint {
-                       remote-endpoint = <&lvds0_input>;
-               };
-       };
-};