| Message ID | abc3e9e51a0dbb418f847f81e7f50e39694ba4ec.1552594551.git-series.maxime.ripard@bootlin.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | ARM: dts: sunxi: Cleanup DTC warnings | expand |
On Fri, Mar 15, 2019 at 4:16 AM Maxime Ripard <maxime.ripard@bootlin.com> wrote: > > Our display engine endpoints trigger some DTC warnings due to the fact that > we're having a single endpoint that doesn't need any reg property, and > since we don't have a reg property, we don't need the address-cells and > size-cells properties anymore. > > Fix those > > Signed-off-by: Maxime Ripard <maxime.ripard@bootlin.com> > --- > arch/arm/boot/dts/sun8i-a23-a33.dtsi | 32 +++---------------- > arch/arm/boot/dts/sun8i-a23-q8-tablet.dts | 6 ++++- > arch/arm/boot/dts/sun8i-a33-q8-tablet.dts | 7 ++++- > arch/arm/boot/dts/sun8i-a33-sinlinx-sina33.dts | 11 +------ > arch/arm/boot/dts/sun8i-a33.dtsi | 18 +++-------- > arch/arm/boot/dts/sun8i-q8-common.dtsi | 18 +---------- > 6 files changed, 29 insertions(+), 63 deletions(-) > > diff --git a/arch/arm/boot/dts/sun8i-a23-a33.dtsi b/arch/arm/boot/dts/sun8i-a23-a33.dtsi > index 43fe215e83ea..6d2625a90a09 100644 > --- a/arch/arm/boot/dts/sun8i-a23-a33.dtsi > +++ b/arch/arm/boot/dts/sun8i-a23-a33.dtsi > @@ -192,19 +192,14 @@ > #size-cells = <0>; > > tcon0_in: port@0 { > - #address-cells = <1>; > - #size-cells = <0>; > reg = <0>; > > - tcon0_in_drc0: endpoint@0 { > - reg = <0>; > + tcon0_in_drc0: endpoint { > remote-endpoint = <&drc0_out_tcon0>; > }; > }; > > tcon0_out: port@1 { > - #address-cells = <1>; > - #size-cells = <0>; > reg = <1>; > }; > }; > @@ -627,12 +622,9 @@ > #size-cells = <0>; > > fe0_out: port@1 { > - #address-cells = <1>; > - #size-cells = <0>; > reg = <1>; > > - fe0_out_be0: endpoint@0 { > - reg = <0>; > + fe0_out_be0: endpoint { > remote-endpoint = <&be0_in_fe0>; > }; > }; > @@ -654,23 +646,17 @@ > #size-cells = <0>; > > be0_in: port@0 { > - #address-cells = <1>; > - #size-cells = <0>; > reg = <0>; > > - be0_in_fe0: endpoint@0 { > - reg = <0>; > + be0_in_fe0: endpoint { > remote-endpoint = <&fe0_out_be0>; > }; > }; > > be0_out: port@1 { > - #address-cells = <1>; > - #size-cells = <0>; > reg = <1>; > > - be0_out_drc0: endpoint@0 { > - reg = <0>; > + be0_out_drc0: endpoint { > remote-endpoint = <&drc0_in_be0>; > }; > }; > @@ -694,23 +680,17 @@ > #size-cells = <0>; > > drc0_in: port@0 { > - #address-cells = <1>; > - #size-cells = <0>; > reg = <0>; > > - drc0_in_be0: endpoint@0 { > - reg = <0>; > + drc0_in_be0: endpoint { > remote-endpoint = <&be0_out_drc0>; > }; > }; > > drc0_out: port@1 { > - #address-cells = <1>; > - #size-cells = <0>; > reg = <1>; > > - drc0_out_tcon0: endpoint@0 { > - reg = <0>; > + drc0_out_tcon0: endpoint { > remote-endpoint = <&tcon0_in_drc0>; > }; > }; > diff --git a/arch/arm/boot/dts/sun8i-a23-q8-tablet.dts b/arch/arm/boot/dts/sun8i-a23-q8-tablet.dts > index d4dab7c28398..5659c63d7d77 100644 > --- a/arch/arm/boot/dts/sun8i-a23-q8-tablet.dts > +++ b/arch/arm/boot/dts/sun8i-a23-q8-tablet.dts > @@ -65,3 +65,9 @@ > &panel { > compatible = "bananapi,s070wv20-ct16", "simple-panel"; > }; > + > +&tcon0_out { > + tcon0_out_lcd: endpoint { > + remote-endpoint = <&panel_input>; > + }; > +}; > diff --git a/arch/arm/boot/dts/sun8i-a33-q8-tablet.dts b/arch/arm/boot/dts/sun8i-a33-q8-tablet.dts > index b0bc2360f8c4..9c5750c25613 100644 > --- a/arch/arm/boot/dts/sun8i-a33-q8-tablet.dts > +++ b/arch/arm/boot/dts/sun8i-a33-q8-tablet.dts > @@ -48,3 +48,10 @@ > model = "Q8 A33 Tablet"; > compatible = "allwinner,q8-a33", "allwinner,sun8i-a33"; > }; > + > +&tcon0_out { > + tcon0_out_lcd: endpoint@0 { > + reg = <0>; > + remote-endpoint = <&panel_input>; > + }; > +}; > diff --git a/arch/arm/boot/dts/sun8i-a33-sinlinx-sina33.dts b/arch/arm/boot/dts/sun8i-a33-sinlinx-sina33.dts > index f3667268adde..785798e3a104 100644 > --- a/arch/arm/boot/dts/sun8i-a33-sinlinx-sina33.dts > +++ b/arch/arm/boot/dts/sun8i-a33-sinlinx-sina33.dts > @@ -63,16 +63,9 @@ > > panel { > compatible = "netron-dy,e231732"; > - #address-cells = <1>; > - #size-cells = <0>; > > - port@0 { > - reg = <0>; > - #address-cells = <1>; > - #size-cells = <0>; > - > - panel_input: endpoint@0 { > - reg = <0>; > + port { > + panel_input: endpoint { > remote-endpoint = <&tcon0_out_panel>; > }; > }; > diff --git a/arch/arm/boot/dts/sun8i-a33.dtsi b/arch/arm/boot/dts/sun8i-a33.dtsi > index 1111a6498102..4484d76c88b5 100644 > --- a/arch/arm/boot/dts/sun8i-a33.dtsi > +++ b/arch/arm/boot/dts/sun8i-a33.dtsi > @@ -266,18 +266,9 @@ > phy-names = "dphy"; > status = "disabled"; > > - ports { > - #address-cells = <1>; > - #size-cells = <0>; > - > - port@0 { > - #address-cells = <1>; > - #size-cells = <0>; > - reg = <0>; > - > - dsi_in_tcon0: endpoint { > - remote-endpoint = <&tcon0_out_dsi>; > - }; > + port { > + dsi_in_tcon0: endpoint { > + remote-endpoint = <&tcon0_out_dsi>; Shouldn't we expect to see an output port as well? > }; > }; > }; > @@ -420,6 +411,9 @@ > }; > > &tcon0_out { > + #address-cells = <1>; > + #size-cells = <0>; > + > tcon0_out_dsi: endpoint@1 { > reg = <1>; > remote-endpoint = <&dsi_in_tcon0>; > diff --git a/arch/arm/boot/dts/sun8i-q8-common.dtsi b/arch/arm/boot/dts/sun8i-q8-common.dtsi > index 53104f4ccacc..3d9a1524e17e 100644 > --- a/arch/arm/boot/dts/sun8i-q8-common.dtsi > +++ b/arch/arm/boot/dts/sun8i-q8-common.dtsi > @@ -54,16 +54,9 @@ > backlight = <&backlight>; > enable-gpios = <&pio 7 7 GPIO_ACTIVE_HIGH>; /* PH7 */ > power-supply = <®_dc1sw>; > - #address-cells = <1>; > - #size-cells = <0>; > > - port@0 { > - reg = <0>; > - #address-cells = <1>; > - #size-cells = <0>; > - > - panel_input: endpoint@0 { > - reg = <0>; > + port { > + panel_input: endpoint { > remote-endpoint = <&tcon0_out_lcd>; > }; > }; > @@ -120,13 +113,6 @@ > status = "okay"; > }; > > -&tcon0_out { > - tcon0_out_lcd: endpoint@0 { > - reg = <0>; > - remote-endpoint = <&panel_input>; > - }; > -}; > - The rest looks fine. Acked-by: Chen-Yu Tsai <wens@csie.org> once the DSI output port is sorted out. > &usbphy { > usb1_vbus-supply = <®_dldo1>; > }; > -- > git-series 0.9.1
Hi, On Fri, Mar 15, 2019 at 10:28:16AM +0800, Chen-Yu Tsai wrote: > > diff --git a/arch/arm/boot/dts/sun8i-a33.dtsi b/arch/arm/boot/dts/sun8i-a33.dtsi > > index 1111a6498102..4484d76c88b5 100644 > > --- a/arch/arm/boot/dts/sun8i-a33.dtsi > > +++ b/arch/arm/boot/dts/sun8i-a33.dtsi > > @@ -266,18 +266,9 @@ > > phy-names = "dphy"; > > status = "disabled"; > > > > - ports { > > - #address-cells = <1>; > > - #size-cells = <0>; > > - > > - port@0 { > > - #address-cells = <1>; > > - #size-cells = <0>; > > - reg = <0>; > > - > > - dsi_in_tcon0: endpoint { > > - remote-endpoint = <&tcon0_out_dsi>; > > - }; > > + port { > > + dsi_in_tcon0: endpoint { > > + remote-endpoint = <&tcon0_out_dsi>; > > Shouldn't we expect to see an output port as well? DSI panels are not using the OF Graph, but are subnodes of the DSI controller itself. It's kind of odd when we have to mix the two, but that means we'll never get an output endpoint for the DSI node. Maxime
diff --git a/arch/arm/boot/dts/sun8i-a23-a33.dtsi b/arch/arm/boot/dts/sun8i-a23-a33.dtsi index 43fe215e83ea..6d2625a90a09 100644 --- a/arch/arm/boot/dts/sun8i-a23-a33.dtsi +++ b/arch/arm/boot/dts/sun8i-a23-a33.dtsi @@ -192,19 +192,14 @@ #size-cells = <0>; tcon0_in: port@0 { - #address-cells = <1>; - #size-cells = <0>; reg = <0>; - tcon0_in_drc0: endpoint@0 { - reg = <0>; + tcon0_in_drc0: endpoint { remote-endpoint = <&drc0_out_tcon0>; }; }; tcon0_out: port@1 { - #address-cells = <1>; - #size-cells = <0>; reg = <1>; }; }; @@ -627,12 +622,9 @@ #size-cells = <0>; fe0_out: port@1 { - #address-cells = <1>; - #size-cells = <0>; reg = <1>; - fe0_out_be0: endpoint@0 { - reg = <0>; + fe0_out_be0: endpoint { remote-endpoint = <&be0_in_fe0>; }; }; @@ -654,23 +646,17 @@ #size-cells = <0>; be0_in: port@0 { - #address-cells = <1>; - #size-cells = <0>; reg = <0>; - be0_in_fe0: endpoint@0 { - reg = <0>; + be0_in_fe0: endpoint { remote-endpoint = <&fe0_out_be0>; }; }; be0_out: port@1 { - #address-cells = <1>; - #size-cells = <0>; reg = <1>; - be0_out_drc0: endpoint@0 { - reg = <0>; + be0_out_drc0: endpoint { remote-endpoint = <&drc0_in_be0>; }; }; @@ -694,23 +680,17 @@ #size-cells = <0>; drc0_in: port@0 { - #address-cells = <1>; - #size-cells = <0>; reg = <0>; - drc0_in_be0: endpoint@0 { - reg = <0>; + drc0_in_be0: endpoint { remote-endpoint = <&be0_out_drc0>; }; }; drc0_out: port@1 { - #address-cells = <1>; - #size-cells = <0>; reg = <1>; - drc0_out_tcon0: endpoint@0 { - reg = <0>; + drc0_out_tcon0: endpoint { remote-endpoint = <&tcon0_in_drc0>; }; }; diff --git a/arch/arm/boot/dts/sun8i-a23-q8-tablet.dts b/arch/arm/boot/dts/sun8i-a23-q8-tablet.dts index d4dab7c28398..5659c63d7d77 100644 --- a/arch/arm/boot/dts/sun8i-a23-q8-tablet.dts +++ b/arch/arm/boot/dts/sun8i-a23-q8-tablet.dts @@ -65,3 +65,9 @@ &panel { compatible = "bananapi,s070wv20-ct16", "simple-panel"; }; + +&tcon0_out { + tcon0_out_lcd: endpoint { + remote-endpoint = <&panel_input>; + }; +}; diff --git a/arch/arm/boot/dts/sun8i-a33-q8-tablet.dts b/arch/arm/boot/dts/sun8i-a33-q8-tablet.dts index b0bc2360f8c4..9c5750c25613 100644 --- a/arch/arm/boot/dts/sun8i-a33-q8-tablet.dts +++ b/arch/arm/boot/dts/sun8i-a33-q8-tablet.dts @@ -48,3 +48,10 @@ model = "Q8 A33 Tablet"; compatible = "allwinner,q8-a33", "allwinner,sun8i-a33"; }; + +&tcon0_out { + tcon0_out_lcd: endpoint@0 { + reg = <0>; + remote-endpoint = <&panel_input>; + }; +}; diff --git a/arch/arm/boot/dts/sun8i-a33-sinlinx-sina33.dts b/arch/arm/boot/dts/sun8i-a33-sinlinx-sina33.dts index f3667268adde..785798e3a104 100644 --- a/arch/arm/boot/dts/sun8i-a33-sinlinx-sina33.dts +++ b/arch/arm/boot/dts/sun8i-a33-sinlinx-sina33.dts @@ -63,16 +63,9 @@ panel { compatible = "netron-dy,e231732"; - #address-cells = <1>; - #size-cells = <0>; - port@0 { - reg = <0>; - #address-cells = <1>; - #size-cells = <0>; - - panel_input: endpoint@0 { - reg = <0>; + port { + panel_input: endpoint { remote-endpoint = <&tcon0_out_panel>; }; }; diff --git a/arch/arm/boot/dts/sun8i-a33.dtsi b/arch/arm/boot/dts/sun8i-a33.dtsi index 1111a6498102..4484d76c88b5 100644 --- a/arch/arm/boot/dts/sun8i-a33.dtsi +++ b/arch/arm/boot/dts/sun8i-a33.dtsi @@ -266,18 +266,9 @@ phy-names = "dphy"; status = "disabled"; - ports { - #address-cells = <1>; - #size-cells = <0>; - - port@0 { - #address-cells = <1>; - #size-cells = <0>; - reg = <0>; - - dsi_in_tcon0: endpoint { - remote-endpoint = <&tcon0_out_dsi>; - }; + port { + dsi_in_tcon0: endpoint { + remote-endpoint = <&tcon0_out_dsi>; }; }; }; @@ -420,6 +411,9 @@ }; &tcon0_out { + #address-cells = <1>; + #size-cells = <0>; + tcon0_out_dsi: endpoint@1 { reg = <1>; remote-endpoint = <&dsi_in_tcon0>; diff --git a/arch/arm/boot/dts/sun8i-q8-common.dtsi b/arch/arm/boot/dts/sun8i-q8-common.dtsi index 53104f4ccacc..3d9a1524e17e 100644 --- a/arch/arm/boot/dts/sun8i-q8-common.dtsi +++ b/arch/arm/boot/dts/sun8i-q8-common.dtsi @@ -54,16 +54,9 @@ backlight = <&backlight>; enable-gpios = <&pio 7 7 GPIO_ACTIVE_HIGH>; /* PH7 */ power-supply = <®_dc1sw>; - #address-cells = <1>; - #size-cells = <0>; - port@0 { - reg = <0>; - #address-cells = <1>; - #size-cells = <0>; - - panel_input: endpoint@0 { - reg = <0>; + port { + panel_input: endpoint { remote-endpoint = <&tcon0_out_lcd>; }; }; @@ -120,13 +113,6 @@ status = "okay"; }; -&tcon0_out { - tcon0_out_lcd: endpoint@0 { - reg = <0>; - remote-endpoint = <&panel_input>; - }; -}; - &usbphy { usb1_vbus-supply = <®_dldo1>; };
Our display engine endpoints trigger some DTC warnings due to the fact that we're having a single endpoint that doesn't need any reg property, and since we don't have a reg property, we don't need the address-cells and size-cells properties anymore. Fix those Signed-off-by: Maxime Ripard <maxime.ripard@bootlin.com> --- arch/arm/boot/dts/sun8i-a23-a33.dtsi | 32 +++---------------- arch/arm/boot/dts/sun8i-a23-q8-tablet.dts | 6 ++++- arch/arm/boot/dts/sun8i-a33-q8-tablet.dts | 7 ++++- arch/arm/boot/dts/sun8i-a33-sinlinx-sina33.dts | 11 +------ arch/arm/boot/dts/sun8i-a33.dtsi | 18 +++-------- arch/arm/boot/dts/sun8i-q8-common.dtsi | 18 +---------- 6 files changed, 29 insertions(+), 63 deletions(-)