[U-Boot] [PATCH 4/4] mmc: dw_mmc: Probe the MMC from OF

[Pantelis Antoniou]

Hi Marek,

> On Jul 27, 2015, at 23:39 , Marek Vasut <marex at denx.de> wrote:
> 
> Rework the driver to probe the MMC controller from Device Tree
> and make it mandatory. There is no longer support for probing
> from the ancient qts-generated header files.
> 
> Signed-off-by: Marek Vasut <marex at denx.de>
> Cc: Dinh Nguyen <dinguyen at opensource.altera.com>
> Cc: Pantelis Antoniou <panto at antoniou-consulting.com>
> Cc: Tom Rini <trini at konsulko.com>
> ---
> arch/arm/mach-socfpga/include/mach/dwmmc.h |  2 +-
> arch/arm/mach-socfpga/misc.c               |  3 +-
> drivers/mmc/socfpga_dw_mmc.c               | 81 +++++++++++++++++++++++++-----
> include/fdtdec.h                           |  1 +
> lib/fdtdec.c                               |  1 +
> 5 files changed, 72 insertions(+), 16 deletions(-)
> 
> diff --git a/arch/arm/mach-socfpga/include/mach/dwmmc.h b/arch/arm/mach-socfpga/include/mach/dwmmc.h
> index 945eb64..e8ba901 100644
> --- a/arch/arm/mach-socfpga/include/mach/dwmmc.h
> +++ b/arch/arm/mach-socfpga/include/mach/dwmmc.h
> @@ -7,6 +7,6 @@
> #ifndef	_SOCFPGA_DWMMC_H_
> #define	_SOCFPGA_DWMMC_H_
> 
> -extern int socfpga_dwmmc_init(u32 regbase, int bus_width, int index);
> +int socfpga_dwmmc_init(const void *blob);
> 
> #endif /* _SOCFPGA_SDMMC_H_ */
> diff --git a/arch/arm/mach-socfpga/misc.c b/arch/arm/mach-socfpga/misc.c
> index 0f8b4d0..3ddac4c 100644
> --- a/arch/arm/mach-socfpga/misc.c
> +++ b/arch/arm/mach-socfpga/misc.c
> @@ -92,8 +92,7 @@ int cpu_eth_init(bd_t *bis)
>  */
> int cpu_mmc_init(bd_t *bis)
> {
> -	return socfpga_dwmmc_init(SOCFPGA_SDMMC_ADDRESS,
> -				  CONFIG_HPS_SDMMC_BUSWIDTH, 0);
> +	return socfpga_dwmmc_init(gd->fdt_blob);
> }
> #endif
> 
> diff --git a/drivers/mmc/socfpga_dw_mmc.c b/drivers/mmc/socfpga_dw_mmc.c
> index eb69aed..8076761 100644
> --- a/drivers/mmc/socfpga_dw_mmc.c
> +++ b/drivers/mmc/socfpga_dw_mmc.c
> @@ -6,6 +6,8 @@
> 
> #include <common.h>
> #include <malloc.h>
> +#include <fdtdec.h>
> +#include <libfdt.h>
> #include <dwmmc.h>
> #include <errno.h>
> #include <asm/arch/dwmmc.h>
> @@ -42,34 +44,87 @@ static void socfpga_dwmci_clksel(struct dwmci_host *host)
> 		CLKMGR_PERPLLGRP_EN_SDMMCCLK_MASK);
> }
> 
> -int socfpga_dwmmc_init(u32 regbase, int bus_width, int index)
> +static int socfpga_dwmci_of_probe(const void *blob, int node, const int idx)
> {
> +	/* FIXME: probe from DT eventually too/ */
> +	const unsigned long clk = cm_get_mmc_controller_clk_hz();
> +
> 	struct dwmci_host *host;
> -	unsigned long clk = cm_get_mmc_controller_clk_hz();
> +	fdt_addr_t reg_base;
> +	int bus_width, fifo_depth;
> 
> 	if (clk == 0) {
> -		printf("%s: MMC clock is zero!", __func__);
> +		printf("DWMMC%d: MMC clock is zero!", idx);
> 		return -EINVAL;
> 	}
> 
> -	/* calloc for zero init */
> -	host = calloc(1, sizeof(struct dwmci_host));
> -	if (!host) {
> -		printf("%s: calloc() failed!\n", __func__);
> -		return -ENOMEM;
> +	/* Get the register address from the device node */
> +	reg_base = fdtdec_get_addr(blob, node, "reg");
> +	if (!reg_base) {
> +		printf("DWMMC%d: Can't get base address\n", idx);
> +		return -EINVAL;
> +	}
> +
> +	/* Get the bus width from the device node */
> +	bus_width = fdtdec_get_int(blob, node, "bus-width", 0);
> +	if (bus_width <= 0) {
> +		printf("DWMMC%d: Can't get bus-width\n", idx);
> +		return -EINVAL;
> 	}
> 
> +	fifo_depth = fdtdec_get_int(blob, node, "fifo-depth", 0);
> +	if (fifo_depth < 0) {
> +		printf("DWMMC%d: Can't get FIFO depth\n", idx);
> +		return -EINVAL;
> +	}
> +
> +	/* Allocate the host */
> +	host = calloc(1, sizeof(*host));
> +	if (!host)
> +		return -ENOMEM;
> +
> 	host->name = "SOCFPGA DWMMC";
> -	host->ioaddr = (void *)regbase;
> +	host->ioaddr = (void *)reg_base;
> 	host->buswidth = bus_width;
> 	host->clksel = socfpga_dwmci_clksel;
> -	host->dev_index = index;
> -	/* fixed clock divide by 4 which due to the SDMMC wrapper */
> +	host->dev_index = idx;
> +	/* Fixed clock divide by 4 which due to the SDMMC wrapper */
> 	host->bus_hz = clk;
> 	host->fifoth_val = MSIZE(0x2) |
> -		RX_WMARK(CONFIG_SOCFPGA_DWMMC_FIFO_DEPTH / 2 - 1) |
> -		TX_WMARK(CONFIG_SOCFPGA_DWMMC_FIFO_DEPTH / 2);
> +		RX_WMARK(fifo_depth / 2 - 1) | TX_WMARK(fifo_depth / 2);
> 
> 	return add_dwmci(host, host->bus_hz, 400000);
> }
> 
> +static int socfpga_dwmci_process_node(const void *blob, int nodes[],
> +				      int count)
> +{
> +	int i, node, ret;
> +
> +	for (i = 0; i < count; i++) {
> +		node = nodes[i];
> +		if (node <= 0)
> +			continue;
> +
> +		ret = socfpga_dwmci_of_probe(blob, node, i);
> +		if (ret) {
> +			printf("%s: failed to decode dev %d\n", __func__, i);
> +			return ret;
> +		}
> +	}
> +	return 0;
> +}
> +
> +int socfpga_dwmmc_init(const void *blob)
> +{
> +	int nodes[2];	/* Max. two controllers. */
> +	int ret, count;
> +
> +	count = fdtdec_find_aliases_for_id(blob, "mmc",
> +					   COMPAT_ALTERA_SOCFPGA_DWMMC,
> +					   nodes, ARRAY_SIZE(nodes));
> +
> +	ret = socfpga_dwmci_process_node(blob, nodes, count);
> +
> +	return ret;
> +}
> diff --git a/include/fdtdec.h b/include/fdtdec.h
> index 2323603..1a39b9f 100644
> --- a/include/fdtdec.h
> +++ b/include/fdtdec.h
> @@ -183,6 +183,7 @@ enum fdt_compat_id {
> 	COMPAT_SOCIONEXT_XHCI,		/* Socionext UniPhier xHCI */
> 	COMPAT_INTEL_PCH,		/* Intel PCH */
> 	COMPAT_INTEL_IRQ_ROUTER,	/* Intel Interrupt Router */
> +	COMPAT_ALTERA_SOCFPGA_DWMMC,	/* SoCFPGA DWMMC controller */
> 
> 	COMPAT_COUNT,
> };
> diff --git a/lib/fdtdec.c b/lib/fdtdec.c
> index 232ca74..d0f81bc 100644
> --- a/lib/fdtdec.c
> +++ b/lib/fdtdec.c
> @@ -76,6 +76,7 @@ static const char * const compat_names[COMPAT_COUNT] = {
> 	COMPAT(SOCIONEXT_XHCI, "socionext,uniphier-xhci"),
> 	COMPAT(COMPAT_INTEL_PCH, "intel,bd82x6x"),
> 	COMPAT(COMPAT_INTEL_IRQ_ROUTER, "intel,irq-router"),
> +	COMPAT(ALTERA_SOCFPGA_DWMMC, "altr,socfpga-dw-mshc"),
> };
> 
> const char *fdtdec_get_compatible(enum fdt_compat_id id)
> -- 
> 2.1.4

Since this does not apply cleanly now, please rework and resent again.
The rest of the patchset has been applied.

Regards

— Pantelis