[U-Boot] [PATCH v2 09/11] samsung: mmc: Drop old MMC init code

[Lukasz Majewski]

On Sun, 16 Dec 2018 19:36:36 -0700
Simon Glass <sjg at chromium.org> wrote:

> Now that these boards use driver model we can drop the old code. At
> present s5p_mmc_init() is still used by goni and smdkv310 so cannot be
> removed unless we remove those boards.
> 
> Signed-off-by: Simon Glass <sjg at chromium.org>
> ---
> 
> Changes in v2: None
> 
>  arch/arm/mach-exynos/include/mach/mmc.h |  2 -
>  board/samsung/common/board.c            | 38 -------------------
>  drivers/mmc/s5p_sdhci.c                 | 50
> ------------------------- 3 files changed, 90 deletions(-)
> 
> diff --git a/arch/arm/mach-exynos/include/mach/mmc.h
> b/arch/arm/mach-exynos/include/mach/mmc.h index
> ca4e7eda342..eece44ea1aa 100644 ---
> a/arch/arm/mach-exynos/include/mach/mmc.h +++
> b/arch/arm/mach-exynos/include/mach/mmc.h @@ -64,6 +64,4 @@ static
> inline int s5p_mmc_init(int index, int bus_width) return
> s5p_sdhci_init(base, index, bus_width); }
>  
> -int exynos_mmc_init(const void *blob);
> -
>  #endif
> diff --git a/board/samsung/common/board.c
> b/board/samsung/common/board.c index 3391228522c..96228a86a11 100644
> --- a/board/samsung/common/board.c
> +++ b/board/samsung/common/board.c
> @@ -249,44 +249,6 @@ int board_eth_init(bd_t *bis)
>  	return 0;
>  }
>  
> -#ifdef CONFIG_MMC
> -static int init_mmc(void)
> -{
> -#ifdef CONFIG_MMC_SDHCI
> -	return exynos_mmc_init(gd->fdt_blob);
> -#else
> -	return 0;
> -#endif
> -}
> -
> -static int init_dwmmc(void)
> -{
> -#ifdef CONFIG_MMC_DW
> -	return exynos_dwmmc_init(gd->fdt_blob);
> -#else
> -	return 0;
> -#endif
> -}
> -
> -int board_mmc_init(bd_t *bis)
> -{
> -	int ret;
> -
> -	if (get_boot_mode() == BOOT_MODE_SD) {
> -		ret = init_mmc();
> -		ret |= init_dwmmc();
> -	} else {
> -		ret = init_dwmmc();
> -		ret |= init_mmc();
> -	}
> -
> -	if (ret)
> -		debug("mmc init failed\n");
> -
> -	return ret;
> -}
> -#endif
> -
>  #ifdef CONFIG_DISPLAY_BOARDINFO
>  int checkboard(void)
>  {
> diff --git a/drivers/mmc/s5p_sdhci.c b/drivers/mmc/s5p_sdhci.c
> index 591a3bce084..9dd0b865eb8 100644
> --- a/drivers/mmc/s5p_sdhci.c
> +++ b/drivers/mmc/s5p_sdhci.c
> @@ -118,9 +118,6 @@ int s5p_sdhci_init(u32 regbase, int index, int
> bus_width) return s5p_sdhci_core_init(host);
>  }
>  
> -#if CONFIG_IS_ENABLED(OF_CONTROL)
> -struct sdhci_host sdhci_host[SDHCI_MAX_HOSTS];
> -
>  static int do_sdhci_init(struct sdhci_host *host)
>  {
>  	int dev_id, flag, ret;
> @@ -191,53 +188,6 @@ static int sdhci_get_config(const void *blob,
> int node, struct sdhci_host *host) return 0;
>  }
>  
> -static int process_nodes(const void *blob, int node_list[], int
> count) -{
> -	struct sdhci_host *host;
> -	int i, node, ret;
> -	int failed = 0;
> -
> -	debug("%s: count = %d\n", __func__, count);
> -
> -	/* build sdhci_host[] for each controller */
> -	for (i = 0; i < count; i++) {
> -		node = node_list[i];
> -		if (node <= 0)
> -			continue;
> -
> -		host = &sdhci_host[i];
> -
> -		ret = sdhci_get_config(blob, node, host);
> -		if (ret) {
> -			printf("%s: failed to decode dev %d
> (%d)\n",	__func__, i, ret);
> -			failed++;
> -			continue;
> -		}
> -
> -		ret = do_sdhci_init(host);
> -		if (ret && ret != -ENODEV) {
> -			printf("%s: failed to initialize dev %d
> (%d)\n", __func__, i, ret);
> -			failed++;
> -		}
> -	}
> -
> -	/* we only consider it an error when all nodes fail */
> -	return (failed == count ? -1 : 0);
> -}
> -
> -int exynos_mmc_init(const void *blob)
> -{
> -	int count;
> -	int node_list[SDHCI_MAX_HOSTS];
> -
> -	count = fdtdec_find_aliases_for_id(blob, "mmc",
> -			COMPAT_SAMSUNG_EXYNOS_MMC, node_list,
> -			SDHCI_MAX_HOSTS);
> -
> -	return process_nodes(blob, node_list, count);
> -}
> -#endif
> -
>  #ifdef CONFIG_DM_MMC
>  static int s5p_sdhci_probe(struct udevice *dev)
>  {

Reviewed-by: Lukasz Majewski <lukma at denx.de>


Best regards,

Lukasz Majewski

--

DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-59 Fax: (+49)-8142-66989-80 Email: lukma at denx.de
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 488 bytes
Desc: OpenPGP digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20181217/87074e9f/attachment.sig>