arm64: dts: imx8mp-var-som: Move UART2 description to Symphony carrier

The VAR-SOM-MX8MP module does not provide an onboard debug console.
UART2 is routed and exposed only on the Symphony carrier board, while
custom carrier designs may choose to expose a different UART.

Move the UART2 node from the SOM device tree to the
imx8mp-var-som-symphony.dts, keeping the SOM dtsi limited to hardware
present on the module itself.

Signed-off-by: Stefano Radaelli <stefano.r@variscite.com>
Signed-off-by: Shawn Guo <shawnguo@kernel.org>

diff --git a/arch/arm64/boot/dts/freescale/imx8mp-var-som-symphony.dts b/arch/arm64/boot/dts/freescale/imx8mp-var-som-symphony.dts
index 361e6122bdc355cc7cddf69452a6e86636251417..291f65e36865bd321972bcea7205493d54847d5a 100644 (file)
--- a/arch/arm64/boot/dts/freescale/imx8mp-var-som-symphony.dts
+++ b/arch/arm64/boot/dts/freescale/imx8mp-var-som-symphony.dts
@@ -9,6 +9,10 @@
        model = "Variscite VAR-SOM-MX8M-PLUS on Symphony-Board";
        compatible = "variscite,var-som-mx8mp-symphony", "variscite,var-som-mx8mp", "fsl,imx8mp";
 
+       chosen {
+               stdout-path = &uart2;
+       };
+
        gpio-leds {
                compatible = "gpio-leds";
 
@@ -68,6 +72,13 @@
        };
 };
 
+/* Console */
+&uart2 {
+       pinctrl-names = "default";
+       pinctrl-0 = <&pinctrl_uart2>;
+       status = "okay";
+};
+
 /* SD-card */
 &usdhc2 {
        pinctrl-names = "default", "state_100mhz", "state_200mhz";
@@ -95,6 +106,13 @@
                >;
        };
 
+       pinctrl_uart2: uart2grp {
+               fsl,pins = <
+                       MX8MP_IOMUXC_UART2_RXD__UART2_DCE_RX                            0x40
+                       MX8MP_IOMUXC_UART2_TXD__UART2_DCE_TX                            0x40
+               >;
+       };
+
        pinctrl_usdhc2_gpio: usdhc2-gpiogrp {
                fsl,pins = <
                        MX8MP_IOMUXC_GPIO1_IO14__GPIO1_IO14                             0x1c4

diff --git a/arch/arm64/boot/dts/freescale/imx8mp-var-som.dtsi b/arch/arm64/boot/dts/freescale/imx8mp-var-som.dtsi
index 158a78ec9656ac18c940dcc0e7ee2651a754a156..5bba91dcef17d3031cf5a61bffc72d40c6d2d827 100644 (file)
--- a/arch/arm64/boot/dts/freescale/imx8mp-var-som.dtsi
+++ b/arch/arm64/boot/dts/freescale/imx8mp-var-som.dtsi
@@ -15,10 +15,6 @@
 / {
        model = "Variscite VAR-SOM-MX8M Plus module";
 
-       chosen {
-               stdout-path = &uart2;
-       };
-
        memory@40000000 {
                device_type = "memory";
                reg = <0x0 0x40000000 0 0xc0000000>,
@@ -206,13 +202,6 @@
        };
 };
 
-/* Console */
-&uart2 {
-        pinctrl-names = "default";
-        pinctrl-0 = <&pinctrl_uart2>;
-        status = "okay";
-};
-
 /* eMMC */
 &usdhc3 {
        pinctrl-names = "default", "state_100mhz", "state_200mhz";
@@ -267,13 +256,6 @@
                >;
        };
 
-       pinctrl_uart2: uart2grp {
-               fsl,pins = <
-                       MX8MP_IOMUXC_UART2_RXD__UART2_DCE_RX                            0x40
-                       MX8MP_IOMUXC_UART2_TXD__UART2_DCE_TX                            0x40
-               >;
-       };
-
        pinctrl_usdhc3: usdhc3grp {
                fsl,pins = <
                        MX8MP_IOMUXC_NAND_WE_B__USDHC3_CLK                              0x190