File 0007-imx93-FRDM-move-terminal-interface-to-uart2.patch of Package uboot-imx
From d7b518e3c45962e28c1120c4e19dc54d617d6eb7 Mon Sep 17 00:00:00 2001
From: dewit <dewit@inventeers.nl>
Date: Mon, 15 Sep 2025 16:13:15 +0200
Subject: [PATCH] Create 0007-imx93-FRDM-move-terminal-interface-to-uart2.patch
Merge branch 'enhancement/2-revert-allpatch-patch-' into local/release
(cherry picked from commit c4609ec41b58bdc69047fc3312ddbcb7f6ac9004)
---
arch/arm/dts/imx93-11x11-frdm-u-boot.dtsi | 24 ++---
arch/arm/dts/imx93-11x11-frdm.dts | 110 +++++++++++-----------
arch/arm/dts/imx93.dtsi | 4 +-
arch/arm/mach-imx/imx9/native/clock.c | 8 +-
board/freescale/imx93_frdm/imx93_frdm.c | 7 +-
include/configs/imx93_frdm.h | 2 +-
6 files changed, 82 insertions(+), 73 deletions(-)
diff --git a/arch/arm/dts/imx93-11x11-frdm-u-boot.dtsi b/arch/arm/dts/imx93-11x11-frdm-u-boot.dtsi
index bb1b600b89b..b9b5fb6b5b4 100644
--- a/arch/arm/dts/imx93-11x11-frdm-u-boot.dtsi
+++ b/arch/arm/dts/imx93-11x11-frdm-u-boot.dtsi
@@ -82,7 +82,7 @@
bootph-pre-ram;
};
-&pinctrl_uart1 {
+&pinctrl_uart2 {
bootph-pre-ram;
bootph-some-ram;
};
@@ -119,7 +119,7 @@
bootph-some-ram;
};
-&lpuart1 {
+&lpuart2 {
bootph-pre-ram;
bootph-some-ram;
};
@@ -165,17 +165,17 @@
bootph-pre-ram;
};
-&fec {
- phy-reset-gpios = <&pcal6524 16 GPIO_ACTIVE_LOW>;
- phy-reset-duration = <15>;
- phy-reset-post-delay = <100>;
-};
+// &fec {
+// phy-reset-gpios = <&pcal6524 16 GPIO_ACTIVE_LOW>;
+// phy-reset-duration = <15>;
+// phy-reset-post-delay = <100>;
+// };
-ðphy1 {
- reset-gpios = <&pcal6524 15 GPIO_ACTIVE_LOW>;
- reset-assert-us = <15000>;
- reset-deassert-us = <100000>;
-};
+// ðphy1 {
+// reset-gpios = <&pcal6524 15 GPIO_ACTIVE_LOW>;
+// reset-assert-us = <15000>;
+// reset-deassert-us = <100000>;
+// };
&usbotg1 {
status = "okay";
diff --git a/arch/arm/dts/imx93-11x11-frdm.dts b/arch/arm/dts/imx93-11x11-frdm.dts
index 57817bb312b..6da60393cf4 100644
--- a/arch/arm/dts/imx93-11x11-frdm.dts
+++ b/arch/arm/dts/imx93-11x11-frdm.dts
@@ -17,8 +17,8 @@
};
chosen {
- bootargs = "console=ttyLP0,115200";
- stdout-path = &lpuart1;
+ bootargs = "console=ttyLP1,115200";
+ stdout-path = &lpuart2;
};
reserved-memory {
@@ -95,45 +95,45 @@
status = "okay";
};
-&eqos {
- pinctrl-names = "default";
- pinctrl-0 = <&pinctrl_eqos>;
- phy-mode = "rgmii-id";
- phy-handle = <ðphy1>;
- status = "okay";
-
- mdio {
- compatible = "snps,dwmac-mdio";
- #address-cells = <1>;
- #size-cells = <0>;
- clock-frequency = <5000000>;
-
- ethphy1: ethernet-phy@1 {
- reg = <1>;
- eee-broken-1000t;
- };
- };
-};
-
-&fec {
- pinctrl-names = "default";
- pinctrl-0 = <&pinctrl_fec>;
- phy-mode = "rgmii-id";
- phy-handle = <ðphy2>;
- fsl,magic-packet;
- status = "okay";
-
- mdio {
- #address-cells = <1>;
- #size-cells = <0>;
- clock-frequency = <5000000>;
-
- ethphy2: ethernet-phy@2 {
- reg = <2>;
- eee-broken-1000t;
- };
- };
-};
+// &eqos {
+// pinctrl-names = "default";
+// pinctrl-0 = <&pinctrl_eqos>;
+// phy-mode = "rgmii-id";
+// phy-handle = <ðphy1>;
+// status = "okay";
+
+// mdio {
+// compatible = "snps,dwmac-mdio";
+// #address-cells = <1>;
+// #size-cells = <0>;
+// clock-frequency = <5000000>;
+
+// ethphy1: ethernet-phy@1 {
+// reg = <1>;
+// eee-broken-1000t;
+// };
+// };
+// };
+
+// &fec {
+// pinctrl-names = "default";
+// pinctrl-0 = <&pinctrl_fec>;
+// phy-mode = "rgmii-id";
+// phy-handle = <ðphy2>;
+// fsl,magic-packet;
+// status = "okay";
+
+// mdio {
+// #address-cells = <1>;
+// #size-cells = <0>;
+// clock-frequency = <5000000>;
+
+// ethphy2: ethernet-phy@2 {
+// reg = <2>;
+// eee-broken-1000t;
+// };
+// };
+// };
&lcdif {
status = "okay";
@@ -259,6 +259,15 @@
interrupt-parent = <&gpio3>;
interrupts = <27 IRQ_TYPE_LEVEL_LOW>;
};
+
+ pcf2131: rtc@53 {
+ compatible = "nxp,pcf2131";
+ reg = <0x53>;
+ interrupt-parent = <&gpio2>;
+ interrupts = <24 IRQ_TYPE_LEVEL_LOW>;
+ status = "okay";
+ };
+
eeprom: at24c256@50 {
compatible = "atmel,24c256";
reg = <0x50>;
@@ -276,14 +285,7 @@
pinctrl-1 = <&pinctrl_lpi2c3>;
status = "okay";
- pcf2131: rtc@53 {
- compatible = "nxp,pcf2131";
- reg = <0x53>;
- interrupt-parent = <&pcal6524>;
- interrupts = <1 IRQ_TYPE_LEVEL_LOW>;
- status = "okay";
- };
-
+
ptn5110: tcpc@50 {
compatible = "nxp,ptn5110";
reg = <0x50>;
@@ -313,9 +315,9 @@
};
-&lpuart1 { /* console */
+&lpuart2 { /* console */
pinctrl-names = "default";
- pinctrl-0 = <&pinctrl_uart1>;
+ pinctrl-0 = <&pinctrl_uart2>;
status = "okay";
};
@@ -477,10 +479,10 @@
>;
};
- pinctrl_uart1: uart1grp {
+ pinctrl_uart2: uart2grp {
fsl,pins = <
- MX93_PAD_UART1_RXD__LPUART1_RX 0x31e
- MX93_PAD_UART1_TXD__LPUART1_TX 0x31e
+ MX93_PAD_UART2_RXD__LPUART2_RX 0x31e
+ MX93_PAD_UART2_TXD__LPUART2_TX 0x31e
>;
};
diff --git a/arch/arm/dts/imx93.dtsi b/arch/arm/dts/imx93.dtsi
index 16d2c8c0ad4..6a513079e7d 100644
--- a/arch/arm/dts/imx93.dtsi
+++ b/arch/arm/dts/imx93.dtsi
@@ -412,8 +412,8 @@
compatible = "fsl,imx93-lpuart", "fsl,imx8ulp-lpuart", "fsl,imx7ulp-lpuart";
reg = <0x44390000 0x1000>;
interrupts = <GIC_SPI 20 IRQ_TYPE_LEVEL_HIGH>;
- clocks = <&clk IMX93_CLK_LPUART2_GATE>;
- clock-names = "ipg";
+ clocks = <&clk IMX93_CLK_LPUART2_GATE>, <&clk IMX93_CLK_LPUART2_GATE>;
+ clock-names = "ipg", "per";
status = "disabled";
};
diff --git a/arch/arm/mach-imx/imx9/native/clock.c b/arch/arm/mach-imx/imx9/native/clock.c
index 44266cdfd33..f9f18781365 100644
--- a/arch/arm/mach-imx/imx9/native/clock.c
+++ b/arch/arm/mach-imx/imx9/native/clock.c
@@ -551,7 +551,7 @@ unsigned int mxc_get_clock(enum mxc_clock clk)
case MXC_ESDHC3_CLK:
return ccm_clk_root_get_rate(USDHC3_CLK_ROOT);
case MXC_UART_CLK:
- return ccm_clk_root_get_rate(LPUART1_CLK_ROOT);
+ return ccm_clk_root_get_rate(LPUART2_CLK_ROOT);
case MXC_FLEXSPI_CLK:
return ccm_clk_root_get_rate(FLEXSPI1_CLK_ROOT);
default:
@@ -600,6 +600,12 @@ void init_uart_clk(u32 index)
ccm_clk_root_cfg(LPUART1_CLK_ROOT, OSC_24M_CLK, 1);
ccm_lpcg_on(CCGR_URT1, true);
break;
+ case LPUART2_CLK_ROOT:
+ /* 24M */
+ ccm_lpcg_on(CCGR_URT2, false);
+ ccm_clk_root_cfg(LPUART2_CLK_ROOT, OSC_24M_CLK, 1);
+ ccm_lpcg_on(CCGR_URT2, true);
+ break;
default:
break;
}
diff --git a/board/freescale/imx93_frdm/imx93_frdm.c b/board/freescale/imx93_frdm/imx93_frdm.c
index 1f514faf625..d441a503793 100644
--- a/board/freescale/imx93_frdm/imx93_frdm.c
+++ b/board/freescale/imx93_frdm/imx93_frdm.c
@@ -29,8 +29,8 @@ DECLARE_GLOBAL_DATA_PTR;
#define WDOG_PAD_CTRL (PAD_CTL_DSE(6) | PAD_CTL_ODE | PAD_CTL_PUE | PAD_CTL_PE)
static const iomux_v3_cfg_t uart_pads[] = {
- MX93_PAD_UART1_RXD__LPUART1_RX | MUX_PAD_CTRL(UART_PAD_CTRL),
- MX93_PAD_UART1_TXD__LPUART1_TX | MUX_PAD_CTRL(UART_PAD_CTRL),
+ MX93_PAD_UART2_RXD__LPUART2_RX | MUX_PAD_CTRL(UART_PAD_CTRL),
+ MX93_PAD_UART2_TXD__LPUART2_TX | MUX_PAD_CTRL(UART_PAD_CTRL),
};
#if CONFIG_IS_ENABLED(EFI_HAVE_CAPSULE_SUPPORT)
@@ -57,7 +57,8 @@ struct efi_capsule_update_info update_info = {
int board_early_init_f(void)
{
imx_iomux_v3_setup_multiple_pads(uart_pads, ARRAY_SIZE(uart_pads));
-
+ init_uart_clk(LPUART2_CLK_ROOT);
+
return 0;
}
diff --git a/include/configs/imx93_frdm.h b/include/configs/imx93_frdm.h
index 547835f748b..3fceaa91bd1 100644
--- a/include/configs/imx93_frdm.h
+++ b/include/configs/imx93_frdm.h
@@ -69,7 +69,7 @@
"kernel_addr_r=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \
"image=Image\0" \
"splashimage=0x90000000\0" \
- "console=ttyLP0,115200 earlycon\0" \
+ "console=ttyLP1,115200 earlycon\0" \
"fdt_addr_r=0x83000000\0" \
"fdt_addr=0x83000000\0" \
"fdt_high=0xffffffffffffffff\0" \
--
2.51.0.windows.1
