[RESEND PATCH v1] colibri_imx6: fix broken fsl_esdhc_imx conversion

[Igor Opaniuk]

Hi Stefano

On Fri, Dec 6, 2019 at 6:24 PM Igor Opaniuk <igor.opaniuk at gmail.com> wrote:
>
> From: Igor Opaniuk <igor.opaniuk at toradex.com>
>
> Not all CONFIG_FSL_ESDHC defines were properly replaced with
> CONFIG_FSL_ESDHC_IMX, which broke U-boot proper booting on
> Colibri iMX6 SoMs.
>
> U-boot is stuck after this message:
> Commercial temperature grade DDR3 timings, 64bit bus width.
> Trying to boot from MMC1
>
> Fixes: e37ac717d7("Convert to use fsl_esdhc_imx for i.MX platforms")
> Signed-off-by: Igor Opaniuk <igor.opaniuk at toradex.com>
> ---
>
>  board/toradex/colibri_imx6/colibri_imx6.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/board/toradex/colibri_imx6/colibri_imx6.c b/board/toradex/colibri_imx6/colibri_imx6.c
> index ad40b589c1..44173dde1f 100644
> --- a/board/toradex/colibri_imx6/colibri_imx6.c
> +++ b/board/toradex/colibri_imx6/colibri_imx6.c
> @@ -83,7 +83,7 @@ iomux_v3_cfg_t const uart1_pads[] = {
>         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)
>  /* Colibri MMC */
>  iomux_v3_cfg_t const usdhc1_pads[] = {
>         MX6_PAD_SD1_CLK__SD1_CLK    | MUX_PAD_CTRL(USDHC_PAD_CTRL),
> @@ -304,7 +304,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, MMC */
>  struct fsl_esdhc_cfg usdhc_cfg[CONFIG_SYS_FSL_USDHC_NUM] = {
>         {USDHC3_BASE_ADDR},
> --
> 2.17.1
>

I've just found the same fix [1] but from Ricardo with Awaiting upstream status
in patchwork (I thought that he has fixed just Apalis iMX6), but seems
the patch was
lost somewhere, as I can not find it nor in u-boot-imx/next neither
in u-boot-imx/master branches.

[1] https://patchwork.ozlabs.org/patch/1157059/

-- 
Best regards - Freundliche Grüsse - Meilleures salutations

Senior Development Engineer,
Igor Opaniuk

Toradex AG
Altsagenstrasse 5 | 6048 Horw/Luzern | Switzerland | T: +41 41 500 48
00 (main line)