On 07.07.21 12:53, Uwe Kleine-König wrote: > The nodes after the root nodes are supposed to be ordered > alphabetically. So move &flexcan1, &flexcan2 and &pinctrl to their > proper place. At least for i.MX, it seems to be convention to have iomuxc at the end of the file. I'd not reorder it, file is easier to browse when it's not in the middle. > > Signed-off-by: Uwe Kleine-König <u.kleine-koenig@xxxxxxxxxxxxxx> > --- > arch/arm64/boot/dts/freescale/imx8mp-evk.dts | 144 +++++++++---------- > 1 file changed, 72 insertions(+), 72 deletions(-) > > diff --git a/arch/arm64/boot/dts/freescale/imx8mp-evk.dts b/arch/arm64/boot/dts/freescale/imx8mp-evk.dts > index 7b99fad6e4d6..4122323d3ea3 100644 > --- a/arch/arm64/boot/dts/freescale/imx8mp-evk.dts > +++ b/arch/arm64/boot/dts/freescale/imx8mp-evk.dts > @@ -67,20 +67,6 @@ reg_usdhc2_vmmc: regulator-usdhc2 { > }; > }; > > -&flexcan1 { > - pinctrl-names = "default"; > - pinctrl-0 = <&pinctrl_flexcan1>; > - xceiver-supply = <®_can1_stby>; > - status = "okay"; > -}; > - > -&flexcan2 { > - pinctrl-names = "default"; > - pinctrl-0 = <&pinctrl_flexcan2>; > - xceiver-supply = <®_can2_stby>; > - status = "disabled";/* can2 pin conflict with pdm */ > -}; > - > &eqos { > pinctrl-names = "default"; > pinctrl-0 = <&pinctrl_eqos>; > @@ -124,6 +110,20 @@ ethphy1: ethernet-phy@1 { > }; > }; > > +&flexcan1 { > + pinctrl-names = "default"; > + pinctrl-0 = <&pinctrl_flexcan1>; > + xceiver-supply = <®_can1_stby>; > + status = "okay"; > +}; > + > +&flexcan2 { > + pinctrl-names = "default"; > + pinctrl-0 = <&pinctrl_flexcan2>; > + xceiver-supply = <®_can2_stby>; > + status = "disabled";/* can2 pin conflict with pdm */ > +}; > + > &i2c1 { > clock-frequency = <400000>; > pinctrl-names = "default"; > @@ -224,64 +224,6 @@ pca6416: gpio@20 { > }; > }; > > -&snvs_pwrkey { > - status = "okay"; > -}; > - > -&uart2 { > - /* console */ > - pinctrl-names = "default"; > - pinctrl-0 = <&pinctrl_uart2>; > - status = "okay"; > -}; > - > -&usb3_phy1 { > - status = "okay"; > -}; > - > -&usb3_1 { > - status = "okay"; > -}; > - > -&usb_dwc3_1 { > - pinctrl-names = "default"; > - pinctrl-0 = <&pinctrl_usb1_vbus>; > - dr_mode = "host"; > - status = "okay"; > -}; > - > -&usdhc2 { > - assigned-clocks = <&clk IMX8MP_CLK_USDHC2>; > - assigned-clock-rates = <400000000>; > - pinctrl-names = "default", "state_100mhz", "state_200mhz"; > - pinctrl-0 = <&pinctrl_usdhc2>, <&pinctrl_usdhc2_gpio>; > - pinctrl-1 = <&pinctrl_usdhc2_100mhz>, <&pinctrl_usdhc2_gpio>; > - pinctrl-2 = <&pinctrl_usdhc2_200mhz>, <&pinctrl_usdhc2_gpio>; > - cd-gpios = <&gpio2 12 GPIO_ACTIVE_LOW>; > - vmmc-supply = <®_usdhc2_vmmc>; > - bus-width = <4>; > - status = "okay"; > -}; > - > -&usdhc3 { > - assigned-clocks = <&clk IMX8MP_CLK_USDHC3>; > - assigned-clock-rates = <400000000>; > - pinctrl-names = "default", "state_100mhz", "state_200mhz"; > - pinctrl-0 = <&pinctrl_usdhc3>; > - pinctrl-1 = <&pinctrl_usdhc3_100mhz>; > - pinctrl-2 = <&pinctrl_usdhc3_200mhz>; > - bus-width = <8>; > - non-removable; > - status = "okay"; > -}; > - > -&wdog1 { > - pinctrl-names = "default"; > - pinctrl-0 = <&pinctrl_wdog>; > - fsl,ext-reset-output; > - status = "okay"; > -}; > - > &iomuxc { > pinctrl_eqos: eqosgrp { > fsl,pins = < > @@ -490,3 +432,61 @@ MX8MP_IOMUXC_GPIO1_IO02__WDOG1_WDOG_B 0x166 > >; > }; > }; > + > +&snvs_pwrkey { > + status = "okay"; > +}; > + > +&uart2 { > + /* console */ > + pinctrl-names = "default"; > + pinctrl-0 = <&pinctrl_uart2>; > + status = "okay"; > +}; > + > +&usb3_phy1 { > + status = "okay"; > +}; > + > +&usb3_1 { > + status = "okay"; > +}; > + > +&usb_dwc3_1 { > + pinctrl-names = "default"; > + pinctrl-0 = <&pinctrl_usb1_vbus>; > + dr_mode = "host"; > + status = "okay"; > +}; > + > +&usdhc2 { > + assigned-clocks = <&clk IMX8MP_CLK_USDHC2>; > + assigned-clock-rates = <400000000>; > + pinctrl-names = "default", "state_100mhz", "state_200mhz"; > + pinctrl-0 = <&pinctrl_usdhc2>, <&pinctrl_usdhc2_gpio>; > + pinctrl-1 = <&pinctrl_usdhc2_100mhz>, <&pinctrl_usdhc2_gpio>; > + pinctrl-2 = <&pinctrl_usdhc2_200mhz>, <&pinctrl_usdhc2_gpio>; > + cd-gpios = <&gpio2 12 GPIO_ACTIVE_LOW>; > + vmmc-supply = <®_usdhc2_vmmc>; > + bus-width = <4>; > + status = "okay"; > +}; > + > +&usdhc3 { > + assigned-clocks = <&clk IMX8MP_CLK_USDHC3>; > + assigned-clock-rates = <400000000>; > + pinctrl-names = "default", "state_100mhz", "state_200mhz"; > + pinctrl-0 = <&pinctrl_usdhc3>; > + pinctrl-1 = <&pinctrl_usdhc3_100mhz>; > + pinctrl-2 = <&pinctrl_usdhc3_200mhz>; > + bus-width = <8>; > + non-removable; > + status = "okay"; > +}; > + > +&wdog1 { > + pinctrl-names = "default"; > + pinctrl-0 = <&pinctrl_wdog>; > + fsl,ext-reset-output; > + status = "okay"; > +}; > -- Pengutronix e.K. | | Steuerwalder Str. 21 | http://www.pengutronix.de/ | 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |