Skip to contentSkip to conversation

ARM: omap3_beagle: Remove non-DM initialization

PATCH In review Romain Naour 2 participants 8 messages Feb 25, 2022 – Mar 14, 2022

lore
Share & tools
lore
#0 lore raw

PATCH 1/4 ARM: omap3_beagle: Remove non-DM initialization

With DM_MMC working for both SPL and U-Boot, this patch removes the legacy style of initializing the MMC driver.

Based on omap3_logic: 42140dd0962bc134c0aad27524d0f4cc3955f255.

---
 board/ti/beagle/beagle.c | 7 -------
 1 file changed, 7 deletions(-)
board/ti/beagle/beagle.c +0 -7
index 888a958491..d5a122af2b 100644
@@ -500,13 +500,6 @@ void set_muxconf_regs(void)
 	MUX_BEAGLE();
 }
 
-#if defined(CONFIG_MMC)
-int board_mmc_init(struct bd_info *bis)
-{
-	return omap_mmc_init(0, 0, 0, -1, -1);
-}
-#endif
-
 #if defined(CONFIG_MMC)
 void board_mmc_power_init(void)
 {
Signature · 1 line
2.35.1
#1 lore raw

PATCH 2/4 ARM: omap3_beagle: Power on MMC when setting up PMIC

The PMIC enables power to the MMC card by default, but depending on the state it was left when restarted, it's possible the MMC may be powered down.

This patch patch explicitly tells the twl4030 to power the MMC.

Based on commits [1][2].

[1] 64fd2d26140aa72b43428d079974f7c0e7f88353
[2] 27b653449178e80b333e7bc5a81eed3bd1bd6861

---
 board/ti/beagle/beagle.c | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)
board/ti/beagle/beagle.c +2 -7
index d5a122af2b..847d596646 100644
@@ -447,6 +447,8 @@ int misc_init_r(void)
 		env_set(expansion_config.env_var, expansion_config.env_setting);
 
 	twl4030_power_init();
+	twl4030_power_mmc_init(0);
+
 	switch (get_board_revision()) {
 	case REVISION_XM_AB:
 		twl4030_led_init(TWL4030_LED_LEDEN_LEDBON);
@@ -499,10 +501,3 @@ void set_muxconf_regs(void)
 {
 	MUX_BEAGLE();
 }
-
-#if defined(CONFIG_MMC)
-void board_mmc_power_init(void)
-{
-	twl4030_power_mmc_init(0);
-}
-#endif
Signature · 1 line
2.35.1
#2 lore raw

Re: [PATCH 2/4] ARM: omap3_beagle: Power on MMC when setting up PMIC

Quoted 4 lines · Romain Naour

The PMIC enables power to the MMC card by default, but depending on the state it was left when restarted, it's possible the MMC may be powered down.

Quoted 8 lines

This patch patch explicitly tells the twl4030 to power the MMC.

Based on commits [1][2].

[1] 64fd2d26140aa72b43428d079974f7c0e7f88353
[2] 27b653449178e80b333e7bc5a81eed3bd1bd6861

Applied to u-boot/next, thanks!

Signature · 1 line
Tom
#3 lore raw

PATCH 3/4 ARM: omap3_beagle: Enable Pinctrl

In reply to Romain Naour

The simple pinctrl driver currently available works with the omap3. Enabling this will use the device tree to automatically set the pin-muxing for various drivers.

Based on commit: 57dbf754e37d3347cad441f3869bf72c0d726a71

---
 configs/omap3_beagle_defconfig | 2 ++
 1 file changed, 2 insertions(+)
configs/omap3_beagle_defconfig +2 -0
index 206118e6af..a9b2c15cee 100644
@@ -83,6 +83,8 @@ CONFIG_SYS_NAND_BUSWIDTH_16BIT=y
 CONFIG_SYS_NAND_U_BOOT_LOCATIONS=y
 CONFIG_SYS_NAND_U_BOOT_OFFS=0x80000
 CONFIG_DM_ETH=y
+CONFIG_PINCTRL=y
+CONFIG_PINCTRL_SINGLE=y
 CONFIG_SPI=y
 CONFIG_DM_SPI=y
 CONFIG_OMAP3_SPI=y
Signature · 1 line
2.35.1
#4 lore raw

Re: [PATCH 3/4] ARM: omap3_beagle: Enable Pinctrl

Quoted 7 lines · Romain Naour

The simple pinctrl driver currently available works with the omap3. Enabling this will use the device tree to automatically set the pin-muxing for various drivers.

Based on commit: 57dbf754e37d3347cad441f3869bf72c0d726a71

Applied to u-boot/next, thanks!

Signature · 1 line
Tom
#5 lore raw

PATCH 4/4 ARM: omap3_beagle: Enable DM_PMIC and DM_REGULATOR

In reply to Romain Naour

Enabling DM_PMIC, DM_REGULATOR_FIXED, and DM_REGULATOR_GPIO gives us the ability to better monitor voltages and enable hardware through the device tree. The TL4030 (TPS65950) is not yet migrated to DM, so this patch only enables the fixed and GPIO controlled regulators.

Based on commit [1][2].

[1] a40d3cc845756e1e38af5ac31986539417e64abb
[2] 2448e42d73fb91e4b56bb41b2677e18ab99a6c83

---
 configs/omap3_beagle_defconfig | 5 +++++
 1 file changed, 5 insertions(+)
configs/omap3_beagle_defconfig +5 -0
index a9b2c15cee..c7111f4e63 100644
@@ -85,6 +85,11 @@ CONFIG_SYS_NAND_U_BOOT_OFFS=0x80000
 CONFIG_DM_ETH=y
 CONFIG_PINCTRL=y
 CONFIG_PINCTRL_SINGLE=y
+CONFIG_DM_PMIC=y
+# CONFIG_SPL_PMIC_CHILDREN is not set
+CONFIG_DM_REGULATOR=y
+CONFIG_DM_REGULATOR_FIXED=y
+CONFIG_DM_REGULATOR_GPIO=y
 CONFIG_SPI=y
 CONFIG_DM_SPI=y
 CONFIG_OMAP3_SPI=y
Signature · 1 line
2.35.1
#6 lore raw

Re: [PATCH 4/4] ARM: omap3_beagle: Enable DM_PMIC and DM_REGULATOR

Quoted 6 lines · Romain Naour

Enabling DM_PMIC, DM_REGULATOR_FIXED, and DM_REGULATOR_GPIO gives us the ability to better monitor voltages and enable hardware through the device tree. The TL4030 (TPS65950) is not yet migrated to DM, so this patch only enables the fixed and GPIO controlled regulators.

Quoted 6 lines

Based on commit [1][2].

[1] a40d3cc845756e1e38af5ac31986539417e64abb
[2] 2448e42d73fb91e4b56bb41b2677e18ab99a6c83

Applied to u-boot/next, thanks!

Signature · 1 line
Tom
#7 lore raw
In reply to Romain Naour
Quoted 6 lines · Romain Naour

With DM_MMC working for both SPL and U-Boot, this patch removes the legacy style of initializing the MMC driver.

Based on omap3_logic: 42140dd0962bc134c0aad27524d0f4cc3955f255.

Applied to u-boot/next, thanks!

Signature · 1 line
Tom