Skip to contentSkip to conversation

apalis_imx6: fix broken fsl_esdhc_imx conversion

PATCH New Ricardo Salveti 3 participants 4 messages Sep 2, 2019 – Sep 3, 2019 Arm i.MX and Layerscape

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 apalis_imx6: fix broken fsl_esdhc_imx conversion

Commit e37ac717d796 ("Convert to use fsl_esdhc_imx for i.MX platforms") converted FSL_ESDHC to FSL_ESDHC_IMX, but the config check for apalis_imx6 wasn't updated accordantly.

---
 board/toradex/apalis_imx6/apalis_imx6.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
board/toradex/apalis_imx6/apalis_imx6.c +2 -2
index ef668fcedc..89680da53f 100644
@@ -93,7 +93,7 @@ iomux_v3_cfg_t const uart1_pads_dte[] = {
 	MX6_PAD_CSI0_DAT11__UART1_TX_DATA | MUX_PAD_CTRL(UART_PAD_CTRL),
 };
 
-#if defined(CONFIG_FSL_ESDHC) && defined(CONFIG_SPL_BUILD)
+#if defined(CONFIG_FSL_ESDHC_IMX) && defined(CONFIG_SPL_BUILD)
 /* Apalis MMC1 */
 iomux_v3_cfg_t const usdhc1_pads[] = {
 	MX6_PAD_SD1_CLK__SD1_CLK   | MUX_PAD_CTRL(USDHC_PAD_CTRL),
@@ -290,7 +290,7 @@ int board_ehci_hcd_init(int port)
 }
 #endif
 
-#if defined(CONFIG_FSL_ESDHC) && defined(CONFIG_SPL_BUILD)
+#if defined(CONFIG_FSL_ESDHC_IMX) && defined(CONFIG_SPL_BUILD)
 /* use the following sequence: eMMC, MMC1, SD1 */
 struct fsl_esdhc_cfg usdhc_cfg[CONFIG_SYS_FSL_USDHC_NUM] = {
 	{USDHC3_BASE_ADDR},
Signature · 1 line
2.23.0
#1 lore raw

PATCH 1/1 apalis_imx6: fix broken fsl_esdhc_imx conversion

Quoted 27 lines

Subject: [PATCH] apalis_imx6: fix broken fsl_esdhc_imx conversion

Commit e37ac717d796 ("Convert to use fsl_esdhc_imx for i.MX platforms") converted FSL_ESDHC to FSL_ESDHC_IMX, but the config check for apalis_imx6 wasn't updated accordantly.

---
 board/toradex/apalis_imx6/apalis_imx6.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
board/toradex/apalis_imx6/apalis_imx6.c +1 -1
index ef668fcedc..89680da53f 100644
@@ -93,7 +93,7 @@ iomux_v3_cfg_t const uart1_pads_dte[] = {
 	MX6_PAD_CSI0_DAT11__UART1_TX_DATA |
 MUX_PAD_CTRL(UART_PAD_CTRL),  };
 
-#if defined(CONFIG_FSL_ESDHC) && defined(CONFIG_SPL_BUILD)
+#if defined(CONFIG_FSL_ESDHC_IMX) && defined(CONFIG_SPL_BUILD)
 /* Apalis MMC1 */
 iomux_v3_cfg_t const usdhc1_pads[] = {
 	MX6_PAD_SD1_CLK__SD1_CLK   |

MUX_PAD_CTRL(USDHC_PAD_CTRL),

board/toradex/apalis_imx6/apalis_imx6.c int board_ehci_hcd_init(int port) } #endif · line 294

Quoted 6 lines
board/toradex/apalis_imx6/apalis_imx6.c +1 -1
@@ -290,7 +290,7 @@ int board_ehci_hcd_init(int port)  }  #endif
 
-#if defined(CONFIG_FSL_ESDHC) && defined(CONFIG_SPL_BUILD)
+#if defined(CONFIG_FSL_ESDHC_IMX) && defined(CONFIG_SPL_BUILD)
 /* use the following sequence: eMMC, MMC1, SD1 */  struct fsl_esdhc_cfg
 usdhc_cfg[CONFIG_SYS_FSL_USDHC_NUM] = {
 	{USDHC3_BASE_ADDR},
Quoted 2 lines
board/toradex/apalis_imx6/apalis_imx6.c +0 -1
--

2.23.0

#2 lore raw

PATCH 1/1 apalis_imx6: fix broken fsl_esdhc_imx conversion

In reply to Ricardo Salveti
Quoted 23 lines · Ricardo Salveti

Commit e37ac717d796 ("Convert to use fsl_esdhc_imx for i.MX platforms") converted FSL_ESDHC to FSL_ESDHC_IMX, but the config check for apalis_imx6 wasn't updated accordantly.

---
 board/toradex/apalis_imx6/apalis_imx6.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
board/toradex/apalis_imx6/apalis_imx6.c +1 -1
index ef668fcedc..89680da53f 100644
@@ -93,7 +93,7 @@ iomux_v3_cfg_t const uart1_pads_dte[] = {
 	MX6_PAD_CSI0_DAT11__UART1_TX_DATA | MUX_PAD_CTRL(UART_PAD_CTRL),
 };
 
-#if defined(CONFIG_FSL_ESDHC) && defined(CONFIG_SPL_BUILD)
+#if defined(CONFIG_FSL_ESDHC_IMX) && defined(CONFIG_SPL_BUILD)
 /* Apalis MMC1 */
 iomux_v3_cfg_t const usdhc1_pads[] = {
 	MX6_PAD_SD1_CLK__SD1_CLK   | MUX_PAD_CTRL(USDHC_PAD_CTRL),

board/toradex/apalis_imx6/apalis_imx6.c int board_ehci_hcd_init(int port) · line 296

Quoted 8 lines
board/toradex/apalis_imx6/apalis_imx6.c +1 -1
@@ -290,7 +290,7 @@ int board_ehci_hcd_init(int port)
 }
 #endif
 
-#if defined(CONFIG_FSL_ESDHC) && defined(CONFIG_SPL_BUILD)
+#if defined(CONFIG_FSL_ESDHC_IMX) && defined(CONFIG_SPL_BUILD)
 /* use the following sequence: eMMC, MMC1, SD1 */
 struct fsl_esdhc_cfg usdhc_cfg[CONFIG_SYS_FSL_USDHC_NUM] = {
 	{USDHC3_BASE_ADDR},

Thanks for fixing this.

I only found two locations where the conversion from FSL_ESDHC to FSL_ESDHC_IMX failed, the one fixed with this patch and of the
same pattern one in the colibri_imx6.c board file.

Do you anyway plan to send a similar patch set for Colibri iMX6? Otherwise I will prepare a fixup patch for the specific issue addressed here for Colibri iMX6.

Max

#3 lore raw

PATCH 1/1 apalis_imx6: fix broken fsl_esdhc_imx conversion

Quoted 38 lines · Max Krummenacher

Review

Quoted 10 lines · Ricardo Salveti

Commit e37ac717d796 ("Convert to use fsl_esdhc_imx for i.MX platforms") converted FSL_ESDHC to FSL_ESDHC_IMX, but the config check for apalis_imx6 wasn't updated accordantly.

---
 board/toradex/apalis_imx6/apalis_imx6.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
(quoted diff) +0 -0

b/board/toradex/apalis_imx6/apalis_imx6.c

Quoted 13 lines

index ef668fcedc..89680da53f 100644

board/toradex/apalis_imx6/apalis_imx6.c +1 -1
@@ -93,7 +93,7 @@ iomux_v3_cfg_t const uart1_pads_dte[] = {
      MX6_PAD_CSI0_DAT11__UART1_TX_DATA | MUX_PAD_CTRL(UART_PAD_CTRL),
 };
 
-#if defined(CONFIG_FSL_ESDHC) && defined(CONFIG_SPL_BUILD)
+#if defined(CONFIG_FSL_ESDHC_IMX) && defined(CONFIG_SPL_BUILD)
 /* Apalis MMC1 */
 iomux_v3_cfg_t const usdhc1_pads[] = {
      MX6_PAD_SD1_CLK__SD1_CLK   | MUX_PAD_CTRL(USDHC_PAD_CTRL),

board/toradex/apalis_imx6/apalis_imx6.c int board_ehci_hcd_init(int port) · line 296

Quoted 8 lines
board/toradex/apalis_imx6/apalis_imx6.c +1 -1
@@ -290,7 +290,7 @@ int board_ehci_hcd_init(int port)
 }
 #endif
 
-#if defined(CONFIG_FSL_ESDHC) && defined(CONFIG_SPL_BUILD)
+#if defined(CONFIG_FSL_ESDHC_IMX) && defined(CONFIG_SPL_BUILD)
 /* use the following sequence: eMMC, MMC1, SD1 */
 struct fsl_esdhc_cfg usdhc_cfg[CONFIG_SYS_FSL_USDHC_NUM] = {
      {USDHC3_BASE_ADDR},

Thanks for fixing this.

Quoted 9 lines

I only found two locations where the conversion from FSL_ESDHC to FSL_ESDHC_IMX failed, the one fixed with this patch and of the
same pattern one in the colibri_imx6.c board file.

Do you anyway plan to send a similar patch set for Colibri iMX6? Otherwise I will prepare a fixup patch for the specific issue addressed here for Colibri iMX6.

Indeed, no worries, I will send a similar one fixing colibri as well.

Thanks,

Signature · 1 line
Ricardo Salveti