Merge tag 'soc-dt-6.6' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc

[platform/kernel/linux-rpi.git] / arch / arm64 / boot / dts / freescale / imx8mm-venice-gw7904.dts

diff --git a/arch/arm64/boot/dts/freescale/imx8mm-venice-gw7904.dts b/arch/arm64/boot/dts/freescale/imx8mm-venice-gw7904.dts
index d5b7168..6afbabc 100644 (file)
--- a/arch/arm64/boot/dts/freescale/imx8mm-venice-gw7904.dts
+++ b/arch/arm64/boot/dts/freescale/imx8mm-venice-gw7904.dts
@@ -460,7 +460,7 @@
                interrupts = <8 IRQ_TYPE_LEVEL_LOW>;
                rohm,reset-snvs-powered;
                #clock-cells = <0>;
-               clocks = <&osc_32k 0>;
+               clocks = <&osc_32k>;
                clock-output-names = "clk-32k-out";
 
                regulators {
@@ -640,6 +640,8 @@
 &uart1 {
        pinctrl-names = "default";
        pinctrl-0 = <&pinctrl_uart1>;
+       cts-gpios = <&gpio5 26 GPIO_ACTIVE_LOW>;
+       rts-gpios = <&gpio5 27 GPIO_ACTIVE_LOW>;
        status = "okay";
 };
 
@@ -650,13 +652,6 @@
        status = "okay";
 };
 
-/* off-board RS232 */
-&uart3 {
-       pinctrl-names = "default";
-       pinctrl-0 = <&pinctrl_uart3>;
-       status = "okay";
-};
-
 &usbotg1 {
        dr_mode = "host";
        disable-over-current;
@@ -818,6 +813,8 @@
                fsl,pins = <
                        MX8MM_IOMUXC_UART1_RXD_UART1_DCE_RX     0x140
                        MX8MM_IOMUXC_UART1_TXD_UART1_DCE_TX     0x140
+                       MX8MM_IOMUXC_UART3_RXD_GPIO5_IO26       0x140 /* CTS# in */
+                       MX8MM_IOMUXC_UART3_TXD_GPIO5_IO27       0x140 /* RTS# out */
                >;
        };
 
@@ -828,13 +825,6 @@
                >;
        };
 
-       pinctrl_uart3: uart3grp {
-               fsl,pins = <
-                       MX8MM_IOMUXC_UART3_RXD_UART3_DCE_RX     0x140
-                       MX8MM_IOMUXC_UART3_TXD_UART3_DCE_TX     0x140
-               >;
-       };
-
        pinctrl_usdhc2: usdhc2grp {
                fsl,pins = <
                        MX8MM_IOMUXC_SD2_CLK_USDHC2_CLK         0x190