Hi Masahiro.

On 12/09/2016 03:46 PM, Masahiro Yamada wrote:
> Add a driver for the Cadence SD4HC SD/SDIO/eMMC Controller.
> 
> Signed-off-by: Masahiro Yamada <yamada.masah...@socionext.com>
> ---
> 
>  - This is a counterpart of the Linux driver,
>    which has been merged in the MMC subsystem:
>    (commit ff6af28fa in linux-next)
>    The DT binding for this driver should be referred
>    in the kernel tree.
> 
>  - This will be applied cleanly after my SDHCI Kconfig moves:
>    http://patchwork.ozlabs.org/patch/703578/
>    Until then, please review.
> 
> 
>  drivers/mmc/Kconfig         |  13 +++++
>  drivers/mmc/Makefile        |   1 +
>  drivers/mmc/sdhci-cadence.c | 125 
> ++++++++++++++++++++++++++++++++++++++++++++
>  3 files changed, 139 insertions(+)
>  create mode 100644 drivers/mmc/sdhci-cadence.c
> 
> diff --git a/drivers/mmc/Kconfig b/drivers/mmc/Kconfig
> index 12df3cf..9ca2f98 100644
> --- a/drivers/mmc/Kconfig
> +++ b/drivers/mmc/Kconfig
> @@ -159,6 +159,19 @@ config MMC_SDHCI_BCM2835
>  
>         If unsure, say N.
>  
> +config MMC_SDHCI_CADENCE
> +     bool "SDHCI support for the Cadence SD/SDIO/eMMC controller"
> +     depends on MMC_SDHCI
> +     depends on DM_MMC_OPS
> +     depends on BLK
> +     depends on OF_CONTROL
> +     help
> +       This selects the Cadence SD/SDIO/eMMC driver.
> +
> +       If you have a controller with this interface, say Y or M here.
> +
> +       If unsure, say N.
> +
>  config MMC_SDHCI_KONA
>       bool "SDHCI support on Broadcom KONA platform"
>       depends on MMC_SDHCI
> diff --git a/drivers/mmc/Makefile b/drivers/mmc/Makefile
> index 2b136ea..a543188 100644
> --- a/drivers/mmc/Makefile
> +++ b/drivers/mmc/Makefile
> @@ -64,6 +64,7 @@ obj-$(CONFIG_MSM_SDHCI) += msm_sdhci.o
>  # SDHCI
>  obj-$(CONFIG_MMC_SDHCI)                      += sdhci.o
>  obj-$(CONFIG_MMC_SDHCI_BCM2835)              += bcm2835_sdhci.o
> +obj-$(CONFIG_MMC_SDHCI_CADENCE)              += sdhci-cadence.o
>  obj-$(CONFIG_MMC_SDHCI_KONA)         += kona_sdhci.o
>  obj-$(CONFIG_MMC_SDHCI_MV)           += mv_sdhci.o
>  obj-$(CONFIG_MMC_SDHCI_S5P)          += s5p_sdhci.o
> diff --git a/drivers/mmc/sdhci-cadence.c b/drivers/mmc/sdhci-cadence.c
> new file mode 100644
> index 0000000..1a59a5d
> --- /dev/null
> +++ b/drivers/mmc/sdhci-cadence.c
> @@ -0,0 +1,125 @@
> +/*
> + * Copyright (C) 2016 Socionext Inc.
> + *   Author: Masahiro Yamada <yamada.masah...@socionext.com>
> + *
> + * SPDX-License-Identifier:  GPL-2.0+
> + */
> +
> +#include <common.h>
> +#include <linux/io.h>
> +#include <linux/sizes.h>
> +#include <dm/device.h>
> +#include <mmc.h>
> +#include <sdhci.h>
> +
> +/* HRS - Host Register Set (specific to Cadence) */
> +#define SDHCI_CDNS_HRS04             0x10            /* PHY access port */
> +#define   SDHCI_CDNS_HRS04_ACK                       BIT(26)
> +#define   SDHCI_CDNS_HRS04_RD                        BIT(25)
> +#define   SDHCI_CDNS_HRS04_WR                        BIT(24)
> +#define   SDHCI_CDNS_HRS04_RDATA_SHIFT               12
> +#define   SDHCI_CDNS_HRS04_WDATA_SHIFT               8
> +#define   SDHCI_CDNS_HRS04_ADDR_SHIFT                0
> +
> +/* SRS - Slot Register Set (SDHCI-compatible) */
> +#define SDHCI_CDNS_SRS_BASE          0x200
> +
> +/* PHY */
> +#define SDHCI_CDNS_PHY_DLY_SD_HS     0x00
> +#define SDHCI_CDNS_PHY_DLY_SD_DEFAULT        0x01
> +#define SDHCI_CDNS_PHY_DLY_UHS_SDR12 0x02
> +#define SDHCI_CDNS_PHY_DLY_UHS_SDR25 0x03
> +#define SDHCI_CDNS_PHY_DLY_UHS_SDR50 0x04
> +#define SDHCI_CDNS_PHY_DLY_UHS_DDR50 0x05
> +#define SDHCI_CDNS_PHY_DLY_EMMC_LEGACY       0x06
> +#define SDHCI_CDNS_PHY_DLY_EMMC_SDR  0x07
> +#define SDHCI_CDNS_PHY_DLY_EMMC_DDR  0x08
> +
> +struct sdhci_cdns_plat {
> +     struct mmc_config cfg;
> +     struct mmc mmc;
> +     void __iomem *hrs_addr;
> +};
> +
> +static void sdhci_cdns_write_phy_reg(struct sdhci_cdns_plat *plat,
> +                                  u8 addr, u8 data)
> +{
> +     void __iomem *reg = plat->hrs_addr + SDHCI_CDNS_HRS04;
> +     u32 tmp;
> +
> +     tmp = (data << SDHCI_CDNS_HRS04_WDATA_SHIFT) |
> +           (addr << SDHCI_CDNS_HRS04_ADDR_SHIFT);
> +     writel(tmp, reg);
> +
> +     tmp |= SDHCI_CDNS_HRS04_WR;
> +     writel(tmp, reg);
> +
> +     tmp &= ~SDHCI_CDNS_HRS04_WR;
> +     writel(tmp, reg);

Is there a special reason for writing after reading?

> +}
> +
> +static void sdhci_cdns_phy_init(struct sdhci_cdns_plat *plat)
> +{
> +     sdhci_cdns_write_phy_reg(plat, SDHCI_CDNS_PHY_DLY_SD_HS, 4);
> +     sdhci_cdns_write_phy_reg(plat, SDHCI_CDNS_PHY_DLY_SD_DEFAULT, 4);
> +     sdhci_cdns_write_phy_reg(plat, SDHCI_CDNS_PHY_DLY_EMMC_LEGACY, 9);
> +     sdhci_cdns_write_phy_reg(plat, SDHCI_CDNS_PHY_DLY_EMMC_SDR, 2);
> +     sdhci_cdns_write_phy_reg(plat, SDHCI_CDNS_PHY_DLY_EMMC_DDR, 3);
> +}
> +
> +static int sdhci_cdns_bind(struct udevice *dev)
> +{
> +     struct sdhci_cdns_plat *plat = dev_get_platdata(dev);
> +
> +     return sdhci_bind(dev, &plat->mmc, &plat->cfg);
> +}
> +
> +static int sdhci_cdns_probe(struct udevice *dev)
> +{
> +     struct mmc_uclass_priv *upriv = dev_get_uclass_priv(dev);
> +     struct sdhci_cdns_plat *plat = dev_get_platdata(dev);
> +     struct sdhci_host *host = dev_get_priv(dev);
> +     fdt_addr_t base;
> +     int ret;
> +
> +     base = dev_get_addr(dev);
> +     if (base == FDT_ADDR_T_NONE)
> +             return -EINVAL;
> +
> +     plat->hrs_addr = devm_ioremap(dev, base, SZ_1K);
> +     if (!plat->hrs_addr)
> +             return -ENOMEM;
> +
> +     host->name = dev->name;
> +     host->ioaddr = plat->hrs_addr + SDHCI_CDNS_SRS_BASE;
> +     host->version = SDHCI_SPEC_300;

Maybe you don't put this..version is checked in sdhci_setup_cfg() with register.

Best Regards,
Jaehoon Chung

> +     host->quirks |= SDHCI_QUIRK_WAIT_SEND_CMD;
> +
> +     sdhci_cdns_phy_init(plat);
> +
> +     ret = sdhci_setup_cfg(&plat->cfg, host, 0, 0);
> +     if (ret)
> +             return ret;
> +
> +     upriv->mmc = &plat->mmc;
> +     host->mmc = &plat->mmc;
> +     host->mmc->priv = host;
> +
> +     return sdhci_probe(dev);
> +}
> +
> +static const struct udevice_id sdhci_cdns_match[] = {
> +     { .compatible = "cdns,sd4hc" },
> +     { /* sentinel */ }
> +};
> +
> +U_BOOT_DRIVER(sdhci_cdns) = {
> +     .name = "sdhci-cdns",
> +     .id = UCLASS_MMC,
> +     .of_match = sdhci_cdns_match,
> +     .bind = sdhci_cdns_bind,
> +     .probe = sdhci_cdns_probe,
> +     .priv_auto_alloc_size = sizeof(struct sdhci_host),
> +     .platdata_auto_alloc_size = sizeof(struct sdhci_cdns_plat),
> +     .ops = &sdhci_ops,
> +};
> 

_______________________________________________
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot

Reply via email to