On 05/13/2017 04:33 PM, Andreas Färber wrote: > Sort nodes referenced by label alphabetically. > > Signed-off-by: Andreas Färber <[email protected]> > --- > v1 -> v2: > * Rebased (new nodes added) > > arch/arm64/boot/dts/amlogic/meson-gxbb-p20x.dtsi | 62 > ++++++++++++------------ > 1 file changed, 31 insertions(+), 31 deletions(-) > > diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb-p20x.dtsi > b/arch/arm64/boot/dts/amlogic/meson-gxbb-p20x.dtsi > index 0ec1d19522dd..d904deb1018c 100644 > --- a/arch/arm64/boot/dts/amlogic/meson-gxbb-p20x.dtsi > +++ b/arch/arm64/boot/dts/amlogic/meson-gxbb-p20x.dtsi > @@ -148,34 +148,36 @@ > }; > }; > > -/* This UART is brought out to the DB9 connector */ > -&uart_AO { > - status = "okay"; > - pinctrl-0 = <&uart_ao_a_pins>; > - pinctrl-names = "default"; > +&cvbs_vdac_port { > + cvbs_vdac_out: endpoint { > + remote-endpoint = <&cvbs_connector_in>; > + }; > }; > > -&ir { > +&hdmi_tx { > status = "okay"; > - pinctrl-0 = <&remote_input_ao_pins>; > + pinctrl-0 = <&hdmi_hpd_pins>, <&hdmi_i2c_pins>; > pinctrl-names = "default"; > }; > > -&usb0_phy { > - status = "okay"; > - phy-supply = <&usb_pwr>; > -}; > - > -&usb1_phy { > - status = "okay"; > +&hdmi_tx_tmds_port { > + hdmi_tx_tmds_out: endpoint { > + remote-endpoint = <&hdmi_connector_in>; > + }; > }; > > -&usb0 { > +&ir { > status = "okay"; > + pinctrl-0 = <&remote_input_ao_pins>; > + pinctrl-names = "default"; > }; > > -&usb1 { > +&pwm_ef { > status = "okay"; > + pinctrl-0 = <&pwm_e_pins>; > + pinctrl-names = "default"; > + clocks = <&clkc CLKID_FCLK_DIV4>; > + clock-names = "clkin0"; > }; > > /* Wireless SDIO Module */ > @@ -242,28 +244,26 @@ > vqmmc-supply = <&vddio_boot>; > }; > > -&pwm_ef { > +/* This UART is brought out to the DB9 connector */ > +&uart_AO { > status = "okay"; > - pinctrl-0 = <&pwm_e_pins>; > + pinctrl-0 = <&uart_ao_a_pins>; > pinctrl-names = "default"; > - clocks = <&clkc CLKID_FCLK_DIV4>; > - clock-names = "clkin0"; > }; > > -&cvbs_vdac_port { > - cvbs_vdac_out: endpoint { > - remote-endpoint = <&cvbs_connector_in>; > - }; > +&usb0_phy { > + status = "okay"; > + phy-supply = <&usb_pwr>; > }; > > -&hdmi_tx { > +&usb1_phy { > status = "okay"; > - pinctrl-0 = <&hdmi_hpd_pins>, <&hdmi_i2c_pins>; > - pinctrl-names = "default"; > }; > > -&hdmi_tx_tmds_port { > - hdmi_tx_tmds_out: endpoint { > - remote-endpoint = <&hdmi_connector_in>; > - }; > +&usb0 { > + status = "okay"; > +}; > + > +&usb1 { > + status = "okay"; > }; >
Hi Andreas, Like a previous attempt, I'm not OK with such rework since it will break bisect and add complexity for new patches handling. The order is not alphabetically ordered, live with it. Neil
