[U-Boot] [PATCH v3 2/4] mmc: Add Aspeed SD controller driver

Eddie James
2019-08-27T14:49:26Z

On 8/27/19 2:34 AM, Peng Fan wrote:
> Hi Eddie,
>
>> Subject: [PATCH v3 2/4] mmc: Add Aspeed SD controller driver
> This patch could not be applied to latest tree, could you please check?

Sorry I was a little behind master. I just sent this patch rebased.

Thanks,

Eddie

>
> Thanks,
> Peng.
>> Add support for the Aspeed SD host controller engine.
>>
>> Signed-off-by: Eddie James <eajames@linux.ibm.com>
>> ---
>> arch/arm/include/asm/gpio.h | 3 +-
>> drivers/mmc/Kconfig | 11 ++++++
>> drivers/mmc/Makefile | 1 +
>> drivers/mmc/aspeed_sdhci.c | 90
>> +++++++++++++++++++++++++++++++++++++++++++++
>> 4 files changed, 104 insertions(+), 1 deletion(-) create mode 100644
>> drivers/mmc/aspeed_sdhci.c
>>
>> diff --git a/arch/arm/include/asm/gpio.h b/arch/arm/include/asm/gpio.h
>> index 370031f..38a5922 100644
>> --- a/arch/arm/include/asm/gpio.h
>> +++ b/arch/arm/include/asm/gpio.h
>> @@ -1,6 +1,7 @@
>> #if !defined(CONFIG_ARCH_UNIPHIER) && !defined(CONFIG_ARCH_STI) &&
>> \
>> !defined(CONFIG_ARCH_K3) && !defined(CONFIG_ARCH_BCM6858) &&
>> \
>> - !defined(CONFIG_ARCH_BCM63158)
>> && !defined(CONFIG_ARCH_ROCKCHIP)
>> + !defined(CONFIG_ARCH_BCM63158)
>> && !defined(CONFIG_ARCH_ROCKCHIP) && \
>> + !defined(CONFIG_ARCH_ASPEED)
>> #include <asm/arch/gpio.h>
>> #endif
>> #include <asm-generic/gpio.h>
>> diff --git a/drivers/mmc/Kconfig b/drivers/mmc/Kconfig index
>> c6812f6..536f66a 100644
>> --- a/drivers/mmc/Kconfig
>> +++ b/drivers/mmc/Kconfig
>> @@ -421,6 +421,17 @@ config SPL_MMC_SDHCI_ADMA
>> This enables support for the ADMA (Advanced DMA) defined
>> in the SD Host Controller Standard Specification Version 3.00 in SPL.
>>
>> +config MMC_SDHCI_ASPEED
>> + bool "Aspeed SDHCI controller"
>> + depends on ARCH_ASPEED
>> + depends on DM_MMC
>> + depends on MMC_SDHCI
>> + help
>> + Enables support for the Aspeed SDHCI 2.0 controller present on
>> Aspeed
>> + SoCs. This device is compatible with SD 3.0 and/or MMC 4.3
>> + specifications. On the AST2600, the device is also compatible with
>> + MMC 5.1 and eMMC 3.0.
>> +
>> config MMC_SDHCI_ATMEL
>> bool "Atmel SDHCI controller support"
>> depends on ARCH_AT91
>> diff --git a/drivers/mmc/Makefile b/drivers/mmc/Makefile index
>> 6cc018b..5594195 100644
>> --- a/drivers/mmc/Makefile
>> +++ b/drivers/mmc/Makefile
>> @@ -46,6 +46,7 @@ obj-$(CONFIG_JZ47XX_MMC) += jz_mmc.o
>>
>> # SDHCI
>> obj-$(CONFIG_MMC_SDHCI) += sdhci.o
>> +obj-$(CONFIG_MMC_SDHCI_ASPEED) += aspeed_sdhci.o
>> obj-$(CONFIG_MMC_SDHCI_ATMEL) += atmel_sdhci.o
>> obj-$(CONFIG_MMC_SDHCI_BCM2835) += bcm2835_sdhci.o
>> obj-$(CONFIG_MMC_SDHCI_BCMSTB) += bcmstb_sdhci.o
>> diff --git a/drivers/mmc/aspeed_sdhci.c b/drivers/mmc/aspeed_sdhci.c new
>> file mode 100644 index 0000000..1321ec3
>> --- /dev/null
>> +++ b/drivers/mmc/aspeed_sdhci.c
>> @@ -0,0 +1,90 @@
>> +// SPDX-License-Identifier: GPL-2.0+
>> +/*
>> + * Copyright 2019 IBM Corp.
>> + * Eddie James <eajames@linux.ibm.com>
>> + */
>> +
>> +#include <common.h>
>> +#include <clk.h>
>> +#include <dm.h>
>> +#include <malloc.h>
>> +#include <sdhci.h>
>> +
>> +struct aspeed_sdhci_plat {
>> + struct mmc_config cfg;
>> + struct mmc mmc;
>> +};
>> +
>> +static int aspeed_sdhci_probe(struct udevice *dev) {
>> + struct mmc_uclass_priv *upriv = dev_get_uclass_priv(dev);
>> + struct aspeed_sdhci_plat *plat = dev_get_platdata(dev);
>> + struct sdhci_host *host = dev_get_priv(dev);
>> + u32 max_clk;
>> + struct clk clk;
>> + int ret;
>> +
>> + ret = clk_get_by_index(dev, 0, &clk);
>> + if (ret)
>> + return ret;
>> +
>> + ret = clk_enable(&clk);
>> + if (ret)
>> + goto free;
>> +
>> + host->name = dev->name;
>> + host->ioaddr = (void *)devfdt_get_addr(dev);
>> +
>> + max_clk = clk_get_rate(&clk);
>> + if (IS_ERR_VALUE(max_clk)) {
>> + ret = max_clk;
>> + goto err;
>> + }
>> +
>> + host->max_clk = max_clk;
>> + host->mmc = &plat->mmc;
>> + host->mmc->dev = dev;
>> + host->mmc->priv = host;
>> + upriv->mmc = host->mmc;
>> +
>> + ret = sdhci_setup_cfg(&plat->cfg, host, 0, 0);
>> + if (ret)
>> + goto err;
>> +
>> + ret = sdhci_probe(dev);
>> + if (ret)
>> + goto err;
>> +
>> + return 0;
>> +
>> +err:
>> + clk_disable(&clk);
>> +free:
>> + clk_free(&clk);
>> + return ret;
>> +}
>> +
>> +static int aspeed_sdhci_bind(struct udevice *dev) {
>> + struct aspeed_sdhci_plat *plat = dev_get_platdata(dev);
>> +
>> + return sdhci_bind(dev, &plat->mmc, &plat->cfg); }
>> +
>> +static const struct udevice_id aspeed_sdhci_ids[] = {
>> + { .compatible = "aspeed,ast2400-sdhci" },
>> + { .compatible = "aspeed,ast2500-sdhci" },
>> + { .compatible = "aspeed,ast2600-sdhci" },
>> + { }
>> +};
>> +
>> +U_BOOT_DRIVER(aspeed_sdhci_drv) = {
>> + .name = "aspeed_sdhci",
>> + .id = UCLASS_MMC,
>> + .of_match = aspeed_sdhci_ids,
>> + .ops = &sdhci_ops,
>> + .bind = aspeed_sdhci_bind,
>> + .probe = aspeed_sdhci_probe,
>> + .priv_auto_alloc_size = sizeof(struct sdhci_host),
>> + .platdata_auto_alloc_size = sizeof(struct aspeed_sdhci_plat), };
>> --
>> 1.8.3.1