| Message ID | 1548170749-12773-2-git-send-email-biju.das@bp.renesas.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 6a6a797625b5fe855bf60c798561896e311d58ce |
| Delegated to: | Simon Horman |
| Headers | show |
| Series | Add Display support | expand |
Hi Biju, Thank you for the patch. On Tue, Jan 22, 2019 at 03:25:45PM +0000, Biju Das wrote: > The internal LVDS encoder now has DT bindings separate from the DU. Port > the device tree over to the new model. > > Fixes: c6a27fa41fab ("drm: rcar-du: Convert LVDS encoder code to bridge driver") Sorry for the breakage. The DT and DU series raced each other, but I should have still caught it. > Signed-off-by: Biju Das <biju.das@bp.renesas.com> Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> I expect Simon to pick this up. > --- > arch/arm/boot/dts/r8a7743.dtsi | 36 ++++++++++++++++++++++++++++++------ > 1 file changed, 30 insertions(+), 6 deletions(-) > > diff --git a/arch/arm/boot/dts/r8a7743.dtsi b/arch/arm/boot/dts/r8a7743.dtsi > index 24e6c2b..de981d6 100644 > --- a/arch/arm/boot/dts/r8a7743.dtsi > +++ b/arch/arm/boot/dts/r8a7743.dtsi > @@ -1660,15 +1660,12 @@ > > du: display@feb00000 { > compatible = "renesas,du-r8a7743"; > - reg = <0 0xfeb00000 0 0x40000>, > - <0 0xfeb90000 0 0x1c>; > - reg-names = "du", "lvds.0"; > + reg = <0 0xfeb00000 0 0x40000>; > 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 { > @@ -1683,6 +1680,33 @@ > port@1 { > reg = <1>; > du_out_lvds0: endpoint { > + remote-endpoint = <&lvds0_in>; > + }; > + }; > + }; > + }; > + > + lvds0: lvds@feb90000 { > + compatible = "renesas,r8a7743-lvds"; > + reg = <0 0xfeb90000 0 0x1c>; > + clocks = <&cpg CPG_MOD 726>; > + power-domains = <&sysc R8A7743_PD_ALWAYS_ON>; > + resets = <&cpg 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 { > }; > }; > };
On Tue, Jan 22, 2019 at 07:13:25PM +0200, Laurent Pinchart wrote: > Hi Biju, > > Thank you for the patch. > > On Tue, Jan 22, 2019 at 03:25:45PM +0000, Biju Das wrote: > > The internal LVDS encoder now has DT bindings separate from the DU. Port > > the device tree over to the new model. > > > > Fixes: c6a27fa41fab ("drm: rcar-du: Convert LVDS encoder code to bridge driver") > > Sorry for the breakage. The DT and DU series raced each other, but I > should have still caught it. > > > Signed-off-by: Biju Das <biju.das@bp.renesas.com> > > Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> > > I expect Simon to pick this up. Thanks, applied as a fix for v5.0 as the fixes tag indicates the breakage occurred in v4.17.
diff --git a/arch/arm/boot/dts/r8a7743.dtsi b/arch/arm/boot/dts/r8a7743.dtsi index 24e6c2b..de981d6 100644 --- a/arch/arm/boot/dts/r8a7743.dtsi +++ b/arch/arm/boot/dts/r8a7743.dtsi @@ -1660,15 +1660,12 @@ du: display@feb00000 { compatible = "renesas,du-r8a7743"; - reg = <0 0xfeb00000 0 0x40000>, - <0 0xfeb90000 0 0x1c>; - reg-names = "du", "lvds.0"; + reg = <0 0xfeb00000 0 0x40000>; 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 { @@ -1683,6 +1680,33 @@ port@1 { reg = <1>; du_out_lvds0: endpoint { + remote-endpoint = <&lvds0_in>; + }; + }; + }; + }; + + lvds0: lvds@feb90000 { + compatible = "renesas,r8a7743-lvds"; + reg = <0 0xfeb90000 0 0x1c>; + clocks = <&cpg CPG_MOD 726>; + power-domains = <&sysc R8A7743_PD_ALWAYS_ON>; + resets = <&cpg 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 { }; }; };
The internal LVDS encoder now has DT bindings separate from the DU. Port the device tree over to the new model. Fixes: c6a27fa41fab ("drm: rcar-du: Convert LVDS encoder code to bridge driver") Signed-off-by: Biju Das <biju.das@bp.renesas.com> --- arch/arm/boot/dts/r8a7743.dtsi | 36 ++++++++++++++++++++++++++++++------ 1 file changed, 30 insertions(+), 6 deletions(-)