Skip to contentSkip to conversation

tbs2910: Convert to DM_SERIAL

PATCH In review Fabio Estevam 4 participants 9 messages Mar 15, 2022 – Jun 14, 2022

Subsystems (2)
lore
Share & tools
lore

Fabio Estevam

author reviewer
#0 lore raw

PATCH 1/1 tbs2910: Convert to DM_SERIAL

From: Fabio Estevam <[email protected]>

Conversion to DM_SERIAL is mandatory.

Select DM_SERIAL and add a imx6q-tbs2910-u-boot.dtsi file that describes the nodes that require dm-pre-reloc, which allows the DM model to configure the UART pinctrl early.

Remove the now unneeded board UART initialization.

---
 arch/arm/dts/imx6q-tbs2910-u-boot.dtsi | 17 +++++++++++++++++
 arch/arm/dts/imx6qdl.dtsi              |  4 ++--
 board/tbs/tbs2910/tbs2910.c            | 26 --------------------------
 configs/tbs2910_defconfig              |  2 +-
 4 files changed, 20 insertions(+), 29 deletions(-)
 create mode 100644 arch/arm/dts/imx6q-tbs2910-u-boot.dtsi
arch/arm/dts/imx6q-tbs2910-u-boot.dtsi new file +17 -0
new file mode 100644
index 000000000000..65ab052ac2c0
@@ -0,0 +1,17 @@
+// SPDX-License-Identifier: GPL-2.0+
+
+&aips1 {
+	u-boot,dm-pre-reloc;
+};
+
+&pinctrl_uart1 {
+	u-boot,dm-pre-reloc;
+};
+
+&soc {
+	u-boot,dm-pre-reloc;
+};
+
+&uart1 {
+	u-boot,dm-pre-reloc;
+};
arch/arm/dts/imx6qdl.dtsi +2 -2
index efd89510d512..d89272039b28 100644
@@ -139,7 +139,7 @@
 		interrupts = <0 94 IRQ_TYPE_LEVEL_HIGH>;
 	};
 
-	soc {
+	soc: soc {
 		#address-cells = <1>;
 		#size-cells = <1>;
 		compatible = "simple-bus";
@@ -283,7 +283,7 @@
 			status = "disabled";
 		};
 
-		bus@2000000 { /* AIPS1 */
+		aips1: bus@2000000 { /* AIPS1 */
 			compatible = "fsl,aips-bus", "simple-bus";
 			#address-cells = <1>;
 			#size-cells = <1>;
board/tbs/tbs2910/tbs2910.c +0 -26
index faf73cc218c9..3a447ca8a93c 100644
@@ -22,32 +22,12 @@
 #include <asm/arch/sys_proto.h>
 DECLARE_GLOBAL_DATA_PTR;
 
-#define UART_PAD_CTRL  (PAD_CTL_PUS_100K_UP |			\
-	PAD_CTL_SPEED_MED | PAD_CTL_DSE_40ohm |			\
-	PAD_CTL_SRE_FAST  | PAD_CTL_HYS)
-
-static iomux_v3_cfg_t const uart1_pads[] = {
-	MX6_PAD_CSI0_DAT10__UART1_TX_DATA | MUX_PAD_CTRL(UART_PAD_CTRL),
-	MX6_PAD_CSI0_DAT11__UART1_RX_DATA | MUX_PAD_CTRL(UART_PAD_CTRL),
-};
-
-static iomux_v3_cfg_t const uart2_pads[] = {
-	MX6_PAD_EIM_D26__UART2_TX_DATA | MUX_PAD_CTRL(UART_PAD_CTRL),
-	MX6_PAD_EIM_D27__UART2_RX_DATA | MUX_PAD_CTRL(UART_PAD_CTRL),
-};
-
 int dram_init(void)
 {
 	gd->ram_size = 2048ul * 1024 * 1024;
 	return 0;
 }
 
-static void setup_iomux_uart(void)
-{
-	imx_iomux_v3_setup_multiple_pads(uart1_pads, ARRAY_SIZE(uart1_pads));
-	imx_iomux_v3_setup_multiple_pads(uart2_pads, ARRAY_SIZE(uart2_pads));
-}
-
 #ifdef CONFIG_FSL_ESDHC_IMX
 /* set environment device to boot device when booting from SD */
 int board_mmc_get_env_dev(int devno)
@@ -150,12 +130,6 @@ static void setup_display(void)
 }
 #endif /* CONFIG_VIDEO_IPUV3 */
 
-int board_early_init_f(void)
-{
-	setup_iomux_uart();
-	return 0;
-}
-
 #ifdef CONFIG_CMD_BMODE
 static const struct boot_mode board_boot_modes[] = {
 	/* 4 bit bus width */
configs/tbs2910_defconfig +1 -1
index 8a3316056408..63a778a45f0b 100644
@@ -23,7 +23,6 @@ CONFIG_USE_PREBOOT=y
 CONFIG_PREBOOT="echo PCI:; pci enum; pci 1; usb start; if hdmidet; then run set_con_hdmi; else run set_con_serial; fi"
 CONFIG_DEFAULT_FDT_FILE="imx6q-tbs2910.dtb"
 CONFIG_PRE_CONSOLE_BUFFER=y
-CONFIG_BOARD_EARLY_INIT_F=y
 CONFIG_HUSH_PARSER=y
 CONFIG_SYS_PROMPT="Matrix U-Boot> "
 # CONFIG_CMD_BDI is not set
@@ -81,6 +80,7 @@ CONFIG_PINCTRL=y
 CONFIG_PINCTRL_IMX6=y
 CONFIG_DM_RTC=y
 CONFIG_RTC_DS1307=y
+CONFIG_DM_SERIAL=y
 CONFIG_MXC_UART=y
 CONFIG_DM_THERMAL=y
 CONFIG_IMX_THERMAL=y
Signature · 1 line
2.25.1
#1 lore raw
Quoted 11 lines · Fabio Estevam

From: Fabio Estevam <[email protected]>

Conversion to DM_SERIAL is mandatory.

Select DM_SERIAL and add a imx6q-tbs2910-u-boot.dtsi file that describes the nodes that require dm-pre-reloc, which allows the DM model to configure the UART pinctrl early.

Remove the now unneeded board UART initialization.

I will test this within the next few days, please give me a little more time.

Thanks,
Soeren

Quoted 123 lines
---
  arch/arm/dts/imx6q-tbs2910-u-boot.dtsi | 17 +++++++++++++++++
  arch/arm/dts/imx6qdl.dtsi              |  4 ++--
  board/tbs/tbs2910/tbs2910.c            | 26 --------------------------
  configs/tbs2910_defconfig              |  2 +-
  4 files changed, 20 insertions(+), 29 deletions(-)

create mode 100644 arch/arm/dts/imx6q-tbs2910-u-boot.dtsi

arch/arm/dts/imx6q-tbs2910-u-boot.dtsi new file +17 -0
new file mode 100644
index 000000000000..65ab052ac2c0
@@ -0,0 +1,17 @@
+// SPDX-License-Identifier: GPL-2.0+
+
+&aips1 {
+	u-boot,dm-pre-reloc;
+};
+
+&pinctrl_uart1 {
+	u-boot,dm-pre-reloc;
+};
+
+&soc {
+	u-boot,dm-pre-reloc;
+};
+
+&uart1 {
+	u-boot,dm-pre-reloc;
+};
arch/arm/dts/imx6qdl.dtsi +2 -2
index efd89510d512..d89272039b28 100644
@@ -139,7 +139,7 @@
  		interrupts = <0 94 IRQ_TYPE_LEVEL_HIGH>;
  	};
 
-	soc {
+	soc: soc {
  		#address-cells = <1>;
  		#size-cells = <1>;
  		compatible = "simple-bus";
@@ -283,7 +283,7 @@
  			status = "disabled";
  		};
 
-		bus@2000000 { /* AIPS1 */
+		aips1: bus@2000000 { /* AIPS1 */
  			compatible = "fsl,aips-bus", "simple-bus";
  			#address-cells = <1>;
  			#size-cells = <1>;
board/tbs/tbs2910/tbs2910.c +0 -26
index faf73cc218c9..3a447ca8a93c 100644
@@ -22,32 +22,12 @@
  #include <asm/arch/sys_proto.h>
  DECLARE_GLOBAL_DATA_PTR;
 
-#define UART_PAD_CTRL  (PAD_CTL_PUS_100K_UP |			\
-	PAD_CTL_SPEED_MED | PAD_CTL_DSE_40ohm |			\
-	PAD_CTL_SRE_FAST  | PAD_CTL_HYS)
-
-static iomux_v3_cfg_t const uart1_pads[] = {
-	MX6_PAD_CSI0_DAT10__UART1_TX_DATA | MUX_PAD_CTRL(UART_PAD_CTRL),
-	MX6_PAD_CSI0_DAT11__UART1_RX_DATA | MUX_PAD_CTRL(UART_PAD_CTRL),
-};
-
-static iomux_v3_cfg_t const uart2_pads[] = {
-	MX6_PAD_EIM_D26__UART2_TX_DATA | MUX_PAD_CTRL(UART_PAD_CTRL),
-	MX6_PAD_EIM_D27__UART2_RX_DATA | MUX_PAD_CTRL(UART_PAD_CTRL),
-};
-
  int dram_init(void)
  {
  	gd->ram_size = 2048ul * 1024 * 1024;
  	return 0;
  }
 
-static void setup_iomux_uart(void)
-{
-	imx_iomux_v3_setup_multiple_pads(uart1_pads, ARRAY_SIZE(uart1_pads));
-	imx_iomux_v3_setup_multiple_pads(uart2_pads, ARRAY_SIZE(uart2_pads));
-}
-
  #ifdef CONFIG_FSL_ESDHC_IMX
  /* set environment device to boot device when booting from SD */
  int board_mmc_get_env_dev(int devno)
@@ -150,12 +130,6 @@ static void setup_display(void)
  }
  #endif /* CONFIG_VIDEO_IPUV3 */
 
-int board_early_init_f(void)
-{
-	setup_iomux_uart();
-	return 0;
-}
-
  #ifdef CONFIG_CMD_BMODE
  static const struct boot_mode board_boot_modes[] = {
  	/* 4 bit bus width */
configs/tbs2910_defconfig +1 -1
index 8a3316056408..63a778a45f0b 100644
@@ -23,7 +23,6 @@ CONFIG_USE_PREBOOT=y
  CONFIG_PREBOOT="echo PCI:; pci enum; pci 1; usb start; if hdmidet; then run set_con_hdmi; else run set_con_serial; fi"
  CONFIG_DEFAULT_FDT_FILE="imx6q-tbs2910.dtb"
  CONFIG_PRE_CONSOLE_BUFFER=y
-CONFIG_BOARD_EARLY_INIT_F=y
  CONFIG_HUSH_PARSER=y
  CONFIG_SYS_PROMPT="Matrix U-Boot> "
  # CONFIG_CMD_BDI is not set
@@ -81,6 +80,7 @@ CONFIG_PINCTRL=y
  CONFIG_PINCTRL_IMX6=y
  CONFIG_DM_RTC=y
  CONFIG_RTC_DS1307=y
+CONFIG_DM_SERIAL=y
  CONFIG_MXC_UART=y
  CONFIG_DM_THERMAL=y
  CONFIG_IMX_THERMAL=y
#2 lore raw
Quoted 9 lines · Soeren Moch
Quoted 8 lines · Fabio Estevam

From: Fabio Estevam <[email protected]>

Conversion to DM_SERIAL is mandatory.

Select DM_SERIAL and add a imx6q-tbs2910-u-boot.dtsi file that describes the nodes that require dm-pre-reloc, which allows the DM model to configure the UART pinctrl early.

Quoted 5 lines
Quoted 3 lines

Remove the now unneeded board UART initialization.

I will test this within the next few days, please give me a little more time.

Thanks. I asked Fabio off-list to re-post it since patchwork didn't see it due to how it was posted and I don't want this getting lost.

Signature · 1 line
Tom
Tested-by on v1 1/1
#3 lore raw
In reply to Fabio Estevam
Quoted 1 line · Fabio Estevam

From: Fabio Estevam <[email protected]>

Usually I wrote 'board: tbs2910: ...' as patch description. But Fabio and Stefano will for sure know better what they like here.

Quoted 10 lines

Conversion to DM_SERIAL is mandatory.

Select DM_SERIAL and add a imx6q-tbs2910-u-boot.dtsi file that describes the nodes that require dm-pre-reloc, which allows the DM model to configure the UART pinctrl early.

Remove the now unneeded board UART initialization.

Works great (on top of v2022.04-rc4), thanks!

Fabio, will you sync the imx6qdl.dtsi changes to linux? Or how is this supposed to keep in sync?

Thanks again for working out the proper DM_SERIAL conversion, Soeren

Quoted 123 lines
---
  arch/arm/dts/imx6q-tbs2910-u-boot.dtsi | 17 +++++++++++++++++
  arch/arm/dts/imx6qdl.dtsi              |  4 ++--
  board/tbs/tbs2910/tbs2910.c            | 26 --------------------------
  configs/tbs2910_defconfig              |  2 +-
  4 files changed, 20 insertions(+), 29 deletions(-)

create mode 100644 arch/arm/dts/imx6q-tbs2910-u-boot.dtsi

arch/arm/dts/imx6q-tbs2910-u-boot.dtsi new file +17 -0
new file mode 100644
index 000000000000..65ab052ac2c0
@@ -0,0 +1,17 @@
+// SPDX-License-Identifier: GPL-2.0+
+
+&aips1 {
+	u-boot,dm-pre-reloc;
+};
+
+&pinctrl_uart1 {
+	u-boot,dm-pre-reloc;
+};
+
+&soc {
+	u-boot,dm-pre-reloc;
+};
+
+&uart1 {
+	u-boot,dm-pre-reloc;
+};
arch/arm/dts/imx6qdl.dtsi +2 -2
index efd89510d512..d89272039b28 100644
@@ -139,7 +139,7 @@
  		interrupts = <0 94 IRQ_TYPE_LEVEL_HIGH>;
  	};
 
-	soc {
+	soc: soc {
  		#address-cells = <1>;
  		#size-cells = <1>;
  		compatible = "simple-bus";
@@ -283,7 +283,7 @@
  			status = "disabled";
  		};
 
-		bus@2000000 { /* AIPS1 */
+		aips1: bus@2000000 { /* AIPS1 */
  			compatible = "fsl,aips-bus", "simple-bus";
  			#address-cells = <1>;
  			#size-cells = <1>;
board/tbs/tbs2910/tbs2910.c +0 -26
index faf73cc218c9..3a447ca8a93c 100644
@@ -22,32 +22,12 @@
  #include <asm/arch/sys_proto.h>
  DECLARE_GLOBAL_DATA_PTR;
 
-#define UART_PAD_CTRL  (PAD_CTL_PUS_100K_UP |			\
-	PAD_CTL_SPEED_MED | PAD_CTL_DSE_40ohm |			\
-	PAD_CTL_SRE_FAST  | PAD_CTL_HYS)
-
-static iomux_v3_cfg_t const uart1_pads[] = {
-	MX6_PAD_CSI0_DAT10__UART1_TX_DATA | MUX_PAD_CTRL(UART_PAD_CTRL),
-	MX6_PAD_CSI0_DAT11__UART1_RX_DATA | MUX_PAD_CTRL(UART_PAD_CTRL),
-};
-
-static iomux_v3_cfg_t const uart2_pads[] = {
-	MX6_PAD_EIM_D26__UART2_TX_DATA | MUX_PAD_CTRL(UART_PAD_CTRL),
-	MX6_PAD_EIM_D27__UART2_RX_DATA | MUX_PAD_CTRL(UART_PAD_CTRL),
-};
-
  int dram_init(void)
  {
  	gd->ram_size = 2048ul * 1024 * 1024;
  	return 0;
  }
 
-static void setup_iomux_uart(void)
-{
-	imx_iomux_v3_setup_multiple_pads(uart1_pads, ARRAY_SIZE(uart1_pads));
-	imx_iomux_v3_setup_multiple_pads(uart2_pads, ARRAY_SIZE(uart2_pads));
-}
-
  #ifdef CONFIG_FSL_ESDHC_IMX
  /* set environment device to boot device when booting from SD */
  int board_mmc_get_env_dev(int devno)
@@ -150,12 +130,6 @@ static void setup_display(void)
  }
  #endif /* CONFIG_VIDEO_IPUV3 */
 
-int board_early_init_f(void)
-{
-	setup_iomux_uart();
-	return 0;
-}
-
  #ifdef CONFIG_CMD_BMODE
  static const struct boot_mode board_boot_modes[] = {
  	/* 4 bit bus width */
configs/tbs2910_defconfig +1 -1
index 8a3316056408..63a778a45f0b 100644
@@ -23,7 +23,6 @@ CONFIG_USE_PREBOOT=y
  CONFIG_PREBOOT="echo PCI:; pci enum; pci 1; usb start; if hdmidet; then run set_con_hdmi; else run set_con_serial; fi"
  CONFIG_DEFAULT_FDT_FILE="imx6q-tbs2910.dtb"
  CONFIG_PRE_CONSOLE_BUFFER=y
-CONFIG_BOARD_EARLY_INIT_F=y
  CONFIG_HUSH_PARSER=y
  CONFIG_SYS_PROMPT="Matrix U-Boot> "
  # CONFIG_CMD_BDI is not set
@@ -81,6 +80,7 @@ CONFIG_PINCTRL=y
  CONFIG_PINCTRL_IMX6=y
  CONFIG_DM_RTC=y
  CONFIG_RTC_DS1307=y
+CONFIG_DM_SERIAL=y
  CONFIG_MXC_UART=y
  CONFIG_DM_THERMAL=y
  CONFIG_IMX_THERMAL=y
author reviewer
#4 lore raw

Hi Soeren,

Quoted 3 lines · Soeren Moch

Works great (on top of v2022.04-rc4), thanks!

Great, thanks for confirming it works.

Quoted 2 lines

Fabio, will you sync the imx6qdl.dtsi changes to linux? Or how is this supposed to keep in sync?

Yes, I plan to submit these imx6qdl.dtsi changes (and similar changes to the other i.MX dtsi files too) to the mainline kernel.

I will do it after 5.18-rc1 is out and will keep you on Cc when I submit it.

Regards,

Fabio Estevam

#5 lore raw

Hi Fabio,

Quoted 7 lines · Fabio Estevam

Hi Soeren,

Quoted 3 lines · Soeren Moch

Works great (on top of v2022.04-rc4), thanks!

Quoted 9 lines

Great, thanks for confirming it works.

Quoted 2 lines

Fabio, will you sync the imx6qdl.dtsi changes to linux? Or how is this supposed to keep in sync?

Yes, I plan to submit these imx6qdl.dtsi changes (and similar changes to the other i.MX dtsi files too) to the mainline kernel.

I will do it after 5.18-rc1 is out and will keep you on Cc when I submit it.

OK, thanks,
Soeren

author reviewer
#6 lore raw
In reply to Fabio Estevam
Quoted 7 lines · Fabio Estevam
Quoted 2 lines

Fabio, will you sync the imx6qdl.dtsi changes to linux? Or how is this supposed to keep in sync?

Yes, I plan to submit these imx6qdl.dtsi changes (and similar changes to the other i.MX dtsi files too) to the mainline kernel.

I will do it after 5.18-rc1 is out and will keep you on Cc when I submit it.

I missed the last cycle, but just sent the two patches upstream:

http://lists.infradead.org/pipermail/linux-arm-kernel/2022-June/751353.html

http://lists.infradead.org/pipermail/linux-arm-kernel/2022-June/751354.html

Regards,

Fabio Estevam

#7 lore raw
Quoted 7 lines · Fabio Estevam
Quoted 5 lines · Fabio Estevam
Quoted 2 lines

Fabio, will you sync the imx6qdl.dtsi changes to linux? Or how is this supposed to keep in sync?

Yes, I plan to submit these imx6qdl.dtsi changes (and similar changes to the other i.MX dtsi files too) to the mainline kernel.

Quoted 6 lines
Quoted 1 line

I will do it after 5.18-rc1 is out and will keep you on Cc when I submit it.

I missed the last cycle, but just sent the two patches upstream:

http://lists.infradead.org/pipermail/linux-arm-kernel/2022-June/751353.html

http://lists.infradead.org/pipermail/linux-arm-kernel/2022-June/751354.html

Yes, I saw your patches.

Thanks,
Soeren

Quoted 4 lines

Regards,

Fabio Estevam

#8 lore raw

PATCH 1/1 tbs2910: Convert to DM_SERIAL

In reply to Fabio Estevam
Quoted 8 lines

From: Fabio Estevam <[email protected]>
Conversion to DM_SERIAL is mandatory.
Select DM_SERIAL and add a imx6q-tbs2910-u-boot.dtsi file that describes the nodes that require dm-pre-reloc, which allows the DM model to configure the UART pinctrl early. Remove the now unneeded board UART initialization.

Applied to u-boot-imx, master, thanks !

Best regards,
Stefano Babic

Signature · 5 lines
=====================================================================
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: [email protected]
=====================================================================