Skip to contentSkip to conversation

dt-bindings: display: rockchip: convert rockchip-lvds.txt to YAML

PATCH Superseded Johan Jonker 2 participants 8 messages Dec 19, 2022 – Dec 20, 2022

Subsystems (6)

v4 of 6 Superseded Latest is v6 →

lore
Share & tools
lore
#0 lore raw

PATCH v4 1/5 dt-bindings: display: rockchip: convert rockchip-lvds.txt to YAML

Convert rockchip-lvds.txt to YAML.

Changed:
Add power-domains property.
Requirements between PX30 and RK3288

---

Changed V3:
Filename matching compatible style
Drop "Regulator phandle for "
Specify properties and requirements per SoC
Sort order and restyle

Changed V2:
Fix title

---
 .../display/rockchip/rockchip,lvds.yaml       | 170 ++++++++++++++++++
 .../display/rockchip/rockchip-lvds.txt        |  92 ----------
 2 files changed, 170 insertions(+), 92 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/display/rockchip/rockchip,lvds.yaml
 delete mode 100644 Documentation/devicetree/bindings/display/rockchip/rockchip-lvds.txt
Documentation/devicetree/bindings/display/rockchip/rockchip,lvds.yaml new file +170 -0
new file mode 100644
index 000000000..03b002a05
@@ -0,0 +1,170 @@
+# SPDX-License-Identifier: GPL-2.0
+%YAML 1.2
+---
+$id: http://devicetree.org/schemas/display/rockchip/rockchip,lvds.yaml#
+$schema: http://devicetree.org/meta-schemas/core.yaml#
+
+title: Rockchip low-voltage differential signal (LVDS) transmitter
+
+maintainers:
+  - Sandy Huang <[email protected]>
+  - Heiko Stuebner <[email protected]>
+
+properties:
+  compatible:
+    enum:
+      - rockchip,px30-lvds
+      - rockchip,rk3288-lvds
+
+  reg:
+    maxItems: 1
+
+  clocks:
+    maxItems: 1
+
+  clock-names:
+    const: pclk_lvds
+
+  avdd1v0-supply:
+    description: 1.0V analog power.
+
+  avdd1v8-supply:
+    description: 1.8V analog power.
+
+  avdd3v3-supply:
+    description: 3.3V analog power.
+
+  rockchip,grf:
+    $ref: /schemas/types.yaml#/definitions/phandle
+    description: Phandle to the general register files syscon.
+
+  rockchip,output:
+    $ref: /schemas/types.yaml#/definitions/string
+    enum: [rgb, lvds, duallvds]
+    description: This describes the output interface.
+
+  phys:
+    maxItems: 1
+
+  phy-names:
+    const: dphy
+
+  pinctrl-names:
+    const: lcdc
+
+  pinctrl-0: true
+
+  power-domains:
+    maxItems: 1
+
+  ports:
+    $ref: /schemas/graph.yaml#/properties/ports
+
+    properties:
+      port@0:
+        $ref: /schemas/graph.yaml#/properties/port
+        description:
+          Video port 0 for the VOP input.
+          The remote endpoint maybe vopb or vopl.
+
+      port@1:
+        $ref: /schemas/graph.yaml#/properties/port
+        description:
+          Video port 1 for either a panel or subsequent encoder.
+
+    required:
+      - port@0
+      - port@1
+
+required:
+  - compatible
+  - rockchip,grf
+  - rockchip,output
+  - ports
+
+allOf:
+  - if:
+      properties:
+        compatible:
+          contains:
+            const: rockchip,px30-lvds
+
+    then:
+      properties:
+        reg: false
+        clocks: false
+        clock-names: false
+        avdd1v0-supply: false
+        avdd1v8-supply: false
+        avdd3v3-supply: false
+
+      required:
+        - phys
+        - phy-names
+
+  - if:
+      properties:
+        compatible:
+          contains:
+            const: rockchip,rk3288-lvds
+
+    then:
+      properties:
+        phys: false
+        phy-names: false
+
+      required:
+        - reg
+        - clocks
+        - clock-names
+        - avdd1v0-supply
+        - avdd1v8-supply
+        - avdd3v3-supply
+
+additionalProperties: false
+
+examples:
+  - |
+    #include <dt-bindings/clock/rk3288-cru.h>
+
+    lvds: lvds@ff96c000 {
+      compatible = "rockchip,rk3288-lvds";
+      reg = <0xff96c000 0x4000>;
+      clocks = <&cru PCLK_LVDS_PHY>;
+      clock-names = "pclk_lvds";
+      avdd1v0-supply = <&vdd10_lcd>;
+      avdd1v8-supply = <&vcc18_lcd>;
+      avdd3v3-supply = <&vcca_33>;
+      pinctrl-names = "lcdc";
+      pinctrl-0 = <&lcdc_ctl>;
+      rockchip,grf = <&grf>;
+      rockchip,output = "rgb";
+
+      ports {
+        #address-cells = <1>;
+        #size-cells = <0>;
+
+        lvds_in: port@0 {
+          reg = <0>;
+          #address-cells = <1>;
+          #size-cells = <0>;
+
+          lvds_in_vopb: endpoint@0 {
+            reg = <0>;
+            remote-endpoint = <&vopb_out_lvds>;
+          };
+          lvds_in_vopl: endpoint@1 {
+            reg = <1>;
+            remote-endpoint = <&vopl_out_lvds>;
+          };
+        };
+
+        lvds_out: port@1 {
+          reg = <1>;
+
+          lvds_out_panel: endpoint {
+            remote-endpoint = <&panel_in_lvds>;
+          };
+        };
+      };
+    };
Documentation/devicetree/bindings/display/rockchip/rockchip-lvds.txt deleted +0 -92

92 lines not on this page · raw message

--
2.20.1

#1 lore raw

PATCH v4 2/5 dt-bindings: soc: rockchip: grf: add rockchip,lvds.yaml

Add new converted rockchip,lvds.yaml to grf.yaml file. Prepare for more SoCs with lvds output.

---
 .../devicetree/bindings/soc/rockchip/grf.yaml          | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)
Documentation/devicetree/bindings/soc/rockchip/grf.yaml +7 -3
index 2ed8cca79..d74295e98 100644
@@ -75,13 +75,17 @@ allOf:
       properties:
         compatible:
           contains:
-            const: rockchip,px30-grf
+            enum:
+              - rockchip,px30-grf
 
     then:
       properties:
         lvds:
-          description:
-            Documentation/devicetree/bindings/display/rockchip/rockchip-lvds.txt
+          type: object
+
+          $ref: "/schemas/display/rockchip/rockchip,lvds.yaml#"
+
+          unevaluatedProperties: false
 
   - if:
       properties:

--
2.20.1

maintainer Reviewed-by on v4 2/5
#2 lore raw

Re: [PATCH v4 2/5] dt-bindings: soc: rockchip: grf: add rockchip,lvds.yaml

Quoted 18 lines · Johan Jonker

Add new converted rockchip,lvds.yaml to grf.yaml file. Prepare for more SoCs with lvds output.

---
 .../devicetree/bindings/soc/rockchip/grf.yaml          | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)
Documentation/devicetree/bindings/soc/rockchip/grf.yaml +1 -1
index 2ed8cca79..d74295e98 100644
@@ -75,13 +75,17 @@ allOf:
       properties:
         compatible:
           contains:
-            const: rockchip,px30-grf
+            enum:

Documentation/devicetree/bindings/soc/rockchip/grf.yaml allOf: · line 86

Quoted 10 lines
Documentation/devicetree/bindings/soc/rockchip/grf.yaml +4 -2
+              - rockchip,px30-grf
 
     then:
       properties:
         lvds:
-          description:
-            Documentation/devicetree/bindings/display/rockchip/rockchip-lvds.txt
+          type: object
+
+          $ref: "/schemas/display/rockchip/rockchip,lvds.yaml#"

You can drop the quotes.

Quoted 9 lines
Documentation/devicetree/bindings/soc/rockchip/grf.yaml +2 -1
+
+          unevaluatedProperties: false
 
   - if:
       properties:
--

2.20.1

#3 lore raw

PATCH v4 3/5 dt-bindings: phy: add port node to phy-rockchip-inno-usb2.yaml

In reply to Johan Jonker

On Rockchip rk3399 a port node with one endpoint can be connected to a USB Type-C connector node.
Add a port node to the phy-rockchip-inno-usb2.yaml file.

---
 .../devicetree/bindings/phy/phy-rockchip-inno-usb2.yaml      | 5 +++++
 1 file changed, 5 insertions(+)
Documentation/devicetree/bindings/phy/phy-rockchip-inno-usb2.yaml +5 -0
index f71920082..ffc7e7560 100644
@@ -115,6 +115,11 @@ properties:
     required:
       - "#phy-cells"
 
+  port:
+    $ref: /schemas/graph.yaml#/properties/port
+    description:
+      Port node with one endpoint connected to a USB Type-C connector node.
+
 required:
   - compatible
   - reg

--
2.20.1

maintainer
#4 lore raw

Re: [PATCH v4 3/5] dt-bindings: phy: add port node to phy-rockchip-inno-usb2.yaml

Quoted 14 lines · Johan Jonker

On Rockchip rk3399 a port node with one endpoint can be connected to a USB Type-C connector node.
Add a port node to the phy-rockchip-inno-usb2.yaml file.

---
 .../devicetree/bindings/phy/phy-rockchip-inno-usb2.yaml      | 5 +++++
 1 file changed, 5 insertions(+)
Documentation/devicetree/bindings/phy/phy-rockchip-inno-usb2.yaml +0 -0
index f71920082..ffc7e7560 100644

Documentation/devicetree/bindings/phy/phy-rockchip-inno-usb2.yaml properties: · line 122

Quoted 8 lines
Documentation/devicetree/bindings/phy/phy-rockchip-inno-usb2.yaml +5 -0
@@ -115,6 +115,11 @@ properties:
     required:
       - "#phy-cells"
 
+  port:
+    $ref: /schemas/graph.yaml#/properties/port
+    description:
+      Port node with one endpoint connected to a USB Type-C connector node.
+

This doesn't make sense. First, this phy has an otg and host phy, so which one is it? Second, the USB connector graph is supposed to be connected to the USB controllers, not a phy.

But I guess we already have this in use, so I guess just mark it deprecated to discourage more usage..

Rob

#5 lore raw

PATCH v4 4/5 ARM: dts: rockchip: rk3288: add lvds_out node

In reply to Johan Jonker

With the conversion of rockchip,lvds.yaml a port@1 node is required, so add a node with label lvds_out.

---
 arch/arm/boot/dts/rk3288.dtsi | 4 ++++
 1 file changed, 4 insertions(+)
arch/arm/boot/dts/rk3288.dtsi +4 -0
index 487b0e03d..60207136f 100644
@@ -1170,6 +1170,10 @@
 					remote-endpoint = <&vopl_out_lvds>;
 				};
 			};
+
+			lvds_out: port@1 {
+				reg = <1>;
+			};
 		};
 	};
 

--
2.20.1

#6 lore raw

PATCH v4 5/5 arm64: dts: rockchip: px30: add lvds_out node

In reply to Johan Jonker

With the conversion of rockchip,lvds.yaml a port@1 node is required, so add a node with label lvds_out.

---
 arch/arm64/boot/dts/rockchip/px30.dtsi | 4 ++++
 1 file changed, 4 insertions(+)
arch/arm64/boot/dts/rockchip/px30.dtsi +4 -0
index bfa358042..eb414d0f8 100644
@@ -468,6 +468,10 @@
 						remote-endpoint = <&vopl_out_lvds>;
 					};
 				};
+
+				lvds_out: port@1 {
+					reg = <1>;
+				};
 			};
 		};
 	};

--
2.20.1

maintainer Reviewed-by on v4 1/5
#7 lore raw
In reply to Johan Jonker
Quoted 15 lines · Johan Jonker

Convert rockchip-lvds.txt to YAML.

Changed:
Add power-domains property.
Requirements between PX30 and RK3288

---

Changed V3:
Filename matching compatible style
Drop "Regulator phandle for "
Specify properties and requirements per SoC
Sort order and restyle

Quoted 9 lines

Changed V2:
Fix title

---
 .../display/rockchip/rockchip,lvds.yaml       | 170 ++++++++++++++++++
 .../display/rockchip/rockchip-lvds.txt        |  92 ----------
 2 files changed, 170 insertions(+), 92 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/display/rockchip/rockchip,lvds.yaml
 delete mode 100644 Documentation/devicetree/bindings/display/rockchip/rockchip-lvds.txt