Convert rockchip-lvds.txt to YAML.
Changed:
Add power-domains property.
Requirements between PX30 and RK3288
Signed-off-by: Johan Jonker <[email protected]>
Reviewed-by: Rob Herring <[email protected]>
---
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
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 <[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>;
+ };
+ };
+ };
+ };
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>;
- };
- };
- };
- };
--
2.20.1
Use generic node name for rk3399.dtsi dsi node.
With the conversion of rockchip,dw-mipi-dsi.yaml a port@1 node
is required, so add a node with label mipi_out.
Also restyle.
Signed-off-by: Johan Jonker <[email protected]>
---
Changed V6:
Restyle
---
arch/arm64/boot/dts/rockchip/rk3399.dtsi | 13 +++++++++++--
1 file changed, 11 insertions(+), 2 deletions(-)
diff --git a/arch/arm64/boot/dts/rockchip/rk3399.dtsi b/arch/arm64/boot/dts/rockchip/rk3399.dtsi
index 834d16acb..2250533cf 100644
--- a/arch/arm64/boot/dts/rockchip/rk3399.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3399.dtsi
@@ -1954,7 +1954,7 @@
};
};
- mipi_dsi: mipi@ff960000 {
+ mipi_dsi: dsi@ff960000 {
compatible = "rockchip,rk3399-mipi-dsi", "snps,dw-mipi-dsi";
reg = <0x0 0xff960000 0x0 0x8000>;
interrupts = <GIC_SPI 45 IRQ_TYPE_LEVEL_HIGH 0>;
@@ -1982,15 +1982,20 @@
reg = <0>;
remote-endpoint = <&vopb_out_mipi>;
};
+
mipi_in_vopl: endpoint@1 {
reg = <1>;
remote-endpoint = <&vopl_out_mipi>;
};
};
+
+ mipi_out: port@1 {
+ reg = <1>;
+ };
};
};
- mipi_dsi1: mipi@ff968000 {
+ mipi_dsi1: dsi@ff968000 {
compatible = "rockchip,rk3399-mipi-dsi", "snps,dw-mipi-dsi";
reg = <0x0 0xff968000 0x0 0x8000>;
interrupts = <GIC_SPI 46 IRQ_TYPE_LEVEL_HIGH 0>;
@@ -2025,6 +2030,10 @@
remote-endpoint = <&vopl_out_mipi1>;
};
};
+
+ mipi1_out: port@1 {
+ reg = <1>;
+ };
};
};
--
2.20.1
The clock-master property is used for the controller and not in the panel,
so move it there.
Signed-off-by: Johan Jonker <[email protected]>
---
.../bindings/display/dsi-controller.yaml | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/Documentation/devicetree/bindings/display/dsi-controller.yaml b/Documentation/devicetree/bindings/display/dsi-controller.yaml
index ca21671f6..67ce10307 100644
--- a/Documentation/devicetree/bindings/display/dsi-controller.yaml
+++ b/Documentation/devicetree/bindings/display/dsi-controller.yaml
@@ -30,6 +30,15 @@ properties:
$nodename:
pattern: "^dsi(@.*)?$"
+ clock-master:
+ type: boolean
+ description:
+ Should be enabled if the host is being used in conjunction with
+ another DSI host to drive the same peripheral. Hardware supporting
+ such a configuration generally requires the data on both the busses
+ to be driven by the same clock. Only the DSI host instance
+ controlling this clock should contain this property.
+
"#address-cells":
const: 1
@@ -52,15 +61,6 @@ patternProperties:
case the reg property can take multiple entries, one for each virtual
channel that the peripheral responds to.
- clock-master:
- type: boolean
- description:
- Should be enabled if the host is being used in conjunction with
- another DSI host to drive the same peripheral. Hardware supporting
- such a configuration generally requires the data on both the busses
- to be driven by the same clock. Only the DSI host instance
- controlling this clock should contain this property.
-
enforce-video-mode:
type: boolean
description:
--
2.20.1
'vbus-supply' does not match any of the regexes in rk3566-box-demo.dts
in the usb2phy0_otg node, so rename vbus-supply to phy-supply.
Signed-off-by: Johan Jonker <[email protected]>
---
arch/arm64/boot/dts/rockchip/rk3566-box-demo.dts | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/arm64/boot/dts/rockchip/rk3566-box-demo.dts b/arch/arm64/boot/dts/rockchip/rk3566-box-demo.dts
index 4c7f9abd5..4dc9b7623 100644
--- a/arch/arm64/boot/dts/rockchip/rk3566-box-demo.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3566-box-demo.dts
@@ -464,7 +464,7 @@
};
&usb2phy0_otg {
- vbus-supply = <&vcc5v0_usb2_otg>;
+ phy-supply = <&vcc5v0_usb2_otg>;
status = "okay";
};
--
2.20.1
Fix clock properties from the common snps,dw-mipi-dsi.yaml file,
as they don't match with what is used on the SoCs.
Signed-off-by: Johan Jonker <[email protected]>
Reviewed-by: Rob Herring <[email protected]>
---
.../display/bridge/snps,dw-mipi-dsi.yaml | 16 +++-------------
1 file changed, 3 insertions(+), 13 deletions(-)
diff --git a/Documentation/devicetree/bindings/display/bridge/snps,dw-mipi-dsi.yaml b/Documentation/devicetree/bindings/display/bridge/snps,dw-mipi-dsi.yaml
index 11fd68a70..0b51c64f1 100644
--- a/Documentation/devicetree/bindings/display/bridge/snps,dw-mipi-dsi.yaml
+++ b/Documentation/devicetree/bindings/display/bridge/snps,dw-mipi-dsi.yaml
@@ -26,19 +26,9 @@ properties:
reg:
maxItems: 1
- clocks:
- items:
- - description: Module clock
- - description: DSI bus clock for either AHB and APB
- - description: Pixel clock for the DPI/RGB input
- minItems: 2
-
- clock-names:
- items:
- - const: ref
- - const: pclk
- - const: px_clk
- minItems: 2
+ clocks: true
+
+ clock-names: true
resets:
maxItems: 1
--
2.20.1
The hclk is not used in the dw-mipi-dsi-rockchip.c driver,
so remove hclk from the rk356x.dtsi dsi node.
Signed-off-by: Johan Jonker <[email protected]>
---
arch/arm64/boot/dts/rockchip/rk356x.dtsi | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/arch/arm64/boot/dts/rockchip/rk356x.dtsi b/arch/arm64/boot/dts/rockchip/rk356x.dtsi
index 5706c3e24..2cb61a783 100644
--- a/arch/arm64/boot/dts/rockchip/rk356x.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk356x.dtsi
@@ -743,8 +743,8 @@
compatible = "rockchip,rk3568-mipi-dsi", "snps,dw-mipi-dsi";
reg = <0x00 0xfe060000 0x00 0x10000>;
interrupts = <GIC_SPI 68 IRQ_TYPE_LEVEL_HIGH>;
- clock-names = "pclk", "hclk";
- clocks = <&cru PCLK_DSITX_0>, <&cru HCLK_VO>;
+ clock-names = "pclk";
+ clocks = <&cru PCLK_DSITX_0>;
phy-names = "dphy";
phys = <&dsi_dphy0>;
power-domains = <&power RK3568_PD_VO>;
@@ -771,8 +771,8 @@
compatible = "rockchip,rk3568-mipi-dsi", "snps,dw-mipi-dsi";
reg = <0x0 0xfe070000 0x0 0x10000>;
interrupts = <GIC_SPI 69 IRQ_TYPE_LEVEL_HIGH>;
- clock-names = "pclk", "hclk";
- clocks = <&cru PCLK_DSITX_1>, <&cru HCLK_VO>;
+ clock-names = "pclk";
+ clocks = <&cru PCLK_DSITX_1>;
phy-names = "dphy";
phys = <&dsi_dphy1>;
power-domains = <&power RK3568_PD_VO>;
--
2.20.1
Use generic node name for rk3399.dtsi dp node.
With the conversion of rockchip,analogix-dp.yaml a port@1 node
is required, so add a node with label edp_out.
Also restyle.
Signed-off-by: Johan Jonker <[email protected]>
---
arch/arm64/boot/dts/rockchip/rk3399.dtsi | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/arch/arm64/boot/dts/rockchip/rk3399.dtsi b/arch/arm64/boot/dts/rockchip/rk3399.dtsi
index 2250533cf..e02483b72 100644
--- a/arch/arm64/boot/dts/rockchip/rk3399.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3399.dtsi
@@ -2037,7 +2037,7 @@
};
};
- edp: edp@ff970000 {
+ edp: dp@ff970000 {
compatible = "rockchip,rk3399-edp";
reg = <0x0 0xff970000 0x0 0x8000>;
interrupts = <GIC_SPI 10 IRQ_TYPE_LEVEL_HIGH 0>;
@@ -2054,6 +2054,7 @@
ports {
#address-cells = <1>;
#size-cells = <0>;
+
edp_in: port@0 {
reg = <0>;
#address-cells = <1>;
@@ -2069,6 +2070,10 @@
remote-endpoint = <&vopl_out_edp>;
};
};
+
+ edp_out: port@1 {
+ reg = <1>;
+ };
};
};
--
2.20.1
On Thu, 22 Dec 2022 15:24:51 +0100, Johan Jonker wrote:
> The clock-master property is used for the controller and not in the panel,
> so move it there.
>
> Signed-off-by: Johan Jonker <[email protected]>
> ---
> .../bindings/display/dsi-controller.yaml | 18 +++++++++---------
> 1 file changed, 9 insertions(+), 9 deletions(-)
>
Reviewed-by: Rob Herring <[email protected]>
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 <[email protected]>
> Reviewed-by: Rob Herring <[email protected]>
> ---
>
> 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 <[email protected]>
>> Reviewed-by: Rob Herring <[email protected]>
>> ---
>>
>> 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,
--
Heiko Stuebner <[email protected]>
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 <[email protected]>
> >> Reviewed-by: Rob Herring <[email protected]>
> >> ---
> >>
> >> 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 <[email protected]> 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 <[email protected]>
> > >> Reviewed-by: Rob Herring <[email protected]>
> > >> ---
> > >>
> > >> 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,
--
Heiko Stuebner <[email protected]>