[PATCHv2 01/56] ARM: dts: omap: add channel to DSI panels

Sebastian Reichel sre at kernel.org
Tue Feb 25 00:01:19 UTC 2020


Hi Laurent,

On Tue, Feb 25, 2020 at 01:38:21AM +0200, Laurent Pinchart wrote:
> Hi Sebastian,
> 
> Thank you for the patch.
> 
> On Tue, Feb 25, 2020 at 12:20:31AM +0100, Sebastian Reichel wrote:
> > The standard binding for DSI requires, that the channel number
> > of the panel is encoded in DT. This adds the channel number in
> > all OMAP3-5 boards, in preparation for using common infrastructure.
> > 
> > Signed-off-by: Sebastian Reichel <sebastian.reichel at collabora.com>
> > ---
> >  .../devicetree/bindings/display/panel/panel-dsi-cm.txt      | 4 +++-
> >  arch/arm/boot/dts/motorola-mapphone-common.dtsi             | 3 ++-
> >  arch/arm/boot/dts/omap3-n950.dts                            | 3 ++-
> >  arch/arm/boot/dts/omap3.dtsi                                | 3 +++
> >  arch/arm/boot/dts/omap4-sdp.dts                             | 6 ++++--
> >  arch/arm/boot/dts/omap4.dtsi                                | 6 ++++++
> >  arch/arm/boot/dts/omap5.dtsi                                | 6 ++++++
> >  7 files changed, 26 insertions(+), 5 deletions(-)
> > 
> > diff --git a/Documentation/devicetree/bindings/display/panel/panel-dsi-cm.txt b/Documentation/devicetree/bindings/display/panel/panel-dsi-cm.txt
> > index dce48eb9db57..f92d5c9adfc5 100644
> > --- a/Documentation/devicetree/bindings/display/panel/panel-dsi-cm.txt
> > +++ b/Documentation/devicetree/bindings/display/panel/panel-dsi-cm.txt
> > @@ -3,6 +3,7 @@ Generic MIPI DSI Command Mode Panel
> >  
> >  Required properties:
> >  - compatible: "panel-dsi-cm"
> > +- reg: DSI channel number
> >  
> >  Optional properties:
> >  - label: a symbolic name for the panel
> > @@ -15,9 +16,10 @@ Required nodes:
> >  Example
> >  -------
> >  
> > -lcd0: display {
> > +lcd0: panel at 0 {
> >  	compatible = "tpo,taal", "panel-dsi-cm";
> >  	label = "lcd0";
> > +	reg = <0>;
> >  
> >  	reset-gpios = <&gpio4 6 GPIO_ACTIVE_HIGH>;
> >  
> 
> While at it, how about converting this to yaml ?

Ack. I was waiting for the dsi-controller YAML bindings to land,
which has happened in the meantime. I think it's better to do
this in a separate patch though, so that this one can easily be
backported.

-- Sebastian

> > diff --git a/arch/arm/boot/dts/motorola-mapphone-common.dtsi b/arch/arm/boot/dts/motorola-mapphone-common.dtsi
> > index 85665506f4f8..a5e4ba7c8dab 100644
> > --- a/arch/arm/boot/dts/motorola-mapphone-common.dtsi
> > +++ b/arch/arm/boot/dts/motorola-mapphone-common.dtsi
> > @@ -199,8 +199,9 @@ dsi1_out_ep: endpoint {
> >  		};
> >  	};
> >  
> > -	lcd0: display {
> > +	lcd0: panel at 0 {
> >  		compatible = "panel-dsi-cm";
> > +		reg = <0>;
> >  		label = "lcd0";
> >  		vddi-supply = <&lcd_regulator>;
> >  		reset-gpios = <&gpio4 5 GPIO_ACTIVE_HIGH>;	/* gpio101 */
> > diff --git a/arch/arm/boot/dts/omap3-n950.dts b/arch/arm/boot/dts/omap3-n950.dts
> > index 31d47a1fad84..80cf4e1177da 100644
> > --- a/arch/arm/boot/dts/omap3-n950.dts
> > +++ b/arch/arm/boot/dts/omap3-n950.dts
> > @@ -225,8 +225,9 @@ dsi_out_ep: endpoint {
> >  		};
> >  	};
> >  
> > -	lcd0: display {
> > +	lcd0: panel at 0 {
> >  		compatible = "nokia,himalaya", "panel-dsi-cm";
> > +		reg = <0>;
> >  		label = "lcd0";
> >  
> >  		pinctrl-names = "default";
> > diff --git a/arch/arm/boot/dts/omap3.dtsi b/arch/arm/boot/dts/omap3.dtsi
> > index 634ea16a711e..409d434a9b18 100644
> > --- a/arch/arm/boot/dts/omap3.dtsi
> > +++ b/arch/arm/boot/dts/omap3.dtsi
> > @@ -820,6 +820,9 @@ dsi: encoder at 4804fc00 {
> >  				ti,hwmods = "dss_dsi1";
> >  				clocks = <&dss1_alwon_fck>, <&dss2_alwon_fck>;
> >  				clock-names = "fck", "sys_clk";
> > +
> > +				#address-cells = <1>;
> > +				#size-cells = <0>;
> >  			};
> >  
> >  			rfbi: encoder at 48050800 {
> > diff --git a/arch/arm/boot/dts/omap4-sdp.dts b/arch/arm/boot/dts/omap4-sdp.dts
> > index 91480ac1f328..8a8307517dab 100644
> > --- a/arch/arm/boot/dts/omap4-sdp.dts
> > +++ b/arch/arm/boot/dts/omap4-sdp.dts
> > @@ -662,8 +662,9 @@ dsi1_out_ep: endpoint {
> >  		};
> >  	};
> >  
> > -	lcd0: display {
> > +	lcd0: panel at 0 {
> >  		compatible = "tpo,taal", "panel-dsi-cm";
> > +		reg = <0>;
> >  		label = "lcd0";
> >  
> >  		reset-gpios = <&gpio4 6 GPIO_ACTIVE_HIGH>;	/* 102 */
> > @@ -687,8 +688,9 @@ dsi2_out_ep: endpoint {
> >  		};
> >  	};
> >  
> > -	lcd1: display {
> > +	lcd1: panel at 0 {
> >  		compatible = "tpo,taal", "panel-dsi-cm";
> > +		reg = <0>;
> >  		label = "lcd1";
> >  
> >  		reset-gpios = <&gpio4 8 GPIO_ACTIVE_HIGH>;	/* 104 */
> > diff --git a/arch/arm/boot/dts/omap4.dtsi b/arch/arm/boot/dts/omap4.dtsi
> > index 9a87440d0b9d..a75734065cac 100644
> > --- a/arch/arm/boot/dts/omap4.dtsi
> > +++ b/arch/arm/boot/dts/omap4.dtsi
> > @@ -465,6 +465,9 @@ dsi1: encoder at 58004000 {
> >  				clocks = <&l3_dss_clkctrl OMAP4_DSS_CORE_CLKCTRL 8>,
> >  					 <&l3_dss_clkctrl OMAP4_DSS_CORE_CLKCTRL 10>;
> >  				clock-names = "fck", "sys_clk";
> > +
> > +				#address-cells = <1>;
> > +				#size-cells = <0>;
> >  			};
> >  
> >  			dsi2: encoder at 58005000 {
> > @@ -479,6 +482,9 @@ dsi2: encoder at 58005000 {
> >  				clocks = <&l3_dss_clkctrl OMAP4_DSS_CORE_CLKCTRL 8>,
> >  					 <&l3_dss_clkctrl OMAP4_DSS_CORE_CLKCTRL 10>;
> >  				clock-names = "fck", "sys_clk";
> > +
> > +				#address-cells = <1>;
> > +				#size-cells = <0>;
> >  			};
> >  
> >  			hdmi: encoder at 58006000 {
> > diff --git a/arch/arm/boot/dts/omap5.dtsi b/arch/arm/boot/dts/omap5.dtsi
> > index d0ecf54d5a23..5c7462e04716 100644
> > --- a/arch/arm/boot/dts/omap5.dtsi
> > +++ b/arch/arm/boot/dts/omap5.dtsi
> > @@ -333,6 +333,9 @@ dsi1: encoder at 58004000 {
> >  				clocks = <&dss_clkctrl OMAP5_DSS_CORE_CLKCTRL 8>,
> >  					 <&dss_clkctrl OMAP5_DSS_CORE_CLKCTRL 10>;
> >  				clock-names = "fck", "sys_clk";
> > +
> > +				#address-cells = <1>;
> > +				#size-cells = <0>;
> >  			};
> >  
> >  			dsi2: encoder at 58005000 {
> > @@ -347,6 +350,9 @@ dsi2: encoder at 58005000 {
> >  				clocks = <&dss_clkctrl OMAP5_DSS_CORE_CLKCTRL 8>,
> >  					 <&dss_clkctrl OMAP5_DSS_CORE_CLKCTRL 10>;
> >  				clock-names = "fck", "sys_clk";
> > +
> > +				#address-cells = <1>;
> > +				#size-cells = <0>;
> >  			};
> >  
> >  			hdmi: encoder at 58060000 {
> 
> -- 
> Regards,
> 
> Laurent Pinchart
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 833 bytes
Desc: not available
URL: <https://lists.freedesktop.org/archives/dri-devel/attachments/20200225/f922b926/attachment.sig>


More information about the dri-devel mailing list