Message ID | 20190902211202.7722-1-ricardo@foundries.io |
---|---|
State | Accepted |
Commit | 536c564b915a66ba063fcb2511a2498bbddb412f |
Delegated to: | Stefano Babic |
Headers | show |
Series | [U-Boot] apalis_imx6: fix broken fsl_esdhc_imx conversion | expand |
> 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. > > Signed-off-by: Ricardo Salveti <ricardo@foundries.io> > --- > board/toradex/apalis_imx6/apalis_imx6.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/board/toradex/apalis_imx6/apalis_imx6.c > b/board/toradex/apalis_imx6/apalis_imx6.c > index ef668fcedc..89680da53f 100644 > --- a/board/toradex/apalis_imx6/apalis_imx6.c > +++ b/board/toradex/apalis_imx6/apalis_imx6.c > @@ -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}, Reviewed-by: Peng Fan <peng.fan@nxp.com> > -- > 2.23.0
On Mon, 2019-09-02 at 18:12 -0300, Ricardo Salveti wrote: > 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. > > Signed-off-by: Ricardo Salveti <ricardo@foundries.io> > --- > board/toradex/apalis_imx6/apalis_imx6.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/board/toradex/apalis_imx6/apalis_imx6.c b/board/toradex/apalis_imx6/apalis_imx6.c > index ef668fcedc..89680da53f 100644 > --- a/board/toradex/apalis_imx6/apalis_imx6.c > +++ b/board/toradex/apalis_imx6/apalis_imx6.c > @@ -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}, Acked-by: Max Krummenacher <max.krummenacher@toradex.com> 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
On Tue, Sep 3, 2019 at 9:58 AM Max Krummenacher < max.krummenacher@toradex.com> wrote: > On Mon, 2019-09-02 at 18:12 -0300, Ricardo Salveti wrote: > > 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. > > > > Signed-off-by: Ricardo Salveti <ricardo@foundries.io> > > --- > > board/toradex/apalis_imx6/apalis_imx6.c | 4 ++-- > > 1 file changed, 2 insertions(+), 2 deletions(-) > > > > diff --git a/board/toradex/apalis_imx6/apalis_imx6.c > b/board/toradex/apalis_imx6/apalis_imx6.c > > index ef668fcedc..89680da53f 100644 > > --- a/board/toradex/apalis_imx6/apalis_imx6.c > > +++ b/board/toradex/apalis_imx6/apalis_imx6.c > > @@ -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}, > > Acked-by: Max Krummenacher <max.krummenacher@toradex.com> > > 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. > Indeed, no worries, I will send a similar one fixing colibri as well. Thanks,
diff --git a/board/toradex/apalis_imx6/apalis_imx6.c b/board/toradex/apalis_imx6/apalis_imx6.c index ef668fcedc..89680da53f 100644 --- a/board/toradex/apalis_imx6/apalis_imx6.c +++ b/board/toradex/apalis_imx6/apalis_imx6.c @@ -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},
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. Signed-off-by: Ricardo Salveti <ricardo@foundries.io> --- board/toradex/apalis_imx6/apalis_imx6.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)