| Message ID | 67771143-fd83-383d-41b2-68e8707134e8@gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [v6,01/17] dt-bindings: display: rockchip: convert rockchip-lvds.txt to YAML | expand |
On Thu, Dec 22, 2022 at 03:22:14PM +0100, Johan Jonker wrote: > Convert rockchip-lvds.txt to YAML. > > Changed: > Add power-domains property. > Requirements between PX30 and RK3288 > > Signed-off-by: Johan Jonker <jbx6244@gmail.com> > Reviewed-by: Rob Herring <robh@kernel.org> > --- > > 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 What's the plan for these patches? Don't see them in linux-next still. Do you want me to take patches 1-8? Rob
On 2/3/23 19:21, Rob Herring wrote: > On Thu, Dec 22, 2022 at 03:22:14PM +0100, Johan Jonker wrote: >> Convert rockchip-lvds.txt to YAML. >> >> Changed: >> Add power-domains property. >> Requirements between PX30 and RK3288 >> >> Signed-off-by: Johan Jonker <jbx6244@gmail.com> >> Reviewed-by: Rob Herring <robh@kernel.org> >> --- >> >> 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 > > What's the plan for these patches? Don't see them in linux-next still. > Do you want me to take patches 1-8? Hi, The display patches normally go through the DRM git. Patch 2 must merge with grf.yaml. Heiko has merged now 3 PHY related patches to grf.yaml first. [PATCH v6 02/17] dt-bindings: soc: rockchip: grf: add rockchip,lvds.yaml See current https://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip.git/log/?h=for-next&qt=grep&q=jonker Not sure what Heiko's plans are. Patch 2 replaces only a description text and some accolades removal, so not "too" important. I urgent then you could merge without conflict: 1, 3-8 Patch 2 requires some adjusted now depending on the grf.yaml current next state. Johan > > Rob
On Thu, 22 Dec 2022 15:22:14 +0100, Johan Jonker wrote: > Convert rockchip-lvds.txt to YAML. > > Changed: > Add power-domains property. > Requirements between PX30 and RK3288 > > > [...] Applied, thanks! [01/17] dt-bindings: display: rockchip: convert rockchip-lvds.txt to YAML commit: d567ca6ed9fd5fe594bca5e29717ff9e9631efba [02/17] dt-bindings: soc: rockchip: grf: add rockchip,lvds.yaml commit: cbfc73a3febdf14395ecdd738decd53835166662 [03/17] dt-bindings: display: dsi-controller: move clock-master property commit: a1b7455dc4a399a565353ceb7cce605b4b9db41a [04/17] dt-bindings: display: bridge: snps,dw-mipi-dsi: fix clock properties commit: a90fa0adbeb07f11c08635364d206678d9e1b938 [05/17] dt-bindings: display: rockchip: convert dw_mipi_dsi_rockchip.txt to yaml commit: 0dac2102cf6baacba0d9d7804b0c163337f69839 [06/17] dt-bindings: display: bridge: convert analogix_dp.txt to yaml commit: 440112adadd3e273d2a2ff6e5d4b969ee03fda47 [07/17] dt-bindings: display: rockchip: convert analogix_dp-rockchip.txt to yaml commit: 9bb35d4c3230803345d5218676a7325b26823209 Best regards,
Hi, Am Freitag, 3. Februar 2023, 20:02:54 CET schrieb Johan Jonker: > > On 2/3/23 19:21, Rob Herring wrote: > > On Thu, Dec 22, 2022 at 03:22:14PM +0100, Johan Jonker wrote: > >> Convert rockchip-lvds.txt to YAML. > >> > >> Changed: > >> Add power-domains property. > >> Requirements between PX30 and RK3288 > >> > >> Signed-off-by: Johan Jonker <jbx6244@gmail.com> > >> Reviewed-by: Rob Herring <robh@kernel.org> > >> --- > >> > >> 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 > > > > > What's the plan for these patches? Don't see them in linux-next still. > > Do you want me to take patches 1-8? > > Hi, > > The display patches normally go through the DRM git. > Patch 2 must merge with grf.yaml. > Heiko has merged now 3 PHY related patches to grf.yaml first. > > [PATCH v6 02/17] dt-bindings: soc: rockchip: grf: add rockchip,lvds.yaml > > See current > https://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip.git/log/?h=for-next&qt=grep&q=jonker > > Not sure what Heiko's plans are. > Patch 2 replaces only a description text and some accolades removal, so not "too" important. > > I urgent then you could merge without conflict: > 1, 3-8 So I've applied patches 1-7 to the drm-tree now. For the GRF-patch, I've dropped the quotes changes, as they are somewhat unrelated to the lvds inclusion and so prevented any conflicts when applying the rest to the DRM tree. @Rob, if you could pick the fusb302 patch (number8), that would be great Thanks Heiko
On Sun, Feb 5, 2023 at 8:12 AM Heiko Stübner <heiko@sntech.de> wrote: > > Hi, > > Am Freitag, 3. Februar 2023, 20:02:54 CET schrieb Johan Jonker: > > > > On 2/3/23 19:21, Rob Herring wrote: > > > On Thu, Dec 22, 2022 at 03:22:14PM +0100, Johan Jonker wrote: > > >> Convert rockchip-lvds.txt to YAML. > > >> > > >> Changed: > > >> Add power-domains property. > > >> Requirements between PX30 and RK3288 > > >> > > >> Signed-off-by: Johan Jonker <jbx6244@gmail.com> > > >> Reviewed-by: Rob Herring <robh@kernel.org> > > >> --- > > >> > > >> 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 > > > > > > > > What's the plan for these patches? Don't see them in linux-next still. > > > Do you want me to take patches 1-8? > > > > Hi, > > > > The display patches normally go through the DRM git. > > Patch 2 must merge with grf.yaml. > > Heiko has merged now 3 PHY related patches to grf.yaml first. > > > > [PATCH v6 02/17] dt-bindings: soc: rockchip: grf: add rockchip,lvds.yaml > > > > See current > > https://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip.git/log/?h=for-next&qt=grep&q=jonker > > > > Not sure what Heiko's plans are. > > Patch 2 replaces only a description text and some accolades removal, so not "too" important. > > > > I urgent then you could merge without conflict: > > 1, 3-8 > > So I've applied patches 1-7 to the drm-tree now. That would have been good a month ago. Now these won't land til 6.4. :( For that reason, if it is after the drm-misc cutoff, I prefer to take DT bindings via my tree. > For the GRF-patch, I've dropped the quotes changes, as they are somewhat > unrelated to the lvds inclusion and so prevented any conflicts when applying > the rest to the DRM tree. Only 1 hunk needed to be dropped to avoid the conflict (which also dropped quotes). If all the quote changes were dropped, please send another patch for that. > @Rob, if you could pick the fusb302 patch (number8), that would be great Will do. Rob
On Thu, 22 Dec 2022 15:22:14 +0100, Johan Jonker wrote: > Convert rockchip-lvds.txt to YAML. > > Changed: > Add power-domains property. > Requirements between PX30 and RK3288 > > > [...] Applied, thanks! [09/17] ARM: dts: rockchip: rk3288: fix dsi node commit: ea2d16f90629e3158307d0183cad5c40aa55c995 [10/17] ARM: dts: rockchip: rk3288: fix lvds node commit: 8a19e4c74d17ed8d1e6bc06b32c5b7b7c3b9fcfb [11/17] ARM: dts: rockchip: rk3288: fix dp node commit: 95e2ac6ae9f2330557a6aef70bf15173e1dd9714 [12/17] arm64: dts: rockchip: px30: fix lvds node commit: 0d5e24918976edffffee006e07730434a36d264a [13/17] arm64: dts: rockchip: px30: fix dsi node commit: 30322f812d4e0e75e2488c1d45aba94e51dd19bb [14/17] arm64: dts: rockchip: rk3399: fix dsi node commit: f82fe7ad31530b38d2f61aa6ae68bd35c33f4ad0 [15/17] arm64: dts: rockchip: rk3399: fix dp node commit: d94024bd6342c6f3e88c5fac785a685c1974d48e [16/17] arm64: dts: rockchip: rename vbus-supply to phy-supply in rk3566-box-demo.dts commit: fc440ea1732abb714150bb8f3d90672ccc679e2d [17/17] arm64: dts: rockchip: rk356x: remove hclk from dsi node commit: cadda005961cd6a202ae6f8ff99f2bba35a31dc8 Best regards,
diff --git a/Documentation/devicetree/bindings/display/rockchip/rockchip,lvds.yaml b/Documentation/devicetree/bindings/display/rockchip/rockchip,lvds.yaml new file mode 100644 index 000000000..03b002a05 --- /dev/null +++ b/Documentation/devicetree/bindings/display/rockchip/rockchip,lvds.yaml @@ -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 <hjc@rock-chips.com> + - Heiko Stuebner <heiko@sntech.de> + +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>; + }; + }; + }; + }; diff --git a/Documentation/devicetree/bindings/display/rockchip/rockchip-lvds.txt b/Documentation/devicetree/bindings/display/rockchip/rockchip-lvds.txt deleted file mode 100644 index aaf8c44cf..000000000 --- a/Documentation/devicetree/bindings/display/rockchip/rockchip-lvds.txt +++ /dev/null @@ -1,92 +0,0 @@ -Rockchip RK3288 LVDS interface -================================ - -Required properties: -- compatible: matching the soc type, one of - - "rockchip,rk3288-lvds"; - - "rockchip,px30-lvds"; - -- reg: physical base address of the controller and length - of memory mapped region. -- clocks: must include clock specifiers corresponding to entries in the - clock-names property. -- clock-names: must contain "pclk_lvds" - -- avdd1v0-supply: regulator phandle for 1.0V analog power -- avdd1v8-supply: regulator phandle for 1.8V analog power -- avdd3v3-supply: regulator phandle for 3.3V analog power - -- rockchip,grf: phandle to the general register files syscon -- rockchip,output: "rgb", "lvds" or "duallvds", This describes the output interface - -- phys: LVDS/DSI DPHY (px30 only) -- phy-names: name of the PHY, must be "dphy" (px30 only) - -Optional properties: -- pinctrl-names: must contain a "lcdc" entry. -- pinctrl-0: pin control group to be used for this controller. - -Required nodes: - -The lvds has two video ports as described by - Documentation/devicetree/bindings/media/video-interfaces.txt -Their connections are modeled using the OF graph bindings specified in - Documentation/devicetree/bindings/graph.txt. - -- video port 0 for the VOP input, the remote endpoint maybe vopb or vopl -- video port 1 for either a panel or subsequent encoder - -Example: - -lvds_panel: lvds-panel { - compatible = "auo,b101ean01"; - enable-gpios = <&gpio7 21 GPIO_ACTIVE_HIGH>; - data-mapping = "jeida-24"; - - ports { - panel_in_lvds: endpoint { - remote-endpoint = <&lvds_out_panel>; - }; - }; -}; - -For Rockchip RK3288: - - lvds: lvds@ff96c000 { - compatible = "rockchip,rk3288-lvds"; - rockchip,grf = <&grf>; - reg = <0xff96c000 0x4000>; - clocks = <&cru PCLK_LVDS_PHY>; - clock-names = "pclk_lvds"; - pinctrl-names = "lcdc"; - pinctrl-0 = <&lcdc_ctl>; - avdd1v0-supply = <&vdd10_lcd>; - avdd1v8-supply = <&vcc18_lcd>; - avdd3v3-supply = <&vcca_33>; - rockchip,output = "rgb"; - ports { - #address-cells = <1>; - #size-cells = <0>; - - lvds_in: port@0 { - reg = <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>; - }; - }; - }; - };