arm64: dts: freescale: imx8mm-var-som: Move UART4 description to Symphony

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

Move the UART4 node from the SOM device tree to the
imx8mm-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: Frank Li <Frank.Li@nxp.com>

diff --git a/arch/arm64/boot/dts/freescale/imx8mm-var-som-symphony.dts b/arch/arm64/boot/dts/freescale/imx8mm-var-som-symphony.dts
index affbc67c2ef6ecf74652124b3ebc8e2c54c301b8..819707e6f3bf3506733bbed9bcde4fd42220c4a6 100644 (file)
--- a/arch/arm64/boot/dts/freescale/imx8mm-var-som-symphony.dts
+++ b/arch/arm64/boot/dts/freescale/imx8mm-var-som-symphony.dts
@@ -11,6 +11,10 @@
        model = "Variscite VAR-SOM-MX8MM Symphony evaluation board";
        compatible = "variscite,var-som-mx8mm-symphony", "variscite,var-som-mx8mm", "fsl,imx8mm";
 
+       chosen {
+               stdout-path = &uart4;
+       };
+
        reg_usdhc2_vmmc: regulator-usdhc2-vmmc {
                compatible = "regulator-fixed";
                pinctrl-names = "default";
@@ -156,6 +160,13 @@
        status = "okay";
 };
 
+/* Console */
+&uart4 {
+       pinctrl-names = "default";
+       pinctrl-0 = <&pinctrl_uart4>;
+       status = "okay";
+};
+
 &usbotg1 {
        disable-over-current;
        extcon = <&extcon_usbotg1>, <&extcon_usbotg1>;
@@ -251,4 +262,11 @@
                        MX8MM_IOMUXC_UART3_TXD_UART3_DCE_TX     0x140
                >;
        };
+
+       pinctrl_uart4: uart4grp {
+               fsl,pins = <
+                       MX8MM_IOMUXC_UART4_RXD_UART4_DCE_RX     0x140
+                       MX8MM_IOMUXC_UART4_TXD_UART4_DCE_TX     0x140
+               >;
+       };
 };

diff --git a/arch/arm64/boot/dts/freescale/imx8mm-var-som.dtsi b/arch/arm64/boot/dts/freescale/imx8mm-var-som.dtsi
index 190bde4edcd72d112c0308dc6fa0b27fabf08e10..b6560c03639eb45922ec281071b7de7776f48637 100644 (file)
--- a/arch/arm64/boot/dts/freescale/imx8mm-var-som.dtsi
+++ b/arch/arm64/boot/dts/freescale/imx8mm-var-som.dtsi
@@ -9,10 +9,6 @@
 / {
        model = "Variscite VAR-SOM-MX8MM module";
 
-       chosen {
-               stdout-path = &uart4;
-       };
-
        memory@40000000 {
                device_type = "memory";
                reg = <0x0 0x40000000 0 0x80000000>;
@@ -274,13 +270,6 @@
        status = "okay";
 };
 
-/* Console */
-&uart4 {
-       pinctrl-names = "default";
-       pinctrl-0 = <&pinctrl_uart4>;
-       status = "okay";
-};
-
 &usbotg1 {
        dr_mode = "otg";
        usb-role-switch;
@@ -418,13 +407,6 @@
                >;
        };
 
-       pinctrl_uart4: uart4grp {
-               fsl,pins = <
-                       MX8MM_IOMUXC_UART4_RXD_UART4_DCE_RX     0x140
-                       MX8MM_IOMUXC_UART4_TXD_UART4_DCE_TX     0x140
-               >;
-       };
-
        pinctrl_usdhc1: usdhc1grp {
                fsl,pins = <
                        MX8MM_IOMUXC_SD1_CLK_USDHC1_CLK         0x190