[U-Boot] [RFC 4/9] arm: imx7d-pico-pi: Convert to DM MMC initialization

[Fabio Estevam]

On Sun, Jan 20, 2019 at 7:52 PM Joris Offouga <offougajoris at gmail.com> wrote:
>
> Furthermore this patch create un alias for mmc0 to usdch3 because before the
> convertion he was the only one described in the pico-imx7d.c.
>
> Signed-off-by: Joris Offouga <offougajoris at gmail.com>
> ---
>  arch/arm/dts/imx7d-pico-pi.dts           |  4 ++++
>  board/technexion/pico-imx7d/pico-imx7d.c | 36 --------------------------------
>  configs/pico-pi-imx7d_defconfig          |  1 +
>  3 files changed, 5 insertions(+), 36 deletions(-)
>
> diff --git a/arch/arm/dts/imx7d-pico-pi.dts b/arch/arm/dts/imx7d-pico-pi.dts
> index 66ca590..d4aca96 100644
> --- a/arch/arm/dts/imx7d-pico-pi.dts
> +++ b/arch/arm/dts/imx7d-pico-pi.dts
> @@ -8,6 +8,10 @@
>         model = "TechNexion PICO-IMX7D Board and PI baseboard";
>         compatible = "technexion,imx7d-pico-pi", "fsl,imx7d";
>
> +       aliases {
> +               mmc0 = &usdhc3;
> +       };
> +
>         leds {
>                 compatible = "gpio-leds";
>                 pinctrl-names = "default";
> diff --git a/board/technexion/pico-imx7d/pico-imx7d.c b/board/technexion/pico-imx7d/pico-imx7d.c
> index 53e1469..48e90b0 100644
> --- a/board/technexion/pico-imx7d/pico-imx7d.c
> +++ b/board/technexion/pico-imx7d/pico-imx7d.c
> @@ -28,9 +28,6 @@ DECLARE_GLOBAL_DATA_PTR;
>  #define UART_PAD_CTRL  (PAD_CTL_DSE_3P3V_49OHM | \
>         PAD_CTL_PUS_PU100KOHM | PAD_CTL_HYS)
>
> -#define USDHC_PAD_CTRL (PAD_CTL_DSE_3P3V_32OHM | PAD_CTL_SRE_SLOW | \
> -       PAD_CTL_HYS | PAD_CTL_PUE | PAD_CTL_PUS_PU47KOHM)
> -
>  #define ENET_PAD_CTRL  (PAD_CTL_PUS_PU100KOHM | PAD_CTL_DSE_3P3V_49OHM)
>  #define ENET_PAD_CTRL_MII  (PAD_CTL_DSE_3P3V_32OHM)
>
> @@ -118,20 +115,6 @@ static iomux_v3_cfg_t const uart5_pads[] = {
>         MX7D_PAD_I2C4_SDA__UART5_DCE_TX | MUX_PAD_CTRL(UART_PAD_CTRL),
>  };
>
> -static iomux_v3_cfg_t const usdhc3_emmc_pads[] = {
> -       MX7D_PAD_SD3_CLK__SD3_CLK | MUX_PAD_CTRL(USDHC_PAD_CTRL),
> -       MX7D_PAD_SD3_CMD__SD3_CMD | MUX_PAD_CTRL(USDHC_PAD_CTRL),
> -       MX7D_PAD_SD3_DATA0__SD3_DATA0 | MUX_PAD_CTRL(USDHC_PAD_CTRL),
> -       MX7D_PAD_SD3_DATA1__SD3_DATA1 | MUX_PAD_CTRL(USDHC_PAD_CTRL),
> -       MX7D_PAD_SD3_DATA2__SD3_DATA2 | MUX_PAD_CTRL(USDHC_PAD_CTRL),
> -       MX7D_PAD_SD3_DATA3__SD3_DATA3 | MUX_PAD_CTRL(USDHC_PAD_CTRL),
> -       MX7D_PAD_SD3_DATA4__SD3_DATA4 | MUX_PAD_CTRL(USDHC_PAD_CTRL),
> -       MX7D_PAD_SD3_DATA5__SD3_DATA5 | MUX_PAD_CTRL(USDHC_PAD_CTRL),
> -       MX7D_PAD_SD3_DATA6__SD3_DATA6 | MUX_PAD_CTRL(USDHC_PAD_CTRL),
> -       MX7D_PAD_SD3_DATA7__SD3_DATA7 | MUX_PAD_CTRL(USDHC_PAD_CTRL),
> -       MX7D_PAD_GPIO1_IO14__GPIO1_IO14 | MUX_PAD_CTRL(USDHC_PAD_CTRL),
> -};
> -
>  #ifdef CONFIG_FEC_MXC
>  static iomux_v3_cfg_t const fec1_pads[] = {
>         MX7D_PAD_SD2_CD_B__ENET1_MDIO | MUX_PAD_CTRL(ENET_PAD_CTRL_MII),
> @@ -216,25 +199,6 @@ static void setup_iomux_uart(void)
>         imx_iomux_v3_setup_multiple_pads(uart5_pads, ARRAY_SIZE(uart5_pads));
>  }
>
> -static struct fsl_esdhc_cfg usdhc_cfg[1] = {
> -       {USDHC3_BASE_ADDR},
> -};
> -
> -int board_mmc_getcd(struct mmc *mmc)
> -{
> -       /* Assume uSDHC3 emmc is always present */
> -       return 1;
> -}
> -
> -int board_mmc_init(bd_t *bis)
> -{
> -       imx_iomux_v3_setup_multiple_pads(
> -                       usdhc3_emmc_pads, ARRAY_SIZE(usdhc3_emmc_pads));
> -       usdhc_cfg[0].sdhc_clk = mxc_get_clock(MXC_ESDHC3_CLK);
> -
> -       return fsl_esdhc_initialize(bis, &usdhc_cfg[0]);
> -}
> -
>  int board_early_init_f(void)
>  {
>         setup_iomux_uart();
> diff --git a/configs/pico-pi-imx7d_defconfig b/configs/pico-pi-imx7d_defconfig
> index 80f5739..0d1c56b 100644
> --- a/configs/pico-pi-imx7d_defconfig
> +++ b/configs/pico-pi-imx7d_defconfig
> @@ -23,6 +23,7 @@ CONFIG_SPL_USB_HOST_SUPPORT=y
>  CONFIG_SPL_USB_GADGET=y
>  CONFIG_SPL_USB_SDP_SUPPORT=y
>  CONFIG_OF_CONTROL=y
> +CONFIG_DM_MMC=y

After converting to the other imx7d pico defconfigs you can add:

Reviewed-by: Fabio Estevam <festevam at gmail.com>