* [PATCH 00/10] R-Car DU: Convert LVDS code to bridge driver
@ 2018-01-12 0:58 Laurent Pinchart
2018-01-12 0:58 ` Laurent Pinchart
` (11 more replies)
0 siblings, 12 replies; 63+ messages in thread
From: Laurent Pinchart @ 2018-01-12 0:58 UTC (permalink / raw)
To: dri-devel; +Cc: linux-renesas-soc, Sergei Shtylyov, devicetree
Hello,
This patch series addresses a design mistake that dates back from the initial
DU support. Support for the LVDS encoders, which are IP cores separate from
the DU, was bundled in the DU driver. Worse, both the DU and LVDS were
described through a single DT node.
To fix the, patches 01/10 and 02/10 define new DT bindings for the LVDS
encoders, and deprecate their description inside the DU bindings. To retain
backward compatibility with existing DT, patch 03/10 then patches the device
tree at runtime to convert the legacy bindings to the new ones.
With the DT side addressed, patch 04/10 then converts the LVDS support code to
a separate bridge driver. After a small fix to the Porter board device tree in
patch 05/10, patches 06/10 to 10/10 then update all the device tree sources to
the new LVDS encoders bindings.
I decided to go for live DT patching in patch 03/10 because implementing
support for both the legacy and new bindings in the driver would have been
very intrusive, and prevented further cleanups. I'm in a way both proud and
ashamed of that patch that I would call a neat and dirty hack. It was fun to
write perhaps in a similar way that one would enjoy researching and developing
proof-of-concepts for security holes: they're good and bad at the same time.
Anyway, with this philosophical considerations aside, there were a few
shortcomings in the OF API that I worked around with local code in the driver.
If anyone is interested in performing similar live DT patching I think we
could move some of the code to the OF core. For instance I was surprised
to not find a device node lookup by path function that would start at a
given node instead of the root of the live device tree, and had to write
rcar_du_of_find_node_by_path(). Utility functions to add or modify properties
or to rename nodes could similarly be added.
Laurent Pinchart (10):
dt-bindings: display: renesas: Add R-Car LVDS encoder DT bindings
dt-bindings: display: renesas: Deprecate LVDS support in the DU
bindings
drm: rcar-du: Fix legacy DT to create LVDS encoder nodes
drm: rcar-du: Convert LVDS encoder code to bridge driver
ARM: dts: porter: Fix HDMI output routing
ARM: dts: r8a7790: Convert to new LVDS DT bindings
ARM: dts: r8a7791: Convert to new LVDS DT bindings
ARM: dts: r8a7793: Convert to new LVDS DT bindings
arm64: dts: renesas: r8a7795: Convert to new LVDS DT bindings
arm64: dts: renesas: r8a7796: Convert to new LVDS DT bindings
.../bindings/display/bridge/renesas,lvds.txt | 54 ++
.../devicetree/bindings/display/renesas,du.txt | 26 +-
MAINTAINERS | 1 +
arch/arm/boot/dts/r8a7790-lager.dts | 22 +-
arch/arm/boot/dts/r8a7790.dtsi | 61 ++-
arch/arm/boot/dts/r8a7791-koelsch.dts | 10 +-
arch/arm/boot/dts/r8a7791-porter.dts | 18 +-
arch/arm/boot/dts/r8a7791.dtsi | 35 +-
arch/arm/boot/dts/r8a7793-gose.dts | 10 +-
arch/arm/boot/dts/r8a7793.dtsi | 35 +-
.../boot/dts/renesas/r8a7795-es1-salvator-x.dts | 3 +-
arch/arm64/boot/dts/renesas/r8a7795-h3ulcb.dts | 3 +-
arch/arm64/boot/dts/renesas/r8a7795-salvator-x.dts | 3 +-
.../arm64/boot/dts/renesas/r8a7795-salvator-xs.dts | 3 +-
arch/arm64/boot/dts/renesas/r8a7795.dtsi | 35 +-
arch/arm64/boot/dts/renesas/r8a7796-m3ulcb.dts | 3 +-
arch/arm64/boot/dts/renesas/r8a7796-salvator-x.dts | 3 +-
arch/arm64/boot/dts/renesas/r8a7796.dtsi | 35 +-
drivers/gpu/drm/rcar-du/Kconfig | 5 +-
drivers/gpu/drm/rcar-du/Makefile | 6 +-
drivers/gpu/drm/rcar-du/rcar_du_drv.c | 21 +-
drivers/gpu/drm/rcar-du/rcar_du_drv.h | 5 -
drivers/gpu/drm/rcar-du/rcar_du_encoder.c | 175 +------
drivers/gpu/drm/rcar-du/rcar_du_encoder.h | 12 -
drivers/gpu/drm/rcar-du/rcar_du_kms.c | 14 +-
drivers/gpu/drm/rcar-du/rcar_du_lvdscon.c | 93 ----
drivers/gpu/drm/rcar-du/rcar_du_lvdscon.h | 24 -
drivers/gpu/drm/rcar-du/rcar_du_lvdsenc.c | 270 ----------
drivers/gpu/drm/rcar-du/rcar_du_lvdsenc.h | 64 ---
drivers/gpu/drm/rcar-du/rcar_du_of.c | 440 ++++++++++++++++
drivers/gpu/drm/rcar-du/rcar_du_of.h | 16 +
drivers/gpu/drm/rcar-du/rcar_du_of_lvds.dts | 82 +++
drivers/gpu/drm/rcar-du/rcar_lvds.c | 554 +++++++++++++++++++++
33 files changed, 1420 insertions(+), 721 deletions(-)
create mode 100644 Documentation/devicetree/bindings/display/bridge/renesas,lvds.txt
delete mode 100644 drivers/gpu/drm/rcar-du/rcar_du_lvdscon.c
delete mode 100644 drivers/gpu/drm/rcar-du/rcar_du_lvdscon.h
delete mode 100644 drivers/gpu/drm/rcar-du/rcar_du_lvdsenc.c
delete mode 100644 drivers/gpu/drm/rcar-du/rcar_du_lvdsenc.h
create mode 100644 drivers/gpu/drm/rcar-du/rcar_du_of.c
create mode 100644 drivers/gpu/drm/rcar-du/rcar_du_of.h
create mode 100644 drivers/gpu/drm/rcar-du/rcar_du_of_lvds.dts
create mode 100644 drivers/gpu/drm/rcar-du/rcar_lvds.c
--
Regards,
Laurent Pinchart
^ permalink raw reply [flat|nested] 63+ messages in thread
* [PATCH 01/10] dt-bindings: display: renesas: Add R-Car LVDS encoder DT bindings
2018-01-12 0:58 [PATCH 00/10] R-Car DU: Convert LVDS code to bridge driver Laurent Pinchart
@ 2018-01-12 0:58 ` Laurent Pinchart
2018-01-12 0:58 ` [PATCH 02/10] dt-bindings: display: renesas: Deprecate LVDS support in the DU bindings Laurent Pinchart
` (10 subsequent siblings)
11 siblings, 0 replies; 63+ messages in thread
From: Laurent Pinchart @ 2018-01-12 0:58 UTC (permalink / raw)
To: dri-devel; +Cc: linux-renesas-soc, devicetree, Sergei Shtylyov
The Renesas R-Car Gen2 and Gen3 SoCs have internal LVDS encoders. Add
corresponding device tree bindings.
Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
---
.../bindings/display/bridge/renesas,lvds.txt | 54 ++++++++++++++++++++++
MAINTAINERS | 1 +
2 files changed, 55 insertions(+)
create mode 100644 Documentation/devicetree/bindings/display/bridge/renesas,lvds.txt
diff --git a/Documentation/devicetree/bindings/display/bridge/renesas,lvds.txt b/Documentation/devicetree/bindings/display/bridge/renesas,lvds.txt
new file mode 100644
index 000000000000..459c56822eda
--- /dev/null
+++ b/Documentation/devicetree/bindings/display/bridge/renesas,lvds.txt
@@ -0,0 +1,54 @@
+Renesas R-Car LVDS Encoder
+==========================
+
+These DT bindings describe the LVDS encoder embedded in the Renesas R-Car Gen2
+and Gen3 SoCs.
+
+Required properties:
+
+- compatible : Shall contain one of
+ - "renesas,lvds-r8a7743" for R8A7790 (R-Car RZ/G1M) compatible LVDS encoders
+ - "renesas,lvds-r8a7790" for R8A7790 (R-Car H2) compatible LVDS encoders
+ - "renesas,lvds-r8a7791" for R8A7791 (R-Car M2-W) compatible LVDS encoders
+ - "renesas,lvds-r8a7793" for R8A7791 (R-Car M2-N) compatible LVDS encoders
+ - "renesas,lvds-r8a7795" for R8A7795 (R-Car H3) compatible LVDS encoders
+ - "renesas,lvds-r8a7796" for R8A7796 (R-Car M3-W) compatible LVDS encoders
+
+- reg: Base address and length for the memory-mapped registers
+- clocks: A phandle + clock-specifier pair for the functional clock
+
+Requires nodes:
+
+The LVDS encoder has two video ports. Their connections are modelled using the
+OF graph bindings specified in Documentation/devicetree/bindings/graph.txt.
+
+- Video port 0 corresponds to the parallel input
+- Video port 1 corresponds to the LVDS output
+
+Each port shall have a single endpoint.
+
+
+Example:
+
+ lvds0: lvds@feb90000 {
+ compatible = "renesas,lvds-r8a7790";
+ reg = <0 0xfeb90000 0 0x1c>;
+ clocks = <&cpg CPG_MOD 726>;
+
+ ports {
+ #address-cells = <1>;
+ #size-cells = <0>;
+
+ port@0 {
+ reg = <0>;
+ lvds0_in: endpoint {
+ remote-endpoint = <&du_out_lvds0>;
+ };
+ };
+ port@1 {
+ reg = <1>;
+ lvds0_out: endpoint {
+ };
+ };
+ };
+ };
diff --git a/MAINTAINERS b/MAINTAINERS
index 40aea858c7ea..5609a7f5ac4d 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -4725,6 +4725,7 @@ F: drivers/gpu/drm/rcar-du/
F: drivers/gpu/drm/shmobile/
F: include/linux/platform_data/shmob_drm.h
F: Documentation/devicetree/bindings/display/bridge/renesas,dw-hdmi.txt
+F: Documentation/devicetree/bindings/display/bridge/renesas,lvds.txt
F: Documentation/devicetree/bindings/display/renesas,du.txt
DRM DRIVERS FOR ROCKCHIP
--
Regards,
Laurent Pinchart
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply related [flat|nested] 63+ messages in thread
* [PATCH 01/10] dt-bindings: display: renesas: Add R-Car LVDS encoder DT bindings
@ 2018-01-12 0:58 ` Laurent Pinchart
0 siblings, 0 replies; 63+ messages in thread
From: Laurent Pinchart @ 2018-01-12 0:58 UTC (permalink / raw)
To: dri-devel; +Cc: linux-renesas-soc, Sergei Shtylyov, devicetree
The Renesas R-Car Gen2 and Gen3 SoCs have internal LVDS encoders. Add
corresponding device tree bindings.
Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
---
.../bindings/display/bridge/renesas,lvds.txt | 54 ++++++++++++++++++++++
MAINTAINERS | 1 +
2 files changed, 55 insertions(+)
create mode 100644 Documentation/devicetree/bindings/display/bridge/renesas,lvds.txt
diff --git a/Documentation/devicetree/bindings/display/bridge/renesas,lvds.txt b/Documentation/devicetree/bindings/display/bridge/renesas,lvds.txt
new file mode 100644
index 000000000000..459c56822eda
--- /dev/null
+++ b/Documentation/devicetree/bindings/display/bridge/renesas,lvds.txt
@@ -0,0 +1,54 @@
+Renesas R-Car LVDS Encoder
+==========================
+
+These DT bindings describe the LVDS encoder embedded in the Renesas R-Car Gen2
+and Gen3 SoCs.
+
+Required properties:
+
+- compatible : Shall contain one of
+ - "renesas,lvds-r8a7743" for R8A7790 (R-Car RZ/G1M) compatible LVDS encoders
+ - "renesas,lvds-r8a7790" for R8A7790 (R-Car H2) compatible LVDS encoders
+ - "renesas,lvds-r8a7791" for R8A7791 (R-Car M2-W) compatible LVDS encoders
+ - "renesas,lvds-r8a7793" for R8A7791 (R-Car M2-N) compatible LVDS encoders
+ - "renesas,lvds-r8a7795" for R8A7795 (R-Car H3) compatible LVDS encoders
+ - "renesas,lvds-r8a7796" for R8A7796 (R-Car M3-W) compatible LVDS encoders
+
+- reg: Base address and length for the memory-mapped registers
+- clocks: A phandle + clock-specifier pair for the functional clock
+
+Requires nodes:
+
+The LVDS encoder has two video ports. Their connections are modelled using the
+OF graph bindings specified in Documentation/devicetree/bindings/graph.txt.
+
+- Video port 0 corresponds to the parallel input
+- Video port 1 corresponds to the LVDS output
+
+Each port shall have a single endpoint.
+
+
+Example:
+
+ lvds0: lvds@feb90000 {
+ compatible = "renesas,lvds-r8a7790";
+ reg = <0 0xfeb90000 0 0x1c>;
+ clocks = <&cpg CPG_MOD 726>;
+
+ ports {
+ #address-cells = <1>;
+ #size-cells = <0>;
+
+ port@0 {
+ reg = <0>;
+ lvds0_in: endpoint {
+ remote-endpoint = <&du_out_lvds0>;
+ };
+ };
+ port@1 {
+ reg = <1>;
+ lvds0_out: endpoint {
+ };
+ };
+ };
+ };
diff --git a/MAINTAINERS b/MAINTAINERS
index 40aea858c7ea..5609a7f5ac4d 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -4725,6 +4725,7 @@ F: drivers/gpu/drm/rcar-du/
F: drivers/gpu/drm/shmobile/
F: include/linux/platform_data/shmob_drm.h
F: Documentation/devicetree/bindings/display/bridge/renesas,dw-hdmi.txt
+F: Documentation/devicetree/bindings/display/bridge/renesas,lvds.txt
F: Documentation/devicetree/bindings/display/renesas,du.txt
DRM DRIVERS FOR ROCKCHIP
--
Regards,
Laurent Pinchart
^ permalink raw reply related [flat|nested] 63+ messages in thread
* [PATCH 02/10] dt-bindings: display: renesas: Deprecate LVDS support in the DU bindings
2018-01-12 0:58 [PATCH 00/10] R-Car DU: Convert LVDS code to bridge driver Laurent Pinchart
2018-01-12 0:58 ` Laurent Pinchart
@ 2018-01-12 0:58 ` Laurent Pinchart
2018-01-12 9:49 ` Geert Uytterhoeven
` (3 more replies)
2018-01-12 0:58 ` [PATCH 03/10] drm: rcar-du: Fix legacy DT to create LVDS encoder nodes Laurent Pinchart
` (9 subsequent siblings)
11 siblings, 4 replies; 63+ messages in thread
From: Laurent Pinchart @ 2018-01-12 0:58 UTC (permalink / raw)
To: dri-devel; +Cc: linux-renesas-soc, Sergei Shtylyov, devicetree
The internal LVDS encoders now have their own DT bindings, representing
them as part of the DU is deprecated.
Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
---
.../devicetree/bindings/display/renesas,du.txt | 26 +++++++++-------------
1 file changed, 11 insertions(+), 15 deletions(-)
diff --git a/Documentation/devicetree/bindings/display/renesas,du.txt b/Documentation/devicetree/bindings/display/renesas,du.txt
index cd48aba3bc8c..8f6e0e118e3e 100644
--- a/Documentation/devicetree/bindings/display/renesas,du.txt
+++ b/Documentation/devicetree/bindings/display/renesas,du.txt
@@ -17,9 +17,7 @@ Required Properties:
- reg: A list of base address and length of each memory resource, one for
each entry in the reg-names property.
- reg-names: Name of the memory resources. The DU requires one memory
- resource for the DU core (named "du") and one memory resource for each
- LVDS encoder (named "lvds.x" with "x" being the LVDS controller numerical
- index).
+ resource for the DU core (named "du").
- interrupt-parent: phandle of the parent interrupt controller.
- interrupts: Interrupt specifiers for the DU interrupts.
@@ -29,14 +27,13 @@ Required Properties:
- clock-names: Name of the clocks. This property is model-dependent.
- R8A7779 uses a single functional clock. The clock doesn't need to be
named.
- - All other DU instances use one functional clock per channel and one
- clock per LVDS encoder (if available). The functional clocks must be
- named "du.x" with "x" being the channel numerical index. The LVDS clocks
- must be named "lvds.x" with "x" being the LVDS encoder numerical index.
- - In addition to the functional and encoder clocks, all DU versions also
- support externally supplied pixel clocks. Those clocks are optional.
- When supplied they must be named "dclkin.x" with "x" being the input
- clock numerical index.
+ - All other DU instances use one functional clock per channel The
+ functional clocks must be named "du.x" with "x" being the channel
+ numerical index.
+ - In addition to the functional clocks, all DU versions also support
+ externally supplied pixel clocks. Those clocks are optional. When
+ supplied they must be named "dclkin.x" with "x" being the input clock
+ numerical index.
- vsps: A list of phandle and channel index tuples to the VSPs that handle
the memory interfaces for the DU channels. The phandle identifies the VSP
@@ -71,7 +68,7 @@ Example: R8A7795 (R-Car H3) ES2.0 DU
compatible = "renesas,du-r8a7795";
reg = <0 0xfeb00000 0 0x80000>,
<0 0xfeb90000 0 0x14>;
- reg-names = "du", "lvds.0";
+ reg-names = "du";
interrupts = <GIC_SPI 256 IRQ_TYPE_LEVEL_HIGH>,
<GIC_SPI 268 IRQ_TYPE_LEVEL_HIGH>,
<GIC_SPI 269 IRQ_TYPE_LEVEL_HIGH>,
@@ -79,9 +76,8 @@ Example: R8A7795 (R-Car H3) ES2.0 DU
clocks = <&cpg CPG_MOD 724>,
<&cpg CPG_MOD 723>,
<&cpg CPG_MOD 722>,
- <&cpg CPG_MOD 721>,
- <&cpg CPG_MOD 727>;
- clock-names = "du.0", "du.1", "du.2", "du.3", "lvds.0";
+ <&cpg CPG_MOD 721>;
+ clock-names = "du.0", "du.1", "du.2", "du.3";
vsps = <&vspd0 0>, <&vspd1 0>, <&vspd2 0>, <&vspd0 1>;
ports {
--
Regards,
Laurent Pinchart
^ permalink raw reply related [flat|nested] 63+ messages in thread
* [PATCH 03/10] drm: rcar-du: Fix legacy DT to create LVDS encoder nodes
2018-01-12 0:58 [PATCH 00/10] R-Car DU: Convert LVDS code to bridge driver Laurent Pinchart
2018-01-12 0:58 ` Laurent Pinchart
2018-01-12 0:58 ` [PATCH 02/10] dt-bindings: display: renesas: Deprecate LVDS support in the DU bindings Laurent Pinchart
@ 2018-01-12 0:58 ` Laurent Pinchart
[not found] ` <20180112005858.26472-4-laurent.pinchart+renesas-ryLnwIuWjnjg/C1BVhZhaw@public.gmane.org>
2018-01-12 0:58 ` [PATCH 04/10] drm: rcar-du: Convert LVDS encoder code to bridge driver Laurent Pinchart
` (8 subsequent siblings)
11 siblings, 1 reply; 63+ messages in thread
From: Laurent Pinchart @ 2018-01-12 0:58 UTC (permalink / raw)
To: dri-devel; +Cc: linux-renesas-soc, Sergei Shtylyov, devicetree
The internal LVDS encoders now have their own DT bindings. Before
switching the driver infrastructure to those new bindings, implement
backward-compatibility through live DT patching.
Patching is disabled and will be enabled along with support for the new
DT bindings in the DU driver.
Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
---
drivers/gpu/drm/rcar-du/Kconfig | 1 +
drivers/gpu/drm/rcar-du/Makefile | 2 +
drivers/gpu/drm/rcar-du/rcar_du_of.c | 440 ++++++++++++++++++++++++++++
drivers/gpu/drm/rcar-du/rcar_du_of.h | 16 +
drivers/gpu/drm/rcar-du/rcar_du_of_lvds.dts | 82 ++++++
5 files changed, 541 insertions(+)
create mode 100644 drivers/gpu/drm/rcar-du/rcar_du_of.c
create mode 100644 drivers/gpu/drm/rcar-du/rcar_du_of.h
create mode 100644 drivers/gpu/drm/rcar-du/rcar_du_of_lvds.dts
diff --git a/drivers/gpu/drm/rcar-du/Kconfig b/drivers/gpu/drm/rcar-du/Kconfig
index 8a50dab19e5c..e3193ebd3ced 100644
--- a/drivers/gpu/drm/rcar-du/Kconfig
+++ b/drivers/gpu/drm/rcar-du/Kconfig
@@ -22,6 +22,7 @@ config DRM_RCAR_LVDS
bool "R-Car DU LVDS Encoder Support"
depends on DRM_RCAR_DU
select DRM_PANEL
+ select OF_OVERLAY
help
Enable support for the R-Car Display Unit embedded LVDS encoders.
diff --git a/drivers/gpu/drm/rcar-du/Makefile b/drivers/gpu/drm/rcar-du/Makefile
index 0cf5c11030e8..0cf457bef1f2 100644
--- a/drivers/gpu/drm/rcar-du/Makefile
+++ b/drivers/gpu/drm/rcar-du/Makefile
@@ -5,6 +5,8 @@ rcar-du-drm-y := rcar_du_crtc.o \
rcar_du_group.o \
rcar_du_kms.o \
rcar_du_lvdscon.o \
+ rcar_du_of.o \
+ rcar_du_of_lvds.dtb.o \
rcar_du_plane.o
rcar-du-drm-$(CONFIG_DRM_RCAR_LVDS) += rcar_du_lvdsenc.o
diff --git a/drivers/gpu/drm/rcar-du/rcar_du_of.c b/drivers/gpu/drm/rcar-du/rcar_du_of.c
new file mode 100644
index 000000000000..c2726e29bd59
--- /dev/null
+++ b/drivers/gpu/drm/rcar-du/rcar_du_of.c
@@ -0,0 +1,440 @@
+// SPDX-License-Identifier: GPL-2.0-only
+/*
+ * 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"
+
+extern u8 __dtb_rcar_du_of_lvds_begin[];
+extern u8 __dtb_rcar_du_of_lvds_end[];
+
+struct rcar_du_of_overlay {
+ struct device_node *np;
+ void *data;
+ void *mem;
+};
+
+static void __init rcar_du_of_free_overlay(struct rcar_du_of_overlay *overlay)
+{
+ of_node_put(overlay->np);
+ kfree(overlay->data);
+ kfree(overlay->mem);
+}
+
+static int __init rcar_du_of_get_overlay(struct rcar_du_of_overlay *overlay,
+ u8 *begin, u8 *end)
+{
+ const size_t size = end - begin;
+
+ memset(overlay, 0, sizeof(*overlay));
+
+ if (!size)
+ return -EINVAL;
+
+ overlay->data = kmemdup(begin, size, GFP_KERNEL);
+ if (!overlay->data)
+ return -ENOMEM;
+
+ overlay->mem = of_fdt_unflatten_tree(overlay->data, NULL, &overlay->np);
+ if (!overlay->mem) {
+ rcar_du_of_free_overlay(overlay);
+ return -ENOMEM;
+ }
+
+ return 0;
+}
+
+static struct device_node __init *
+rcar_du_of_find_node_by_path(struct device_node *parent, const char *path)
+{
+ parent = of_node_get(parent);
+ if (!parent)
+ return NULL;
+
+ while (parent && *path == '/') {
+ struct device_node *child = NULL;
+ struct device_node *node;
+ const char *next;
+ size_t len;
+
+ /* Skip the initial '/' delimiter and find the next one. */
+ path++;
+ next = strchrnul(path, '/');
+ len = next - path;
+ if (!len)
+ goto error;
+
+ for_each_child_of_node(parent, node) {
+ const char *name = kbasename(node->full_name);
+
+ if (strncmp(path, name, len) == 0 &&
+ strlen(name) == len) {
+ child = node;
+ break;
+ }
+ }
+
+ if (!child)
+ goto error;
+
+ of_node_put(parent);
+ parent = child;
+ path = next;
+ }
+
+ return parent;
+
+error:
+ of_node_put(parent);
+ return NULL;
+}
+
+static int __init rcar_du_of_add_property(struct device_node *np,
+ const char *name, const void *value,
+ size_t length)
+{
+ struct property *prop;
+
+ prop = kzalloc(sizeof(*prop), GFP_KERNEL);
+ if (!prop)
+ return -ENOMEM;
+
+ prop->name = kstrdup(name, GFP_KERNEL);
+ prop->value = kmemdup(value, length, GFP_KERNEL);
+ prop->length = length;
+
+ if (!prop->name || !prop->value) {
+ kfree(prop->name);
+ kfree(prop->value);
+ kfree(prop);
+ return -ENOMEM;
+ }
+
+ of_property_set_flag(prop, OF_DYNAMIC);
+
+ prop->next = np->properties;
+ np->properties = prop;
+
+ return 0;
+}
+
+/* Free properties allocated dynamically by rcar_du_of_add_property(). */
+static void __init rcar_du_of_free_properties(struct device_node *np)
+{
+ while (np->properties) {
+ struct property *prop = np->properties;
+
+ np->properties = prop->next;
+
+ if (OF_IS_DYNAMIC(prop)) {
+ kfree(prop->name);
+ kfree(prop->value);
+ kfree(prop);
+ }
+ }
+}
+
+static int __init rcar_du_of_update_target_path(struct device_node *du,
+ struct device_node *remote,
+ struct device_node *np)
+{
+ struct device_node *target = NULL;
+ struct property **prev;
+ struct property *prop;
+ char *path;
+ int ret;
+
+ for (prop = np->properties, prev = ∝ prop != NULL;
+ prev = &prop->next, prop = prop->next) {
+ if (of_prop_cmp(prop->name, "target-path"))
+ continue;
+
+ if (!of_prop_cmp(prop->value, "soc")) {
+ target = of_get_parent(du);
+ break;
+ }
+ if (!of_prop_cmp(prop->value, "du")) {
+ target = of_node_get(du);
+ break;
+ }
+ if (!of_prop_cmp(prop->value, "lvds-sink")) {
+ target = of_graph_get_port_parent(remote);
+ break;
+ }
+
+ return -EINVAL;
+ }
+
+ if (!target)
+ return -EINVAL;
+
+ path = kasprintf(GFP_KERNEL, "%pOF", target);
+ of_node_put(target);
+ if (!path)
+ return -ENOMEM;
+
+ /*
+ * Remove the existing target-path property that has not been
+ * dynamically allocated and replace it with a new dynamic one to
+ * ensure that the value will be properly freed.
+ */
+ *prev = prop->next;
+ ret = rcar_du_of_add_property(np, "target-path", path,
+ strlen(path) + 1);
+ if (ret < 0) {
+ kfree(path);
+ return ret;
+ }
+
+ return 0;
+}
+
+static void __init rcar_du_of_lvds_patch_one(struct device_node *du,
+ unsigned int port_id,
+ const struct resource *res,
+ const __be32 *reg,
+ const struct of_phandle_args *clkspec,
+ struct device_node *local,
+ struct device_node *remote)
+{
+ struct rcar_du_of_overlay overlay;
+ struct device_node *du_port, *du_port_fixup;
+ struct device_node *lvds_endpoints[2];
+ struct device_node *lvds;
+ struct device_node *fragment;
+ struct property *prop;
+ const char *compatible;
+ const char *soc_suffix;
+ unsigned int psize;
+ unsigned int i;
+ __be32 value[4];
+ char name[23];
+ int ovcs_id;
+ int ret;
+
+ /* Skip if the LVDS node already exists. */
+ sprintf(name, "lvds@%llx", (u64)res->start);
+ lvds = of_get_child_by_name(du->parent, name);
+ if (lvds) {
+ of_node_put(lvds);
+ return;
+ }
+
+ /* Parse the overlay. */
+ ret = rcar_du_of_get_overlay(&overlay, __dtb_rcar_du_of_lvds_begin,
+ __dtb_rcar_du_of_lvds_end);
+ if (ret < 0)
+ return;
+
+ /*
+ * Patch the LVDS and DU port nodes names and the associated fixup
+ * entries.
+ */
+ lvds = rcar_du_of_find_node_by_path(overlay.np,
+ "/fragment@0/__overlay__/lvds");
+ lvds_endpoints[0] = rcar_du_of_find_node_by_path(overlay.np,
+ "/fragment@0/__overlay__/lvds/ports/port@0/endpoint");
+ lvds_endpoints[1] = rcar_du_of_find_node_by_path(overlay.np,
+ "/fragment@0/__overlay__/lvds/ports/port@1/endpoint");
+ du_port = rcar_du_of_find_node_by_path(overlay.np,
+ "/fragment@1/__overlay__/ports/port@0");
+ du_port_fixup = rcar_du_of_find_node_by_path(overlay.np,
+ "/__local_fixups__/fragment@1/__overlay__/ports/port@0");
+ if (!lvds || !lvds_endpoints[0] || !lvds_endpoints[1] ||
+ !du_port || !du_port_fixup)
+ goto out_put_nodes;
+
+ lvds->full_name = kstrdup(name, GFP_KERNEL);
+
+ sprintf(name, "port@%u", port_id);
+ du_port->full_name = kstrdup(name, GFP_KERNEL);
+ du_port_fixup->full_name = kstrdup(name, GFP_KERNEL);
+
+ if (!lvds->full_name || !du_port->full_name ||
+ !du_port_fixup->full_name)
+ goto out_free_names;
+
+ /* Patch the target paths in all fragments. */
+ for_each_child_of_node(overlay.np, fragment) {
+ if (strncmp("fragment@", of_node_full_name(fragment), 9))
+ continue;
+
+ ret = rcar_du_of_update_target_path(du, remote, fragment);
+ if (ret < 0) {
+ of_node_put(fragment);
+ goto out_free_properties;
+ }
+ }
+
+ /*
+ * Create a compatible string for the LVDS node using the SoC model
+ * from the DU node.
+ */
+ ret = of_property_read_string(du, "compatible", &compatible);
+ if (ret < 0)
+ goto out_free_properties;
+
+ soc_suffix = strchr(compatible, '-');
+ if (!soc_suffix || strlen(soc_suffix) > 10)
+ goto out_free_properties;
+
+ psize = sprintf(name, "renesas,lvds%s", soc_suffix) + 1;
+ ret = rcar_du_of_add_property(lvds, "compatible", name, psize);
+ if (ret < 0)
+ goto out_free_properties;
+
+ /* Copy the LVDS reg and clocks properties from the DU node. */
+ psize = (of_n_addr_cells(du) + of_n_size_cells(du)) * 4;
+ ret = rcar_du_of_add_property(lvds, "reg", reg, psize);
+ if (ret < 0)
+ goto out_free_properties;
+
+ if (clkspec->args_count >= ARRAY_SIZE(value) - 1)
+ goto out_free_properties;
+
+ value[0] = cpu_to_be32(clkspec->np->phandle);
+ for (i = 0; i < clkspec->args_count; ++i)
+ value[i + 1] = cpu_to_be32(clkspec->args[i]);
+
+ psize = (clkspec->args_count + 1) * 4;
+ ret = rcar_du_of_add_property(lvds, "clocks", value, psize);
+ if (ret < 0)
+ goto out_free_properties;
+
+ /*
+ * 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.
+ */
+ prop = of_find_property(lvds_endpoints[0], "remote-endpoint", NULL);
+ if (!prop)
+ goto out_free_properties;
+
+ *(__be32 *)prop->value = cpu_to_be32(local->phandle);
+
+ prop = of_find_property(lvds_endpoints[1], "remote-endpoint", NULL);
+ if (!prop)
+ goto out_free_properties;
+
+ *(__be32 *)prop->value = cpu_to_be32(remote->phandle);
+
+ /* Apply the overlay, this will resolve phandles. */
+ ovcs_id = 0;
+ ret = of_overlay_apply(overlay.np, &ovcs_id);
+
+ /* We're done, free all allocated memory. */
+out_free_properties:
+ rcar_du_of_free_properties(lvds);
+ rcar_du_of_free_properties(du_port);
+ rcar_du_of_free_properties(du_port_fixup);
+out_free_names:
+ kfree(lvds->full_name);
+ kfree(du_port->full_name);
+ kfree(du_port_fixup->full_name);
+out_put_nodes:
+ of_node_put(lvds);
+ of_node_put(lvds_endpoints[0]);
+ of_node_put(lvds_endpoints[1]);
+ of_node_put(du_port);
+ of_node_put(du_port_fixup);
+
+ rcar_du_of_free_overlay(&overlay);
+}
+
+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 device_node *du;
+ unsigned int i;
+ int ret;
+
+ /* Get the DU node and exit if not present or disabled. */
+ du = of_find_matching_node_and_match(NULL, of_ids, &match);
+ if (!du || !of_device_is_available(du))
+ goto done;
+
+ info = match->data;
+
+ /* Patch every LVDS encoder. */
+ for (i = 0; i < info->num_lvds; ++i) {
+ struct of_phandle_args clkspec;
+ struct device_node *local, *remote;
+ struct resource res;
+ unsigned int port_id;
+ const __be32 *reg;
+ char name[7];
+ int index;
+
+ /*
+ * Retrieve the register specifier, the clock specifier and the
+ * local and remote endpoints of the LVDS link.
+ */
+ sprintf(name, "lvds.%u", i);
+ index = of_property_match_string(du, "reg-names", name);
+ if (index < 0)
+ continue;
+
+ reg = of_get_address(du, index, NULL, NULL);
+ if (!reg)
+ continue;
+
+ ret = of_address_to_resource(du, index, &res);
+ if (ret < 0)
+ continue;
+
+ index = of_property_match_string(du, "clock-names", name);
+ if (index < 0)
+ continue;
+
+ ret = of_parse_phandle_with_args(du, "clocks", "#clock-cells",
+ index, &clkspec);
+ if (ret < 0)
+ continue;
+
+ port_id = info->routes[RCAR_DU_OUTPUT_LVDS0 + i].port;
+
+ local = of_graph_get_endpoint_by_regs(du, port_id, 0);
+ if (!local) {
+ of_node_put(clkspec.np);
+ continue;
+ }
+
+ remote = of_graph_get_remote_endpoint(local);
+ if (!remote) {
+ of_node_put(local);
+ of_node_put(clkspec.np);
+ continue;
+ }
+
+ /* Patch the LVDS encoder. */
+ rcar_du_of_lvds_patch_one(du, port_id, &res, reg, &clkspec,
+ local, remote);
+
+ of_node_put(clkspec.np);
+ of_node_put(remote);
+ of_node_put(local);
+ }
+
+done:
+ of_node_put(du);
+}
+
+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
new file mode 100644
index 000000000000..d96bb80df4c2
--- /dev/null
+++ b/drivers/gpu/drm/rcar-du/rcar_du_of.h
@@ -0,0 +1,16 @@
+// SPDX-License-Identifier: GPL-2.0-only
+/*
+ * 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;
+
+void __init rcar_du_of_init(const struct of_device_id *of_ids);
+
+#endif /* __RCAR_DU_OF_H__ */
diff --git a/drivers/gpu/drm/rcar-du/rcar_du_of_lvds.dts b/drivers/gpu/drm/rcar-du/rcar_du_of_lvds.dts
new file mode 100644
index 000000000000..89ababf15768
--- /dev/null
+++ b/drivers/gpu/drm/rcar-du/rcar_du_of_lvds.dts
@@ -0,0 +1,82 @@
+// SPDX-License-Identifier: GPL-2.0-only
+/*
+ * rcar_du_of_lvds.dts - Legacy LVDS DT bindings conversion
+ *
+ * Copyright (C) 2018 Laurent Pinchart <laurent.pinchart@ideasonboard.com>
+ *
+ * Based on work from Jyri Sarha <jsarha@ti.com>
+ * Copyright (C) 2015 Texas Instruments
+ */
+
+/*
+ * The target-paths, lvds node name, DU port number and LVDS remote endpoints
+ * will be patched dynamically at runtime.
+ */
+
+/dts-v1/;
+/ {
+ fragment@0 {
+ target-path = "soc";
+ __overlay__ {
+ lvds {
+ ports {
+ #address-cells = <1>;
+ #size-cells = <0>;
+
+ port@0 {
+ reg = <0>;
+ lvds_input: endpoint {
+ remote-endpoint = <0>;
+ };
+ };
+
+ port@1 {
+ reg = <1>;
+ lvds_output: endpoint {
+ remote-endpoint = <0>;
+ };
+ };
+ };
+ };
+ };
+ };
+
+ fragment@1 {
+ target-path = "du";
+ __overlay__ {
+ ports {
+ port@0 {
+ endpoint {
+ remote-endpoint = <&lvds_input>;
+ };
+ };
+ };
+ };
+ };
+
+ fragment@2 {
+ target-path = "lvds-sink";
+ __overlay__ {
+ remote-endpoint = <&lvds_output>;
+ };
+ };
+
+ __local_fixups__ {
+ fragment@1 {
+ __overlay__ {
+ ports {
+ port@0 {
+ endpoint {
+ remote-endpoint = <0>;
+ };
+ };
+ };
+ };
+ };
+ fragment@2 {
+ __overlay__ {
+ remote-endpoint = <0>;
+ };
+ };
+ };
+};
--
Regards,
Laurent Pinchart
^ permalink raw reply related [flat|nested] 63+ messages in thread
* [PATCH 04/10] drm: rcar-du: Convert LVDS encoder code to bridge driver
2018-01-12 0:58 [PATCH 00/10] R-Car DU: Convert LVDS code to bridge driver Laurent Pinchart
` (2 preceding siblings ...)
2018-01-12 0:58 ` [PATCH 03/10] drm: rcar-du: Fix legacy DT to create LVDS encoder nodes Laurent Pinchart
@ 2018-01-12 0:58 ` Laurent Pinchart
2018-01-12 0:58 ` [PATCH 05/10] ARM: dts: porter: Fix HDMI output routing Laurent Pinchart
` (7 subsequent siblings)
11 siblings, 0 replies; 63+ messages in thread
From: Laurent Pinchart @ 2018-01-12 0:58 UTC (permalink / raw)
To: dri-devel; +Cc: linux-renesas-soc, Sergei Shtylyov
The LVDS encoders used to be described in DT as part of the DU. They now
have their own DT node, linked to the DU using the OF graph bindings.
This allows moving internal LVDS encoder support to a separate driver
modelled as a DRM bridge. Backward compatibility is retained as legacy
DT is patched live to move to the new bindings.
Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
---
drivers/gpu/drm/rcar-du/Kconfig | 4 +-
drivers/gpu/drm/rcar-du/Makefile | 4 +-
drivers/gpu/drm/rcar-du/rcar_du_drv.c | 21 +-
drivers/gpu/drm/rcar-du/rcar_du_drv.h | 5 -
drivers/gpu/drm/rcar-du/rcar_du_encoder.c | 175 +---------
drivers/gpu/drm/rcar-du/rcar_du_encoder.h | 12 -
drivers/gpu/drm/rcar-du/rcar_du_kms.c | 14 +-
drivers/gpu/drm/rcar-du/rcar_du_lvdscon.c | 93 -----
drivers/gpu/drm/rcar-du/rcar_du_lvdscon.h | 24 --
drivers/gpu/drm/rcar-du/rcar_du_lvdsenc.c | 270 ---------------
drivers/gpu/drm/rcar-du/rcar_du_lvdsenc.h | 64 ----
drivers/gpu/drm/rcar-du/rcar_lvds.c | 554 ++++++++++++++++++++++++++++++
12 files changed, 591 insertions(+), 649 deletions(-)
delete mode 100644 drivers/gpu/drm/rcar-du/rcar_du_lvdscon.c
delete mode 100644 drivers/gpu/drm/rcar-du/rcar_du_lvdscon.h
delete mode 100644 drivers/gpu/drm/rcar-du/rcar_du_lvdsenc.c
delete mode 100644 drivers/gpu/drm/rcar-du/rcar_du_lvdsenc.h
create mode 100644 drivers/gpu/drm/rcar-du/rcar_lvds.c
diff --git a/drivers/gpu/drm/rcar-du/Kconfig b/drivers/gpu/drm/rcar-du/Kconfig
index e3193ebd3ced..1d6f1b849287 100644
--- a/drivers/gpu/drm/rcar-du/Kconfig
+++ b/drivers/gpu/drm/rcar-du/Kconfig
@@ -19,8 +19,8 @@ config DRM_RCAR_DW_HDMI
Enable support for R-Car Gen3 internal HDMI encoder.
config DRM_RCAR_LVDS
- bool "R-Car DU LVDS Encoder Support"
- depends on DRM_RCAR_DU
+ tristate "R-Car DU LVDS Encoder Support"
+ depends on DRM && DRM_BRIDGE && OF
select DRM_PANEL
select OF_OVERLAY
help
diff --git a/drivers/gpu/drm/rcar-du/Makefile b/drivers/gpu/drm/rcar-du/Makefile
index 0cf457bef1f2..d2ae53efd982 100644
--- a/drivers/gpu/drm/rcar-du/Makefile
+++ b/drivers/gpu/drm/rcar-du/Makefile
@@ -4,14 +4,12 @@ rcar-du-drm-y := rcar_du_crtc.o \
rcar_du_encoder.o \
rcar_du_group.o \
rcar_du_kms.o \
- rcar_du_lvdscon.o \
rcar_du_of.o \
rcar_du_of_lvds.dtb.o \
rcar_du_plane.o
-rcar-du-drm-$(CONFIG_DRM_RCAR_LVDS) += rcar_du_lvdsenc.o
-
rcar-du-drm-$(CONFIG_DRM_RCAR_VSP) += rcar_du_vsp.o
obj-$(CONFIG_DRM_RCAR_DU) += rcar-du-drm.o
obj-$(CONFIG_DRM_RCAR_DW_HDMI) += rcar_dw_hdmi.o
+obj-$(CONFIG_DRM_RCAR_LVDS) += rcar_lvds.o
diff --git a/drivers/gpu/drm/rcar-du/rcar_du_drv.c b/drivers/gpu/drm/rcar-du/rcar_du_drv.c
index 6e02c762a557..06a3fbdd728a 100644
--- a/drivers/gpu/drm/rcar-du/rcar_du_drv.c
+++ b/drivers/gpu/drm/rcar-du/rcar_du_drv.c
@@ -29,6 +29,7 @@
#include "rcar_du_drv.h"
#include "rcar_du_kms.h"
+#include "rcar_du_of.h"
#include "rcar_du_regs.h"
/* -----------------------------------------------------------------------------
@@ -74,7 +75,6 @@ static const struct rcar_du_device_info rzg1_du_r8a7745_info = {
.port = 1,
},
},
- .num_lvds = 0,
};
static const struct rcar_du_device_info rcar_du_r8a7779_info = {
@@ -95,14 +95,13 @@ static const struct rcar_du_device_info rcar_du_r8a7779_info = {
.port = 1,
},
},
- .num_lvds = 0,
};
static const struct rcar_du_device_info rcar_du_r8a7790_info = {
.gen = 2,
.features = RCAR_DU_FEATURE_CRTC_IRQ_CLOCK
| RCAR_DU_FEATURE_EXT_CTRL_REGS,
- .quirks = RCAR_DU_QUIRK_ALIGN_128B | RCAR_DU_QUIRK_LVDS_LANES,
+ .quirks = RCAR_DU_QUIRK_ALIGN_128B,
.num_crtcs = 3,
.routes = {
/*
@@ -164,7 +163,6 @@ static const struct rcar_du_device_info rcar_du_r8a7792_info = {
.port = 1,
},
},
- .num_lvds = 0,
};
static const struct rcar_du_device_info rcar_du_r8a7794_info = {
@@ -186,7 +184,6 @@ static const struct rcar_du_device_info rcar_du_r8a7794_info = {
.port = 1,
},
},
- .num_lvds = 0,
};
static const struct rcar_du_device_info rcar_du_r8a7795_info = {
@@ -434,7 +431,19 @@ static struct platform_driver rcar_du_platform_driver = {
},
};
-module_platform_driver(rcar_du_platform_driver);
+static int __init rcar_du_init(void)
+{
+ 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_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_drv.h b/drivers/gpu/drm/rcar-du/rcar_du_drv.h
index f400fde65a0c..5c7ec15818c7 100644
--- a/drivers/gpu/drm/rcar-du/rcar_du_drv.h
+++ b/drivers/gpu/drm/rcar-du/rcar_du_drv.h
@@ -26,14 +26,12 @@ struct device;
struct drm_device;
struct drm_fbdev_cma;
struct rcar_du_device;
-struct rcar_du_lvdsenc;
#define RCAR_DU_FEATURE_CRTC_IRQ_CLOCK (1 << 0) /* Per-CRTC IRQ and clock */
#define RCAR_DU_FEATURE_EXT_CTRL_REGS (1 << 1) /* Has extended control registers */
#define RCAR_DU_FEATURE_VSP1_SOURCE (1 << 2) /* Has inputs from VSP1 */
#define RCAR_DU_QUIRK_ALIGN_128B (1 << 0) /* Align pitches to 128 bytes */
-#define RCAR_DU_QUIRK_LVDS_LANES (1 << 1) /* LVDS lanes 1 and 3 inverted */
/*
* struct rcar_du_output_routing - Output routing specification
@@ -70,7 +68,6 @@ struct rcar_du_device_info {
#define RCAR_DU_MAX_CRTCS 4
#define RCAR_DU_MAX_GROUPS DIV_ROUND_UP(RCAR_DU_MAX_CRTCS, 2)
-#define RCAR_DU_MAX_LVDS 2
#define RCAR_DU_MAX_VSPS 4
struct rcar_du_device {
@@ -96,8 +93,6 @@ struct rcar_du_device {
unsigned int dpad0_source;
unsigned int vspd1_sink;
-
- struct rcar_du_lvdsenc *lvds[RCAR_DU_MAX_LVDS];
};
static inline bool rcar_du_has(struct rcar_du_device *rcdu,
diff --git a/drivers/gpu/drm/rcar-du/rcar_du_encoder.c b/drivers/gpu/drm/rcar-du/rcar_du_encoder.c
index ba8d2804c1d1..f9c933d3bae6 100644
--- a/drivers/gpu/drm/rcar-du/rcar_du_encoder.c
+++ b/drivers/gpu/drm/rcar-du/rcar_du_encoder.c
@@ -21,134 +21,22 @@
#include "rcar_du_drv.h"
#include "rcar_du_encoder.h"
#include "rcar_du_kms.h"
-#include "rcar_du_lvdscon.h"
-#include "rcar_du_lvdsenc.h"
/* -----------------------------------------------------------------------------
* Encoder
*/
-static void rcar_du_encoder_disable(struct drm_encoder *encoder)
-{
- struct rcar_du_encoder *renc = to_rcar_encoder(encoder);
-
- if (renc->connector && renc->connector->panel) {
- drm_panel_disable(renc->connector->panel);
- drm_panel_unprepare(renc->connector->panel);
- }
-
- if (renc->lvds)
- rcar_du_lvdsenc_enable(renc->lvds, encoder->crtc, false);
-}
-
-static void rcar_du_encoder_enable(struct drm_encoder *encoder)
-{
- struct rcar_du_encoder *renc = to_rcar_encoder(encoder);
-
- if (renc->lvds)
- rcar_du_lvdsenc_enable(renc->lvds, encoder->crtc, true);
-
- if (renc->connector && renc->connector->panel) {
- drm_panel_prepare(renc->connector->panel);
- drm_panel_enable(renc->connector->panel);
- }
-}
-
-static int rcar_du_encoder_atomic_check(struct drm_encoder *encoder,
- struct drm_crtc_state *crtc_state,
- struct drm_connector_state *conn_state)
-{
- struct rcar_du_encoder *renc = to_rcar_encoder(encoder);
- struct drm_display_mode *adjusted_mode = &crtc_state->adjusted_mode;
- const struct drm_display_mode *mode = &crtc_state->mode;
- struct drm_connector *connector = conn_state->connector;
- struct drm_device *dev = encoder->dev;
-
- /*
- * Only panel-related encoder types require validation here, everything
- * else is handled by the bridge drivers.
- */
- if (connector->connector_type == DRM_MODE_CONNECTOR_LVDS) {
- const struct drm_display_mode *panel_mode;
-
- if (list_empty(&connector->modes)) {
- dev_dbg(dev->dev, "encoder: empty modes list\n");
- return -EINVAL;
- }
-
- panel_mode = list_first_entry(&connector->modes,
- struct drm_display_mode, head);
-
- /* We're not allowed to modify the resolution. */
- if (mode->hdisplay != panel_mode->hdisplay ||
- mode->vdisplay != panel_mode->vdisplay)
- return -EINVAL;
-
- /*
- * The flat panel mode is fixed, just copy it to the adjusted
- * mode.
- */
- drm_mode_copy(adjusted_mode, panel_mode);
- }
-
- if (renc->lvds)
- rcar_du_lvdsenc_atomic_check(renc->lvds, adjusted_mode);
-
- return 0;
-}
-
static void rcar_du_encoder_mode_set(struct drm_encoder *encoder,
struct drm_crtc_state *crtc_state,
struct drm_connector_state *conn_state)
{
struct rcar_du_encoder *renc = to_rcar_encoder(encoder);
- struct drm_display_info *info = &conn_state->connector->display_info;
- enum rcar_lvds_mode mode;
rcar_du_crtc_route_output(crtc_state->crtc, renc->output);
-
- if (!renc->lvds) {
- /*
- * The DU driver creates connectors only for the outputs of the
- * internal LVDS encoders.
- */
- renc->connector = NULL;
- return;
- }
-
- renc->connector = to_rcar_connector(conn_state->connector);
-
- if (!info->num_bus_formats || !info->bus_formats) {
- dev_err(encoder->dev->dev, "no LVDS bus format reported\n");
- return;
- }
-
- switch (info->bus_formats[0]) {
- case MEDIA_BUS_FMT_RGB666_1X7X3_SPWG:
- case MEDIA_BUS_FMT_RGB888_1X7X4_JEIDA:
- mode = RCAR_LVDS_MODE_JEIDA;
- break;
- case MEDIA_BUS_FMT_RGB888_1X7X4_SPWG:
- mode = RCAR_LVDS_MODE_VESA;
- break;
- default:
- dev_err(encoder->dev->dev,
- "unsupported LVDS bus format 0x%04x\n",
- info->bus_formats[0]);
- return;
- }
-
- if (info->bus_flags & DRM_BUS_FLAG_DATA_LSB_TO_MSB)
- mode |= RCAR_LVDS_MODE_MIRROR;
-
- rcar_du_lvdsenc_set_mode(renc->lvds, mode);
}
static const struct drm_encoder_helper_funcs encoder_helper_funcs = {
.atomic_mode_set = rcar_du_encoder_mode_set,
- .disable = rcar_du_encoder_disable,
- .enable = rcar_du_encoder_enable,
- .atomic_check = rcar_du_encoder_atomic_check,
};
static const struct drm_encoder_funcs encoder_funcs = {
@@ -172,33 +60,14 @@ int rcar_du_encoder_init(struct rcar_du_device *rcdu,
renc->output = output;
encoder = rcar_encoder_to_drm_encoder(renc);
- switch (output) {
- case RCAR_DU_OUTPUT_LVDS0:
- renc->lvds = rcdu->lvds[0];
- break;
+ dev_dbg(rcdu->dev, "initializing encoder %pOF for output %u\n",
+ enc_node, output);
- case RCAR_DU_OUTPUT_LVDS1:
- renc->lvds = rcdu->lvds[1];
- break;
-
- default:
- break;
- }
-
- if (enc_node) {
- dev_dbg(rcdu->dev, "initializing encoder %pOF for output %u\n",
- enc_node, output);
-
- /* Locate the DRM bridge from the encoder DT node. */
- bridge = of_drm_find_bridge(enc_node);
- if (!bridge) {
- ret = -EPROBE_DEFER;
- goto done;
- }
- } else {
- dev_dbg(rcdu->dev,
- "initializing internal encoder for output %u\n",
- output);
+ /* Locate the DRM bridge from the encoder DT node. */
+ bridge = of_drm_find_bridge(enc_node);
+ if (!bridge) {
+ ret = -EPROBE_DEFER;
+ goto done;
}
ret = drm_encoder_init(rcdu->ddev, encoder, &encoder_funcs,
@@ -208,28 +77,14 @@ int rcar_du_encoder_init(struct rcar_du_device *rcdu,
drm_encoder_helper_add(encoder, &encoder_helper_funcs);
- if (bridge) {
- /*
- * Attach the bridge to the encoder. The bridge will create the
- * connector.
- */
- ret = drm_bridge_attach(encoder, bridge, NULL);
- if (ret) {
- drm_encoder_cleanup(encoder);
- return ret;
- }
- } else {
- /* There's no bridge, create the connector manually. */
- switch (output) {
- case RCAR_DU_OUTPUT_LVDS0:
- case RCAR_DU_OUTPUT_LVDS1:
- ret = rcar_du_lvds_connector_init(rcdu, renc, con_node);
- break;
-
- default:
- ret = -EINVAL;
- break;
- }
+ /*
+ * Attach the bridge to the encoder. The bridge will create the
+ * connector.
+ */
+ ret = drm_bridge_attach(encoder, bridge, NULL);
+ if (ret) {
+ drm_encoder_cleanup(encoder);
+ return ret;
}
done:
diff --git a/drivers/gpu/drm/rcar-du/rcar_du_encoder.h b/drivers/gpu/drm/rcar-du/rcar_du_encoder.h
index 5422fa4df272..2d2abcacd169 100644
--- a/drivers/gpu/drm/rcar-du/rcar_du_encoder.h
+++ b/drivers/gpu/drm/rcar-du/rcar_du_encoder.h
@@ -19,13 +19,10 @@
struct drm_panel;
struct rcar_du_device;
-struct rcar_du_lvdsenc;
struct rcar_du_encoder {
struct drm_encoder base;
enum rcar_du_output output;
- struct rcar_du_connector *connector;
- struct rcar_du_lvdsenc *lvds;
};
#define to_rcar_encoder(e) \
@@ -33,15 +30,6 @@ struct rcar_du_encoder {
#define rcar_encoder_to_drm_encoder(e) (&(e)->base)
-struct rcar_du_connector {
- struct drm_connector connector;
- struct rcar_du_encoder *encoder;
- struct drm_panel *panel;
-};
-
-#define to_rcar_connector(c) \
- container_of(c, struct rcar_du_connector, connector)
-
int rcar_du_encoder_init(struct rcar_du_device *rcdu,
enum rcar_du_output output,
struct device_node *enc_node,
diff --git a/drivers/gpu/drm/rcar-du/rcar_du_kms.c b/drivers/gpu/drm/rcar-du/rcar_du_kms.c
index 566d1a948c8f..0329b354bfa0 100644
--- a/drivers/gpu/drm/rcar-du/rcar_du_kms.c
+++ b/drivers/gpu/drm/rcar-du/rcar_du_kms.c
@@ -27,7 +27,6 @@
#include "rcar_du_drv.h"
#include "rcar_du_encoder.h"
#include "rcar_du_kms.h"
-#include "rcar_du_lvdsenc.h"
#include "rcar_du_regs.h"
#include "rcar_du_vsp.h"
@@ -341,11 +340,10 @@ static int rcar_du_encoders_init_one(struct rcar_du_device *rcdu,
of_node_put(entity_ep_node);
if (!encoder) {
- /*
- * If no encoder has been found the entity must be the
- * connector.
- */
- connector = entity;
+ dev_warn(rcdu->dev,
+ "no encoder found for endpoint %pOF, skipping\n",
+ ep->local_node);
+ return -ENODEV;
}
ret = rcar_du_encoder_init(rcdu, output, encoder, connector);
@@ -595,10 +593,6 @@ int rcar_du_modeset_init(struct rcar_du_device *rcdu)
}
/* Initialize the encoders. */
- ret = rcar_du_lvdsenc_init(rcdu);
- if (ret < 0)
- return ret;
-
ret = rcar_du_encoders_init(rcdu);
if (ret < 0)
return ret;
diff --git a/drivers/gpu/drm/rcar-du/rcar_du_lvdscon.c b/drivers/gpu/drm/rcar-du/rcar_du_lvdscon.c
deleted file mode 100644
index e96f2df0c305..000000000000
--- a/drivers/gpu/drm/rcar-du/rcar_du_lvdscon.c
+++ /dev/null
@@ -1,93 +0,0 @@
-/*
- * rcar_du_lvdscon.c -- R-Car Display Unit LVDS Connector
- *
- * Copyright (C) 2013-2014 Renesas Electronics Corporation
- *
- * Contact: Laurent Pinchart (laurent.pinchart@ideasonboard.com)
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- */
-
-#include <drm/drmP.h>
-#include <drm/drm_atomic_helper.h>
-#include <drm/drm_crtc.h>
-#include <drm/drm_crtc_helper.h>
-#include <drm/drm_panel.h>
-
-#include <video/display_timing.h>
-#include <video/of_display_timing.h>
-#include <video/videomode.h>
-
-#include "rcar_du_drv.h"
-#include "rcar_du_encoder.h"
-#include "rcar_du_kms.h"
-#include "rcar_du_lvdscon.h"
-
-static int rcar_du_lvds_connector_get_modes(struct drm_connector *connector)
-{
- struct rcar_du_connector *rcon = to_rcar_connector(connector);
-
- return drm_panel_get_modes(rcon->panel);
-}
-
-static const struct drm_connector_helper_funcs connector_helper_funcs = {
- .get_modes = rcar_du_lvds_connector_get_modes,
-};
-
-static void rcar_du_lvds_connector_destroy(struct drm_connector *connector)
-{
- struct rcar_du_connector *rcon = to_rcar_connector(connector);
-
- drm_panel_detach(rcon->panel);
- drm_connector_cleanup(connector);
-}
-
-static const struct drm_connector_funcs connector_funcs = {
- .reset = drm_atomic_helper_connector_reset,
- .fill_modes = drm_helper_probe_single_connector_modes,
- .destroy = rcar_du_lvds_connector_destroy,
- .atomic_duplicate_state = drm_atomic_helper_connector_duplicate_state,
- .atomic_destroy_state = drm_atomic_helper_connector_destroy_state,
-};
-
-int rcar_du_lvds_connector_init(struct rcar_du_device *rcdu,
- struct rcar_du_encoder *renc,
- const struct device_node *np)
-{
- struct drm_encoder *encoder = rcar_encoder_to_drm_encoder(renc);
- struct rcar_du_connector *rcon;
- struct drm_connector *connector;
- int ret;
-
- rcon = devm_kzalloc(rcdu->dev, sizeof(*rcon), GFP_KERNEL);
- if (rcon == NULL)
- return -ENOMEM;
-
- connector = &rcon->connector;
-
- rcon->panel = of_drm_find_panel(np);
- if (!rcon->panel)
- return -EPROBE_DEFER;
-
- ret = drm_connector_init(rcdu->ddev, connector, &connector_funcs,
- DRM_MODE_CONNECTOR_LVDS);
- if (ret < 0)
- return ret;
-
- drm_connector_helper_add(connector, &connector_helper_funcs);
-
- ret = drm_mode_connector_attach_encoder(connector, encoder);
- if (ret < 0)
- return ret;
-
- ret = drm_panel_attach(rcon->panel, connector);
- if (ret < 0)
- return ret;
-
- rcon->encoder = renc;
-
- return 0;
-}
diff --git a/drivers/gpu/drm/rcar-du/rcar_du_lvdscon.h b/drivers/gpu/drm/rcar-du/rcar_du_lvdscon.h
deleted file mode 100644
index 639071dd235c..000000000000
--- a/drivers/gpu/drm/rcar-du/rcar_du_lvdscon.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * rcar_du_lvdscon.h -- R-Car Display Unit LVDS Connector
- *
- * Copyright (C) 2013-2014 Renesas Electronics Corporation
- *
- * Contact: Laurent Pinchart (laurent.pinchart@ideasonboard.com)
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- */
-
-#ifndef __RCAR_DU_LVDSCON_H__
-#define __RCAR_DU_LVDSCON_H__
-
-struct rcar_du_device;
-struct rcar_du_encoder;
-
-int rcar_du_lvds_connector_init(struct rcar_du_device *rcdu,
- struct rcar_du_encoder *renc,
- const struct device_node *np);
-
-#endif /* __RCAR_DU_LVDSCON_H__ */
diff --git a/drivers/gpu/drm/rcar-du/rcar_du_lvdsenc.c b/drivers/gpu/drm/rcar-du/rcar_du_lvdsenc.c
deleted file mode 100644
index 553bab7b3b1e..000000000000
--- a/drivers/gpu/drm/rcar-du/rcar_du_lvdsenc.c
+++ /dev/null
@@ -1,270 +0,0 @@
-/*
- * rcar_du_lvdsenc.c -- R-Car Display Unit LVDS Encoder
- *
- * Copyright (C) 2013-2014 Renesas Electronics Corporation
- *
- * Contact: Laurent Pinchart (laurent.pinchart@ideasonboard.com)
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- */
-
-#include <linux/clk.h>
-#include <linux/delay.h>
-#include <linux/io.h>
-#include <linux/platform_device.h>
-#include <linux/slab.h>
-
-#include "rcar_du_drv.h"
-#include "rcar_du_encoder.h"
-#include "rcar_du_lvdsenc.h"
-#include "rcar_lvds_regs.h"
-
-struct rcar_du_lvdsenc {
- struct rcar_du_device *dev;
-
- unsigned int index;
- void __iomem *mmio;
- struct clk *clock;
- bool enabled;
-
- enum rcar_lvds_input input;
- enum rcar_lvds_mode mode;
-};
-
-static void rcar_lvds_write(struct rcar_du_lvdsenc *lvds, u32 reg, u32 data)
-{
- iowrite32(data, lvds->mmio + reg);
-}
-
-static void rcar_du_lvdsenc_start_gen2(struct rcar_du_lvdsenc *lvds,
- struct rcar_du_crtc *rcrtc)
-{
- const struct drm_display_mode *mode = &rcrtc->crtc.mode;
- unsigned int freq = mode->clock;
- u32 lvdcr0;
- u32 pllcr;
-
- /* PLL clock configuration */
- if (freq < 39000)
- pllcr = LVDPLLCR_CEEN | LVDPLLCR_COSEL | LVDPLLCR_PLLDLYCNT_38M;
- else if (freq < 61000)
- pllcr = LVDPLLCR_CEEN | LVDPLLCR_COSEL | LVDPLLCR_PLLDLYCNT_60M;
- else if (freq < 121000)
- pllcr = LVDPLLCR_CEEN | LVDPLLCR_COSEL | LVDPLLCR_PLLDLYCNT_121M;
- else
- pllcr = LVDPLLCR_PLLDLYCNT_150M;
-
- rcar_lvds_write(lvds, LVDPLLCR, pllcr);
-
- /*
- * Select the input, hardcode mode 0, enable LVDS operation and turn
- * bias circuitry on.
- */
- lvdcr0 = (lvds->mode << LVDCR0_LVMD_SHIFT) | LVDCR0_BEN | LVDCR0_LVEN;
- if (rcrtc->index == 2)
- lvdcr0 |= LVDCR0_DUSEL;
- rcar_lvds_write(lvds, LVDCR0, lvdcr0);
-
- /* Turn all the channels on. */
- rcar_lvds_write(lvds, LVDCR1,
- LVDCR1_CHSTBY(3) | LVDCR1_CHSTBY(2) |
- LVDCR1_CHSTBY(1) | LVDCR1_CHSTBY(0) | LVDCR1_CLKSTBY);
-
- /*
- * Turn the PLL on, wait for the startup delay, and turn the output
- * on.
- */
- lvdcr0 |= LVDCR0_PLLON;
- rcar_lvds_write(lvds, LVDCR0, lvdcr0);
-
- usleep_range(100, 150);
-
- lvdcr0 |= LVDCR0_LVRES;
- rcar_lvds_write(lvds, LVDCR0, lvdcr0);
-}
-
-static void rcar_du_lvdsenc_start_gen3(struct rcar_du_lvdsenc *lvds,
- struct rcar_du_crtc *rcrtc)
-{
- const struct drm_display_mode *mode = &rcrtc->crtc.mode;
- unsigned int freq = mode->clock;
- u32 lvdcr0;
- u32 pllcr;
-
- /* PLL clock configuration */
- if (freq < 42000)
- pllcr = LVDPLLCR_PLLDIVCNT_42M;
- else if (freq < 85000)
- pllcr = LVDPLLCR_PLLDIVCNT_85M;
- else if (freq < 128000)
- pllcr = LVDPLLCR_PLLDIVCNT_128M;
- else
- pllcr = LVDPLLCR_PLLDIVCNT_148M;
-
- rcar_lvds_write(lvds, LVDPLLCR, pllcr);
-
- /* Turn all the channels on. */
- rcar_lvds_write(lvds, LVDCR1,
- LVDCR1_CHSTBY(3) | LVDCR1_CHSTBY(2) |
- LVDCR1_CHSTBY(1) | LVDCR1_CHSTBY(0) | LVDCR1_CLKSTBY);
-
- /*
- * Turn the PLL on, set it to LVDS normal mode, wait for the startup
- * delay and turn the output on.
- */
- lvdcr0 = (lvds->mode << LVDCR0_LVMD_SHIFT) | LVDCR0_PLLON;
- rcar_lvds_write(lvds, LVDCR0, lvdcr0);
-
- lvdcr0 |= LVDCR0_PWD;
- rcar_lvds_write(lvds, LVDCR0, lvdcr0);
-
- usleep_range(100, 150);
-
- lvdcr0 |= LVDCR0_LVRES;
- rcar_lvds_write(lvds, LVDCR0, lvdcr0);
-}
-
-static int rcar_du_lvdsenc_start(struct rcar_du_lvdsenc *lvds,
- struct rcar_du_crtc *rcrtc)
-{
- u32 lvdhcr;
- int ret;
-
- if (lvds->enabled)
- return 0;
-
- ret = clk_prepare_enable(lvds->clock);
- if (ret < 0)
- return ret;
-
- /*
- * Hardcode the channels and control signals routing for now.
- *
- * HSYNC -> CTRL0
- * VSYNC -> CTRL1
- * DISP -> CTRL2
- * 0 -> CTRL3
- */
- rcar_lvds_write(lvds, LVDCTRCR, LVDCTRCR_CTR3SEL_ZERO |
- LVDCTRCR_CTR2SEL_DISP | LVDCTRCR_CTR1SEL_VSYNC |
- LVDCTRCR_CTR0SEL_HSYNC);
-
- if (rcar_du_needs(lvds->dev, RCAR_DU_QUIRK_LVDS_LANES))
- lvdhcr = LVDCHCR_CHSEL_CH(0, 0) | LVDCHCR_CHSEL_CH(1, 3)
- | LVDCHCR_CHSEL_CH(2, 2) | LVDCHCR_CHSEL_CH(3, 1);
- else
- lvdhcr = LVDCHCR_CHSEL_CH(0, 0) | LVDCHCR_CHSEL_CH(1, 1)
- | LVDCHCR_CHSEL_CH(2, 2) | LVDCHCR_CHSEL_CH(3, 3);
-
- rcar_lvds_write(lvds, LVDCHCR, lvdhcr);
-
- /* Perform generation-specific initialization. */
- if (lvds->dev->info->gen < 3)
- rcar_du_lvdsenc_start_gen2(lvds, rcrtc);
- else
- rcar_du_lvdsenc_start_gen3(lvds, rcrtc);
-
- lvds->enabled = true;
-
- return 0;
-}
-
-static void rcar_du_lvdsenc_stop(struct rcar_du_lvdsenc *lvds)
-{
- if (!lvds->enabled)
- return;
-
- rcar_lvds_write(lvds, LVDCR0, 0);
- rcar_lvds_write(lvds, LVDCR1, 0);
-
- clk_disable_unprepare(lvds->clock);
-
- lvds->enabled = false;
-}
-
-int rcar_du_lvdsenc_enable(struct rcar_du_lvdsenc *lvds, struct drm_crtc *crtc,
- bool enable)
-{
- if (!enable) {
- rcar_du_lvdsenc_stop(lvds);
- return 0;
- } else if (crtc) {
- struct rcar_du_crtc *rcrtc = to_rcar_crtc(crtc);
- return rcar_du_lvdsenc_start(lvds, rcrtc);
- } else
- return -EINVAL;
-}
-
-void rcar_du_lvdsenc_atomic_check(struct rcar_du_lvdsenc *lvds,
- struct drm_display_mode *mode)
-{
- struct rcar_du_device *rcdu = lvds->dev;
-
- /*
- * The internal LVDS encoder has a restricted clock frequency operating
- * range (30MHz to 150MHz on Gen2, 25.175MHz to 148.5MHz on Gen3). Clamp
- * the clock accordingly.
- */
- if (rcdu->info->gen < 3)
- mode->clock = clamp(mode->clock, 30000, 150000);
- else
- mode->clock = clamp(mode->clock, 25175, 148500);
-}
-
-void rcar_du_lvdsenc_set_mode(struct rcar_du_lvdsenc *lvds,
- enum rcar_lvds_mode mode)
-{
- lvds->mode = mode;
-}
-
-static int rcar_du_lvdsenc_get_resources(struct rcar_du_lvdsenc *lvds,
- struct platform_device *pdev)
-{
- struct resource *mem;
- char name[7];
-
- sprintf(name, "lvds.%u", lvds->index);
-
- mem = platform_get_resource_byname(pdev, IORESOURCE_MEM, name);
- lvds->mmio = devm_ioremap_resource(&pdev->dev, mem);
- if (IS_ERR(lvds->mmio))
- return PTR_ERR(lvds->mmio);
-
- lvds->clock = devm_clk_get(&pdev->dev, name);
- if (IS_ERR(lvds->clock)) {
- dev_err(&pdev->dev, "failed to get clock for %s\n", name);
- return PTR_ERR(lvds->clock);
- }
-
- return 0;
-}
-
-int rcar_du_lvdsenc_init(struct rcar_du_device *rcdu)
-{
- struct platform_device *pdev = to_platform_device(rcdu->dev);
- struct rcar_du_lvdsenc *lvds;
- unsigned int i;
- int ret;
-
- for (i = 0; i < rcdu->info->num_lvds; ++i) {
- lvds = devm_kzalloc(&pdev->dev, sizeof(*lvds), GFP_KERNEL);
- if (lvds == NULL)
- return -ENOMEM;
-
- lvds->dev = rcdu;
- lvds->index = i;
- lvds->input = i ? RCAR_LVDS_INPUT_DU1 : RCAR_LVDS_INPUT_DU0;
- lvds->enabled = false;
-
- ret = rcar_du_lvdsenc_get_resources(lvds, pdev);
- if (ret < 0)
- return ret;
-
- rcdu->lvds[i] = lvds;
- }
-
- return 0;
-}
diff --git a/drivers/gpu/drm/rcar-du/rcar_du_lvdsenc.h b/drivers/gpu/drm/rcar-du/rcar_du_lvdsenc.h
deleted file mode 100644
index 7218ac89333e..000000000000
--- a/drivers/gpu/drm/rcar-du/rcar_du_lvdsenc.h
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * rcar_du_lvdsenc.h -- R-Car Display Unit LVDS Encoder
- *
- * Copyright (C) 2013-2014 Renesas Electronics Corporation
- *
- * Contact: Laurent Pinchart (laurent.pinchart@ideasonboard.com)
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- */
-
-#ifndef __RCAR_DU_LVDSENC_H__
-#define __RCAR_DU_LVDSENC_H__
-
-#include <linux/io.h>
-#include <linux/module.h>
-
-struct rcar_drm_crtc;
-struct rcar_du_lvdsenc;
-
-enum rcar_lvds_input {
- RCAR_LVDS_INPUT_DU0,
- RCAR_LVDS_INPUT_DU1,
- RCAR_LVDS_INPUT_DU2,
-};
-
-/* Keep in sync with the LVDCR0.LVMD hardware register values. */
-enum rcar_lvds_mode {
- RCAR_LVDS_MODE_JEIDA = 0,
- RCAR_LVDS_MODE_MIRROR = 1,
- RCAR_LVDS_MODE_VESA = 4,
-};
-
-#if IS_ENABLED(CONFIG_DRM_RCAR_LVDS)
-int rcar_du_lvdsenc_init(struct rcar_du_device *rcdu);
-void rcar_du_lvdsenc_set_mode(struct rcar_du_lvdsenc *lvds,
- enum rcar_lvds_mode mode);
-int rcar_du_lvdsenc_enable(struct rcar_du_lvdsenc *lvds,
- struct drm_crtc *crtc, bool enable);
-void rcar_du_lvdsenc_atomic_check(struct rcar_du_lvdsenc *lvds,
- struct drm_display_mode *mode);
-#else
-static inline int rcar_du_lvdsenc_init(struct rcar_du_device *rcdu)
-{
- return 0;
-}
-static inline void rcar_du_lvdsenc_set_mode(struct rcar_du_lvdsenc *lvds,
- enum rcar_lvds_mode mode)
-{
-}
-static inline int rcar_du_lvdsenc_enable(struct rcar_du_lvdsenc *lvds,
- struct drm_crtc *crtc, bool enable)
-{
- return 0;
-}
-static inline void rcar_du_lvdsenc_atomic_check(struct rcar_du_lvdsenc *lvds,
- struct drm_display_mode *mode)
-{
-}
-#endif
-
-#endif /* __RCAR_DU_LVDSENC_H__ */
diff --git a/drivers/gpu/drm/rcar-du/rcar_lvds.c b/drivers/gpu/drm/rcar-du/rcar_lvds.c
new file mode 100644
index 000000000000..250e8511a378
--- /dev/null
+++ b/drivers/gpu/drm/rcar-du/rcar_lvds.c
@@ -0,0 +1,554 @@
+// SPDX-License-Identifier: GPL-2.0-only
+/*
+ * rcar_lvds.c -- R-Car LVDS Encoder
+ *
+ * Copyright (C) 2013-2014 Renesas Electronics Corporation
+ *
+ * Contact: Laurent Pinchart (laurent.pinchart@ideasonboard.com)
+ */
+
+#include <linux/clk.h>
+#include <linux/delay.h>
+#include <linux/io.h>
+#include <linux/of.h>
+#include <linux/of_device.h>
+#include <linux/of_graph.h>
+#include <linux/platform_device.h>
+#include <linux/slab.h>
+
+#include <drm/drm_atomic.h>
+#include <drm/drm_atomic_helper.h>
+#include <drm/drm_bridge.h>
+#include <drm/drm_crtc_helper.h>
+#include <drm/drm_panel.h>
+
+#include "rcar_lvds_regs.h"
+
+/* Keep in sync with the LVDCR0.LVMD hardware register values. */
+enum rcar_lvds_mode {
+ RCAR_LVDS_MODE_JEIDA = 0,
+ RCAR_LVDS_MODE_MIRROR = 1,
+ RCAR_LVDS_MODE_VESA = 4,
+};
+
+#define RCAR_LVDS_QUIRK_LANES (1 << 0) /* LVDS lanes 1 and 3 inverted */
+
+struct rcar_lvds_device_info {
+ unsigned int gen;
+ unsigned int quirks;
+};
+
+struct rcar_lvds {
+ struct device *dev;
+ const struct rcar_lvds_device_info *info;
+
+ struct drm_bridge bridge;
+
+ struct drm_bridge *next_bridge;
+ struct drm_connector connector;
+ struct drm_panel *panel;
+
+ void __iomem *mmio;
+ struct clk *clock;
+ bool enabled;
+
+ struct drm_display_mode display_mode;
+ enum rcar_lvds_mode mode;
+};
+
+#define bridge_to_rcar_lvds(bridge) \
+ container_of(bridge, struct rcar_lvds, bridge)
+
+#define connector_to_rcar_lvds(connector) \
+ container_of(connector, struct rcar_lvds, connector)
+
+static void rcar_lvds_write(struct rcar_lvds *lvds, u32 reg, u32 data)
+{
+ iowrite32(data, lvds->mmio + reg);
+}
+
+/* -----------------------------------------------------------------------------
+ * Connector & Panel
+ */
+
+static int rcar_lvds_connector_get_modes(struct drm_connector *connector)
+{
+ struct rcar_lvds *lvds = connector_to_rcar_lvds(connector);
+
+ return drm_panel_get_modes(lvds->panel);
+}
+
+static int rcar_lvds_connector_atomic_check(struct drm_connector *connector,
+ struct drm_connector_state *state)
+{
+ struct rcar_lvds *lvds = connector_to_rcar_lvds(connector);
+ const struct drm_display_mode *panel_mode;
+ struct drm_crtc_state *crtc_state;
+
+ if (list_empty(&connector->modes)) {
+ dev_dbg(lvds->dev, "connector: empty modes list\n");
+ return -EINVAL;
+ }
+
+ panel_mode = list_first_entry(&connector->modes,
+ struct drm_display_mode, head);
+
+ /* We're not allowed to modify the resolution. */
+ crtc_state = drm_atomic_get_crtc_state(state->state, state->crtc);
+ if (IS_ERR(crtc_state))
+ return PTR_ERR(crtc_state);
+
+ if (crtc_state->mode.hdisplay != panel_mode->hdisplay ||
+ crtc_state->mode.vdisplay != panel_mode->vdisplay)
+ return -EINVAL;
+
+ /* The flat panel mode is fixed, just copy it to the adjusted mode. */
+ drm_mode_copy(&crtc_state->adjusted_mode, panel_mode);
+
+ return 0;
+}
+
+static const struct drm_connector_helper_funcs rcar_lvds_conn_helper_funcs = {
+ .get_modes = rcar_lvds_connector_get_modes,
+ .atomic_check = rcar_lvds_connector_atomic_check,
+};
+
+static const struct drm_connector_funcs rcar_lvds_conn_funcs = {
+ .reset = drm_atomic_helper_connector_reset,
+ .fill_modes = drm_helper_probe_single_connector_modes,
+ .destroy = drm_connector_cleanup,
+ .atomic_duplicate_state = drm_atomic_helper_connector_duplicate_state,
+ .atomic_destroy_state = drm_atomic_helper_connector_destroy_state,
+};
+
+/* -----------------------------------------------------------------------------
+ * Bridge
+ */
+
+static void rcar_lvds_enable_gen2(struct rcar_lvds *lvds)
+{
+ const struct drm_display_mode *mode = &lvds->display_mode;
+ /*
+ * FIXME: We should really retrieve this through the state, but how do
+ * we get a state pointer?
+ */
+ struct drm_crtc *crtc = lvds->bridge.encoder->crtc;
+ unsigned int freq = mode->clock;
+ u32 lvdcr0;
+ u32 pllcr;
+
+ /* PLL clock configuration */
+ if (freq < 39000)
+ pllcr = LVDPLLCR_CEEN | LVDPLLCR_COSEL | LVDPLLCR_PLLDLYCNT_38M;
+ else if (freq < 61000)
+ pllcr = LVDPLLCR_CEEN | LVDPLLCR_COSEL | LVDPLLCR_PLLDLYCNT_60M;
+ else if (freq < 121000)
+ pllcr = LVDPLLCR_CEEN | LVDPLLCR_COSEL | LVDPLLCR_PLLDLYCNT_121M;
+ else
+ pllcr = LVDPLLCR_PLLDLYCNT_150M;
+
+ rcar_lvds_write(lvds, LVDPLLCR, pllcr);
+
+ /*
+ * Select the input, hardcode mode 0, enable LVDS operation and turn
+ * bias circuitry on.
+ */
+ lvdcr0 = (lvds->mode << LVDCR0_LVMD_SHIFT) | LVDCR0_BEN | LVDCR0_LVEN;
+ if (drm_crtc_index(crtc) == 2)
+ lvdcr0 |= LVDCR0_DUSEL;
+ rcar_lvds_write(lvds, LVDCR0, lvdcr0);
+
+ /* Turn all the channels on. */
+ rcar_lvds_write(lvds, LVDCR1, LVDCR1_CHSTBY(3) | LVDCR1_CHSTBY(2) |
+ LVDCR1_CHSTBY(1) | LVDCR1_CHSTBY(0) | LVDCR1_CLKSTBY);
+
+ /*
+ * Turn the PLL on, wait for the startup delay, and turn the output
+ * on.
+ */
+ lvdcr0 |= LVDCR0_PLLON;
+ rcar_lvds_write(lvds, LVDCR0, lvdcr0);
+
+ usleep_range(100, 150);
+
+ lvdcr0 |= LVDCR0_LVRES;
+ rcar_lvds_write(lvds, LVDCR0, lvdcr0);
+}
+
+static void rcar_lvds_enable_gen3(struct rcar_lvds *lvds)
+{
+ const struct drm_display_mode *mode = &lvds->display_mode;
+ unsigned int freq = mode->clock;
+ u32 lvdcr0;
+ u32 pllcr;
+
+ /* PLL clock configuration */
+ if (freq < 42000)
+ pllcr = LVDPLLCR_PLLDIVCNT_42M;
+ else if (freq < 85000)
+ pllcr = LVDPLLCR_PLLDIVCNT_85M;
+ else if (freq < 128000)
+ pllcr = LVDPLLCR_PLLDIVCNT_128M;
+ else
+ pllcr = LVDPLLCR_PLLDIVCNT_148M;
+
+ rcar_lvds_write(lvds, LVDPLLCR, pllcr);
+
+ /* Turn all the channels on. */
+ rcar_lvds_write(lvds, LVDCR1, LVDCR1_CHSTBY(3) | LVDCR1_CHSTBY(2) |
+ LVDCR1_CHSTBY(1) | LVDCR1_CHSTBY(0) | LVDCR1_CLKSTBY);
+
+ /*
+ * Turn the PLL on, set it to LVDS normal mode, wait for the startup
+ * delay and turn the output on.
+ */
+ lvdcr0 = (lvds->mode << LVDCR0_LVMD_SHIFT) | LVDCR0_PLLON;
+ rcar_lvds_write(lvds, LVDCR0, lvdcr0);
+
+ lvdcr0 |= LVDCR0_PWD;
+ rcar_lvds_write(lvds, LVDCR0, lvdcr0);
+
+ usleep_range(100, 150);
+
+ lvdcr0 |= LVDCR0_LVRES;
+ rcar_lvds_write(lvds, LVDCR0, lvdcr0);
+}
+
+static void rcar_lvds_enable(struct drm_bridge *bridge)
+{
+ struct rcar_lvds *lvds = bridge_to_rcar_lvds(bridge);
+ u32 lvdhcr;
+ int ret;
+
+ WARN_ON(lvds->enabled);
+
+ ret = clk_prepare_enable(lvds->clock);
+ if (ret < 0)
+ return;
+
+ /*
+ * Hardcode the channels and control signals routing for now.
+ *
+ * HSYNC -> CTRL0
+ * VSYNC -> CTRL1
+ * DISP -> CTRL2
+ * 0 -> CTRL3
+ */
+ rcar_lvds_write(lvds, LVDCTRCR, LVDCTRCR_CTR3SEL_ZERO |
+ LVDCTRCR_CTR2SEL_DISP | LVDCTRCR_CTR1SEL_VSYNC |
+ LVDCTRCR_CTR0SEL_HSYNC);
+
+ if (lvds->info->quirks & RCAR_LVDS_QUIRK_LANES)
+ lvdhcr = LVDCHCR_CHSEL_CH(0, 0) | LVDCHCR_CHSEL_CH(1, 3)
+ | LVDCHCR_CHSEL_CH(2, 2) | LVDCHCR_CHSEL_CH(3, 1);
+ else
+ lvdhcr = LVDCHCR_CHSEL_CH(0, 0) | LVDCHCR_CHSEL_CH(1, 1)
+ | LVDCHCR_CHSEL_CH(2, 2) | LVDCHCR_CHSEL_CH(3, 3);
+
+ rcar_lvds_write(lvds, LVDCHCR, lvdhcr);
+
+ /* Perform generation-specific initialization. */
+ if (lvds->info->gen < 3)
+ rcar_lvds_enable_gen2(lvds);
+ else
+ rcar_lvds_enable_gen3(lvds);
+
+ if (lvds->panel) {
+ drm_panel_prepare(lvds->panel);
+ drm_panel_enable(lvds->panel);
+ }
+
+ lvds->enabled = true;
+}
+
+static void rcar_lvds_disable(struct drm_bridge *bridge)
+{
+ struct rcar_lvds *lvds = bridge_to_rcar_lvds(bridge);
+
+ WARN_ON(!lvds->enabled);
+
+ if (lvds->panel) {
+ drm_panel_disable(lvds->panel);
+ drm_panel_unprepare(lvds->panel);
+ }
+
+ rcar_lvds_write(lvds, LVDCR0, 0);
+ rcar_lvds_write(lvds, LVDCR1, 0);
+
+ clk_disable_unprepare(lvds->clock);
+
+ lvds->enabled = false;
+}
+
+static bool rcar_lvds_mode_fixup(struct drm_bridge *bridge,
+ const struct drm_display_mode *mode,
+ struct drm_display_mode *adjusted_mode)
+{
+ struct rcar_lvds *lvds = bridge_to_rcar_lvds(bridge);
+
+ /*
+ * The internal LVDS encoder has a restricted clock frequency operating
+ * range (30MHz to 150MHz on Gen2, 25.175MHz to 148.5MHz on Gen3). Clamp
+ * the clock accordingly.
+ */
+ if (lvds->info->gen < 3)
+ adjusted_mode->clock = clamp(adjusted_mode->clock, 30000,
+ 150000);
+ else
+ adjusted_mode->clock = clamp(adjusted_mode->clock, 25175,
+ 148500);
+
+ return true;
+}
+
+static void rcar_lvds_get_lvds_mode(struct rcar_lvds *lvds)
+{
+ struct drm_display_info *info = &lvds->connector.display_info;
+ enum rcar_lvds_mode mode;
+
+ /*
+ * There is no API yet to retrieve LVDS mode from a bridge, only panels
+ * are supported.
+ */
+ if (!lvds->panel)
+ return;
+
+ if (!info->num_bus_formats || !info->bus_formats) {
+ dev_err(lvds->dev, "no LVDS bus format reported\n");
+ return;
+ }
+
+ switch (info->bus_formats[0]) {
+ case MEDIA_BUS_FMT_RGB666_1X7X3_SPWG:
+ case MEDIA_BUS_FMT_RGB888_1X7X4_JEIDA:
+ mode = RCAR_LVDS_MODE_JEIDA;
+ break;
+ case MEDIA_BUS_FMT_RGB888_1X7X4_SPWG:
+ mode = RCAR_LVDS_MODE_VESA;
+ break;
+ default:
+ dev_err(lvds->dev, "unsupported LVDS bus format 0x%04x\n",
+ info->bus_formats[0]);
+ return;
+ }
+
+ if (info->bus_flags & DRM_BUS_FLAG_DATA_LSB_TO_MSB)
+ mode |= RCAR_LVDS_MODE_MIRROR;
+
+ lvds->mode = mode;
+}
+
+static void rcar_lvds_mode_set(struct drm_bridge *bridge,
+ struct drm_display_mode *mode,
+ struct drm_display_mode *adjusted_mode)
+{
+ struct rcar_lvds *lvds = bridge_to_rcar_lvds(bridge);
+
+ WARN_ON(lvds->enabled);
+
+ lvds->display_mode = *adjusted_mode;
+
+ rcar_lvds_get_lvds_mode(lvds);
+}
+
+static int rcar_lvds_attach(struct drm_bridge *bridge)
+{
+ struct rcar_lvds *lvds = bridge_to_rcar_lvds(bridge);
+ struct drm_connector *connector = &lvds->connector;
+ struct drm_encoder *encoder = bridge->encoder;
+ int ret;
+
+ /* If we have a next bridge just attach it. */
+ if (lvds->next_bridge)
+ return drm_bridge_attach(bridge->encoder, lvds->next_bridge,
+ bridge);
+
+ /* Otherwise we have a panel, create a connector. */
+ ret = drm_connector_init(bridge->dev, connector, &rcar_lvds_conn_funcs,
+ DRM_MODE_CONNECTOR_LVDS);
+ if (ret < 0)
+ return ret;
+
+ drm_connector_helper_add(connector, &rcar_lvds_conn_helper_funcs);
+
+ ret = drm_mode_connector_attach_encoder(connector, encoder);
+ if (ret < 0)
+ return ret;
+
+ return drm_panel_attach(lvds->panel, connector);
+}
+
+static void rcar_lvds_detach(struct drm_bridge *bridge)
+{
+ struct rcar_lvds *lvds = bridge_to_rcar_lvds(bridge);
+
+ if (lvds->panel)
+ drm_panel_detach(lvds->panel);
+}
+
+static const struct drm_bridge_funcs rcar_lvds_bridge_ops = {
+ .attach = rcar_lvds_attach,
+ .detach = rcar_lvds_detach,
+ .enable = rcar_lvds_enable,
+ .disable = rcar_lvds_disable,
+ .mode_fixup = rcar_lvds_mode_fixup,
+ .mode_set = rcar_lvds_mode_set,
+};
+
+/* -----------------------------------------------------------------------------
+ * Probe & Remove
+ */
+
+static int rcar_lvds_parse_dt(struct rcar_lvds *lvds)
+{
+ struct device_node *local_output = NULL;
+ struct device_node *remote_input = NULL;
+ struct device_node *remote = NULL;
+ struct device_node *node;
+ bool is_bridge = false;
+ int ret = 0;
+
+ local_output = of_graph_get_endpoint_by_regs(lvds->dev->of_node, 1, 0);
+ if (!local_output) {
+ dev_dbg(lvds->dev, "unconnected port@1\n");
+ return -ENODEV;
+ }
+
+ /*
+ * Locate the connected entity and infer its type from the number of
+ * endpoints.
+ */
+ remote = of_graph_get_remote_port_parent(local_output);
+ if (!remote) {
+ dev_dbg(lvds->dev, "unconnected endpoint %pOF\n", local_output);
+ ret = -ENODEV;
+ goto done;
+ }
+
+ if (!of_device_is_available(remote)) {
+ dev_dbg(lvds->dev, "connected entity %pOF is disabled\n",
+ remote);
+ ret = -ENODEV;
+ goto done;
+ }
+
+ remote_input = of_graph_get_remote_endpoint(local_output);
+
+ for_each_endpoint_of_node(remote, node) {
+ if (node != remote_input) {
+ /*
+ * We've found one endpoint other than the input, this
+ * must be a bridge.
+ */
+ is_bridge = true;
+ of_node_put(node);
+ break;
+ }
+ }
+
+ if (is_bridge) {
+ lvds->next_bridge = of_drm_find_bridge(remote);
+ if (!lvds->next_bridge)
+ ret = -EPROBE_DEFER;
+ } else {
+ lvds->panel = of_drm_find_panel(remote);
+ if (!lvds->panel)
+ ret = -EPROBE_DEFER;
+ }
+
+done:
+ of_node_put(local_output);
+ of_node_put(remote_input);
+ of_node_put(remote);
+
+ return ret;
+}
+
+static int rcar_lvds_probe(struct platform_device *pdev)
+{
+ struct rcar_lvds *lvds;
+ struct resource *mem;
+ int ret;
+
+ lvds = devm_kzalloc(&pdev->dev, sizeof(*lvds), GFP_KERNEL);
+ if (lvds == NULL)
+ return -ENOMEM;
+
+ platform_set_drvdata(pdev, lvds);
+
+ lvds->dev = &pdev->dev;
+ lvds->info = of_device_get_match_data(&pdev->dev);
+ lvds->enabled = false;
+
+ ret = rcar_lvds_parse_dt(lvds);
+ if (ret < 0)
+ return ret;
+
+ lvds->bridge.driver_private = lvds;
+ lvds->bridge.funcs = &rcar_lvds_bridge_ops;
+ lvds->bridge.of_node = pdev->dev.of_node;
+
+ mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+ lvds->mmio = devm_ioremap_resource(&pdev->dev, mem);
+ if (IS_ERR(lvds->mmio))
+ return PTR_ERR(lvds->mmio);
+
+ lvds->clock = devm_clk_get(&pdev->dev, NULL);
+ if (IS_ERR(lvds->clock)) {
+ dev_err(&pdev->dev, "failed to get clock\n");
+ return PTR_ERR(lvds->clock);
+ }
+
+ drm_bridge_add(&lvds->bridge);
+
+ return 0;
+}
+
+static int rcar_lvds_remove(struct platform_device *pdev)
+{
+ struct rcar_lvds *lvds = platform_get_drvdata(pdev);
+
+ drm_bridge_remove(&lvds->bridge);
+
+ return 0;
+}
+
+static const struct rcar_lvds_device_info rcar_lvds_gen2_info = {
+ .gen = 2,
+};
+
+static const struct rcar_lvds_device_info rcar_lvds_r8a7790_info = {
+ .gen = 2,
+ .quirks = RCAR_LVDS_QUIRK_LANES,
+};
+
+static const struct rcar_lvds_device_info rcar_lvds_gen3_info = {
+ .gen = 3,
+};
+
+static const struct of_device_id rcar_lvds_of_table[] = {
+ { .compatible = "renesas,lvds-r8a7743", .data = &rcar_lvds_gen2_info },
+ { .compatible = "renesas,lvds-r8a7790", .data = &rcar_lvds_r8a7790_info },
+ { .compatible = "renesas,lvds-r8a7791", .data = &rcar_lvds_gen2_info },
+ { .compatible = "renesas,lvds-r8a7793", .data = &rcar_lvds_gen2_info },
+ { .compatible = "renesas,lvds-r8a7795", .data = &rcar_lvds_gen3_info },
+ { .compatible = "renesas,lvds-r8a7796", .data = &rcar_lvds_gen3_info },
+ { }
+};
+
+MODULE_DEVICE_TABLE(of, rcar_lvds_of_table);
+
+static struct platform_driver rcar_lvds_platform_driver = {
+ .probe = rcar_lvds_probe,
+ .remove = rcar_lvds_remove,
+ .driver = {
+ .name = "rcar-lvds",
+ .of_match_table = rcar_lvds_of_table,
+ },
+};
+
+module_platform_driver(rcar_lvds_platform_driver);
+
+MODULE_AUTHOR("Laurent Pinchart <laurent.pinchart@ideasonboard.com>");
+MODULE_DESCRIPTION("Renesas R-Car LVDS Encoder Driver");
+MODULE_LICENSE("GPL");
--
Regards,
Laurent Pinchart
^ permalink raw reply related [flat|nested] 63+ messages in thread
* [PATCH 05/10] ARM: dts: porter: Fix HDMI output routing
2018-01-12 0:58 [PATCH 00/10] R-Car DU: Convert LVDS code to bridge driver Laurent Pinchart
` (3 preceding siblings ...)
2018-01-12 0:58 ` [PATCH 04/10] drm: rcar-du: Convert LVDS encoder code to bridge driver Laurent Pinchart
@ 2018-01-12 0:58 ` Laurent Pinchart
2018-01-15 7:56 ` Simon Horman
2018-01-12 0:58 ` Laurent Pinchart
` (6 subsequent siblings)
11 siblings, 1 reply; 63+ messages in thread
From: Laurent Pinchart @ 2018-01-12 0:58 UTC (permalink / raw)
To: dri-devel; +Cc: linux-renesas-soc, Sergei Shtylyov
The HDMI encoder is connected to the RGB output of the DU, which is
port@0, not port@1. Fix the incorrect DT description.
Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
---
arch/arm/boot/dts/r8a7791-porter.dts | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/arm/boot/dts/r8a7791-porter.dts b/arch/arm/boot/dts/r8a7791-porter.dts
index eb374956294f..9a02d03b23c2 100644
--- a/arch/arm/boot/dts/r8a7791-porter.dts
+++ b/arch/arm/boot/dts/r8a7791-porter.dts
@@ -425,7 +425,7 @@
"dclkin.0", "dclkin.1";
ports {
- port@1 {
+ port@0 {
endpoint {
remote-endpoint = <&adv7511_in>;
};
--
Regards,
Laurent Pinchart
^ permalink raw reply related [flat|nested] 63+ messages in thread
* [PATCH 06/10] ARM: dts: r8a7790: Convert to new LVDS DT bindings
2018-01-12 0:58 [PATCH 00/10] R-Car DU: Convert LVDS code to bridge driver Laurent Pinchart
@ 2018-01-12 0:58 ` Laurent Pinchart
2018-01-12 0:58 ` [PATCH 02/10] dt-bindings: display: renesas: Deprecate LVDS support in the DU bindings Laurent Pinchart
` (10 subsequent siblings)
11 siblings, 0 replies; 63+ messages in thread
From: Laurent Pinchart @ 2018-01-12 0:58 UTC (permalink / raw)
To: dri-devel; +Cc: linux-renesas-soc, Sergei Shtylyov
The internal LVDS encoder now has DT bindings separate from the DU. Port
the device tree over to the new model.
Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
---
arch/arm/boot/dts/r8a7790-lager.dts | 22 ++++++++++---
arch/arm/boot/dts/r8a7790.dtsi | 61 ++++++++++++++++++++++++++++++++-----
2 files changed, 71 insertions(+), 12 deletions(-)
diff --git a/arch/arm/boot/dts/r8a7790-lager.dts b/arch/arm/boot/dts/r8a7790-lager.dts
index 7d5cd01069a3..f84963cb6785 100644
--- a/arch/arm/boot/dts/r8a7790-lager.dts
+++ b/arch/arm/boot/dts/r8a7790-lager.dts
@@ -317,10 +317,8 @@
status = "okay";
clocks = <&cpg CPG_MOD 724>, <&cpg CPG_MOD 723>, <&cpg CPG_MOD 722>,
- <&cpg CPG_MOD 726>, <&cpg CPG_MOD 725>,
<&x13_clk>, <&x2_clk>;
- clock-names = "du.0", "du.1", "du.2", "lvds.0", "lvds.1",
- "dclkin.0", "dclkin.1";
+ clock-names = "du.0", "du.1", "du.2", "dclkin.0", "dclkin.1";
ports {
port@0 {
@@ -328,12 +326,26 @@
remote-endpoint = <&adv7123_in>;
};
};
+ };
+};
+
+&lvds0 {
+ status = "okay";
+
+ ports {
port@1 {
endpoint {
remote-endpoint = <&adv7511_in>;
};
};
- port@2 {
+ };
+};
+
+&lvds1 {
+ status = "okay";
+
+ ports {
+ port@1 {
lvds_connector: endpoint {
};
};
@@ -689,7 +701,7 @@
port@0 {
reg = <0>;
adv7511_in: endpoint {
- remote-endpoint = <&du_out_lvds0>;
+ remote-endpoint = <&lvds0_out>;
};
};
diff --git a/arch/arm/boot/dts/r8a7790.dtsi b/arch/arm/boot/dts/r8a7790.dtsi
index 62baabd757b6..ccb3e4fb36ed 100644
--- a/arch/arm/boot/dts/r8a7790.dtsi
+++ b/arch/arm/boot/dts/r8a7790.dtsi
@@ -1067,17 +1067,14 @@
du: display@feb00000 {
compatible = "renesas,du-r8a7790";
- reg = <0 0xfeb00000 0 0x70000>,
- <0 0xfeb90000 0 0x1c>,
- <0 0xfeb94000 0 0x1c>;
- reg-names = "du", "lvds.0", "lvds.1";
+ reg = <0 0xfeb00000 0 0x70000>;
+ reg-names = "du";
interrupts = <GIC_SPI 256 IRQ_TYPE_LEVEL_HIGH>,
<GIC_SPI 268 IRQ_TYPE_LEVEL_HIGH>,
<GIC_SPI 269 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&cpg CPG_MOD 724>, <&cpg CPG_MOD 723>,
- <&cpg CPG_MOD 722>, <&cpg CPG_MOD 726>,
- <&cpg CPG_MOD 725>;
- clock-names = "du.0", "du.1", "du.2", "lvds.0", "lvds.1";
+ <&cpg CPG_MOD 722>;
+ clock-names = "du.0", "du.1", "du.2";
status = "disabled";
ports {
@@ -1092,11 +1089,61 @@
port@1 {
reg = <1>;
du_out_lvds0: endpoint {
+ remote-endpoint = <&lvds0_in>;
};
};
port@2 {
reg = <2>;
du_out_lvds1: endpoint {
+ remote-endpoint = <&lvds1_in>;
+ };
+ };
+ };
+ };
+
+ lvds0: lvds@feb90000 {
+ compatible = "renesas,lvds-r8a7790";
+ reg = <0 0xfeb90000 0 0x1c>;
+ clocks = <&cpg CPG_MOD 726>;
+ status = "disabled";
+
+ ports {
+ #address-cells = <1>;
+ #size-cells = <0>;
+
+ port@0 {
+ reg = <0>;
+ lvds0_in: endpoint {
+ remote-endpoint = <&du_out_lvds0>;
+ };
+ };
+ port@1 {
+ reg = <1>;
+ lvds0_out: endpoint {
+ };
+ };
+ };
+ };
+
+ lvds1: lvds@feb94000 {
+ compatible = "renesas,lvds-r8a7790";
+ reg = <0 0xfeb94000 0 0x1c>;
+ clocks = <&cpg CPG_MOD 725>;
+ status = "disabled";
+
+ ports {
+ #address-cells = <1>;
+ #size-cells = <0>;
+
+ port@0 {
+ reg = <0>;
+ lvds1_in: endpoint {
+ remote-endpoint = <&du_out_lvds1>;
+ };
+ };
+ port@1 {
+ reg = <1>;
+ lvds1_out: endpoint {
};
};
};
--
Regards,
Laurent Pinchart
^ permalink raw reply related [flat|nested] 63+ messages in thread
* [PATCH 06/10] ARM: dts: r8a7790: Convert to new LVDS DT bindings
@ 2018-01-12 0:58 ` Laurent Pinchart
0 siblings, 0 replies; 63+ messages in thread
From: Laurent Pinchart @ 2018-01-12 0:58 UTC (permalink / raw)
To: dri-devel; +Cc: linux-renesas-soc, Sergei Shtylyov
The internal LVDS encoder now has DT bindings separate from the DU. Port
the device tree over to the new model.
Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
---
arch/arm/boot/dts/r8a7790-lager.dts | 22 ++++++++++---
arch/arm/boot/dts/r8a7790.dtsi | 61 ++++++++++++++++++++++++++++++++-----
2 files changed, 71 insertions(+), 12 deletions(-)
diff --git a/arch/arm/boot/dts/r8a7790-lager.dts b/arch/arm/boot/dts/r8a7790-lager.dts
index 7d5cd01069a3..f84963cb6785 100644
--- a/arch/arm/boot/dts/r8a7790-lager.dts
+++ b/arch/arm/boot/dts/r8a7790-lager.dts
@@ -317,10 +317,8 @@
status = "okay";
clocks = <&cpg CPG_MOD 724>, <&cpg CPG_MOD 723>, <&cpg CPG_MOD 722>,
- <&cpg CPG_MOD 726>, <&cpg CPG_MOD 725>,
<&x13_clk>, <&x2_clk>;
- clock-names = "du.0", "du.1", "du.2", "lvds.0", "lvds.1",
- "dclkin.0", "dclkin.1";
+ clock-names = "du.0", "du.1", "du.2", "dclkin.0", "dclkin.1";
ports {
port@0 {
@@ -328,12 +326,26 @@
remote-endpoint = <&adv7123_in>;
};
};
+ };
+};
+
+&lvds0 {
+ status = "okay";
+
+ ports {
port@1 {
endpoint {
remote-endpoint = <&adv7511_in>;
};
};
- port@2 {
+ };
+};
+
+&lvds1 {
+ status = "okay";
+
+ ports {
+ port@1 {
lvds_connector: endpoint {
};
};
@@ -689,7 +701,7 @@
port@0 {
reg = <0>;
adv7511_in: endpoint {
- remote-endpoint = <&du_out_lvds0>;
+ remote-endpoint = <&lvds0_out>;
};
};
diff --git a/arch/arm/boot/dts/r8a7790.dtsi b/arch/arm/boot/dts/r8a7790.dtsi
index 62baabd757b6..ccb3e4fb36ed 100644
--- a/arch/arm/boot/dts/r8a7790.dtsi
+++ b/arch/arm/boot/dts/r8a7790.dtsi
@@ -1067,17 +1067,14 @@
du: display@feb00000 {
compatible = "renesas,du-r8a7790";
- reg = <0 0xfeb00000 0 0x70000>,
- <0 0xfeb90000 0 0x1c>,
- <0 0xfeb94000 0 0x1c>;
- reg-names = "du", "lvds.0", "lvds.1";
+ reg = <0 0xfeb00000 0 0x70000>;
+ reg-names = "du";
interrupts = <GIC_SPI 256 IRQ_TYPE_LEVEL_HIGH>,
<GIC_SPI 268 IRQ_TYPE_LEVEL_HIGH>,
<GIC_SPI 269 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&cpg CPG_MOD 724>, <&cpg CPG_MOD 723>,
- <&cpg CPG_MOD 722>, <&cpg CPG_MOD 726>,
- <&cpg CPG_MOD 725>;
- clock-names = "du.0", "du.1", "du.2", "lvds.0", "lvds.1";
+ <&cpg CPG_MOD 722>;
+ clock-names = "du.0", "du.1", "du.2";
status = "disabled";
ports {
@@ -1092,11 +1089,61 @@
port@1 {
reg = <1>;
du_out_lvds0: endpoint {
+ remote-endpoint = <&lvds0_in>;
};
};
port@2 {
reg = <2>;
du_out_lvds1: endpoint {
+ remote-endpoint = <&lvds1_in>;
+ };
+ };
+ };
+ };
+
+ lvds0: lvds@feb90000 {
+ compatible = "renesas,lvds-r8a7790";
+ reg = <0 0xfeb90000 0 0x1c>;
+ clocks = <&cpg CPG_MOD 726>;
+ status = "disabled";
+
+ ports {
+ #address-cells = <1>;
+ #size-cells = <0>;
+
+ port@0 {
+ reg = <0>;
+ lvds0_in: endpoint {
+ remote-endpoint = <&du_out_lvds0>;
+ };
+ };
+ port@1 {
+ reg = <1>;
+ lvds0_out: endpoint {
+ };
+ };
+ };
+ };
+
+ lvds1: lvds@feb94000 {
+ compatible = "renesas,lvds-r8a7790";
+ reg = <0 0xfeb94000 0 0x1c>;
+ clocks = <&cpg CPG_MOD 725>;
+ status = "disabled";
+
+ ports {
+ #address-cells = <1>;
+ #size-cells = <0>;
+
+ port@0 {
+ reg = <0>;
+ lvds1_in: endpoint {
+ remote-endpoint = <&du_out_lvds1>;
+ };
+ };
+ port@1 {
+ reg = <1>;
+ lvds1_out: endpoint {
};
};
};
--
Regards,
Laurent Pinchart
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply related [flat|nested] 63+ messages in thread
* [PATCH 07/10] ARM: dts: r8a7791: Convert to new LVDS DT bindings
2018-01-12 0:58 [PATCH 00/10] R-Car DU: Convert LVDS code to bridge driver Laurent Pinchart
` (5 preceding siblings ...)
2018-01-12 0:58 ` Laurent Pinchart
@ 2018-01-12 0:58 ` Laurent Pinchart
2018-01-12 0:58 ` [PATCH 08/10] ARM: dts: r8a7793: " Laurent Pinchart
` (4 subsequent siblings)
11 siblings, 0 replies; 63+ messages in thread
From: Laurent Pinchart @ 2018-01-12 0:58 UTC (permalink / raw)
To: dri-devel; +Cc: linux-renesas-soc, Sergei Shtylyov
The internal LVDS encoder now has DT bindings separate from the DU. Port
the device tree over to the new model.
Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
---
arch/arm/boot/dts/r8a7791-koelsch.dts | 10 ++++++++--
arch/arm/boot/dts/r8a7791-porter.dts | 16 +++++++++++++---
arch/arm/boot/dts/r8a7791.dtsi | 35 +++++++++++++++++++++++++++++------
3 files changed, 50 insertions(+), 11 deletions(-)
diff --git a/arch/arm/boot/dts/r8a7791-koelsch.dts b/arch/arm/boot/dts/r8a7791-koelsch.dts
index e164eda69baf..5a0f87ed7f16 100644
--- a/arch/arm/boot/dts/r8a7791-koelsch.dts
+++ b/arch/arm/boot/dts/r8a7791-koelsch.dts
@@ -332,8 +332,7 @@
clocks = <&cpg CPG_MOD 724>, <&cpg CPG_MOD 723>, <&cpg CPG_MOD 726>,
<&x13_clk>, <&x2_clk>;
- clock-names = "du.0", "du.1", "lvds.0",
- "dclkin.0", "dclkin.1";
+ clock-names = "du.0", "du.1", "dclkin.0", "dclkin.1";
ports {
port@0 {
@@ -341,6 +340,13 @@
remote-endpoint = <&adv7511_in>;
};
};
+ };
+};
+
+&lvds0 {
+ status = "okay";
+
+ ports {
port@1 {
lvds_connector: endpoint {
};
diff --git a/arch/arm/boot/dts/r8a7791-porter.dts b/arch/arm/boot/dts/r8a7791-porter.dts
index 9a02d03b23c2..e6d02839d636 100644
--- a/arch/arm/boot/dts/r8a7791-porter.dts
+++ b/arch/arm/boot/dts/r8a7791-porter.dts
@@ -419,10 +419,9 @@
pinctrl-names = "default";
status = "okay";
- clocks = <&cpg CPG_MOD 724>, <&cpg CPG_MOD 723>, <&cpg CPG_MOD 726>,
+ clocks = <&cpg CPG_MOD 724>, <&cpg CPG_MOD 723>,
<&x3_clk>, <&x16_clk>;
- clock-names = "du.0", "du.1", "lvds.0",
- "dclkin.0", "dclkin.1";
+ clock-names = "du.0", "du.1", "dclkin.0", "dclkin.1";
ports {
port@0 {
@@ -433,6 +432,17 @@
};
};
+&lvds0 {
+ status = "okay";
+
+ ports {
+ port@1 {
+ lvds_connector: endpoint {
+ };
+ };
+ };
+};
+
&rcar_sound {
pinctrl-0 = <&ssi_pins &audio_clk_pins>;
pinctrl-names = "default";
diff --git a/arch/arm/boot/dts/r8a7791.dtsi b/arch/arm/boot/dts/r8a7791.dtsi
index 67831d0405f3..c2415a558997 100644
--- a/arch/arm/boot/dts/r8a7791.dtsi
+++ b/arch/arm/boot/dts/r8a7791.dtsi
@@ -1103,15 +1103,13 @@
du: display@feb00000 {
compatible = "renesas,du-r8a7791";
- reg = <0 0xfeb00000 0 0x40000>,
- <0 0xfeb90000 0 0x1c>;
- reg-names = "du", "lvds.0";
+ reg = <0 0xfeb00000 0 0x40000>;
+ reg-names = "du";
interrupts = <GIC_SPI 256 IRQ_TYPE_LEVEL_HIGH>,
<GIC_SPI 268 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&cpg CPG_MOD 724>,
- <&cpg CPG_MOD 723>,
- <&cpg CPG_MOD 726>;
- clock-names = "du.0", "du.1", "lvds.0";
+ <&cpg CPG_MOD 723>;
+ clock-names = "du.0", "du.1";
status = "disabled";
ports {
@@ -1126,6 +1124,31 @@
port@1 {
reg = <1>;
du_out_lvds0: endpoint {
+ remote-endpoint = <&lvds0_in>;
+ };
+ };
+ };
+ };
+
+ lvds0: lvds@feb90000 {
+ compatible = "renesas,lvds-r8a7791";
+ reg = <0 0xfeb90000 0 0x1c>;
+ clocks = <&cpg CPG_MOD 726>;
+ status = "disabled";
+
+ ports {
+ #address-cells = <1>;
+ #size-cells = <0>;
+
+ port@0 {
+ reg = <0>;
+ lvds0_in: endpoint {
+ remote-endpoint = <&du_out_lvds0>;
+ };
+ };
+ port@1 {
+ reg = <1>;
+ lvds0_out: endpoint {
};
};
};
--
Regards,
Laurent Pinchart
^ permalink raw reply related [flat|nested] 63+ messages in thread
* [PATCH 08/10] ARM: dts: r8a7793: Convert to new LVDS DT bindings
2018-01-12 0:58 [PATCH 00/10] R-Car DU: Convert LVDS code to bridge driver Laurent Pinchart
` (6 preceding siblings ...)
2018-01-12 0:58 ` [PATCH 07/10] ARM: dts: r8a7791: " Laurent Pinchart
@ 2018-01-12 0:58 ` Laurent Pinchart
2018-01-12 0:58 ` [PATCH 09/10] arm64: dts: renesas: r8a7795: " Laurent Pinchart
` (3 subsequent siblings)
11 siblings, 0 replies; 63+ messages in thread
From: Laurent Pinchart @ 2018-01-12 0:58 UTC (permalink / raw)
To: dri-devel; +Cc: linux-renesas-soc, Sergei Shtylyov
The internal LVDS encoder now has DT bindings separate from the DU. Port
the device tree over to the new model.
Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
---
arch/arm/boot/dts/r8a7793-gose.dts | 10 +++++++---
arch/arm/boot/dts/r8a7793.dtsi | 35 +++++++++++++++++++++++++++++------
2 files changed, 36 insertions(+), 9 deletions(-)
diff --git a/arch/arm/boot/dts/r8a7793-gose.dts b/arch/arm/boot/dts/r8a7793-gose.dts
index 51b3ffac8efa..c6121f9b72a8 100644
--- a/arch/arm/boot/dts/r8a7793-gose.dts
+++ b/arch/arm/boot/dts/r8a7793-gose.dts
@@ -303,10 +303,9 @@
pinctrl-names = "default";
status = "okay";
- clocks = <&cpg CPG_MOD 724>, <&cpg CPG_MOD 723>, <&cpg CPG_MOD 726>,
+ clocks = <&cpg CPG_MOD 724>, <&cpg CPG_MOD 723>,
<&x13_clk>, <&x2_clk>;
- clock-names = "du.0", "du.1", "lvds.0",
- "dclkin.0", "dclkin.1";
+ clock-names = "du.0", "du.1", "dclkin.0", "dclkin.1";
ports {
port@0 {
@@ -314,6 +313,11 @@
remote-endpoint = <&adv7511_in>;
};
};
+ };
+};
+
+&lvds0 {
+ ports {
port@1 {
lvds_connector: endpoint {
};
diff --git a/arch/arm/boot/dts/r8a7793.dtsi b/arch/arm/boot/dts/r8a7793.dtsi
index 0cd1035de1a4..c044291bb2a2 100644
--- a/arch/arm/boot/dts/r8a7793.dtsi
+++ b/arch/arm/boot/dts/r8a7793.dtsi
@@ -976,15 +976,13 @@
du: display@feb00000 {
compatible = "renesas,du-r8a7793";
- reg = <0 0xfeb00000 0 0x40000>,
- <0 0xfeb90000 0 0x1c>;
- reg-names = "du", "lvds.0";
+ reg = <0 0xfeb00000 0 0x40000>;
+ reg-names = "du";
interrupts = <GIC_SPI 256 IRQ_TYPE_LEVEL_HIGH>,
<GIC_SPI 268 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&cpg CPG_MOD 724>,
- <&cpg CPG_MOD 723>,
- <&cpg CPG_MOD 726>;
- clock-names = "du.0", "du.1", "lvds.0";
+ <&cpg CPG_MOD 723>;
+ clock-names = "du.0", "du.1";
status = "disabled";
ports {
@@ -999,6 +997,31 @@
port@1 {
reg = <1>;
du_out_lvds0: endpoint {
+ remote-endpoint = <&lvds0_in>;
+ };
+ };
+ };
+ };
+
+ lvds0: lvds@feb90000 {
+ compatible = "renesas,lvds-r8a7793";
+ reg = <0 0xfeb90000 0 0x1c>;
+ clocks = <&cpg CPG_MOD 726>;
+ status = "disabled";
+
+ ports {
+ #address-cells = <1>;
+ #size-cells = <0>;
+
+ port@0 {
+ reg = <0>;
+ lvds0_in: endpoint {
+ remote-endpoint = <&du_out_lvds0>;
+ };
+ };
+ port@1 {
+ reg = <1>;
+ lvds0_out: endpoint {
};
};
};
--
Regards,
Laurent Pinchart
^ permalink raw reply related [flat|nested] 63+ messages in thread
* [PATCH 09/10] arm64: dts: renesas: r8a7795: Convert to new LVDS DT bindings
2018-01-12 0:58 [PATCH 00/10] R-Car DU: Convert LVDS code to bridge driver Laurent Pinchart
` (7 preceding siblings ...)
2018-01-12 0:58 ` [PATCH 08/10] ARM: dts: r8a7793: " Laurent Pinchart
@ 2018-01-12 0:58 ` Laurent Pinchart
2018-01-12 0:58 ` [PATCH 10/10] arm64: dts: renesas: r8a7796: " Laurent Pinchart
` (2 subsequent siblings)
11 siblings, 0 replies; 63+ messages in thread
From: Laurent Pinchart @ 2018-01-12 0:58 UTC (permalink / raw)
To: dri-devel; +Cc: linux-renesas-soc, Sergei Shtylyov
The internal LVDS encoder now has DT bindings separate from the DU. Port
the device tree over to the new model.
Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
---
.../boot/dts/renesas/r8a7795-es1-salvator-x.dts | 3 +-
arch/arm64/boot/dts/renesas/r8a7795-h3ulcb.dts | 3 +-
arch/arm64/boot/dts/renesas/r8a7795-salvator-x.dts | 3 +-
.../arm64/boot/dts/renesas/r8a7795-salvator-xs.dts | 3 +-
arch/arm64/boot/dts/renesas/r8a7795.dtsi | 35 ++++++++++++++++++----
5 files changed, 33 insertions(+), 14 deletions(-)
diff --git a/arch/arm64/boot/dts/renesas/r8a7795-es1-salvator-x.dts b/arch/arm64/boot/dts/renesas/r8a7795-es1-salvator-x.dts
index 9ef9a4e5f376..0dda1c0ed1ce 100644
--- a/arch/arm64/boot/dts/renesas/r8a7795-es1-salvator-x.dts
+++ b/arch/arm64/boot/dts/renesas/r8a7795-es1-salvator-x.dts
@@ -43,12 +43,11 @@
<&cpg CPG_MOD 723>,
<&cpg CPG_MOD 722>,
<&cpg CPG_MOD 721>,
- <&cpg CPG_MOD 727>,
<&versaclock5 1>,
<&x21_clk>,
<&x22_clk>,
<&versaclock5 2>;
- clock-names = "du.0", "du.1", "du.2", "du.3", "lvds.0",
+ clock-names = "du.0", "du.1", "du.2", "du.3",
"dclkin.0", "dclkin.1", "dclkin.2", "dclkin.3";
};
diff --git a/arch/arm64/boot/dts/renesas/r8a7795-h3ulcb.dts b/arch/arm64/boot/dts/renesas/r8a7795-h3ulcb.dts
index 0afe777973de..f0d6528c05eb 100644
--- a/arch/arm64/boot/dts/renesas/r8a7795-h3ulcb.dts
+++ b/arch/arm64/boot/dts/renesas/r8a7795-h3ulcb.dts
@@ -44,11 +44,10 @@
<&cpg CPG_MOD 723>,
<&cpg CPG_MOD 722>,
<&cpg CPG_MOD 721>,
- <&cpg CPG_MOD 727>,
<&versaclock5 1>,
<&versaclock5 3>,
<&versaclock5 4>,
<&versaclock5 2>;
- clock-names = "du.0", "du.1", "du.2", "du.3", "lvds.0",
+ clock-names = "du.0", "du.1", "du.2", "du.3",
"dclkin.0", "dclkin.1", "dclkin.2", "dclkin.3";
};
diff --git a/arch/arm64/boot/dts/renesas/r8a7795-salvator-x.dts b/arch/arm64/boot/dts/renesas/r8a7795-salvator-x.dts
index 00ad1ab53a7d..e34b986185d4 100644
--- a/arch/arm64/boot/dts/renesas/r8a7795-salvator-x.dts
+++ b/arch/arm64/boot/dts/renesas/r8a7795-salvator-x.dts
@@ -43,12 +43,11 @@
<&cpg CPG_MOD 723>,
<&cpg CPG_MOD 722>,
<&cpg CPG_MOD 721>,
- <&cpg CPG_MOD 727>,
<&versaclock5 1>,
<&x21_clk>,
<&x22_clk>,
<&versaclock5 2>;
- clock-names = "du.0", "du.1", "du.2", "du.3", "lvds.0",
+ clock-names = "du.0", "du.1", "du.2", "du.3",
"dclkin.0", "dclkin.1", "dclkin.2", "dclkin.3";
};
diff --git a/arch/arm64/boot/dts/renesas/r8a7795-salvator-xs.dts b/arch/arm64/boot/dts/renesas/r8a7795-salvator-xs.dts
index 79e8b65622db..31f2abaa90aa 100644
--- a/arch/arm64/boot/dts/renesas/r8a7795-salvator-xs.dts
+++ b/arch/arm64/boot/dts/renesas/r8a7795-salvator-xs.dts
@@ -43,12 +43,11 @@
<&cpg CPG_MOD 723>,
<&cpg CPG_MOD 722>,
<&cpg CPG_MOD 721>,
- <&cpg CPG_MOD 727>,
<&versaclock6 1>,
<&x21_clk>,
<&x22_clk>,
<&versaclock6 2>;
- clock-names = "du.0", "du.1", "du.2", "du.3", "lvds.0",
+ clock-names = "du.0", "du.1", "du.2", "du.3",
"dclkin.0", "dclkin.1", "dclkin.2", "dclkin.3";
};
diff --git a/arch/arm64/boot/dts/renesas/r8a7795.dtsi b/arch/arm64/boot/dts/renesas/r8a7795.dtsi
index 15ef292a8d9f..d6c423988ab6 100644
--- a/arch/arm64/boot/dts/renesas/r8a7795.dtsi
+++ b/arch/arm64/boot/dts/renesas/r8a7795.dtsi
@@ -2077,9 +2077,8 @@
du: display@feb00000 {
compatible = "renesas,du-r8a7795";
- reg = <0 0xfeb00000 0 0x80000>,
- <0 0xfeb90000 0 0x14>;
- reg-names = "du", "lvds.0";
+ reg = <0 0xfeb00000 0 0x80000>;
+ reg-names = "du";
interrupts = <GIC_SPI 256 IRQ_TYPE_LEVEL_HIGH>,
<GIC_SPI 268 IRQ_TYPE_LEVEL_HIGH>,
<GIC_SPI 269 IRQ_TYPE_LEVEL_HIGH>,
@@ -2087,9 +2086,8 @@
clocks = <&cpg CPG_MOD 724>,
<&cpg CPG_MOD 723>,
<&cpg CPG_MOD 722>,
- <&cpg CPG_MOD 721>,
- <&cpg CPG_MOD 727>;
- clock-names = "du.0", "du.1", "du.2", "du.3", "lvds.0";
+ <&cpg CPG_MOD 721>;
+ clock-names = "du.0", "du.1", "du.2", "du.3";
vsps = <&vspd0 0 &vspd1 0 &vspd2 0 &vspd0 1>;
status = "disabled";
@@ -2117,6 +2115,31 @@
port@3 {
reg = <3>;
du_out_lvds0: endpoint {
+ remote-endpoint = <&lvds0_in>;
+ };
+ };
+ };
+ };
+
+ lvds0: lvds@feb90000 {
+ compatible = "renesas,lvds-r8a7795";
+ reg = <0 0xfeb90000 0 0x14>;
+ clocks = <&cpg CPG_MOD 727>;
+ status = "disabled";
+
+ ports {
+ #address-cells = <1>;
+ #size-cells = <0>;
+
+ port@0 {
+ reg = <0>;
+ lvds0_in: endpoint {
+ remote-endpoint = <&du_out_lvds0>;
+ };
+ };
+ port@1 {
+ reg = <1>;
+ lvds0_out: endpoint {
};
};
};
--
Regards,
Laurent Pinchart
^ permalink raw reply related [flat|nested] 63+ messages in thread
* [PATCH 10/10] arm64: dts: renesas: r8a7796: Convert to new LVDS DT bindings
2018-01-12 0:58 [PATCH 00/10] R-Car DU: Convert LVDS code to bridge driver Laurent Pinchart
` (8 preceding siblings ...)
2018-01-12 0:58 ` [PATCH 09/10] arm64: dts: renesas: r8a7795: " Laurent Pinchart
@ 2018-01-12 0:58 ` Laurent Pinchart
2018-01-12 9:47 ` [PATCH 00/10] R-Car DU: Convert LVDS code to bridge driver Geert Uytterhoeven
[not found] ` <20180112005858.26472-1-laurent.pinchart+renesas-ryLnwIuWjnjg/C1BVhZhaw@public.gmane.org>
11 siblings, 0 replies; 63+ messages in thread
From: Laurent Pinchart @ 2018-01-12 0:58 UTC (permalink / raw)
To: dri-devel; +Cc: linux-renesas-soc, Sergei Shtylyov
The internal LVDS encoder now has DT bindings separate from the DU. Port
the device tree over to the new model.
Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
---
arch/arm64/boot/dts/renesas/r8a7796-m3ulcb.dts | 3 +-
arch/arm64/boot/dts/renesas/r8a7796-salvator-x.dts | 3 +-
arch/arm64/boot/dts/renesas/r8a7796.dtsi | 35 ++++++++++++++++++----
3 files changed, 31 insertions(+), 10 deletions(-)
diff --git a/arch/arm64/boot/dts/renesas/r8a7796-m3ulcb.dts b/arch/arm64/boot/dts/renesas/r8a7796-m3ulcb.dts
index daee1f1a3f68..21bd679062f3 100644
--- a/arch/arm64/boot/dts/renesas/r8a7796-m3ulcb.dts
+++ b/arch/arm64/boot/dts/renesas/r8a7796-m3ulcb.dts
@@ -33,10 +33,9 @@
clocks = <&cpg CPG_MOD 724>,
<&cpg CPG_MOD 723>,
<&cpg CPG_MOD 722>,
- <&cpg CPG_MOD 727>,
<&versaclock5 1>,
<&versaclock5 3>,
<&versaclock5 2>;
- clock-names = "du.0", "du.1", "du.2", "lvds.0",
+ clock-names = "du.0", "du.1", "du.2",
"dclkin.0", "dclkin.1", "dclkin.2";
};
diff --git a/arch/arm64/boot/dts/renesas/r8a7796-salvator-x.dts b/arch/arm64/boot/dts/renesas/r8a7796-salvator-x.dts
index 4088bea8d62c..ecbfbcb65df3 100644
--- a/arch/arm64/boot/dts/renesas/r8a7796-salvator-x.dts
+++ b/arch/arm64/boot/dts/renesas/r8a7796-salvator-x.dts
@@ -32,11 +32,10 @@
clocks = <&cpg CPG_MOD 724>,
<&cpg CPG_MOD 723>,
<&cpg CPG_MOD 722>,
- <&cpg CPG_MOD 727>,
<&versaclock5 1>,
<&x21_clk>,
<&versaclock5 2>;
- clock-names = "du.0", "du.1", "du.2", "lvds.0",
+ clock-names = "du.0", "du.1", "du.2",
"dclkin.0", "dclkin.1", "dclkin.2";
};
diff --git a/arch/arm64/boot/dts/renesas/r8a7796.dtsi b/arch/arm64/boot/dts/renesas/r8a7796.dtsi
index f2b2e40c655e..ed30660c367b 100644
--- a/arch/arm64/boot/dts/renesas/r8a7796.dtsi
+++ b/arch/arm64/boot/dts/renesas/r8a7796.dtsi
@@ -1826,17 +1826,15 @@
du: display@feb00000 {
compatible = "renesas,du-r8a7796";
- reg = <0 0xfeb00000 0 0x70000>,
- <0 0xfeb90000 0 0x14>;
- reg-names = "du", "lvds.0";
+ reg = <0 0xfeb00000 0 0x70000>;
+ reg-names = "du";
interrupts = <GIC_SPI 256 IRQ_TYPE_LEVEL_HIGH>,
<GIC_SPI 268 IRQ_TYPE_LEVEL_HIGH>,
<GIC_SPI 269 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&cpg CPG_MOD 724>,
<&cpg CPG_MOD 723>,
- <&cpg CPG_MOD 722>,
- <&cpg CPG_MOD 727>;
- clock-names = "du.0", "du.1", "du.2", "lvds.0";
+ <&cpg CPG_MOD 722>;
+ clock-names = "du.0", "du.1", "du.2";
status = "disabled";
vsps = <&vspd0 &vspd1 &vspd2>;
@@ -1859,6 +1857,31 @@
port@2 {
reg = <2>;
du_out_lvds0: endpoint {
+ remote-endpoint = <&lvds0_in>;
+ };
+ };
+ };
+ };
+
+ lvds0: lvds@feb90000 {
+ compatible = "renesas,lvds-r8a7796";
+ reg = <0 0xfeb90000 0 0x14>;
+ clocks = <&cpg CPG_MOD 727>;
+ status = "disabled";
+
+ ports {
+ #address-cells = <1>;
+ #size-cells = <0>;
+
+ port@0 {
+ reg = <0>;
+ lvds0_in: endpoint {
+ remote-endpoint = <&du_out_lvds0>;
+ };
+ };
+ port@1 {
+ reg = <1>;
+ lvds0_out: endpoint {
};
};
};
--
Regards,
Laurent Pinchart
^ permalink raw reply related [flat|nested] 63+ messages in thread
* Re: [PATCH 01/10] dt-bindings: display: renesas: Add R-Car LVDS encoder DT bindings
2018-01-12 0:58 ` Laurent Pinchart
(?)
@ 2018-01-12 9:45 ` Geert Uytterhoeven
[not found] ` <CAMuHMdWMgst-1evod+0hZujU2xPtO3UmO9c2CPPrTg=gpHpTbw-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
-1 siblings, 1 reply; 63+ messages in thread
From: Geert Uytterhoeven @ 2018-01-12 9:45 UTC (permalink / raw)
To: Laurent Pinchart
Cc: DRI Development, Linux-Renesas, Sergei Shtylyov, devicetree
Hi Laurent,
On Fri, Jan 12, 2018 at 1:58 AM, Laurent Pinchart
<laurent.pinchart+renesas@ideasonboard.com> wrote:
> The Renesas R-Car Gen2 and Gen3 SoCs have internal LVDS encoders. Add
> corresponding device tree bindings.
>
> Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
> --- /dev/null
> +++ b/Documentation/devicetree/bindings/display/bridge/renesas,lvds.txt
> @@ -0,0 +1,54 @@
> +Renesas R-Car LVDS Encoder
> +==========================
> +
> +These DT bindings describe the LVDS encoder embedded in the Renesas R-Car Gen2
> +and Gen3 SoCs.
> +
> +Required properties:
> +
> +- compatible : Shall contain one of
> + - "renesas,lvds-r8a7743" for R8A7790 (R-Car RZ/G1M) compatible LVDS encoders
> + - "renesas,lvds-r8a7790" for R8A7790 (R-Car H2) compatible LVDS encoders
> + - "renesas,lvds-r8a7791" for R8A7791 (R-Car M2-W) compatible LVDS encoders
> + - "renesas,lvds-r8a7793" for R8A7791 (R-Car M2-N) compatible LVDS encoders
> + - "renesas,lvds-r8a7795" for R8A7795 (R-Car H3) compatible LVDS encoders
> + - "renesas,lvds-r8a7796" for R8A7796 (R-Car M3-W) compatible LVDS encoders
> +
> +- reg: Base address and length for the memory-mapped registers
> +- clocks: A phandle + clock-specifier pair for the functional clock
Please document the "resets" property, too, and add it to the example.
According to the rcar-3.6.0 BSP, reset support is needed desperately.
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org
In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds
^ permalink raw reply [flat|nested] 63+ messages in thread
* Re: [PATCH 00/10] R-Car DU: Convert LVDS code to bridge driver
2018-01-12 0:58 [PATCH 00/10] R-Car DU: Convert LVDS code to bridge driver Laurent Pinchart
` (9 preceding siblings ...)
2018-01-12 0:58 ` [PATCH 10/10] arm64: dts: renesas: r8a7796: " Laurent Pinchart
@ 2018-01-12 9:47 ` Geert Uytterhoeven
2018-01-12 13:48 ` Laurent Pinchart
[not found] ` <20180112005858.26472-1-laurent.pinchart+renesas-ryLnwIuWjnjg/C1BVhZhaw@public.gmane.org>
11 siblings, 1 reply; 63+ messages in thread
From: Geert Uytterhoeven @ 2018-01-12 9:47 UTC (permalink / raw)
To: Laurent Pinchart
Cc: DRI Development, Linux-Renesas, Sergei Shtylyov, devicetree
Hi Laurent,
On Fri, Jan 12, 2018 at 1:58 AM, Laurent Pinchart
<laurent.pinchart+renesas@ideasonboard.com> wrote:
> This patch series addresses a design mistake that dates back from the initial
> DU support. Support for the LVDS encoders, which are IP cores separate from
> the DU, was bundled in the DU driver. Worse, both the DU and LVDS were
> described through a single DT node.
>
> To fix the, patches 01/10 and 02/10 define new DT bindings for the LVDS
> encoders, and deprecate their description inside the DU bindings. To retain
> backward compatibility with existing DT, patch 03/10 then patches the device
> tree at runtime to convert the legacy bindings to the new ones.
Looks like we will have to postpone the R-Car Gen2 Modern DT flag day
again by a few kernel releases?
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org
In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds
^ permalink raw reply [flat|nested] 63+ messages in thread
* Re: [PATCH 02/10] dt-bindings: display: renesas: Deprecate LVDS support in the DU bindings
2018-01-12 0:58 ` [PATCH 02/10] dt-bindings: display: renesas: Deprecate LVDS support in the DU bindings Laurent Pinchart
@ 2018-01-12 9:49 ` Geert Uytterhoeven
[not found] ` <CAMuHMdXYJmh8ssSRt8u75fTv5gyrpcoPKAuCT=BaF1Eu27CaiQ-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
[not found] ` <20180112005858.26472-3-laurent.pinchart+renesas-ryLnwIuWjnjg/C1BVhZhaw@public.gmane.org>
` (2 subsequent siblings)
3 siblings, 1 reply; 63+ messages in thread
From: Geert Uytterhoeven @ 2018-01-12 9:49 UTC (permalink / raw)
To: Laurent Pinchart
Cc: DRI Development, Linux-Renesas, Sergei Shtylyov, devicetree
Hi Laurent,
On Fri, Jan 12, 2018 at 1:58 AM, Laurent Pinchart
<laurent.pinchart+renesas@ideasonboard.com> wrote:
> The internal LVDS encoders now have their own DT bindings, representing
> them as part of the DU is deprecated.
>
> Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
FWIW, you're not really deprecating the LVDS part, but removing it completely.
Do you want to keep a reference instead?
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org
In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds
^ permalink raw reply [flat|nested] 63+ messages in thread
* Re: [PATCH 02/10] dt-bindings: display: renesas: Deprecate LVDS support in the DU bindings
2018-01-12 0:58 ` [PATCH 02/10] dt-bindings: display: renesas: Deprecate LVDS support in the DU bindings Laurent Pinchart
@ 2018-01-12 9:54 ` Vladimir Zapolskiy
[not found] ` <20180112005858.26472-3-laurent.pinchart+renesas-ryLnwIuWjnjg/C1BVhZhaw@public.gmane.org>
` (2 subsequent siblings)
3 siblings, 0 replies; 63+ messages in thread
From: Vladimir Zapolskiy @ 2018-01-12 9:54 UTC (permalink / raw)
To: Laurent Pinchart, dri-devel-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW
Cc: linux-renesas-soc-u79uwXL29TY76Z2rM5mHXA, Sergei Shtylyov,
devicetree-u79uwXL29TY76Z2rM5mHXA
Hi Laurent,
On 01/12/2018 02:58 AM, Laurent Pinchart wrote:
> The internal LVDS encoders now have their own DT bindings, representing
> them as part of the DU is deprecated.
>
> Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas-ryLnwIuWjnjg/C1BVhZhaw@public.gmane.org>
> ---
> .../devicetree/bindings/display/renesas,du.txt | 26 +++++++++-------------
> 1 file changed, 11 insertions(+), 15 deletions(-)
>
> diff --git a/Documentation/devicetree/bindings/display/renesas,du.txt b/Documentation/devicetree/bindings/display/renesas,du.txt
> index cd48aba3bc8c..8f6e0e118e3e 100644
> --- a/Documentation/devicetree/bindings/display/renesas,du.txt
> +++ b/Documentation/devicetree/bindings/display/renesas,du.txt
> @@ -17,9 +17,7 @@ Required Properties:
> - reg: A list of base address and length of each memory resource, one for
> each entry in the reg-names property.
> - reg-names: Name of the memory resources. The DU requires one memory
> - resource for the DU core (named "du") and one memory resource for each
> - LVDS encoder (named "lvds.x" with "x" being the LVDS controller numerical
> - index).
> + resource for the DU core (named "du").
>
> - interrupt-parent: phandle of the parent interrupt controller.
> - interrupts: Interrupt specifiers for the DU interrupts.
> @@ -29,14 +27,13 @@ Required Properties:
> - clock-names: Name of the clocks. This property is model-dependent.
> - R8A7779 uses a single functional clock. The clock doesn't need to be
> named.
> - - All other DU instances use one functional clock per channel and one
> - clock per LVDS encoder (if available). The functional clocks must be
> - named "du.x" with "x" being the channel numerical index. The LVDS clocks
> - must be named "lvds.x" with "x" being the LVDS encoder numerical index.
> - - In addition to the functional and encoder clocks, all DU versions also
> - support externally supplied pixel clocks. Those clocks are optional.
> - When supplied they must be named "dclkin.x" with "x" being the input
> - clock numerical index.
> + - All other DU instances use one functional clock per channel The
> + functional clocks must be named "du.x" with "x" being the channel
> + numerical index.
> + - In addition to the functional clocks, all DU versions also support
> + externally supplied pixel clocks. Those clocks are optional. When
> + supplied they must be named "dclkin.x" with "x" being the input clock
> + numerical index.
>
> - vsps: A list of phandle and channel index tuples to the VSPs that handle
> the memory interfaces for the DU channels. The phandle identifies the VSP
> @@ -71,7 +68,7 @@ Example: R8A7795 (R-Car H3) ES2.0 DU
> compatible = "renesas,du-r8a7795";
> reg = <0 0xfeb00000 0 0x80000>,
> <0 0xfeb90000 0 0x14>;
> - reg-names = "du", "lvds.0";
> + reg-names = "du";
Since "reg-names" list is changed, I believe you'd like to update
the "reg" property value as well.
> interrupts = <GIC_SPI 256 IRQ_TYPE_LEVEL_HIGH>,
> <GIC_SPI 268 IRQ_TYPE_LEVEL_HIGH>,
> <GIC_SPI 269 IRQ_TYPE_LEVEL_HIGH>,
> @@ -79,9 +76,8 @@ Example: R8A7795 (R-Car H3) ES2.0 DU
> clocks = <&cpg CPG_MOD 724>,
> <&cpg CPG_MOD 723>,
> <&cpg CPG_MOD 722>,
> - <&cpg CPG_MOD 721>,
> - <&cpg CPG_MOD 727>;
> - clock-names = "du.0", "du.1", "du.2", "du.3", "lvds.0";
> + <&cpg CPG_MOD 721>;
> + clock-names = "du.0", "du.1", "du.2", "du.3";
> vsps = <&vspd0 0>, <&vspd1 0>, <&vspd2 0>, <&vspd0 1>;
>
> ports {
>
--
With best wishes,
Vladimir
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 63+ messages in thread
* Re: [PATCH 02/10] dt-bindings: display: renesas: Deprecate LVDS support in the DU bindings
@ 2018-01-12 9:54 ` Vladimir Zapolskiy
0 siblings, 0 replies; 63+ messages in thread
From: Vladimir Zapolskiy @ 2018-01-12 9:54 UTC (permalink / raw)
To: Laurent Pinchart, dri-devel
Cc: linux-renesas-soc, Sergei Shtylyov, devicetree
Hi Laurent,
On 01/12/2018 02:58 AM, Laurent Pinchart wrote:
> The internal LVDS encoders now have their own DT bindings, representing
> them as part of the DU is deprecated.
>
> Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
> ---
> .../devicetree/bindings/display/renesas,du.txt | 26 +++++++++-------------
> 1 file changed, 11 insertions(+), 15 deletions(-)
>
> diff --git a/Documentation/devicetree/bindings/display/renesas,du.txt b/Documentation/devicetree/bindings/display/renesas,du.txt
> index cd48aba3bc8c..8f6e0e118e3e 100644
> --- a/Documentation/devicetree/bindings/display/renesas,du.txt
> +++ b/Documentation/devicetree/bindings/display/renesas,du.txt
> @@ -17,9 +17,7 @@ Required Properties:
> - reg: A list of base address and length of each memory resource, one for
> each entry in the reg-names property.
> - reg-names: Name of the memory resources. The DU requires one memory
> - resource for the DU core (named "du") and one memory resource for each
> - LVDS encoder (named "lvds.x" with "x" being the LVDS controller numerical
> - index).
> + resource for the DU core (named "du").
>
> - interrupt-parent: phandle of the parent interrupt controller.
> - interrupts: Interrupt specifiers for the DU interrupts.
> @@ -29,14 +27,13 @@ Required Properties:
> - clock-names: Name of the clocks. This property is model-dependent.
> - R8A7779 uses a single functional clock. The clock doesn't need to be
> named.
> - - All other DU instances use one functional clock per channel and one
> - clock per LVDS encoder (if available). The functional clocks must be
> - named "du.x" with "x" being the channel numerical index. The LVDS clocks
> - must be named "lvds.x" with "x" being the LVDS encoder numerical index.
> - - In addition to the functional and encoder clocks, all DU versions also
> - support externally supplied pixel clocks. Those clocks are optional.
> - When supplied they must be named "dclkin.x" with "x" being the input
> - clock numerical index.
> + - All other DU instances use one functional clock per channel The
> + functional clocks must be named "du.x" with "x" being the channel
> + numerical index.
> + - In addition to the functional clocks, all DU versions also support
> + externally supplied pixel clocks. Those clocks are optional. When
> + supplied they must be named "dclkin.x" with "x" being the input clock
> + numerical index.
>
> - vsps: A list of phandle and channel index tuples to the VSPs that handle
> the memory interfaces for the DU channels. The phandle identifies the VSP
> @@ -71,7 +68,7 @@ Example: R8A7795 (R-Car H3) ES2.0 DU
> compatible = "renesas,du-r8a7795";
> reg = <0 0xfeb00000 0 0x80000>,
> <0 0xfeb90000 0 0x14>;
> - reg-names = "du", "lvds.0";
> + reg-names = "du";
Since "reg-names" list is changed, I believe you'd like to update
the "reg" property value as well.
> interrupts = <GIC_SPI 256 IRQ_TYPE_LEVEL_HIGH>,
> <GIC_SPI 268 IRQ_TYPE_LEVEL_HIGH>,
> <GIC_SPI 269 IRQ_TYPE_LEVEL_HIGH>,
> @@ -79,9 +76,8 @@ Example: R8A7795 (R-Car H3) ES2.0 DU
> clocks = <&cpg CPG_MOD 724>,
> <&cpg CPG_MOD 723>,
> <&cpg CPG_MOD 722>,
> - <&cpg CPG_MOD 721>,
> - <&cpg CPG_MOD 727>;
> - clock-names = "du.0", "du.1", "du.2", "du.3", "lvds.0";
> + <&cpg CPG_MOD 721>;
> + clock-names = "du.0", "du.1", "du.2", "du.3";
> vsps = <&vspd0 0>, <&vspd1 0>, <&vspd2 0>, <&vspd0 1>;
>
> ports {
>
--
With best wishes,
Vladimir
^ permalink raw reply [flat|nested] 63+ messages in thread
* Re: [PATCH 03/10] drm: rcar-du: Fix legacy DT to create LVDS encoder nodes
2018-01-12 0:58 ` [PATCH 03/10] drm: rcar-du: Fix legacy DT to create LVDS encoder nodes Laurent Pinchart
@ 2018-01-12 10:09 ` Geert Uytterhoeven
0 siblings, 0 replies; 63+ messages in thread
From: Geert Uytterhoeven @ 2018-01-12 10:09 UTC (permalink / raw)
To: Laurent Pinchart
Cc: DRI Development, Linux-Renesas, Sergei Shtylyov,
devicetree-u79uwXL29TY76Z2rM5mHXA
Hi Laurent,
On Fri, Jan 12, 2018 at 1:58 AM, Laurent Pinchart
<laurent.pinchart+renesas-ryLnwIuWjnjg/C1BVhZhaw@public.gmane.org> wrote:
> The internal LVDS encoders now have their own DT bindings. Before
> switching the driver infrastructure to those new bindings, implement
> backward-compatibility through live DT patching.
>
> Patching is disabled and will be enabled along with support for the new
> DT bindings in the DU driver.
>
> Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas-ryLnwIuWjnjg/C1BVhZhaw@public.gmane.org>
Thanks for your patch!
> --- a/drivers/gpu/drm/rcar-du/Kconfig
> +++ b/drivers/gpu/drm/rcar-du/Kconfig
> @@ -22,6 +22,7 @@ config DRM_RCAR_LVDS
> bool "R-Car DU LVDS Encoder Support"
> depends on DRM_RCAR_DU
> select DRM_PANEL
> + select OF_OVERLAY
select OF_FLATTREE for of_fdt_unflatten_tree()
(you can probably check with sparc all*config)
> --- /dev/null
> +++ b/drivers/gpu/drm/rcar-du/rcar_du_of.c
> @@ -0,0 +1,440 @@
> +// SPDX-License-Identifier: GPL-2.0-only
-ENOENT in Documentation/process/license-rules.rst ;-)
> +extern u8 __dtb_rcar_du_of_lvds_begin[];
> +extern u8 __dtb_rcar_du_of_lvds_end[];
Typically sections are declared using char, not u8.
> +static int __init rcar_du_of_get_overlay(struct rcar_du_of_overlay *overlay,
> + u8 *begin, u8 *end)
"void *begin, void *end" sounds more natural to me.
> +static void __init rcar_du_of_lvds_patch_one(struct device_node *du,
> + unsigned int port_id,
> + const struct resource *res,
> + const __be32 *reg,
> + const struct of_phandle_args *clkspec,
> + struct device_node *local,
> + struct device_node *remote)
> +{
> +
> + /* Skip if the LVDS node already exists. */
> + sprintf(name, "lvds@%llx", (u64)res->start);
I guess you cannot use %pa because you don't want a 0x prefix?
> + /*
> + * Patch the LVDS and DU port nodes names and the associated fixup
> + * entries.
> + */
> + lvds = rcar_du_of_find_node_by_path(overlay.np,
> + "/fragment@0/__overlay__/lvds");
> + lvds_endpoints[0] = rcar_du_of_find_node_by_path(overlay.np,
> + "/fragment@0/__overlay__/lvds/ports/port@0/endpoint");
> + lvds_endpoints[1] = rcar_du_of_find_node_by_path(overlay.np,
> + "/fragment@0/__overlay__/lvds/ports/port@1/endpoint");
> + du_port = rcar_du_of_find_node_by_path(overlay.np,
> + "/fragment@1/__overlay__/ports/port@0");
> + du_port_fixup = rcar_du_of_find_node_by_path(overlay.np,
> + "/__local_fixups__/fragment@1/__overlay__/ports/port@0");
Many strings with similar prefixes or substrings?
Would it make sense to e.g. locate "/fragment@0/__overlay__/lvds/ports"
first, and continue from there?
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert-Td1EMuHUCqxL1ZNQvxDV9g@public.gmane.org
In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 63+ messages in thread
* Re: [PATCH 03/10] drm: rcar-du: Fix legacy DT to create LVDS encoder nodes
@ 2018-01-12 10:09 ` Geert Uytterhoeven
0 siblings, 0 replies; 63+ messages in thread
From: Geert Uytterhoeven @ 2018-01-12 10:09 UTC (permalink / raw)
To: Laurent Pinchart
Cc: DRI Development, Linux-Renesas, Sergei Shtylyov, devicetree
Hi Laurent,
On Fri, Jan 12, 2018 at 1:58 AM, Laurent Pinchart
<laurent.pinchart+renesas@ideasonboard.com> wrote:
> The internal LVDS encoders now have their own DT bindings. Before
> switching the driver infrastructure to those new bindings, implement
> backward-compatibility through live DT patching.
>
> Patching is disabled and will be enabled along with support for the new
> DT bindings in the DU driver.
>
> Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Thanks for your patch!
> --- a/drivers/gpu/drm/rcar-du/Kconfig
> +++ b/drivers/gpu/drm/rcar-du/Kconfig
> @@ -22,6 +22,7 @@ config DRM_RCAR_LVDS
> bool "R-Car DU LVDS Encoder Support"
> depends on DRM_RCAR_DU
> select DRM_PANEL
> + select OF_OVERLAY
select OF_FLATTREE for of_fdt_unflatten_tree()
(you can probably check with sparc all*config)
> --- /dev/null
> +++ b/drivers/gpu/drm/rcar-du/rcar_du_of.c
> @@ -0,0 +1,440 @@
> +// SPDX-License-Identifier: GPL-2.0-only
-ENOENT in Documentation/process/license-rules.rst ;-)
> +extern u8 __dtb_rcar_du_of_lvds_begin[];
> +extern u8 __dtb_rcar_du_of_lvds_end[];
Typically sections are declared using char, not u8.
> +static int __init rcar_du_of_get_overlay(struct rcar_du_of_overlay *overlay,
> + u8 *begin, u8 *end)
"void *begin, void *end" sounds more natural to me.
> +static void __init rcar_du_of_lvds_patch_one(struct device_node *du,
> + unsigned int port_id,
> + const struct resource *res,
> + const __be32 *reg,
> + const struct of_phandle_args *clkspec,
> + struct device_node *local,
> + struct device_node *remote)
> +{
> +
> + /* Skip if the LVDS node already exists. */
> + sprintf(name, "lvds@%llx", (u64)res->start);
I guess you cannot use %pa because you don't want a 0x prefix?
> + /*
> + * Patch the LVDS and DU port nodes names and the associated fixup
> + * entries.
> + */
> + lvds = rcar_du_of_find_node_by_path(overlay.np,
> + "/fragment@0/__overlay__/lvds");
> + lvds_endpoints[0] = rcar_du_of_find_node_by_path(overlay.np,
> + "/fragment@0/__overlay__/lvds/ports/port@0/endpoint");
> + lvds_endpoints[1] = rcar_du_of_find_node_by_path(overlay.np,
> + "/fragment@0/__overlay__/lvds/ports/port@1/endpoint");
> + du_port = rcar_du_of_find_node_by_path(overlay.np,
> + "/fragment@1/__overlay__/ports/port@0");
> + du_port_fixup = rcar_du_of_find_node_by_path(overlay.np,
> + "/__local_fixups__/fragment@1/__overlay__/ports/port@0");
Many strings with similar prefixes or substrings?
Would it make sense to e.g. locate "/fragment@0/__overlay__/lvds/ports"
first, and continue from there?
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org
In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds
^ permalink raw reply [flat|nested] 63+ messages in thread
* Re: [PATCH 01/10] dt-bindings: display: renesas: Add R-Car LVDS encoder DT bindings
2018-01-12 0:58 ` Laurent Pinchart
(?)
(?)
@ 2018-01-12 10:13 ` Geert Uytterhoeven
2018-01-12 13:29 ` Laurent Pinchart
-1 siblings, 1 reply; 63+ messages in thread
From: Geert Uytterhoeven @ 2018-01-12 10:13 UTC (permalink / raw)
To: Laurent Pinchart
Cc: DRI Development, Linux-Renesas, Sergei Shtylyov, devicetree
Hi Laurent,
On Fri, Jan 12, 2018 at 1:58 AM, Laurent Pinchart
<laurent.pinchart+renesas@ideasonboard.com> wrote:
> The Renesas R-Car Gen2 and Gen3 SoCs have internal LVDS encoders. Add
> corresponding device tree bindings.
>
> Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
> --- /dev/null
> +++ b/Documentation/devicetree/bindings/display/bridge/renesas,lvds.txt
> @@ -0,0 +1,54 @@
> +Renesas R-Car LVDS Encoder
> +==========================
> +
> +These DT bindings describe the LVDS encoder embedded in the Renesas R-Car Gen2
> +and Gen3 SoCs.
> +
> +Required properties:
> +
> +- compatible : Shall contain one of
> + - "renesas,lvds-r8a7743" for R8A7790 (R-Car RZ/G1M) compatible LVDS encoders
> + - "renesas,lvds-r8a7790" for R8A7790 (R-Car H2) compatible LVDS encoders
> + - "renesas,lvds-r8a7791" for R8A7791 (R-Car M2-W) compatible LVDS encoders
> + - "renesas,lvds-r8a7793" for R8A7791 (R-Car M2-N) compatible LVDS encoders
> + - "renesas,lvds-r8a7795" for R8A7795 (R-Car H3) compatible LVDS encoders
> + - "renesas,lvds-r8a7796" for R8A7796 (R-Car M3-W) compatible LVDS encoders
As this is a new binding, please use "renesas,<soc>-lvds".
BTW, would it make sense to use "renesas,<soc>-du" for the new DU binding, too?
Or have you reserved that for the future version that will have a one-to-one
mapping between device nodes and DU channels? ;-)
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org
In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds
^ permalink raw reply [flat|nested] 63+ messages in thread
* Re: [PATCH 02/10] dt-bindings: display: renesas: Deprecate LVDS support in the DU bindings
2018-01-12 9:54 ` Vladimir Zapolskiy
(?)
@ 2018-01-12 10:43 ` Laurent Pinchart
2018-01-12 14:52 ` Sergei Shtylyov
-1 siblings, 1 reply; 63+ messages in thread
From: Laurent Pinchart @ 2018-01-12 10:43 UTC (permalink / raw)
To: Vladimir Zapolskiy
Cc: Laurent Pinchart, dri-devel, linux-renesas-soc, Sergei Shtylyov,
devicetree
Hi Vladimir,
On Friday, 12 January 2018 11:54:57 EET Vladimir Zapolskiy wrote:
> On 01/12/2018 02:58 AM, Laurent Pinchart wrote:
> > The internal LVDS encoders now have their own DT bindings, representing
> > them as part of the DU is deprecated.
> >
> > Signed-off-by: Laurent Pinchart
> > <laurent.pinchart+renesas@ideasonboard.com>
> > ---
> >
> > .../devicetree/bindings/display/renesas,du.txt | 26
> > +++++++++------------- 1 file changed, 11 insertions(+), 15 deletions(-)
> >
> > diff --git a/Documentation/devicetree/bindings/display/renesas,du.txt
> > b/Documentation/devicetree/bindings/display/renesas,du.txt index
> > cd48aba3bc8c..8f6e0e118e3e 100644
> > --- a/Documentation/devicetree/bindings/display/renesas,du.txt
> > +++ b/Documentation/devicetree/bindings/display/renesas,du.txt
> > @@ -17,9 +17,7 @@ Required Properties:
> > - reg: A list of base address and length of each memory resource, one
> > for
> > each entry in the reg-names property.
> > - reg-names: Name of the memory resources. The DU requires one memory
> > - resource for the DU core (named "du") and one memory resource for
> > each
> > - LVDS encoder (named "lvds.x" with "x" being the LVDS controller
> > numerical
> > - index).
> > + resource for the DU core (named "du").
> > - interrupt-parent: phandle of the parent interrupt controller.
> > - interrupts: Interrupt specifiers for the DU interrupts.
> >
> > @@ -29,14 +27,13 @@ Required Properties:
> > - clock-names: Name of the clocks. This property is model-dependent.
> > - R8A7779 uses a single functional clock. The clock doesn't need to
> > be
> > named.
> > - - All other DU instances use one functional clock per channel and one
> > - clock per LVDS encoder (if available). The functional clocks must
> > be
> > - named "du.x" with "x" being the channel numerical index. The LVDS
> > clocks
> > - must be named "lvds.x" with "x" being the LVDS encoder numerical
> > index.
> > - - In addition to the functional and encoder clocks, all DU versions
> > also
> > - support externally supplied pixel clocks. Those clocks are
> > optional.
> > - When supplied they must be named "dclkin.x" with "x" being the
> > input
> > - clock numerical index.
> > + - All other DU instances use one functional clock per channel The
> > + functional clocks must be named "du.x" with "x" being the channel
> > + numerical index.
> > + - In addition to the functional clocks, all DU versions also support
> > + externally supplied pixel clocks. Those clocks are optional. When
> > + supplied they must be named "dclkin.x" with "x" being the input
> > clock
> > + numerical index.
> >
> > - vsps: A list of phandle and channel index tuples to the VSPs that
> > handle
> > the memory interfaces for the DU channels. The phandle identifies the
> > VSP
> > @@ -71,7 +68,7 @@ Example: R8A7795 (R-Car H3) ES2.0 DU
> > compatible = "renesas,du-r8a7795";
> > reg = <0 0xfeb00000 0 0x80000>,
> > <0 0xfeb90000 0 0x14>;
> > - reg-names = "du", "lvds.0";
> > + reg-names = "du";
>
> Since "reg-names" list is changed, I believe you'd like to update
> the "reg" property value as well.
Good point, I'll fix it.
> > interrupts = <GIC_SPI 256 IRQ_TYPE_LEVEL_HIGH>,
> > <GIC_SPI 268 IRQ_TYPE_LEVEL_HIGH>,
> > <GIC_SPI 269 IRQ_TYPE_LEVEL_HIGH>,
> > @@ -79,9 +76,8 @@ Example: R8A7795 (R-Car H3) ES2.0 DU
> > clocks = <&cpg CPG_MOD 724>,
> > <&cpg CPG_MOD 723>,
> > <&cpg CPG_MOD 722>,
> > - <&cpg CPG_MOD 721>,
> > - <&cpg CPG_MOD 727>;
> > - clock-names = "du.0", "du.1", "du.2", "du.3", "lvds.0";
> > + <&cpg CPG_MOD 721>;
> > + clock-names = "du.0", "du.1", "du.2", "du.3";
> > vsps = <&vspd0 0>, <&vspd1 0>, <&vspd2 0>, <&vspd0 1>;
> >
> > ports {
--
Regards,
Laurent Pinchart
^ permalink raw reply [flat|nested] 63+ messages in thread
* Re: [PATCH 02/10] dt-bindings: display: renesas: Deprecate LVDS support in the DU bindings
2018-01-12 9:49 ` Geert Uytterhoeven
@ 2018-01-12 10:44 ` Laurent Pinchart
0 siblings, 0 replies; 63+ messages in thread
From: Laurent Pinchart @ 2018-01-12 10:44 UTC (permalink / raw)
To: Geert Uytterhoeven
Cc: Laurent Pinchart, DRI Development, Linux-Renesas,
Sergei Shtylyov, devicetree-u79uwXL29TY76Z2rM5mHXA
Hi Geert,
On Friday, 12 January 2018 11:49:28 EET Geert Uytterhoeven wrote:
> On Fri, Jan 12, 2018 at 1:58 AM, Laurent Pinchart wrote:
> > The internal LVDS encoders now have their own DT bindings, representing
> > them as part of the DU is deprecated.
> >
> > Signed-off-by: Laurent Pinchart
> > <laurent.pinchart+renesas-ryLnwIuWjnjg/C1BVhZhaw@public.gmane.org>
>
> FWIW, you're not really deprecating the LVDS part, but removing it
> completely. Do you want to keep a reference instead?
I don't think we should keep a reference as it would only confuse DT authors.
The information is kept in the git history. I can rewrite the commit message,
but I consider this as deprecating the legacy bindings.
--
Regards,
Laurent Pinchart
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 63+ messages in thread
* Re: [PATCH 02/10] dt-bindings: display: renesas: Deprecate LVDS support in the DU bindings
@ 2018-01-12 10:44 ` Laurent Pinchart
0 siblings, 0 replies; 63+ messages in thread
From: Laurent Pinchart @ 2018-01-12 10:44 UTC (permalink / raw)
To: Geert Uytterhoeven
Cc: Laurent Pinchart, DRI Development, Linux-Renesas,
Sergei Shtylyov, devicetree
Hi Geert,
On Friday, 12 January 2018 11:49:28 EET Geert Uytterhoeven wrote:
> On Fri, Jan 12, 2018 at 1:58 AM, Laurent Pinchart wrote:
> > The internal LVDS encoders now have their own DT bindings, representing
> > them as part of the DU is deprecated.
> >
> > Signed-off-by: Laurent Pinchart
> > <laurent.pinchart+renesas@ideasonboard.com>
>
> FWIW, you're not really deprecating the LVDS part, but removing it
> completely. Do you want to keep a reference instead?
I don't think we should keep a reference as it would only confuse DT authors.
The information is kept in the git history. I can rewrite the commit message,
but I consider this as deprecating the legacy bindings.
--
Regards,
Laurent Pinchart
^ permalink raw reply [flat|nested] 63+ messages in thread
* RE: [PATCH 01/10] dt-bindings: display: renesas: Add R-Car LVDS encoder DT bindings
2018-01-12 0:58 ` Laurent Pinchart
@ 2018-01-12 12:59 ` Biju Das
-1 siblings, 0 replies; 63+ messages in thread
From: Biju Das @ 2018-01-12 12:59 UTC (permalink / raw)
To: Laurent Pinchart, dri-devel-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW
Cc: linux-renesas-soc-u79uwXL29TY76Z2rM5mHXA, Sergei Shtylyov,
devicetree-u79uwXL29TY76Z2rM5mHXA
Hi,
> Subject: [PATCH 01/10] dt-bindings: display: renesas: Add R-Car LVDS encoder
> DT bindings
>
> The Renesas R-Car Gen2 and Gen3 SoCs have internal LVDS encoders. Add
> corresponding device tree bindings.
>
> Signed-off-by: Laurent Pinchart
> <laurent.pinchart+renesas-ryLnwIuWjnjg/C1BVhZhaw@public.gmane.org>
> ---
> .../bindings/display/bridge/renesas,lvds.txt | 54
> ++++++++++++++++++++++
> MAINTAINERS | 1 +
> 2 files changed, 55 insertions(+)
> create mode 100644
> Documentation/devicetree/bindings/display/bridge/renesas,lvds.txt
>
> diff --git a/Documentation/devicetree/bindings/display/bridge/renesas,lvds.txt
> b/Documentation/devicetree/bindings/display/bridge/renesas,lvds.txt
> new file mode 100644
> index 000000000000..459c56822eda
> --- /dev/null
> +++ b/Documentation/devicetree/bindings/display/bridge/renesas,lvds.txt
> @@ -0,0 +1,54 @@
> +Renesas R-Car LVDS Encoder
> +==========================
> +
> +These DT bindings describe the LVDS encoder embedded in the Renesas
> +R-Car Gen2 and Gen3 SoCs.
> +
> +Required properties:
> +
> +- compatible : Shall contain one of
> + - "renesas,lvds-r8a7743" for R8A7790 (R-Car RZ/G1M) compatible LVDS
> +encoders
Typo. It should be R8A7743 .
Regards,
Biju
Renesas Electronics Europe Ltd, Dukes Meadow, Millboard Road, Bourne End, Buckinghamshire, SL8 5FH, UK. Registered in England & Wales under Registered No. 04586709.
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 63+ messages in thread
* RE: [PATCH 01/10] dt-bindings: display: renesas: Add R-Car LVDS encoder DT bindings
@ 2018-01-12 12:59 ` Biju Das
0 siblings, 0 replies; 63+ messages in thread
From: Biju Das @ 2018-01-12 12:59 UTC (permalink / raw)
To: Laurent Pinchart, dri-devel
Cc: linux-renesas-soc, Sergei Shtylyov, devicetree
Hi,
> Subject: [PATCH 01/10] dt-bindings: display: renesas: Add R-Car LVDS encoder
> DT bindings
>
> The Renesas R-Car Gen2 and Gen3 SoCs have internal LVDS encoders. Add
> corresponding device tree bindings.
>
> Signed-off-by: Laurent Pinchart
> <laurent.pinchart+renesas@ideasonboard.com>
> ---
> .../bindings/display/bridge/renesas,lvds.txt | 54
> ++++++++++++++++++++++
> MAINTAINERS | 1 +
> 2 files changed, 55 insertions(+)
> create mode 100644
> Documentation/devicetree/bindings/display/bridge/renesas,lvds.txt
>
> diff --git a/Documentation/devicetree/bindings/display/bridge/renesas,lvds.txt
> b/Documentation/devicetree/bindings/display/bridge/renesas,lvds.txt
> new file mode 100644
> index 000000000000..459c56822eda
> --- /dev/null
> +++ b/Documentation/devicetree/bindings/display/bridge/renesas,lvds.txt
> @@ -0,0 +1,54 @@
> +Renesas R-Car LVDS Encoder
> +==========================
> +
> +These DT bindings describe the LVDS encoder embedded in the Renesas
> +R-Car Gen2 and Gen3 SoCs.
> +
> +Required properties:
> +
> +- compatible : Shall contain one of
> + - "renesas,lvds-r8a7743" for R8A7790 (R-Car RZ/G1M) compatible LVDS
> +encoders
Typo. It should be R8A7743 .
Regards,
Biju
Renesas Electronics Europe Ltd, Dukes Meadow, Millboard Road, Bourne End, Buckinghamshire, SL8 5FH, UK. Registered in England & Wales under Registered No. 04586709.
^ permalink raw reply [flat|nested] 63+ messages in thread
* Re: [PATCH 01/10] dt-bindings: display: renesas: Add R-Car LVDS encoder DT bindings
2018-01-12 12:59 ` Biju Das
(?)
@ 2018-01-12 13:26 ` Laurent Pinchart
2018-01-12 14:00 ` Fabrizio Castro
-1 siblings, 1 reply; 63+ messages in thread
From: Laurent Pinchart @ 2018-01-12 13:26 UTC (permalink / raw)
To: Biju Das
Cc: Laurent Pinchart, dri-devel, linux-renesas-soc, Sergei Shtylyov,
devicetree
Hi Biju,
On Friday, 12 January 2018 14:59:53 EET Biju Das wrote:
> Hi,
>
> > Subject: [PATCH 01/10] dt-bindings: display: renesas: Add R-Car LVDS
> > encoder DT bindings
> >
> > The Renesas R-Car Gen2 and Gen3 SoCs have internal LVDS encoders. Add
> > corresponding device tree bindings.
> >
> > Signed-off-by: Laurent Pinchart
> > <laurent.pinchart+renesas@ideasonboard.com>
> > ---
> >
> > .../bindings/display/bridge/renesas,lvds.txt | 54 +++++++++++++++++
> > MAINTAINERS | 1 +
> > 2 files changed, 55 insertions(+)
> > create mode 100644
> >
> > Documentation/devicetree/bindings/display/bridge/renesas,lvds.txt
> >
> > diff --git
> > a/Documentation/devicetree/bindings/display/bridge/renesas,lvds.txt
> > b/Documentation/devicetree/bindings/display/bridge/renesas,lvds.txt new
> > file mode 100644
> > index 000000000000..459c56822eda
> > --- /dev/null
> > +++ b/Documentation/devicetree/bindings/display/bridge/renesas,lvds.txt
> > @@ -0,0 +1,54 @@
> > +Renesas R-Car LVDS Encoder
> > +==========================
> > +
> > +These DT bindings describe the LVDS encoder embedded in the Renesas
> > +R-Car Gen2 and Gen3 SoCs.
> > +
> > +Required properties:
> > +
> > +- compatible : Shall contain one of
> > + - "renesas,lvds-r8a7743" for R8A7790 (R-Car RZ/G1M) compatible LVDS
> > +encoders
>
> Typo. It should be R8A7743 .
Oops. Will fix in v2.
--
Regards,
Laurent Pinchart
^ permalink raw reply [flat|nested] 63+ messages in thread
* Re: [PATCH 01/10] dt-bindings: display: renesas: Add R-Car LVDS encoder DT bindings
2018-01-12 10:13 ` Geert Uytterhoeven
@ 2018-01-12 13:29 ` Laurent Pinchart
2018-01-15 6:55 ` Simon Horman
0 siblings, 1 reply; 63+ messages in thread
From: Laurent Pinchart @ 2018-01-12 13:29 UTC (permalink / raw)
To: Geert Uytterhoeven
Cc: Laurent Pinchart, DRI Development, Linux-Renesas,
Sergei Shtylyov, devicetree
Hi Geert,
On Friday, 12 January 2018 12:13:18 EET Geert Uytterhoeven wrote:
> On Fri, Jan 12, 2018 at 1:58 AM, Laurent Pinchart wrote:
> > The Renesas R-Car Gen2 and Gen3 SoCs have internal LVDS encoders. Add
> > corresponding device tree bindings.
> >
> > Signed-off-by: Laurent Pinchart
> > <laurent.pinchart+renesas@ideasonboard.com>
> >
> > --- /dev/null
> > +++ b/Documentation/devicetree/bindings/display/bridge/renesas,lvds.txt
> > @@ -0,0 +1,54 @@
> > +Renesas R-Car LVDS Encoder
> > +==========================
> > +
> > +These DT bindings describe the LVDS encoder embedded in the Renesas R-Car
> > Gen2 +and Gen3 SoCs.
> > +
> > +Required properties:
> > +
> > +- compatible : Shall contain one of
> > + - "renesas,lvds-r8a7743" for R8A7790 (R-Car RZ/G1M) compatible LVDS
> > encoders
> > + - "renesas,lvds-r8a7790" for R8A7790 (R-Car H2) compatible LVDS
> > encoders
> > + - "renesas,lvds-r8a7791" for R8A7791 (R-Car M2-W) compatible LVDS
> > encoders
> > + - "renesas,lvds-r8a7793" for R8A7791 (R-Car M2-N) compatible LVDS
> > encoders
> > + - "renesas,lvds-r8a7795" for R8A7795 (R-Car H3) compatible LVDS
> > encoders
> > + - "renesas,lvds-r8a7796" for R8A7796 (R-Car M3-W) compatible LVDS
> > encoders
>
> As this is a new binding, please use "renesas,<soc>-lvds".
I've recently been thinking that we made the wrong choice, <ip>-<soc> would be
better in my opinion as it aligns with <ip>-<version>, but it's too late to
change that, so I'll change the order here.
> BTW, would it make sense to use "renesas,<soc>-du" for the new DU binding,
> too? Or have you reserved that for the future version that will have a
> one-to-one mapping between device nodes and DU channels? ;-)
It's a good idea, let's reserve it for that evolution. If it ever happens ;-)
--
Regards,
Laurent Pinchart
^ permalink raw reply [flat|nested] 63+ messages in thread
* Re: [PATCH 01/10] dt-bindings: display: renesas: Add R-Car LVDS encoder DT bindings
2018-01-12 9:45 ` Geert Uytterhoeven
@ 2018-01-12 13:36 ` Laurent Pinchart
0 siblings, 0 replies; 63+ messages in thread
From: Laurent Pinchart @ 2018-01-12 13:36 UTC (permalink / raw)
To: Geert Uytterhoeven
Cc: Laurent Pinchart, DRI Development, Linux-Renesas,
Sergei Shtylyov, devicetree-u79uwXL29TY76Z2rM5mHXA
Hi Geert,
On Friday, 12 January 2018 11:45:56 EET Geert Uytterhoeven wrote:
> On Fri, Jan 12, 2018 at 1:58 AM, Laurent Pinchart wrote:
> > The Renesas R-Car Gen2 and Gen3 SoCs have internal LVDS encoders. Add
> > corresponding device tree bindings.
> >
> > Signed-off-by: Laurent Pinchart
> > <laurent.pinchart+renesas-ryLnwIuWjnjg/C1BVhZhaw@public.gmane.org>
> >
> > --- /dev/null
> > +++ b/Documentation/devicetree/bindings/display/bridge/renesas,lvds.txt
> > @@ -0,0 +1,54 @@
> > +Renesas R-Car LVDS Encoder
> > +==========================
> > +
> > +These DT bindings describe the LVDS encoder embedded in the Renesas R-Car
> > Gen2 +and Gen3 SoCs.
> > +
> > +Required properties:
> > +
> > +- compatible : Shall contain one of
> > + - "renesas,lvds-r8a7743" for R8A7790 (R-Car RZ/G1M) compatible LVDS
> > encoders
> > + - "renesas,lvds-r8a7790" for R8A7790 (R-Car H2) compatible LVDS
> > encoders
> > + - "renesas,lvds-r8a7791" for R8A7791 (R-Car M2-W) compatible LVDS
> > encoders
> > + - "renesas,lvds-r8a7793" for R8A7791 (R-Car M2-N) compatible LVDS
> > encoders
> > + - "renesas,lvds-r8a7795" for R8A7795 (R-Car H3) compatible LVDS
> > encoders
> > + - "renesas,lvds-r8a7796" for R8A7796 (R-Car M3-W) compatible LVDS
> > encoders
> > +
> > +- reg: Base address and length for the memory-mapped registers
> > +- clocks: A phandle + clock-specifier pair for the functional clock
>
> Please document the "resets" property, too, and add it to the example.
> According to the rcar-3.6.0 BSP, reset support is needed desperately.
Good point. I'll make it mandatory in the new bindings but treat it as
optional in the driver as the live DT patching doesn't create the reset
properties.
--
Regards,
Laurent Pinchart
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 63+ messages in thread
* Re: [PATCH 01/10] dt-bindings: display: renesas: Add R-Car LVDS encoder DT bindings
@ 2018-01-12 13:36 ` Laurent Pinchart
0 siblings, 0 replies; 63+ messages in thread
From: Laurent Pinchart @ 2018-01-12 13:36 UTC (permalink / raw)
To: Geert Uytterhoeven
Cc: Laurent Pinchart, DRI Development, Linux-Renesas,
Sergei Shtylyov, devicetree
Hi Geert,
On Friday, 12 January 2018 11:45:56 EET Geert Uytterhoeven wrote:
> On Fri, Jan 12, 2018 at 1:58 AM, Laurent Pinchart wrote:
> > The Renesas R-Car Gen2 and Gen3 SoCs have internal LVDS encoders. Add
> > corresponding device tree bindings.
> >
> > Signed-off-by: Laurent Pinchart
> > <laurent.pinchart+renesas@ideasonboard.com>
> >
> > --- /dev/null
> > +++ b/Documentation/devicetree/bindings/display/bridge/renesas,lvds.txt
> > @@ -0,0 +1,54 @@
> > +Renesas R-Car LVDS Encoder
> > +==========================
> > +
> > +These DT bindings describe the LVDS encoder embedded in the Renesas R-Car
> > Gen2 +and Gen3 SoCs.
> > +
> > +Required properties:
> > +
> > +- compatible : Shall contain one of
> > + - "renesas,lvds-r8a7743" for R8A7790 (R-Car RZ/G1M) compatible LVDS
> > encoders
> > + - "renesas,lvds-r8a7790" for R8A7790 (R-Car H2) compatible LVDS
> > encoders
> > + - "renesas,lvds-r8a7791" for R8A7791 (R-Car M2-W) compatible LVDS
> > encoders
> > + - "renesas,lvds-r8a7793" for R8A7791 (R-Car M2-N) compatible LVDS
> > encoders
> > + - "renesas,lvds-r8a7795" for R8A7795 (R-Car H3) compatible LVDS
> > encoders
> > + - "renesas,lvds-r8a7796" for R8A7796 (R-Car M3-W) compatible LVDS
> > encoders
> > +
> > +- reg: Base address and length for the memory-mapped registers
> > +- clocks: A phandle + clock-specifier pair for the functional clock
>
> Please document the "resets" property, too, and add it to the example.
> According to the rcar-3.6.0 BSP, reset support is needed desperately.
Good point. I'll make it mandatory in the new bindings but treat it as
optional in the driver as the live DT patching doesn't create the reset
properties.
--
Regards,
Laurent Pinchart
^ permalink raw reply [flat|nested] 63+ messages in thread
* Re: [PATCH 00/10] R-Car DU: Convert LVDS code to bridge driver
2018-01-12 9:47 ` [PATCH 00/10] R-Car DU: Convert LVDS code to bridge driver Geert Uytterhoeven
@ 2018-01-12 13:48 ` Laurent Pinchart
2018-01-15 6:57 ` Simon Horman
0 siblings, 1 reply; 63+ messages in thread
From: Laurent Pinchart @ 2018-01-12 13:48 UTC (permalink / raw)
To: Geert Uytterhoeven
Cc: Laurent Pinchart, DRI Development, Linux-Renesas,
Sergei Shtylyov, devicetree
Hi Geert,
On Friday, 12 January 2018 11:47:03 EET Geert Uytterhoeven wrote:
> On Fri, Jan 12, 2018 at 1:58 AM, Laurent Pinchart wrote:
> > This patch series addresses a design mistake that dates back from the
> > initial DU support. Support for the LVDS encoders, which are IP cores
> > separate from the DU, was bundled in the DU driver. Worse, both the DU
> > and LVDS were described through a single DT node.
> >
> > To fix the, patches 01/10 and 02/10 define new DT bindings for the LVDS
> > encoders, and deprecate their description inside the DU bindings. To
> > retain backward compatibility with existing DT, patch 03/10 then patches
> > the device tree at runtime to convert the legacy bindings to the new ones.
>
> Looks like we will have to postpone the R-Car Gen2 Modern DT flag day
> again by a few kernel releases?
Why so ? We don't have to drop support for all legacy DT bindings at the same
time, do we ? We can switch to the new-style clock bindings on Gen2 already,
and drop the legacy LVDS bindings later.
--
Regards,
Laurent Pinchart
^ permalink raw reply [flat|nested] 63+ messages in thread
* Re: [PATCH 03/10] drm: rcar-du: Fix legacy DT to create LVDS encoder nodes
2018-01-12 10:09 ` Geert Uytterhoeven
@ 2018-01-12 13:53 ` Laurent Pinchart
-1 siblings, 0 replies; 63+ messages in thread
From: Laurent Pinchart @ 2018-01-12 13:53 UTC (permalink / raw)
To: Geert Uytterhoeven
Cc: Laurent Pinchart, DRI Development, Linux-Renesas,
Sergei Shtylyov, devicetree-u79uwXL29TY76Z2rM5mHXA
Hi Geert,
On Friday, 12 January 2018 12:09:45 EET Geert Uytterhoeven wrote:
> On Fri, Jan 12, 2018 at 1:58 AM, Laurent Pinchart wrote:
> > The internal LVDS encoders now have their own DT bindings. Before
> > switching the driver infrastructure to those new bindings, implement
> > backward-compatibility through live DT patching.
> >
> > Patching is disabled and will be enabled along with support for the new
> > DT bindings in the DU driver.
> >
> > Signed-off-by: Laurent Pinchart
> > <laurent.pinchart+renesas-ryLnwIuWjnjg/C1BVhZhaw@public.gmane.org>
>
> Thanks for your patch!
>
> > --- a/drivers/gpu/drm/rcar-du/Kconfig
> > +++ b/drivers/gpu/drm/rcar-du/Kconfig
> > @@ -22,6 +22,7 @@ config DRM_RCAR_LVDS
> > bool "R-Car DU LVDS Encoder Support"
> > depends on DRM_RCAR_DU
> > select DRM_PANEL
> > + select OF_OVERLAY
>
> select OF_FLATTREE for of_fdt_unflatten_tree()
I'll fix that.
> (you can probably check with sparc all*config)
I'd have to install a sparc cross-compiler :-)
> > --- /dev/null
> > +++ b/drivers/gpu/drm/rcar-du/rcar_du_of.c
> > @@ -0,0 +1,440 @@
[snip]
> > +static void __init rcar_du_of_lvds_patch_one(struct device_node *du,
> > + unsigned int port_id,
> > + const struct resource *res,
> > + const __be32 *reg,
> > + const struct of_phandle_args
> > *clkspec,
> > + struct device_node *local,
> > + struct device_node *remote)
> > +{
> >
> > +
> > + /* Skip if the LVDS node already exists. */
> > + sprintf(name, "lvds@%llx", (u64)res->start);
>
> I guess you cannot use %pa because you don't want a 0x prefix?
Correct.
> > + /*
> > + * Patch the LVDS and DU port nodes names and the associated fixup
> > + * entries.
> > + */
> > + lvds = rcar_du_of_find_node_by_path(overlay.np,
> > + "/fragment@0/__overlay__/lvds");
> > + lvds_endpoints[0] = rcar_du_of_find_node_by_path(overlay.np,
> > + "/fragment@0/__overlay__/lvds/ports/port@0/endpoint");
> > + lvds_endpoints[1] = rcar_du_of_find_node_by_path(overlay.np,
> > + "/fragment@0/__overlay__/lvds/ports/port@1/endpoint");
> > + du_port = rcar_du_of_find_node_by_path(overlay.np,
> > + "/fragment@1/__overlay__/ports/port@0");
> > + du_port_fixup = rcar_du_of_find_node_by_path(overlay.np,
> > + "/__local_fixups__/fragment@1/__overlay__/ports/port@0");
>
> Many strings with similar prefixes or substrings?
> Would it make sense to e.g. locate "/fragment@0/__overlay__/lvds/ports"
> first, and continue from there?
I can do that for the first three, yes.
--
Regards,
Laurent Pinchart
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 63+ messages in thread
* Re: [PATCH 03/10] drm: rcar-du: Fix legacy DT to create LVDS encoder nodes
@ 2018-01-12 13:53 ` Laurent Pinchart
0 siblings, 0 replies; 63+ messages in thread
From: Laurent Pinchart @ 2018-01-12 13:53 UTC (permalink / raw)
To: Geert Uytterhoeven
Cc: Laurent Pinchart, DRI Development, Linux-Renesas,
Sergei Shtylyov, devicetree
Hi Geert,
On Friday, 12 January 2018 12:09:45 EET Geert Uytterhoeven wrote:
> On Fri, Jan 12, 2018 at 1:58 AM, Laurent Pinchart wrote:
> > The internal LVDS encoders now have their own DT bindings. Before
> > switching the driver infrastructure to those new bindings, implement
> > backward-compatibility through live DT patching.
> >
> > Patching is disabled and will be enabled along with support for the new
> > DT bindings in the DU driver.
> >
> > Signed-off-by: Laurent Pinchart
> > <laurent.pinchart+renesas@ideasonboard.com>
>
> Thanks for your patch!
>
> > --- a/drivers/gpu/drm/rcar-du/Kconfig
> > +++ b/drivers/gpu/drm/rcar-du/Kconfig
> > @@ -22,6 +22,7 @@ config DRM_RCAR_LVDS
> > bool "R-Car DU LVDS Encoder Support"
> > depends on DRM_RCAR_DU
> > select DRM_PANEL
> > + select OF_OVERLAY
>
> select OF_FLATTREE for of_fdt_unflatten_tree()
I'll fix that.
> (you can probably check with sparc all*config)
I'd have to install a sparc cross-compiler :-)
> > --- /dev/null
> > +++ b/drivers/gpu/drm/rcar-du/rcar_du_of.c
> > @@ -0,0 +1,440 @@
[snip]
> > +static void __init rcar_du_of_lvds_patch_one(struct device_node *du,
> > + unsigned int port_id,
> > + const struct resource *res,
> > + const __be32 *reg,
> > + const struct of_phandle_args
> > *clkspec,
> > + struct device_node *local,
> > + struct device_node *remote)
> > +{
> >
> > +
> > + /* Skip if the LVDS node already exists. */
> > + sprintf(name, "lvds@%llx", (u64)res->start);
>
> I guess you cannot use %pa because you don't want a 0x prefix?
Correct.
> > + /*
> > + * Patch the LVDS and DU port nodes names and the associated fixup
> > + * entries.
> > + */
> > + lvds = rcar_du_of_find_node_by_path(overlay.np,
> > + "/fragment@0/__overlay__/lvds");
> > + lvds_endpoints[0] = rcar_du_of_find_node_by_path(overlay.np,
> > + "/fragment@0/__overlay__/lvds/ports/port@0/endpoint");
> > + lvds_endpoints[1] = rcar_du_of_find_node_by_path(overlay.np,
> > + "/fragment@0/__overlay__/lvds/ports/port@1/endpoint");
> > + du_port = rcar_du_of_find_node_by_path(overlay.np,
> > + "/fragment@1/__overlay__/ports/port@0");
> > + du_port_fixup = rcar_du_of_find_node_by_path(overlay.np,
> > + "/__local_fixups__/fragment@1/__overlay__/ports/port@0");
>
> Many strings with similar prefixes or substrings?
> Would it make sense to e.g. locate "/fragment@0/__overlay__/lvds/ports"
> first, and continue from there?
I can do that for the first three, yes.
--
Regards,
Laurent Pinchart
^ permalink raw reply [flat|nested] 63+ messages in thread
* RE: [PATCH 01/10] dt-bindings: display: renesas: Add R-Car LVDS encoder DT bindings
2018-01-12 13:26 ` Laurent Pinchart
@ 2018-01-12 14:00 ` Fabrizio Castro
2018-01-12 14:25 ` Laurent Pinchart
0 siblings, 1 reply; 63+ messages in thread
From: Fabrizio Castro @ 2018-01-12 14:00 UTC (permalink / raw)
To: Laurent Pinchart, Biju Das
Cc: Laurent Pinchart, dri-devel, linux-renesas-soc, Sergei Shtylyov,
devicetree
Hi Laurent,
> Subject: Re: [PATCH 01/10] dt-bindings: display: renesas: Add R-Car LVDS encoder DT bindings
>
> Hi Biju,
>
> On Friday, 12 January 2018 14:59:53 EET Biju Das wrote:
> > Hi,
> >
> > > Subject: [PATCH 01/10] dt-bindings: display: renesas: Add R-Car LVDS
> > > encoder DT bindings
> > >
> > > The Renesas R-Car Gen2 and Gen3 SoCs have internal LVDS encoders. Add
> > > corresponding device tree bindings.
> > >
> > > Signed-off-by: Laurent Pinchart
> > > <laurent.pinchart+renesas@ideasonboard.com>
> > > ---
> > >
> > > .../bindings/display/bridge/renesas,lvds.txt | 54 +++++++++++++++++
> > > MAINTAINERS | 1 +
> > > 2 files changed, 55 insertions(+)
> > > create mode 100644
> > >
> > > Documentation/devicetree/bindings/display/bridge/renesas,lvds.txt
> > >
> > > diff --git
> > > a/Documentation/devicetree/bindings/display/bridge/renesas,lvds.txt
> > > b/Documentation/devicetree/bindings/display/bridge/renesas,lvds.txt new
> > > file mode 100644
> > > index 000000000000..459c56822eda
> > > --- /dev/null
> > > +++ b/Documentation/devicetree/bindings/display/bridge/renesas,lvds.txt
> > > @@ -0,0 +1,54 @@
> > > +Renesas R-Car LVDS Encoder
> > > +==========================
> > > +
> > > +These DT bindings describe the LVDS encoder embedded in the Renesas
> > > +R-Car Gen2 and Gen3 SoCs.
> > > +
> > > +Required properties:
> > > +
> > > +- compatible : Shall contain one of
> > > + - "renesas,lvds-r8a7743" for R8A7790 (R-Car RZ/G1M) compatible LVDS
The following also needs polishing for v2:
"(R-Car RZ/G1M)" -> "(RZ/G1M)"
Thanks,
Fab
> > > +encoders
> >
> > Typo. It should be R8A7743 .
>
> Oops. Will fix in v2.
>
> --
> Regards,
>
> Laurent Pinchart
Renesas Electronics Europe Ltd, Dukes Meadow, Millboard Road, Bourne End, Buckinghamshire, SL8 5FH, UK. Registered in England & Wales under Registered No. 04586709.
^ permalink raw reply [flat|nested] 63+ messages in thread
* Re: [PATCH 01/10] dt-bindings: display: renesas: Add R-Car LVDS encoder DT bindings
2018-01-12 14:00 ` Fabrizio Castro
@ 2018-01-12 14:25 ` Laurent Pinchart
0 siblings, 0 replies; 63+ messages in thread
From: Laurent Pinchart @ 2018-01-12 14:25 UTC (permalink / raw)
To: Fabrizio Castro
Cc: devicetree, Laurent Pinchart, Sergei Shtylyov, dri-devel,
Biju Das, linux-renesas-soc
Hi Fabrizio,
On Friday, 12 January 2018 16:00:31 EET Fabrizio Castro wrote:
> Hi Laurent,
>
> > Subject: Re: [PATCH 01/10] dt-bindings: display: renesas: Add R-Car LVDS
> > encoder DT bindings
> > On Friday, 12 January 2018 14:59:53 EET Biju Das wrote:
> >> Hi,
> >>
> >>> Subject: [PATCH 01/10] dt-bindings: display: renesas: Add R-Car LVDS
> >>> encoder DT bindings
> >>>
> >>> The Renesas R-Car Gen2 and Gen3 SoCs have internal LVDS encoders. Add
> >>> corresponding device tree bindings.
> >>>
> >>> Signed-off-by: Laurent Pinchart
> >>> <laurent.pinchart+renesas@ideasonboard.com>
> >>> ---
> >>>
> >>> .../bindings/display/bridge/renesas,lvds.txt | 54 +++++++++++++++
> >>> MAINTAINERS | 1 +
> >>> 2 files changed, 55 insertions(+)
> >>> create mode 100644
> >>>
> >>> Documentation/devicetree/bindings/display/bridge/renesas,lvds.txt
> >>>
> >>> diff --git
> >>> a/Documentation/devicetree/bindings/display/bridge/renesas,lvds.txt
> >>> b/Documentation/devicetree/bindings/display/bridge/renesas,lvds.txt
> >>> new
> >>> file mode 100644
> >>> index 000000000000..459c56822eda
> >>> --- /dev/null
> >>> +++
> >>> b/Documentation/devicetree/bindings/display/bridge/renesas,lvds.txt
> >>> @@ -0,0 +1,54 @@
> >>> +Renesas R-Car LVDS Encoder
> >>> +==========================
> >>> +
> >>> +These DT bindings describe the LVDS encoder embedded in the Renesas
> >>> +R-Car Gen2 and Gen3 SoCs.
> >>> +
> >>> +Required properties:
> >>> +
> >>> +- compatible : Shall contain one of
> >>> + - "renesas,lvds-r8a7743" for R8A7790 (R-Car RZ/G1M) compatible LVDS
>
> The following also needs polishing for v2:
> "(R-Car RZ/G1M)" -> "(RZ/G1M)"
I'll fix it too.
> >>> +encoders
> >>
> >> Typo. It should be R8A7743 .
> >
> > Oops. Will fix in v2.
--
Regards,
Laurent Pinchart
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply [flat|nested] 63+ messages in thread
* Re: [PATCH 01/10] dt-bindings: display: renesas: Add R-Car LVDS encoder DT bindings
@ 2018-01-12 14:25 ` Laurent Pinchart
0 siblings, 0 replies; 63+ messages in thread
From: Laurent Pinchart @ 2018-01-12 14:25 UTC (permalink / raw)
To: Fabrizio Castro
Cc: Biju Das, Laurent Pinchart, dri-devel, linux-renesas-soc,
Sergei Shtylyov, devicetree
Hi Fabrizio,
On Friday, 12 January 2018 16:00:31 EET Fabrizio Castro wrote:
> Hi Laurent,
>
> > Subject: Re: [PATCH 01/10] dt-bindings: display: renesas: Add R-Car LVDS
> > encoder DT bindings
> > On Friday, 12 January 2018 14:59:53 EET Biju Das wrote:
> >> Hi,
> >>
> >>> Subject: [PATCH 01/10] dt-bindings: display: renesas: Add R-Car LVDS
> >>> encoder DT bindings
> >>>
> >>> The Renesas R-Car Gen2 and Gen3 SoCs have internal LVDS encoders. Add
> >>> corresponding device tree bindings.
> >>>
> >>> Signed-off-by: Laurent Pinchart
> >>> <laurent.pinchart+renesas@ideasonboard.com>
> >>> ---
> >>>
> >>> .../bindings/display/bridge/renesas,lvds.txt | 54 +++++++++++++++
> >>> MAINTAINERS | 1 +
> >>> 2 files changed, 55 insertions(+)
> >>> create mode 100644
> >>>
> >>> Documentation/devicetree/bindings/display/bridge/renesas,lvds.txt
> >>>
> >>> diff --git
> >>> a/Documentation/devicetree/bindings/display/bridge/renesas,lvds.txt
> >>> b/Documentation/devicetree/bindings/display/bridge/renesas,lvds.txt
> >>> new
> >>> file mode 100644
> >>> index 000000000000..459c56822eda
> >>> --- /dev/null
> >>> +++
> >>> b/Documentation/devicetree/bindings/display/bridge/renesas,lvds.txt
> >>> @@ -0,0 +1,54 @@
> >>> +Renesas R-Car LVDS Encoder
> >>> +==========================
> >>> +
> >>> +These DT bindings describe the LVDS encoder embedded in the Renesas
> >>> +R-Car Gen2 and Gen3 SoCs.
> >>> +
> >>> +Required properties:
> >>> +
> >>> +- compatible : Shall contain one of
> >>> + - "renesas,lvds-r8a7743" for R8A7790 (R-Car RZ/G1M) compatible LVDS
>
> The following also needs polishing for v2:
> "(R-Car RZ/G1M)" -> "(RZ/G1M)"
I'll fix it too.
> >>> +encoders
> >>
> >> Typo. It should be R8A7743 .
> >
> > Oops. Will fix in v2.
--
Regards,
Laurent Pinchart
^ permalink raw reply [flat|nested] 63+ messages in thread
* Re: [PATCH 02/10] dt-bindings: display: renesas: Deprecate LVDS support in the DU bindings
2018-01-12 10:43 ` Laurent Pinchart
@ 2018-01-12 14:52 ` Sergei Shtylyov
0 siblings, 0 replies; 63+ messages in thread
From: Sergei Shtylyov @ 2018-01-12 14:52 UTC (permalink / raw)
To: Laurent Pinchart, Vladimir Zapolskiy
Cc: Laurent Pinchart, dri-devel-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW,
linux-renesas-soc-u79uwXL29TY76Z2rM5mHXA,
devicetree-u79uwXL29TY76Z2rM5mHXA
On 01/12/2018 01:43 PM, Laurent Pinchart wrote:
>>> The internal LVDS encoders now have their own DT bindings, representing
>>> them as part of the DU is deprecated.
>>>
>>> Signed-off-by: Laurent Pinchart
>>> <laurent.pinchart+renesas-ryLnwIuWjnjg/C1BVhZhaw@public.gmane.org>
>>> ---
>>>
>>> .../devicetree/bindings/display/renesas,du.txt | 26
>>> +++++++++------------- 1 file changed, 11 insertions(+), 15 deletions(-)
>>>
>>> diff --git a/Documentation/devicetree/bindings/display/renesas,du.txt
>>> b/Documentation/devicetree/bindings/display/renesas,du.txt index
>>> cd48aba3bc8c..8f6e0e118e3e 100644
>>> --- a/Documentation/devicetree/bindings/display/renesas,du.txt
>>> +++ b/Documentation/devicetree/bindings/display/renesas,du.txt
[...]
>>> @@ -71,7 +68,7 @@ Example: R8A7795 (R-Car H3) ES2.0 DU
>>> compatible = "renesas,du-r8a7795";
>>> reg = <0 0xfeb00000 0 0x80000>,
>>> <0 0xfeb90000 0 0x14>;
>>> - reg-names = "du", "lvds.0";
>>> + reg-names = "du";
>>
>> Since "reg-names" list is changed, I believe you'd like to update
>> the "reg" property value as well.
>
> Good point, I'll fix it.
Could you also totally drop "reg-names"? Or is that a strong requirement
now? I mostly dislike how this memory region is named in /proc/iomem... :-)
[...]
MBR, Sergei
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 63+ messages in thread
* Re: [PATCH 02/10] dt-bindings: display: renesas: Deprecate LVDS support in the DU bindings
@ 2018-01-12 14:52 ` Sergei Shtylyov
0 siblings, 0 replies; 63+ messages in thread
From: Sergei Shtylyov @ 2018-01-12 14:52 UTC (permalink / raw)
To: Laurent Pinchart, Vladimir Zapolskiy
Cc: Laurent Pinchart, dri-devel, linux-renesas-soc, devicetree
On 01/12/2018 01:43 PM, Laurent Pinchart wrote:
>>> The internal LVDS encoders now have their own DT bindings, representing
>>> them as part of the DU is deprecated.
>>>
>>> Signed-off-by: Laurent Pinchart
>>> <laurent.pinchart+renesas@ideasonboard.com>
>>> ---
>>>
>>> .../devicetree/bindings/display/renesas,du.txt | 26
>>> +++++++++------------- 1 file changed, 11 insertions(+), 15 deletions(-)
>>>
>>> diff --git a/Documentation/devicetree/bindings/display/renesas,du.txt
>>> b/Documentation/devicetree/bindings/display/renesas,du.txt index
>>> cd48aba3bc8c..8f6e0e118e3e 100644
>>> --- a/Documentation/devicetree/bindings/display/renesas,du.txt
>>> +++ b/Documentation/devicetree/bindings/display/renesas,du.txt
[...]
>>> @@ -71,7 +68,7 @@ Example: R8A7795 (R-Car H3) ES2.0 DU
>>> compatible = "renesas,du-r8a7795";
>>> reg = <0 0xfeb00000 0 0x80000>,
>>> <0 0xfeb90000 0 0x14>;
>>> - reg-names = "du", "lvds.0";
>>> + reg-names = "du";
>>
>> Since "reg-names" list is changed, I believe you'd like to update
>> the "reg" property value as well.
>
> Good point, I'll fix it.
Could you also totally drop "reg-names"? Or is that a strong requirement
now? I mostly dislike how this memory region is named in /proc/iomem... :-)
[...]
MBR, Sergei
^ permalink raw reply [flat|nested] 63+ messages in thread
* Re: [PATCH 01/10] dt-bindings: display: renesas: Add R-Car LVDS encoder DT bindings
2018-01-12 0:58 ` Laurent Pinchart
` (3 preceding siblings ...)
(?)
@ 2018-01-12 15:13 ` Sergei Shtylyov
[not found] ` <81a9462b-6aaa-52c7-f741-e504c14838e9-M4DtvfQ/ZS1MRgGoP+s0PdBPR1lH4CV8@public.gmane.org>
-1 siblings, 1 reply; 63+ messages in thread
From: Sergei Shtylyov @ 2018-01-12 15:13 UTC (permalink / raw)
To: Laurent Pinchart, dri-devel; +Cc: linux-renesas-soc, devicetree
Hello!
On 01/12/2018 03:58 AM, Laurent Pinchart wrote:
> The Renesas R-Car Gen2 and Gen3 SoCs have internal LVDS encoders. Add
> corresponding device tree bindings.
>
> Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
> ---
> .../bindings/display/bridge/renesas,lvds.txt | 54 ++++++++++++++++++++++
> MAINTAINERS | 1 +
> 2 files changed, 55 insertions(+)
> create mode 100644 Documentation/devicetree/bindings/display/bridge/renesas,lvds.txt
>
> diff --git a/Documentation/devicetree/bindings/display/bridge/renesas,lvds.txt b/Documentation/devicetree/bindings/display/bridge/renesas,lvds.txt
> new file mode 100644
> index 000000000000..459c56822eda
> --- /dev/null
> +++ b/Documentation/devicetree/bindings/display/bridge/renesas,lvds.txt
> @@ -0,0 +1,54 @@
> +Renesas R-Car LVDS Encoder
> +==========================
> +
> +These DT bindings describe the LVDS encoder embedded in the Renesas R-Car Gen2
> +and Gen3 SoCs.
> +
> +Required properties:
> +
> +- compatible : Shall contain one of
> + - "renesas,lvds-r8a7743" for R8A7790 (R-Car RZ/G1M) compatible LVDS encoders
> + - "renesas,lvds-r8a7790" for R8A7790 (R-Car H2) compatible LVDS encoders
> + - "renesas,lvds-r8a7791" for R8A7791 (R-Car M2-W) compatible LVDS encoders
> + - "renesas,lvds-r8a7793" for R8A7791 (R-Car M2-N) compatible LVDS encoders
> + - "renesas,lvds-r8a7795" for R8A7795 (R-Car H3) compatible LVDS encoders
> + - "renesas,lvds-r8a7796" for R8A7796 (R-Car M3-W) compatible LVDS encoders
> +
> +- reg: Base address and length for the memory-mapped registers
> +- clocks: A phandle + clock-specifier pair for the functional clock
> +
> +Requires nodes:
> +
> +The LVDS encoder has two video ports. Their connections are modelled using the
> +OF graph bindings specified in Documentation/devicetree/bindings/graph.txt.
> +
> +- Video port 0 corresponds to the parallel input
s/parallel/RGB/, perhaps?
> +- Video port 1 corresponds to the LVDS output
> +
> +Each port shall have a single endpoint.
> +
> +
> +Example:
> +
> + lvds0: lvds@feb90000 {
> + compatible = "renesas,lvds-r8a7790";
> + reg = <0 0xfeb90000 0 0x1c>;
> + clocks = <&cpg CPG_MOD 726>;
> +
> + ports {
> + #address-cells = <1>;
> + #size-cells = <0>;
> +
> + port@0 {
> + reg = <0>;
> + lvds0_in: endpoint {
> + remote-endpoint = <&du_out_lvds0>;
Err, that "du_out_lvds0" label no longer reflects reality, no?
[...]
MBR, Sergei
^ permalink raw reply [flat|nested] 63+ messages in thread
* Re: [PATCH 02/10] dt-bindings: display: renesas: Deprecate LVDS support in the DU bindings
2018-01-12 0:58 ` [PATCH 02/10] dt-bindings: display: renesas: Deprecate LVDS support in the DU bindings Laurent Pinchart
@ 2018-01-12 15:14 ` Sergei Shtylyov
[not found] ` <20180112005858.26472-3-laurent.pinchart+renesas-ryLnwIuWjnjg/C1BVhZhaw@public.gmane.org>
` (2 subsequent siblings)
3 siblings, 0 replies; 63+ messages in thread
From: Sergei Shtylyov @ 2018-01-12 15:14 UTC (permalink / raw)
To: Laurent Pinchart, dri-devel; +Cc: linux-renesas-soc, devicetree
Hello!
On 01/12/2018 03:58 AM, Laurent Pinchart wrote:
> The internal LVDS encoders now have their own DT bindings, representing
> them as part of the DU is deprecated.
>
> Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
> ---
> .../devicetree/bindings/display/renesas,du.txt | 26 +++++++++-------------
> 1 file changed, 11 insertions(+), 15 deletions(-)
>
> diff --git a/Documentation/devicetree/bindings/display/renesas,du.txt b/Documentation/devicetree/bindings/display/renesas,du.txt
> index cd48aba3bc8c..8f6e0e118e3e 100644
> --- a/Documentation/devicetree/bindings/display/renesas,du.txt
> +++ b/Documentation/devicetree/bindings/display/renesas,du.txt
> @@ -17,9 +17,7 @@ Required Properties:
> - reg: A list of base address and length of each memory resource, one for
> each entry in the reg-names property.
> - reg-names: Name of the memory resources. The DU requires one memory
> - resource for the DU core (named "du") and one memory resource for each
> - LVDS encoder (named "lvds.x" with "x" being the LVDS controller numerical
> - index).
> + resource for the DU core (named "du").
Could we get rid of this prop altogether?
[...]
MBR, Sergei
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply [flat|nested] 63+ messages in thread
* Re: [PATCH 02/10] dt-bindings: display: renesas: Deprecate LVDS support in the DU bindings
@ 2018-01-12 15:14 ` Sergei Shtylyov
0 siblings, 0 replies; 63+ messages in thread
From: Sergei Shtylyov @ 2018-01-12 15:14 UTC (permalink / raw)
To: Laurent Pinchart, dri-devel; +Cc: linux-renesas-soc, devicetree
Hello!
On 01/12/2018 03:58 AM, Laurent Pinchart wrote:
> The internal LVDS encoders now have their own DT bindings, representing
> them as part of the DU is deprecated.
>
> Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
> ---
> .../devicetree/bindings/display/renesas,du.txt | 26 +++++++++-------------
> 1 file changed, 11 insertions(+), 15 deletions(-)
>
> diff --git a/Documentation/devicetree/bindings/display/renesas,du.txt b/Documentation/devicetree/bindings/display/renesas,du.txt
> index cd48aba3bc8c..8f6e0e118e3e 100644
> --- a/Documentation/devicetree/bindings/display/renesas,du.txt
> +++ b/Documentation/devicetree/bindings/display/renesas,du.txt
> @@ -17,9 +17,7 @@ Required Properties:
> - reg: A list of base address and length of each memory resource, one for
> each entry in the reg-names property.
> - reg-names: Name of the memory resources. The DU requires one memory
> - resource for the DU core (named "du") and one memory resource for each
> - LVDS encoder (named "lvds.x" with "x" being the LVDS controller numerical
> - index).
> + resource for the DU core (named "du").
Could we get rid of this prop altogether?
[...]
MBR, Sergei
^ permalink raw reply [flat|nested] 63+ messages in thread
* Re: [PATCH 02/10] dt-bindings: display: renesas: Deprecate LVDS support in the DU bindings
2018-01-12 15:14 ` Sergei Shtylyov
(?)
@ 2018-01-12 16:46 ` Laurent Pinchart
-1 siblings, 0 replies; 63+ messages in thread
From: Laurent Pinchart @ 2018-01-12 16:46 UTC (permalink / raw)
To: Sergei Shtylyov
Cc: Laurent Pinchart, dri-devel, linux-renesas-soc, devicetree
Hi Sergei,
On Friday, 12 January 2018 17:14:33 EET Sergei Shtylyov wrote:
> On 01/12/2018 03:58 AM, Laurent Pinchart wrote:
> > The internal LVDS encoders now have their own DT bindings, representing
> > them as part of the DU is deprecated.
> >
> > Signed-off-by: Laurent Pinchart
> > <laurent.pinchart+renesas@ideasonboard.com>
> > ---
> >
> > .../devicetree/bindings/display/renesas,du.txt | 26 ++++++++---------
> > 1 file changed, 11 insertions(+), 15 deletions(-)
> >
> > diff --git a/Documentation/devicetree/bindings/display/renesas,du.txt
> > b/Documentation/devicetree/bindings/display/renesas,du.txt index
> > cd48aba3bc8c..8f6e0e118e3e 100644
> > --- a/Documentation/devicetree/bindings/display/renesas,du.txt
> > +++ b/Documentation/devicetree/bindings/display/renesas,du.txt
> >
> > @@ -17,9 +17,7 @@ Required Properties:
> > - reg: A list of base address and length of each memory resource, one
> > for
> > each entry in the reg-names property.
> > - reg-names: Name of the memory resources. The DU requires one memory
> >
> > - resource for the DU core (named "du") and one memory resource for
> > each
> > - LVDS encoder (named "lvds.x" with "x" being the LVDS controller
> > numerical
> > - index).
> > + resource for the DU core (named "du").
>
> Could we get rid of this prop altogether?
Actually yes, as unlike what I thought the driver doesn't use it. I'll drop it
in v2.
--
Regards,
Laurent Pinchart
^ permalink raw reply [flat|nested] 63+ messages in thread
* Re: [PATCH 01/10] dt-bindings: display: renesas: Add R-Car LVDS encoder DT bindings
2018-01-12 15:13 ` Sergei Shtylyov
@ 2018-01-12 20:34 ` Laurent Pinchart
0 siblings, 0 replies; 63+ messages in thread
From: Laurent Pinchart @ 2018-01-12 20:34 UTC (permalink / raw)
To: Sergei Shtylyov
Cc: Laurent Pinchart, dri-devel-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW,
linux-renesas-soc-u79uwXL29TY76Z2rM5mHXA,
devicetree-u79uwXL29TY76Z2rM5mHXA
Hi Sergei,
On Friday, 12 January 2018 17:13:06 EET Sergei Shtylyov wrote:
> On 01/12/2018 03:58 AM, Laurent Pinchart wrote:
> > The Renesas R-Car Gen2 and Gen3 SoCs have internal LVDS encoders. Add
> > corresponding device tree bindings.
> >
> > Signed-off-by: Laurent Pinchart
> > <laurent.pinchart+renesas-ryLnwIuWjnjg/C1BVhZhaw@public.gmane.org>
> > ---
> >
> > .../bindings/display/bridge/renesas,lvds.txt | 54 +++++++++++++++++
> > MAINTAINERS | 1 +
> > 2 files changed, 55 insertions(+)
> > create mode 100644
> > Documentation/devicetree/bindings/display/bridge/renesas,lvds.txt>
> > diff --git
> > a/Documentation/devicetree/bindings/display/bridge/renesas,lvds.txt
> > b/Documentation/devicetree/bindings/display/bridge/renesas,lvds.txt new
> > file mode 100644
> > index 000000000000..459c56822eda
> > --- /dev/null
> > +++ b/Documentation/devicetree/bindings/display/bridge/renesas,lvds.txt
> > @@ -0,0 +1,54 @@
> > +Renesas R-Car LVDS Encoder
> > +==========================
> > +
> > +These DT bindings describe the LVDS encoder embedded in the Renesas R-Car
> > Gen2
> > +and Gen3 SoCs.
> > +
> > +Required properties:
> > +
> > +- compatible : Shall contain one of
> > + - "renesas,lvds-r8a7743" for R8A7790 (R-Car RZ/G1M) compatible LVDS
> > encoders
> > + - "renesas,lvds-r8a7790" for R8A7790 (R-Car H2) compatible LVDS
> > encoders
> > + - "renesas,lvds-r8a7791" for R8A7791 (R-Car M2-W) compatible LVDS
> > encoders
> > + - "renesas,lvds-r8a7793" for R8A7791 (R-Car M2-N) compatible LVDS
> > encoders
> > + - "renesas,lvds-r8a7795" for R8A7795 (R-Car H3) compatible LVDS
> > encoders
> > + - "renesas,lvds-r8a7796" for R8A7796 (R-Car M3-W) compatible LVDS
> > encoders
> > +
> > +- reg: Base address and length for the memory-mapped registers
> > +- clocks: A phandle + clock-specifier pair for the functional clock
> > +
> > +Requires nodes:
> > +
> > +The LVDS encoder has two video ports. Their connections are modelled
> > using the
> > +OF graph bindings specified in Documentation/devicetree/bindings/
> > graph.txt.
> > +
> > +- Video port 0 corresponds to the parallel input
>
> s/parallel/RGB/, perhaps?
Strictly speaking the LVDS output also carries RGB. I'll replace "parallel"
with "parallel RGB".
> > +- Video port 1 corresponds to the LVDS output
> > +
> > +Each port shall have a single endpoint.
> > +
> > +
> > +Example:
> > +
> > + lvds0: lvds@feb90000 {
> > + compatible = "renesas,lvds-r8a7790";
> > + reg = <0 0xfeb90000 0 0x1c>;
> > + clocks = <&cpg CPG_MOD 726>;
> > +
> > + ports {
> > + #address-cells = <1>;
> > + #size-cells = <0>;
> > +
> > + port@0 {
> > + reg = <0>;
> > + lvds0_in: endpoint {
> > + remote-endpoint = <&du_out_lvds0>;
>
> Err, that "du_out_lvds0" label no longer reflects reality, no?
Well, it's the output of the DU connected to LVDS encoder 0, so I think the
name still makes sense. If you can think of a better name feel free to propose
one, otherwise I'll keep this one.
--
Regards,
Laurent Pinchart
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 63+ messages in thread
* Re: [PATCH 01/10] dt-bindings: display: renesas: Add R-Car LVDS encoder DT bindings
@ 2018-01-12 20:34 ` Laurent Pinchart
0 siblings, 0 replies; 63+ messages in thread
From: Laurent Pinchart @ 2018-01-12 20:34 UTC (permalink / raw)
To: Sergei Shtylyov
Cc: Laurent Pinchart, dri-devel, linux-renesas-soc, devicetree
Hi Sergei,
On Friday, 12 January 2018 17:13:06 EET Sergei Shtylyov wrote:
> On 01/12/2018 03:58 AM, Laurent Pinchart wrote:
> > The Renesas R-Car Gen2 and Gen3 SoCs have internal LVDS encoders. Add
> > corresponding device tree bindings.
> >
> > Signed-off-by: Laurent Pinchart
> > <laurent.pinchart+renesas@ideasonboard.com>
> > ---
> >
> > .../bindings/display/bridge/renesas,lvds.txt | 54 +++++++++++++++++
> > MAINTAINERS | 1 +
> > 2 files changed, 55 insertions(+)
> > create mode 100644
> > Documentation/devicetree/bindings/display/bridge/renesas,lvds.txt>
> > diff --git
> > a/Documentation/devicetree/bindings/display/bridge/renesas,lvds.txt
> > b/Documentation/devicetree/bindings/display/bridge/renesas,lvds.txt new
> > file mode 100644
> > index 000000000000..459c56822eda
> > --- /dev/null
> > +++ b/Documentation/devicetree/bindings/display/bridge/renesas,lvds.txt
> > @@ -0,0 +1,54 @@
> > +Renesas R-Car LVDS Encoder
> > +==========================
> > +
> > +These DT bindings describe the LVDS encoder embedded in the Renesas R-Car
> > Gen2
> > +and Gen3 SoCs.
> > +
> > +Required properties:
> > +
> > +- compatible : Shall contain one of
> > + - "renesas,lvds-r8a7743" for R8A7790 (R-Car RZ/G1M) compatible LVDS
> > encoders
> > + - "renesas,lvds-r8a7790" for R8A7790 (R-Car H2) compatible LVDS
> > encoders
> > + - "renesas,lvds-r8a7791" for R8A7791 (R-Car M2-W) compatible LVDS
> > encoders
> > + - "renesas,lvds-r8a7793" for R8A7791 (R-Car M2-N) compatible LVDS
> > encoders
> > + - "renesas,lvds-r8a7795" for R8A7795 (R-Car H3) compatible LVDS
> > encoders
> > + - "renesas,lvds-r8a7796" for R8A7796 (R-Car M3-W) compatible LVDS
> > encoders
> > +
> > +- reg: Base address and length for the memory-mapped registers
> > +- clocks: A phandle + clock-specifier pair for the functional clock
> > +
> > +Requires nodes:
> > +
> > +The LVDS encoder has two video ports. Their connections are modelled
> > using the
> > +OF graph bindings specified in Documentation/devicetree/bindings/
> > graph.txt.
> > +
> > +- Video port 0 corresponds to the parallel input
>
> s/parallel/RGB/, perhaps?
Strictly speaking the LVDS output also carries RGB. I'll replace "parallel"
with "parallel RGB".
> > +- Video port 1 corresponds to the LVDS output
> > +
> > +Each port shall have a single endpoint.
> > +
> > +
> > +Example:
> > +
> > + lvds0: lvds@feb90000 {
> > + compatible = "renesas,lvds-r8a7790";
> > + reg = <0 0xfeb90000 0 0x1c>;
> > + clocks = <&cpg CPG_MOD 726>;
> > +
> > + ports {
> > + #address-cells = <1>;
> > + #size-cells = <0>;
> > +
> > + port@0 {
> > + reg = <0>;
> > + lvds0_in: endpoint {
> > + remote-endpoint = <&du_out_lvds0>;
>
> Err, that "du_out_lvds0" label no longer reflects reality, no?
Well, it's the output of the DU connected to LVDS encoder 0, so I think the
name still makes sense. If you can think of a better name feel free to propose
one, otherwise I'll keep this one.
--
Regards,
Laurent Pinchart
^ permalink raw reply [flat|nested] 63+ messages in thread
* Re: [PATCH 01/10] dt-bindings: display: renesas: Add R-Car LVDS encoder DT bindings
2018-01-12 13:29 ` Laurent Pinchart
@ 2018-01-15 6:55 ` Simon Horman
0 siblings, 0 replies; 63+ messages in thread
From: Simon Horman @ 2018-01-15 6:55 UTC (permalink / raw)
To: Laurent Pinchart
Cc: Geert Uytterhoeven, Laurent Pinchart, DRI Development,
Linux-Renesas, Sergei Shtylyov,
devicetree-u79uwXL29TY76Z2rM5mHXA
On Fri, Jan 12, 2018 at 03:29:48PM +0200, Laurent Pinchart wrote:
> Hi Geert,
>
> On Friday, 12 January 2018 12:13:18 EET Geert Uytterhoeven wrote:
> > On Fri, Jan 12, 2018 at 1:58 AM, Laurent Pinchart wrote:
> > > The Renesas R-Car Gen2 and Gen3 SoCs have internal LVDS encoders. Add
> > > corresponding device tree bindings.
> > >
> > > Signed-off-by: Laurent Pinchart
> > > <laurent.pinchart+renesas-ryLnwIuWjnjg/C1BVhZhaw@public.gmane.org>
> > >
> > > --- /dev/null
> > > +++ b/Documentation/devicetree/bindings/display/bridge/renesas,lvds.txt
> > > @@ -0,0 +1,54 @@
> > > +Renesas R-Car LVDS Encoder
> > > +==========================
> > > +
> > > +These DT bindings describe the LVDS encoder embedded in the Renesas R-Car
> > > Gen2 +and Gen3 SoCs.
> > > +
> > > +Required properties:
> > > +
> > > +- compatible : Shall contain one of
> > > + - "renesas,lvds-r8a7743" for R8A7790 (R-Car RZ/G1M) compatible LVDS
> > > encoders
> > > + - "renesas,lvds-r8a7790" for R8A7790 (R-Car H2) compatible LVDS
> > > encoders
> > > + - "renesas,lvds-r8a7791" for R8A7791 (R-Car M2-W) compatible LVDS
> > > encoders
> > > + - "renesas,lvds-r8a7793" for R8A7791 (R-Car M2-N) compatible LVDS
> > > encoders
> > > + - "renesas,lvds-r8a7795" for R8A7795 (R-Car H3) compatible LVDS
> > > encoders
> > > + - "renesas,lvds-r8a7796" for R8A7796 (R-Car M3-W) compatible LVDS
> > > encoders
> >
> > As this is a new binding, please use "renesas,<soc>-lvds".
>
> I've recently been thinking that we made the wrong choice, <ip>-<soc> would be
> better in my opinion as it aligns with <ip>-<version>, but it's too late to
> change that, so I'll change the order here.
My recollection is that in the beginning we had a bit of a mixture but
leaned towards <ip>-<soc>, which made sense in my opinion. However, after
some discussion it was agreed that the best-practice for upstream was to
use <soc>-<ip>. Unless that situation has changed lets stock with using
<soc>-<ip> for new bindings.
> > BTW, would it make sense to use "renesas,<soc>-du" for the new DU binding,
> > too? Or have you reserved that for the future version that will have a
> > one-to-one mapping between device nodes and DU channels? ;-)
>
> It's a good idea, let's reserve it for that evolution. If it ever happens ;-)
>
> --
> Regards,
>
> Laurent Pinchart
>
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 63+ messages in thread
* Re: [PATCH 01/10] dt-bindings: display: renesas: Add R-Car LVDS encoder DT bindings
@ 2018-01-15 6:55 ` Simon Horman
0 siblings, 0 replies; 63+ messages in thread
From: Simon Horman @ 2018-01-15 6:55 UTC (permalink / raw)
To: Laurent Pinchart
Cc: Geert Uytterhoeven, Laurent Pinchart, DRI Development,
Linux-Renesas, Sergei Shtylyov, devicetree
On Fri, Jan 12, 2018 at 03:29:48PM +0200, Laurent Pinchart wrote:
> Hi Geert,
>
> On Friday, 12 January 2018 12:13:18 EET Geert Uytterhoeven wrote:
> > On Fri, Jan 12, 2018 at 1:58 AM, Laurent Pinchart wrote:
> > > The Renesas R-Car Gen2 and Gen3 SoCs have internal LVDS encoders. Add
> > > corresponding device tree bindings.
> > >
> > > Signed-off-by: Laurent Pinchart
> > > <laurent.pinchart+renesas@ideasonboard.com>
> > >
> > > --- /dev/null
> > > +++ b/Documentation/devicetree/bindings/display/bridge/renesas,lvds.txt
> > > @@ -0,0 +1,54 @@
> > > +Renesas R-Car LVDS Encoder
> > > +==========================
> > > +
> > > +These DT bindings describe the LVDS encoder embedded in the Renesas R-Car
> > > Gen2 +and Gen3 SoCs.
> > > +
> > > +Required properties:
> > > +
> > > +- compatible : Shall contain one of
> > > + - "renesas,lvds-r8a7743" for R8A7790 (R-Car RZ/G1M) compatible LVDS
> > > encoders
> > > + - "renesas,lvds-r8a7790" for R8A7790 (R-Car H2) compatible LVDS
> > > encoders
> > > + - "renesas,lvds-r8a7791" for R8A7791 (R-Car M2-W) compatible LVDS
> > > encoders
> > > + - "renesas,lvds-r8a7793" for R8A7791 (R-Car M2-N) compatible LVDS
> > > encoders
> > > + - "renesas,lvds-r8a7795" for R8A7795 (R-Car H3) compatible LVDS
> > > encoders
> > > + - "renesas,lvds-r8a7796" for R8A7796 (R-Car M3-W) compatible LVDS
> > > encoders
> >
> > As this is a new binding, please use "renesas,<soc>-lvds".
>
> I've recently been thinking that we made the wrong choice, <ip>-<soc> would be
> better in my opinion as it aligns with <ip>-<version>, but it's too late to
> change that, so I'll change the order here.
My recollection is that in the beginning we had a bit of a mixture but
leaned towards <ip>-<soc>, which made sense in my opinion. However, after
some discussion it was agreed that the best-practice for upstream was to
use <soc>-<ip>. Unless that situation has changed lets stock with using
<soc>-<ip> for new bindings.
> > BTW, would it make sense to use "renesas,<soc>-du" for the new DU binding,
> > too? Or have you reserved that for the future version that will have a
> > one-to-one mapping between device nodes and DU channels? ;-)
>
> It's a good idea, let's reserve it for that evolution. If it ever happens ;-)
>
> --
> Regards,
>
> Laurent Pinchart
>
^ permalink raw reply [flat|nested] 63+ messages in thread
* Re: [PATCH 00/10] R-Car DU: Convert LVDS code to bridge driver
2018-01-12 13:48 ` Laurent Pinchart
@ 2018-01-15 6:57 ` Simon Horman
0 siblings, 0 replies; 63+ messages in thread
From: Simon Horman @ 2018-01-15 6:57 UTC (permalink / raw)
To: Laurent Pinchart
Cc: Geert Uytterhoeven, Laurent Pinchart, DRI Development,
Linux-Renesas, Sergei Shtylyov,
devicetree-u79uwXL29TY76Z2rM5mHXA
On Fri, Jan 12, 2018 at 03:48:25PM +0200, Laurent Pinchart wrote:
> Hi Geert,
>
> On Friday, 12 January 2018 11:47:03 EET Geert Uytterhoeven wrote:
> > On Fri, Jan 12, 2018 at 1:58 AM, Laurent Pinchart wrote:
> > > This patch series addresses a design mistake that dates back from the
> > > initial DU support. Support for the LVDS encoders, which are IP cores
> > > separate from the DU, was bundled in the DU driver. Worse, both the DU
> > > and LVDS were described through a single DT node.
> > >
> > > To fix the, patches 01/10 and 02/10 define new DT bindings for the LVDS
> > > encoders, and deprecate their description inside the DU bindings. To
> > > retain backward compatibility with existing DT, patch 03/10 then patches
> > > the device tree at runtime to convert the legacy bindings to the new ones.
> >
> > Looks like we will have to postpone the R-Car Gen2 Modern DT flag day
> > again by a few kernel releases?
>
> Why so ? We don't have to drop support for all legacy DT bindings at the same
> time, do we ? We can switch to the new-style clock bindings on Gen2 already,
> and drop the legacy LVDS bindings later.
To clarify, after this patchset.
* Old DTs work with old and new kernels.
* New DTs require new kernels.
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 63+ messages in thread
* Re: [PATCH 00/10] R-Car DU: Convert LVDS code to bridge driver
@ 2018-01-15 6:57 ` Simon Horman
0 siblings, 0 replies; 63+ messages in thread
From: Simon Horman @ 2018-01-15 6:57 UTC (permalink / raw)
To: Laurent Pinchart
Cc: Geert Uytterhoeven, Laurent Pinchart, DRI Development,
Linux-Renesas, Sergei Shtylyov, devicetree
On Fri, Jan 12, 2018 at 03:48:25PM +0200, Laurent Pinchart wrote:
> Hi Geert,
>
> On Friday, 12 January 2018 11:47:03 EET Geert Uytterhoeven wrote:
> > On Fri, Jan 12, 2018 at 1:58 AM, Laurent Pinchart wrote:
> > > This patch series addresses a design mistake that dates back from the
> > > initial DU support. Support for the LVDS encoders, which are IP cores
> > > separate from the DU, was bundled in the DU driver. Worse, both the DU
> > > and LVDS were described through a single DT node.
> > >
> > > To fix the, patches 01/10 and 02/10 define new DT bindings for the LVDS
> > > encoders, and deprecate their description inside the DU bindings. To
> > > retain backward compatibility with existing DT, patch 03/10 then patches
> > > the device tree at runtime to convert the legacy bindings to the new ones.
> >
> > Looks like we will have to postpone the R-Car Gen2 Modern DT flag day
> > again by a few kernel releases?
>
> Why so ? We don't have to drop support for all legacy DT bindings at the same
> time, do we ? We can switch to the new-style clock bindings on Gen2 already,
> and drop the legacy LVDS bindings later.
To clarify, after this patchset.
* Old DTs work with old and new kernels.
* New DTs require new kernels.
^ permalink raw reply [flat|nested] 63+ messages in thread
* Re: [PATCH 00/10] R-Car DU: Convert LVDS code to bridge driver
2018-01-12 0:58 [PATCH 00/10] R-Car DU: Convert LVDS code to bridge driver Laurent Pinchart
@ 2018-01-15 6:59 ` Simon Horman
2018-01-12 0:58 ` [PATCH 02/10] dt-bindings: display: renesas: Deprecate LVDS support in the DU bindings Laurent Pinchart
` (10 subsequent siblings)
11 siblings, 0 replies; 63+ messages in thread
From: Simon Horman @ 2018-01-15 6:59 UTC (permalink / raw)
To: Laurent Pinchart
Cc: dri-devel-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW,
linux-renesas-soc-u79uwXL29TY76Z2rM5mHXA, Sergei Shtylyov,
devicetree-u79uwXL29TY76Z2rM5mHXA
On Fri, Jan 12, 2018 at 02:58:48AM +0200, Laurent Pinchart wrote:
> Hello,
>
> This patch series addresses a design mistake that dates back from the initial
> DU support. Support for the LVDS encoders, which are IP cores separate from
> the DU, was bundled in the DU driver. Worse, both the DU and LVDS were
> described through a single DT node.
>
> To fix the, patches 01/10 and 02/10 define new DT bindings for the LVDS
> encoders, and deprecate their description inside the DU bindings. To retain
> backward compatibility with existing DT, patch 03/10 then patches the device
> tree at runtime to convert the legacy bindings to the new ones.
>
> With the DT side addressed, patch 04/10 then converts the LVDS support code to
> a separate bridge driver. After a small fix to the Porter board device tree in
> patch 05/10, patches 06/10 to 10/10 then update all the device tree sources to
> the new LVDS encoders bindings.
>
> I decided to go for live DT patching in patch 03/10 because implementing
> support for both the legacy and new bindings in the driver would have been
> very intrusive, and prevented further cleanups. I'm in a way both proud and
> ashamed of that patch that I would call a neat and dirty hack. It was fun to
> write perhaps in a similar way that one would enjoy researching and developing
> proof-of-concepts for security holes: they're good and bad at the same time.
>
> Anyway, with this philosophical considerations aside, there were a few
> shortcomings in the OF API that I worked around with local code in the driver.
> If anyone is interested in performing similar live DT patching I think we
> could move some of the code to the OF core. For instance I was surprised
> to not find a device node lookup by path function that would start at a
> given node instead of the root of the live device tree, and had to write
> rcar_du_of_find_node_by_path(). Utility functions to add or modify properties
> or to rename nodes could similarly be added.
>
> Laurent Pinchart (10):
> dt-bindings: display: renesas: Add R-Car LVDS encoder DT bindings
> dt-bindings: display: renesas: Deprecate LVDS support in the DU
> bindings
> drm: rcar-du: Fix legacy DT to create LVDS encoder nodes
> drm: rcar-du: Convert LVDS encoder code to bridge driver
> ARM: dts: porter: Fix HDMI output routing
> ARM: dts: r8a7790: Convert to new LVDS DT bindings
> ARM: dts: r8a7791: Convert to new LVDS DT bindings
> ARM: dts: r8a7793: Convert to new LVDS DT bindings
> arm64: dts: renesas: r8a7795: Convert to new LVDS DT bindings
> arm64: dts: renesas: r8a7796: Convert to new LVDS DT bindings
I understand that there will be a v2 to address review of the non DTS
patches. I am marking the DTS patches as "Changes Requested" as they
are dependent on the bindings patches from my PoV.
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 63+ messages in thread
* Re: [PATCH 00/10] R-Car DU: Convert LVDS code to bridge driver
@ 2018-01-15 6:59 ` Simon Horman
0 siblings, 0 replies; 63+ messages in thread
From: Simon Horman @ 2018-01-15 6:59 UTC (permalink / raw)
To: Laurent Pinchart
Cc: dri-devel, linux-renesas-soc, Sergei Shtylyov, devicetree
On Fri, Jan 12, 2018 at 02:58:48AM +0200, Laurent Pinchart wrote:
> Hello,
>
> This patch series addresses a design mistake that dates back from the initial
> DU support. Support for the LVDS encoders, which are IP cores separate from
> the DU, was bundled in the DU driver. Worse, both the DU and LVDS were
> described through a single DT node.
>
> To fix the, patches 01/10 and 02/10 define new DT bindings for the LVDS
> encoders, and deprecate their description inside the DU bindings. To retain
> backward compatibility with existing DT, patch 03/10 then patches the device
> tree at runtime to convert the legacy bindings to the new ones.
>
> With the DT side addressed, patch 04/10 then converts the LVDS support code to
> a separate bridge driver. After a small fix to the Porter board device tree in
> patch 05/10, patches 06/10 to 10/10 then update all the device tree sources to
> the new LVDS encoders bindings.
>
> I decided to go for live DT patching in patch 03/10 because implementing
> support for both the legacy and new bindings in the driver would have been
> very intrusive, and prevented further cleanups. I'm in a way both proud and
> ashamed of that patch that I would call a neat and dirty hack. It was fun to
> write perhaps in a similar way that one would enjoy researching and developing
> proof-of-concepts for security holes: they're good and bad at the same time.
>
> Anyway, with this philosophical considerations aside, there were a few
> shortcomings in the OF API that I worked around with local code in the driver.
> If anyone is interested in performing similar live DT patching I think we
> could move some of the code to the OF core. For instance I was surprised
> to not find a device node lookup by path function that would start at a
> given node instead of the root of the live device tree, and had to write
> rcar_du_of_find_node_by_path(). Utility functions to add or modify properties
> or to rename nodes could similarly be added.
>
> Laurent Pinchart (10):
> dt-bindings: display: renesas: Add R-Car LVDS encoder DT bindings
> dt-bindings: display: renesas: Deprecate LVDS support in the DU
> bindings
> drm: rcar-du: Fix legacy DT to create LVDS encoder nodes
> drm: rcar-du: Convert LVDS encoder code to bridge driver
> ARM: dts: porter: Fix HDMI output routing
> ARM: dts: r8a7790: Convert to new LVDS DT bindings
> ARM: dts: r8a7791: Convert to new LVDS DT bindings
> ARM: dts: r8a7793: Convert to new LVDS DT bindings
> arm64: dts: renesas: r8a7795: Convert to new LVDS DT bindings
> arm64: dts: renesas: r8a7796: Convert to new LVDS DT bindings
I understand that there will be a v2 to address review of the non DTS
patches. I am marking the DTS patches as "Changes Requested" as they
are dependent on the bindings patches from my PoV.
^ permalink raw reply [flat|nested] 63+ messages in thread
* Re: [PATCH 01/10] dt-bindings: display: renesas: Add R-Car LVDS encoder DT bindings
2018-01-15 6:55 ` Simon Horman
@ 2018-01-15 6:59 ` Laurent Pinchart
-1 siblings, 0 replies; 63+ messages in thread
From: Laurent Pinchart @ 2018-01-15 6:59 UTC (permalink / raw)
To: Simon Horman
Cc: Geert Uytterhoeven, Laurent Pinchart, DRI Development,
Linux-Renesas, Sergei Shtylyov,
devicetree-u79uwXL29TY76Z2rM5mHXA
Hi Simon,
On Monday, 15 January 2018 08:55:29 EET Simon Horman wrote:
> On Fri, Jan 12, 2018 at 03:29:48PM +0200, Laurent Pinchart wrote:
> > On Friday, 12 January 2018 12:13:18 EET Geert Uytterhoeven wrote:
> >> On Fri, Jan 12, 2018 at 1:58 AM, Laurent Pinchart wrote:
> >>> The Renesas R-Car Gen2 and Gen3 SoCs have internal LVDS encoders. Add
> >>> corresponding device tree bindings.
> >>>
> >>> Signed-off-by: Laurent Pinchart
> >>> <laurent.pinchart+renesas-ryLnwIuWjnjg/C1BVhZhaw@public.gmane.org>
> >>>
> >>> --- /dev/null
> >>> +++
> >>> b/Documentation/devicetree/bindings/display/bridge/renesas,lvds.txt
> >>> @@ -0,0 +1,54 @@
> >>> +Renesas R-Car LVDS Encoder
> >>> +==========================
> >>> +
> >>> +These DT bindings describe the LVDS encoder embedded in the Renesas
> >>> R-Car Gen2 +and Gen3 SoCs.
> >>> +
> >>> +Required properties:
> >>> +
> >>> +- compatible : Shall contain one of
> >>> + - "renesas,lvds-r8a7743" for R8A7790 (R-Car RZ/G1M) compatible LVDS
> >>> encoders
> >>> + - "renesas,lvds-r8a7790" for R8A7790 (R-Car H2) compatible LVDS
> >>> encoders
> >>> + - "renesas,lvds-r8a7791" for R8A7791 (R-Car M2-W) compatible LVDS
> >>> encoders
> >>> + - "renesas,lvds-r8a7793" for R8A7791 (R-Car M2-N) compatible LVDS
> >>> encoders
> >>> + - "renesas,lvds-r8a7795" for R8A7795 (R-Car H3) compatible LVDS
> >>> encoders
> >>> + - "renesas,lvds-r8a7796" for R8A7796 (R-Car M3-W) compatible LVDS
> >>> encoders
> >>
> >> As this is a new binding, please use "renesas,<soc>-lvds".
> >
> > I've recently been thinking that we made the wrong choice, <ip>-<soc>
> > would be better in my opinion as it aligns with <ip>-<version>, but it's
> > too late to change that, so I'll change the order here.
>
> My recollection is that in the beginning we had a bit of a mixture but
> leaned towards <ip>-<soc>, which made sense in my opinion. However, after
> some discussion it was agreed that the best-practice for upstream was to
> use <soc>-<ip>. Unless that situation has changed lets stock with using
> <soc>-<ip> for new bindings.
Sure, that was my plan, and it seems I failed to explain it clearly. I too
believe that <ip>-<soc> would be better, but as we have standardized on <soc>-
<ip> and as there's no strong reason to reconsider that decision at the
moment, the next version of this patch will use <soc>-<ip>. It was a mistake
in v1, not an attempt to change what we had agreed on.
> >> BTW, would it make sense to use "renesas,<soc>-du" for the new DU
> >> binding, too? Or have you reserved that for the future version that will
> >> have a one-to-one mapping between device nodes and DU channels? ;-)
> >
> > It's a good idea, let's reserve it for that evolution. If it ever happens
> > ;-)
--
Regards,
Laurent Pinchart
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 63+ messages in thread
* Re: [PATCH 01/10] dt-bindings: display: renesas: Add R-Car LVDS encoder DT bindings
@ 2018-01-15 6:59 ` Laurent Pinchart
0 siblings, 0 replies; 63+ messages in thread
From: Laurent Pinchart @ 2018-01-15 6:59 UTC (permalink / raw)
To: Simon Horman
Cc: Geert Uytterhoeven, Laurent Pinchart, DRI Development,
Linux-Renesas, Sergei Shtylyov, devicetree
Hi Simon,
On Monday, 15 January 2018 08:55:29 EET Simon Horman wrote:
> On Fri, Jan 12, 2018 at 03:29:48PM +0200, Laurent Pinchart wrote:
> > On Friday, 12 January 2018 12:13:18 EET Geert Uytterhoeven wrote:
> >> On Fri, Jan 12, 2018 at 1:58 AM, Laurent Pinchart wrote:
> >>> The Renesas R-Car Gen2 and Gen3 SoCs have internal LVDS encoders. Add
> >>> corresponding device tree bindings.
> >>>
> >>> Signed-off-by: Laurent Pinchart
> >>> <laurent.pinchart+renesas@ideasonboard.com>
> >>>
> >>> --- /dev/null
> >>> +++
> >>> b/Documentation/devicetree/bindings/display/bridge/renesas,lvds.txt
> >>> @@ -0,0 +1,54 @@
> >>> +Renesas R-Car LVDS Encoder
> >>> +==========================
> >>> +
> >>> +These DT bindings describe the LVDS encoder embedded in the Renesas
> >>> R-Car Gen2 +and Gen3 SoCs.
> >>> +
> >>> +Required properties:
> >>> +
> >>> +- compatible : Shall contain one of
> >>> + - "renesas,lvds-r8a7743" for R8A7790 (R-Car RZ/G1M) compatible LVDS
> >>> encoders
> >>> + - "renesas,lvds-r8a7790" for R8A7790 (R-Car H2) compatible LVDS
> >>> encoders
> >>> + - "renesas,lvds-r8a7791" for R8A7791 (R-Car M2-W) compatible LVDS
> >>> encoders
> >>> + - "renesas,lvds-r8a7793" for R8A7791 (R-Car M2-N) compatible LVDS
> >>> encoders
> >>> + - "renesas,lvds-r8a7795" for R8A7795 (R-Car H3) compatible LVDS
> >>> encoders
> >>> + - "renesas,lvds-r8a7796" for R8A7796 (R-Car M3-W) compatible LVDS
> >>> encoders
> >>
> >> As this is a new binding, please use "renesas,<soc>-lvds".
> >
> > I've recently been thinking that we made the wrong choice, <ip>-<soc>
> > would be better in my opinion as it aligns with <ip>-<version>, but it's
> > too late to change that, so I'll change the order here.
>
> My recollection is that in the beginning we had a bit of a mixture but
> leaned towards <ip>-<soc>, which made sense in my opinion. However, after
> some discussion it was agreed that the best-practice for upstream was to
> use <soc>-<ip>. Unless that situation has changed lets stock with using
> <soc>-<ip> for new bindings.
Sure, that was my plan, and it seems I failed to explain it clearly. I too
believe that <ip>-<soc> would be better, but as we have standardized on <soc>-
<ip> and as there's no strong reason to reconsider that decision at the
moment, the next version of this patch will use <soc>-<ip>. It was a mistake
in v1, not an attempt to change what we had agreed on.
> >> BTW, would it make sense to use "renesas,<soc>-du" for the new DU
> >> binding, too? Or have you reserved that for the future version that will
> >> have a one-to-one mapping between device nodes and DU channels? ;-)
> >
> > It's a good idea, let's reserve it for that evolution. If it ever happens
> > ;-)
--
Regards,
Laurent Pinchart
^ permalink raw reply [flat|nested] 63+ messages in thread
* Re: [PATCH 00/10] R-Car DU: Convert LVDS code to bridge driver
2018-01-15 6:57 ` Simon Horman
(?)
@ 2018-01-15 7:00 ` Laurent Pinchart
2018-01-15 7:58 ` Simon Horman
-1 siblings, 1 reply; 63+ messages in thread
From: Laurent Pinchart @ 2018-01-15 7:00 UTC (permalink / raw)
To: Simon Horman
Cc: Geert Uytterhoeven, Laurent Pinchart, DRI Development,
Linux-Renesas, Sergei Shtylyov, devicetree
Hi Simon,
On Monday, 15 January 2018 08:57:48 EET Simon Horman wrote:
> On Fri, Jan 12, 2018 at 03:48:25PM +0200, Laurent Pinchart wrote:
> > On Friday, 12 January 2018 11:47:03 EET Geert Uytterhoeven wrote:
> >> On Fri, Jan 12, 2018 at 1:58 AM, Laurent Pinchart wrote:
> >>> This patch series addresses a design mistake that dates back from the
> >>> initial DU support. Support for the LVDS encoders, which are IP cores
> >>> separate from the DU, was bundled in the DU driver. Worse, both the DU
> >>> and LVDS were described through a single DT node.
> >>>
> >>> To fix the, patches 01/10 and 02/10 define new DT bindings for the
> >>> LVDS encoders, and deprecate their description inside the DU bindings.
> >>> To retain backward compatibility with existing DT, patch 03/10 then
> >>> patches the device tree at runtime to convert the legacy bindings to the
> >>> new ones.
> >>
> >> Looks like we will have to postpone the R-Car Gen2 Modern DT flag day
> >> again by a few kernel releases?
> >
> > Why so ? We don't have to drop support for all legacy DT bindings at the
> > same time, do we ? We can switch to the new-style clock bindings on Gen2
> > already, and drop the legacy LVDS bindings later.
>
> To clarify, after this patchset.
> * Old DTs work with old and new kernels.
> * New DTs require new kernels.
That's correct. I've tested old DTs with new kernels successfully on Lager,
Salvator-X (both H3 ES1.x and M3-W) and Salvator-XS.
--
Regards,
Laurent Pinchart
^ permalink raw reply [flat|nested] 63+ messages in thread
* Re: [PATCH 05/10] ARM: dts: porter: Fix HDMI output routing
2018-01-12 0:58 ` [PATCH 05/10] ARM: dts: porter: Fix HDMI output routing Laurent Pinchart
@ 2018-01-15 7:56 ` Simon Horman
2018-01-15 8:25 ` Laurent Pinchart
0 siblings, 1 reply; 63+ messages in thread
From: Simon Horman @ 2018-01-15 7:56 UTC (permalink / raw)
To: Laurent Pinchart; +Cc: dri-devel, linux-renesas-soc, Sergei Shtylyov
On Fri, Jan 12, 2018 at 02:58:53AM +0200, Laurent Pinchart wrote:
> The HDMI encoder is connected to the RGB output of the DU, which is
> port@0, not port@1. Fix the incorrect DT description.
>
> Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Should this have the following tag?
Fixes: c5af8a4248d3 ("ARM: dts: porter: add DU DT support")
If so, is it a fix to apply for v4.15 or a more regular patch
to apply for v4.16?
^ permalink raw reply [flat|nested] 63+ messages in thread
* Re: [PATCH 01/10] dt-bindings: display: renesas: Add R-Car LVDS encoder DT bindings
2018-01-15 6:59 ` Laurent Pinchart
(?)
@ 2018-01-15 7:57 ` Simon Horman
-1 siblings, 0 replies; 63+ messages in thread
From: Simon Horman @ 2018-01-15 7:57 UTC (permalink / raw)
To: Laurent Pinchart
Cc: Geert Uytterhoeven, Laurent Pinchart, DRI Development,
Linux-Renesas, Sergei Shtylyov, devicetree
On Mon, Jan 15, 2018 at 08:59:38AM +0200, Laurent Pinchart wrote:
> Hi Simon,
>
> On Monday, 15 January 2018 08:55:29 EET Simon Horman wrote:
> > On Fri, Jan 12, 2018 at 03:29:48PM +0200, Laurent Pinchart wrote:
> > > On Friday, 12 January 2018 12:13:18 EET Geert Uytterhoeven wrote:
> > >> On Fri, Jan 12, 2018 at 1:58 AM, Laurent Pinchart wrote:
> > >>> The Renesas R-Car Gen2 and Gen3 SoCs have internal LVDS encoders. Add
> > >>> corresponding device tree bindings.
> > >>>
> > >>> Signed-off-by: Laurent Pinchart
> > >>> <laurent.pinchart+renesas@ideasonboard.com>
> > >>>
> > >>> --- /dev/null
> > >>> +++
> > >>> b/Documentation/devicetree/bindings/display/bridge/renesas,lvds.txt
> > >>> @@ -0,0 +1,54 @@
> > >>> +Renesas R-Car LVDS Encoder
> > >>> +==========================
> > >>> +
> > >>> +These DT bindings describe the LVDS encoder embedded in the Renesas
> > >>> R-Car Gen2 +and Gen3 SoCs.
> > >>> +
> > >>> +Required properties:
> > >>> +
> > >>> +- compatible : Shall contain one of
> > >>> + - "renesas,lvds-r8a7743" for R8A7790 (R-Car RZ/G1M) compatible LVDS
> > >>> encoders
> > >>> + - "renesas,lvds-r8a7790" for R8A7790 (R-Car H2) compatible LVDS
> > >>> encoders
> > >>> + - "renesas,lvds-r8a7791" for R8A7791 (R-Car M2-W) compatible LVDS
> > >>> encoders
> > >>> + - "renesas,lvds-r8a7793" for R8A7791 (R-Car M2-N) compatible LVDS
> > >>> encoders
> > >>> + - "renesas,lvds-r8a7795" for R8A7795 (R-Car H3) compatible LVDS
> > >>> encoders
> > >>> + - "renesas,lvds-r8a7796" for R8A7796 (R-Car M3-W) compatible LVDS
> > >>> encoders
> > >>
> > >> As this is a new binding, please use "renesas,<soc>-lvds".
> > >
> > > I've recently been thinking that we made the wrong choice, <ip>-<soc>
> > > would be better in my opinion as it aligns with <ip>-<version>, but it's
> > > too late to change that, so I'll change the order here.
> >
> > My recollection is that in the beginning we had a bit of a mixture but
> > leaned towards <ip>-<soc>, which made sense in my opinion. However, after
> > some discussion it was agreed that the best-practice for upstream was to
> > use <soc>-<ip>. Unless that situation has changed lets stock with using
> > <soc>-<ip> for new bindings.
>
> Sure, that was my plan, and it seems I failed to explain it clearly. I too
> believe that <ip>-<soc> would be better, but as we have standardized on <soc>-
> <ip> and as there's no strong reason to reconsider that decision at the
> moment, the next version of this patch will use <soc>-<ip>. It was a mistake
> in v1, not an attempt to change what we had agreed on.
Thanks, it seems that we are in complete agreement.
> > >> BTW, would it make sense to use "renesas,<soc>-du" for the new DU
> > >> binding, too? Or have you reserved that for the future version that will
> > >> have a one-to-one mapping between device nodes and DU channels? ;-)
> > >
> > > It's a good idea, let's reserve it for that evolution. If it ever happens
> > > ;-)
>
> --
> Regards,
>
> Laurent Pinchart
>
^ permalink raw reply [flat|nested] 63+ messages in thread
* Re: [PATCH 00/10] R-Car DU: Convert LVDS code to bridge driver
2018-01-15 7:00 ` Laurent Pinchart
@ 2018-01-15 7:58 ` Simon Horman
0 siblings, 0 replies; 63+ messages in thread
From: Simon Horman @ 2018-01-15 7:58 UTC (permalink / raw)
To: Laurent Pinchart
Cc: Geert Uytterhoeven, Laurent Pinchart, DRI Development,
Linux-Renesas, Sergei Shtylyov, devicetree
On Mon, Jan 15, 2018 at 09:00:59AM +0200, Laurent Pinchart wrote:
> Hi Simon,
>
> On Monday, 15 January 2018 08:57:48 EET Simon Horman wrote:
> > On Fri, Jan 12, 2018 at 03:48:25PM +0200, Laurent Pinchart wrote:
> > > On Friday, 12 January 2018 11:47:03 EET Geert Uytterhoeven wrote:
> > >> On Fri, Jan 12, 2018 at 1:58 AM, Laurent Pinchart wrote:
> > >>> This patch series addresses a design mistake that dates back from the
> > >>> initial DU support. Support for the LVDS encoders, which are IP cores
> > >>> separate from the DU, was bundled in the DU driver. Worse, both the DU
> > >>> and LVDS were described through a single DT node.
> > >>>
> > >>> To fix the, patches 01/10 and 02/10 define new DT bindings for the
> > >>> LVDS encoders, and deprecate their description inside the DU bindings.
> > >>> To retain backward compatibility with existing DT, patch 03/10 then
> > >>> patches the device tree at runtime to convert the legacy bindings to the
> > >>> new ones.
> > >>
> > >> Looks like we will have to postpone the R-Car Gen2 Modern DT flag day
> > >> again by a few kernel releases?
> > >
> > > Why so ? We don't have to drop support for all legacy DT bindings at the
> > > same time, do we ? We can switch to the new-style clock bindings on Gen2
> > > already, and drop the legacy LVDS bindings later.
> >
> > To clarify, after this patchset.
> > * Old DTs work with old and new kernels.
> > * New DTs require new kernels.
>
> That's correct. I've tested old DTs with new kernels successfully on Lager,
> Salvator-X (both H3 ES1.x and M3-W) and Salvator-XS.
Thanks, no objections to this approach from my side.
^ permalink raw reply [flat|nested] 63+ messages in thread
* Re: [PATCH 01/10] dt-bindings: display: renesas: Add R-Car LVDS encoder DT bindings
2018-01-15 6:59 ` Laurent Pinchart
(?)
(?)
@ 2018-01-15 8:05 ` Geert Uytterhoeven
2018-01-15 8:26 ` Laurent Pinchart
-1 siblings, 1 reply; 63+ messages in thread
From: Geert Uytterhoeven @ 2018-01-15 8:05 UTC (permalink / raw)
To: Laurent Pinchart
Cc: Simon Horman, Laurent Pinchart, DRI Development, Linux-Renesas,
Sergei Shtylyov, devicetree
Hi Laurent,
On Mon, Jan 15, 2018 at 7:59 AM, Laurent Pinchart
<laurent.pinchart@ideasonboard.com> wrote:
> On Monday, 15 January 2018 08:55:29 EET Simon Horman wrote:
>> On Fri, Jan 12, 2018 at 03:29:48PM +0200, Laurent Pinchart wrote:
>> > On Friday, 12 January 2018 12:13:18 EET Geert Uytterhoeven wrote:
>> >> As this is a new binding, please use "renesas,<soc>-lvds".
>> >
>> > I've recently been thinking that we made the wrong choice, <ip>-<soc>
>> > would be better in my opinion as it aligns with <ip>-<version>, but it's
>> > too late to change that, so I'll change the order here.
>>
>> My recollection is that in the beginning we had a bit of a mixture but
>> leaned towards <ip>-<soc>, which made sense in my opinion. However, after
>> some discussion it was agreed that the best-practice for upstream was to
>> use <soc>-<ip>. Unless that situation has changed lets stock with using
>> <soc>-<ip> for new bindings.
>
> Sure, that was my plan, and it seems I failed to explain it clearly. I too
> believe that <ip>-<soc> would be better, but as we have standardized on <soc>-
> <ip> and as there's no strong reason to reconsider that decision at the
> moment, the next version of this patch will use <soc>-<ip>. It was a mistake
> in v1, not an attempt to change what we had agreed on.
Note that I believe you have to consider the full tuple "<vendor>,<soc>-<ip>"
to see the light: <soc> is more closely tied to <vendor>, than <ip> is.
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org
In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds
^ permalink raw reply [flat|nested] 63+ messages in thread
* Re: [PATCH 05/10] ARM: dts: porter: Fix HDMI output routing
2018-01-15 7:56 ` Simon Horman
@ 2018-01-15 8:25 ` Laurent Pinchart
2018-01-16 9:09 ` Simon Horman
0 siblings, 1 reply; 63+ messages in thread
From: Laurent Pinchart @ 2018-01-15 8:25 UTC (permalink / raw)
To: Simon Horman
Cc: Laurent Pinchart, dri-devel, linux-renesas-soc, Sergei Shtylyov
Hi Simon,
On Monday, 15 January 2018 09:56:03 EET Simon Horman wrote:
> On Fri, Jan 12, 2018 at 02:58:53AM +0200, Laurent Pinchart wrote:
> > The HDMI encoder is connected to the RGB output of the DU, which is
> > port@0, not port@1. Fix the incorrect DT description.
> >
> > Signed-off-by: Laurent Pinchart
> > <laurent.pinchart+renesas@ideasonboard.com>
>
> Should this have the following tag?
>
> Fixes: c5af8a4248d3 ("ARM: dts: porter: add DU DT support")
That would make sense, yes.
> If so, is it a fix to apply for v4.15 or a more regular patch
> to apply for v4.16?
I believe we can wait for v4.16. HDMI output works on Porter at the moment due
to a separate bug in the DU driver that clones outputs by default when it
shouldn't. There's however no harm in backporting the patch to stable series
if desired, but it's not required.
--
Regards,
Laurent Pinchart
^ permalink raw reply [flat|nested] 63+ messages in thread
* Re: [PATCH 01/10] dt-bindings: display: renesas: Add R-Car LVDS encoder DT bindings
2018-01-15 8:05 ` Geert Uytterhoeven
@ 2018-01-15 8:26 ` Laurent Pinchart
0 siblings, 0 replies; 63+ messages in thread
From: Laurent Pinchart @ 2018-01-15 8:26 UTC (permalink / raw)
To: Geert Uytterhoeven
Cc: Simon Horman, Laurent Pinchart, DRI Development, Linux-Renesas,
Sergei Shtylyov, devicetree
Hi Geert,
On Monday, 15 January 2018 10:05:59 EET Geert Uytterhoeven wrote:
> On Mon, Jan 15, 2018 at 7:59 AM, Laurent Pinchart wrote:
> > On Monday, 15 January 2018 08:55:29 EET Simon Horman wrote:
> >> On Fri, Jan 12, 2018 at 03:29:48PM +0200, Laurent Pinchart wrote:
> >>> On Friday, 12 January 2018 12:13:18 EET Geert Uytterhoeven wrote:
> >>>> As this is a new binding, please use "renesas,<soc>-lvds".
> >>>
> >>> I've recently been thinking that we made the wrong choice, <ip>-<soc>
> >>> would be better in my opinion as it aligns with <ip>-<version>, but
> >>> it's too late to change that, so I'll change the order here.
> >>
> >> My recollection is that in the beginning we had a bit of a mixture but
> >> leaned towards <ip>-<soc>, which made sense in my opinion. However, after
> >> some discussion it was agreed that the best-practice for upstream was to
> >> use <soc>-<ip>. Unless that situation has changed lets stock with using
> >> <soc>-<ip> for new bindings.
> >
> > Sure, that was my plan, and it seems I failed to explain it clearly. I too
> > believe that <ip>-<soc> would be better, but as we have standardized on
> > <soc>- <ip> and as there's no strong reason to reconsider that decision
> > at the moment, the next version of this patch will use <soc>-<ip>. It was
> > a mistake in v1, not an attempt to change what we had agreed on.
>
> Note that I believe you have to consider the full tuple
> "<vendor>,<soc>-<ip>" to see the light: <soc> is more closely tied to
> <vendor>, than <ip> is.
I suppose there are pros and cons for both options :-) I see <soc> more as a
version qualifier.
--
Regards,
Laurent Pinchart
^ permalink raw reply [flat|nested] 63+ messages in thread
* Re: [PATCH 05/10] ARM: dts: porter: Fix HDMI output routing
2018-01-15 8:25 ` Laurent Pinchart
@ 2018-01-16 9:09 ` Simon Horman
0 siblings, 0 replies; 63+ messages in thread
From: Simon Horman @ 2018-01-16 9:09 UTC (permalink / raw)
To: Laurent Pinchart
Cc: Laurent Pinchart, dri-devel, linux-renesas-soc, Sergei Shtylyov
On Mon, Jan 15, 2018 at 10:25:34AM +0200, Laurent Pinchart wrote:
> Hi Simon,
>
> On Monday, 15 January 2018 09:56:03 EET Simon Horman wrote:
> > On Fri, Jan 12, 2018 at 02:58:53AM +0200, Laurent Pinchart wrote:
> > > The HDMI encoder is connected to the RGB output of the DU, which is
> > > port@0, not port@1. Fix the incorrect DT description.
> > >
> > > Signed-off-by: Laurent Pinchart
> > > <laurent.pinchart+renesas@ideasonboard.com>
> >
> > Should this have the following tag?
> >
> > Fixes: c5af8a4248d3 ("ARM: dts: porter: add DU DT support")
>
> That would make sense, yes.
>
> > If so, is it a fix to apply for v4.15 or a more regular patch
> > to apply for v4.16?
>
> I believe we can wait for v4.16. HDMI output works on Porter at the
> moment due to a separate bug in the DU driver that clones outputs by
> default when it shouldn't. There's however no harm in backporting the
> patch to stable series if desired, but it's not required.
Thanks, I've applied this for v4.16 with the fixes tag above.
Possibly the fixes tag will result in some automated backporting occurring.
If so we can let that run its course, if not we can leave things be with
the option to backport later if we decide its necessary.
I have not applied the other dts patches in this series at this point.
^ permalink raw reply [flat|nested] 63+ messages in thread
* Re: [PATCH 02/10] dt-bindings: display: renesas: Deprecate LVDS support in the DU bindings
2018-01-12 10:44 ` Laurent Pinchart
@ 2018-01-19 21:23 ` Rob Herring
-1 siblings, 0 replies; 63+ messages in thread
From: Rob Herring @ 2018-01-19 21:23 UTC (permalink / raw)
To: Laurent Pinchart
Cc: Geert Uytterhoeven, Laurent Pinchart, DRI Development,
Linux-Renesas, Sergei Shtylyov,
devicetree-u79uwXL29TY76Z2rM5mHXA
On Fri, Jan 12, 2018 at 12:44:45PM +0200, Laurent Pinchart wrote:
> Hi Geert,
>
> On Friday, 12 January 2018 11:49:28 EET Geert Uytterhoeven wrote:
> > On Fri, Jan 12, 2018 at 1:58 AM, Laurent Pinchart wrote:
> > > The internal LVDS encoders now have their own DT bindings, representing
> > > them as part of the DU is deprecated.
> > >
> > > Signed-off-by: Laurent Pinchart
> > > <laurent.pinchart+renesas-ryLnwIuWjnjg/C1BVhZhaw@public.gmane.org>
> >
> > FWIW, you're not really deprecating the LVDS part, but removing it
> > completely. Do you want to keep a reference instead?
>
> I don't think we should keep a reference as it would only confuse DT authors.
> The information is kept in the git history. I can rewrite the commit message,
> but I consider this as deprecating the legacy bindings.
We've done it both ways. I'm fine with just deleting.
Rob
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 63+ messages in thread
* Re: [PATCH 02/10] dt-bindings: display: renesas: Deprecate LVDS support in the DU bindings
@ 2018-01-19 21:23 ` Rob Herring
0 siblings, 0 replies; 63+ messages in thread
From: Rob Herring @ 2018-01-19 21:23 UTC (permalink / raw)
To: Laurent Pinchart
Cc: Geert Uytterhoeven, Laurent Pinchart, DRI Development,
Linux-Renesas, Sergei Shtylyov, devicetree
On Fri, Jan 12, 2018 at 12:44:45PM +0200, Laurent Pinchart wrote:
> Hi Geert,
>
> On Friday, 12 January 2018 11:49:28 EET Geert Uytterhoeven wrote:
> > On Fri, Jan 12, 2018 at 1:58 AM, Laurent Pinchart wrote:
> > > The internal LVDS encoders now have their own DT bindings, representing
> > > them as part of the DU is deprecated.
> > >
> > > Signed-off-by: Laurent Pinchart
> > > <laurent.pinchart+renesas@ideasonboard.com>
> >
> > FWIW, you're not really deprecating the LVDS part, but removing it
> > completely. Do you want to keep a reference instead?
>
> I don't think we should keep a reference as it would only confuse DT authors.
> The information is kept in the git history. I can rewrite the commit message,
> but I consider this as deprecating the legacy bindings.
We've done it both ways. I'm fine with just deleting.
Rob
^ permalink raw reply [flat|nested] 63+ messages in thread
* Re: [PATCH 02/10] dt-bindings: display: renesas: Deprecate LVDS support in the DU bindings
2018-01-12 0:58 ` [PATCH 02/10] dt-bindings: display: renesas: Deprecate LVDS support in the DU bindings Laurent Pinchart
` (2 preceding siblings ...)
2018-01-12 15:14 ` Sergei Shtylyov
@ 2018-01-19 21:24 ` Rob Herring
3 siblings, 0 replies; 63+ messages in thread
From: Rob Herring @ 2018-01-19 21:24 UTC (permalink / raw)
To: Laurent Pinchart
Cc: dri-devel, linux-renesas-soc, Sergei Shtylyov, devicetree
On Fri, Jan 12, 2018 at 02:58:50AM +0200, Laurent Pinchart wrote:
> The internal LVDS encoders now have their own DT bindings, representing
> them as part of the DU is deprecated.
>
> Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
> ---
> .../devicetree/bindings/display/renesas,du.txt | 26 +++++++++-------------
> 1 file changed, 11 insertions(+), 15 deletions(-)
This is the easy part. :)
Reviewed-by: Rob Herring <robh@kernel.org>
^ permalink raw reply [flat|nested] 63+ messages in thread
end of thread, other threads:[~2018-01-19 21:24 UTC | newest]
Thread overview: 63+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-01-12 0:58 [PATCH 00/10] R-Car DU: Convert LVDS code to bridge driver Laurent Pinchart
2018-01-12 0:58 ` [PATCH 01/10] dt-bindings: display: renesas: Add R-Car LVDS encoder DT bindings Laurent Pinchart
2018-01-12 0:58 ` Laurent Pinchart
2018-01-12 9:45 ` Geert Uytterhoeven
[not found] ` <CAMuHMdWMgst-1evod+0hZujU2xPtO3UmO9c2CPPrTg=gpHpTbw-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2018-01-12 13:36 ` Laurent Pinchart
2018-01-12 13:36 ` Laurent Pinchart
2018-01-12 10:13 ` Geert Uytterhoeven
2018-01-12 13:29 ` Laurent Pinchart
2018-01-15 6:55 ` Simon Horman
2018-01-15 6:55 ` Simon Horman
[not found] ` <20180115065528.cfelrll6dm6ggf4e-/R6kz+dDXgpPR4JQBCEnsQ@public.gmane.org>
2018-01-15 6:59 ` Laurent Pinchart
2018-01-15 6:59 ` Laurent Pinchart
2018-01-15 7:57 ` Simon Horman
2018-01-15 8:05 ` Geert Uytterhoeven
2018-01-15 8:26 ` Laurent Pinchart
[not found] ` <20180112005858.26472-2-laurent.pinchart+renesas-ryLnwIuWjnjg/C1BVhZhaw@public.gmane.org>
2018-01-12 12:59 ` Biju Das
2018-01-12 12:59 ` Biju Das
2018-01-12 13:26 ` Laurent Pinchart
2018-01-12 14:00 ` Fabrizio Castro
2018-01-12 14:25 ` Laurent Pinchart
2018-01-12 14:25 ` Laurent Pinchart
2018-01-12 15:13 ` Sergei Shtylyov
[not found] ` <81a9462b-6aaa-52c7-f741-e504c14838e9-M4DtvfQ/ZS1MRgGoP+s0PdBPR1lH4CV8@public.gmane.org>
2018-01-12 20:34 ` Laurent Pinchart
2018-01-12 20:34 ` Laurent Pinchart
2018-01-12 0:58 ` [PATCH 02/10] dt-bindings: display: renesas: Deprecate LVDS support in the DU bindings Laurent Pinchart
2018-01-12 9:49 ` Geert Uytterhoeven
[not found] ` <CAMuHMdXYJmh8ssSRt8u75fTv5gyrpcoPKAuCT=BaF1Eu27CaiQ-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2018-01-12 10:44 ` Laurent Pinchart
2018-01-12 10:44 ` Laurent Pinchart
2018-01-19 21:23 ` Rob Herring
2018-01-19 21:23 ` Rob Herring
[not found] ` <20180112005858.26472-3-laurent.pinchart+renesas-ryLnwIuWjnjg/C1BVhZhaw@public.gmane.org>
2018-01-12 9:54 ` Vladimir Zapolskiy
2018-01-12 9:54 ` Vladimir Zapolskiy
2018-01-12 10:43 ` Laurent Pinchart
2018-01-12 14:52 ` Sergei Shtylyov
2018-01-12 14:52 ` Sergei Shtylyov
2018-01-12 15:14 ` Sergei Shtylyov
2018-01-12 15:14 ` Sergei Shtylyov
2018-01-12 16:46 ` Laurent Pinchart
2018-01-19 21:24 ` Rob Herring
2018-01-12 0:58 ` [PATCH 03/10] drm: rcar-du: Fix legacy DT to create LVDS encoder nodes Laurent Pinchart
[not found] ` <20180112005858.26472-4-laurent.pinchart+renesas-ryLnwIuWjnjg/C1BVhZhaw@public.gmane.org>
2018-01-12 10:09 ` Geert Uytterhoeven
2018-01-12 10:09 ` Geert Uytterhoeven
[not found] ` <CAMuHMdW5wDj5gyTnh+Xa3J10b_6For0MdhcTFgdU_+sgx=BYmA-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2018-01-12 13:53 ` Laurent Pinchart
2018-01-12 13:53 ` Laurent Pinchart
2018-01-12 0:58 ` [PATCH 04/10] drm: rcar-du: Convert LVDS encoder code to bridge driver Laurent Pinchart
2018-01-12 0:58 ` [PATCH 05/10] ARM: dts: porter: Fix HDMI output routing Laurent Pinchart
2018-01-15 7:56 ` Simon Horman
2018-01-15 8:25 ` Laurent Pinchart
2018-01-16 9:09 ` Simon Horman
2018-01-12 0:58 ` [PATCH 06/10] ARM: dts: r8a7790: Convert to new LVDS DT bindings Laurent Pinchart
2018-01-12 0:58 ` Laurent Pinchart
2018-01-12 0:58 ` [PATCH 07/10] ARM: dts: r8a7791: " Laurent Pinchart
2018-01-12 0:58 ` [PATCH 08/10] ARM: dts: r8a7793: " Laurent Pinchart
2018-01-12 0:58 ` [PATCH 09/10] arm64: dts: renesas: r8a7795: " Laurent Pinchart
2018-01-12 0:58 ` [PATCH 10/10] arm64: dts: renesas: r8a7796: " Laurent Pinchart
2018-01-12 9:47 ` [PATCH 00/10] R-Car DU: Convert LVDS code to bridge driver Geert Uytterhoeven
2018-01-12 13:48 ` Laurent Pinchart
2018-01-15 6:57 ` Simon Horman
2018-01-15 6:57 ` Simon Horman
2018-01-15 7:00 ` Laurent Pinchart
2018-01-15 7:58 ` Simon Horman
[not found] ` <20180112005858.26472-1-laurent.pinchart+renesas-ryLnwIuWjnjg/C1BVhZhaw@public.gmane.org>
2018-01-15 6:59 ` Simon Horman
2018-01-15 6:59 ` Simon Horman
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.