On 22 May 2014 17:18, Peter Griffin <peter.griffin@xxxxxxxxxx> wrote: > This platform driver adds initial support for the SDHCI host controller > found on STMicroelectronics SoCs. > > It has been tested on STiH41x b2020 platforms currently. > > Signed-off-by: Peter Griffin <peter.griffin@xxxxxxxxxx> > Signed-off-by: Giuseppe Cavallaro <peppe.cavallaro@xxxxxx> > --- > drivers/mmc/host/Kconfig | 12 +++ > drivers/mmc/host/Makefile | 1 + > drivers/mmc/host/sdhci-st.c | 244 ++++++++++++++++++++++++++++++++++++++++++++ > 3 files changed, 257 insertions(+) > create mode 100644 drivers/mmc/host/sdhci-st.c > > diff --git a/drivers/mmc/host/Kconfig b/drivers/mmc/host/Kconfig > index 8aaf8c1..b62c40d 100644 > --- a/drivers/mmc/host/Kconfig > +++ b/drivers/mmc/host/Kconfig > @@ -283,6 +283,18 @@ config MMC_SDHCI_BCM2835 > > If unsure, say N. > > +config MMC_SDHCI_ST > + tristate "SDHCI support on STMicroelectronics SoC" > + depends on ARCH_STI > + depends on MMC_SDHCI_PLTFM > + select MMC_SDHCI_IO_ACCESSORS > + help > + This selects the Secure Digital Host Controller Interface in > + STMicroelectronics SoCs. > + > + If you have a controller with this interface, say Y or M here. > + If unsure, say N. > + > config MMC_OMAP > tristate "TI OMAP Multimedia Card Interface support" > depends on ARCH_OMAP > diff --git a/drivers/mmc/host/Makefile b/drivers/mmc/host/Makefile > index 0c8aa5e..6e0acf7 100644 > --- a/drivers/mmc/host/Makefile > +++ b/drivers/mmc/host/Makefile > @@ -64,6 +64,7 @@ obj-$(CONFIG_MMC_SDHCI_OF_HLWD) += sdhci-of-hlwd.o > obj-$(CONFIG_MMC_SDHCI_BCM_KONA) += sdhci-bcm-kona.o > obj-$(CONFIG_MMC_SDHCI_BCM2835) += sdhci-bcm2835.o > obj-$(CONFIG_MMC_SDHCI_MSM) += sdhci-msm.o > +obj-$(CONFIG_MMC_SDHCI_ST) += sdhci-st.o > > ifeq ($(CONFIG_CB710_DEBUG),y) > CFLAGS-cb710-mmc += -DDEBUG > diff --git a/drivers/mmc/host/sdhci-st.c b/drivers/mmc/host/sdhci-st.c > new file mode 100644 > index 0000000..1790fa7 > --- /dev/null > +++ b/drivers/mmc/host/sdhci-st.c > @@ -0,0 +1,244 @@ > +/* > + * Support for SDHCI on STMicroelectronics SoCs > + * > + * Copyright (C) 2014 STMicroelectronics Ltd > + * Author: Giuseppe Cavallaro <peppe.cavallaro@xxxxxx> > + * > + * Based on sdhci-cns3xxx.c > + * > + * This program is free software; you can redistribute it and/or modify > + * it under the terms of the GNU General Public License version 2 as > + * published by the Free Software Foundation. > + * > + * This program is distributed in the hope that it will be useful, > + * but WITHOUT ANY WARRANTY; without even the implied warranty of > + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the > + * GNU General Public License for more details. > + * > + */ > + > +#include <linux/io.h> > +#include <linux/of.h> > +#include <linux/module.h> > +#include <linux/err.h> > +#include <linux/of_gpio.h> > +#include <linux/mmc/host.h> > +#include <linux/reset.h> > + > +#include "sdhci-pltfm.h" > + > +struct st_mmc_platform_data { > + struct reset_control *rstc; > +}; > + > +static int sdhci_st_8bit_width(struct sdhci_host *host, int width) > +{ > + u8 ctrl; > + > + ctrl = sdhci_readb(host, SDHCI_HOST_CONTROL); > + > + switch (width) { > + case MMC_BUS_WIDTH_8: > + ctrl |= SDHCI_CTRL_8BITBUS; > + ctrl &= ~SDHCI_CTRL_4BITBUS; > + break; > + case MMC_BUS_WIDTH_4: > + ctrl |= SDHCI_CTRL_4BITBUS; > + ctrl &= ~SDHCI_CTRL_8BITBUS; > + break; > + default: > + ctrl &= ~(SDHCI_CTRL_8BITBUS | SDHCI_CTRL_4BITBUS); > + break; > + } > + > + sdhci_writeb(host, ctrl, SDHCI_HOST_CONTROL); > + > + return 0; > +} > + > +static unsigned int sdhci_st_get_max_clk(struct sdhci_host *host) > +{ > + struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host); > + > + return clk_get_rate(pltfm_host->clk); > +} There are sdhci library function for the above: sdhci_pltfm_clk_get_max_clock() > + > +static u32 sdhci_st_readl(struct sdhci_host *host, int reg) > +{ > + u32 ret; > + > + switch (reg) { > + case SDHCI_CAPABILITIES: > + ret = readl(host->ioaddr + reg); > + /* Support 3.3V and 1.8V */ > + ret &= ~SDHCI_CAN_VDD_300; > + break; > + default: > + ret = readl(host->ioaddr + reg); > + } > + return ret; > +} > + > +static const struct sdhci_ops sdhci_st_ops = { > + .get_max_clock = sdhci_st_get_max_clk, > + .platform_bus_width = sdhci_st_8bit_width, > + .read_l = sdhci_st_readl, > +}; > + > +static const struct sdhci_pltfm_data sdhci_st_pdata = { > + .ops = &sdhci_st_ops, > + .quirks = SDHCI_QUIRK_NO_ENDATTR_IN_NOPDESC | > + SDHCI_QUIRK_CAP_CLOCK_BASE_BROKEN, > +}; > + > + > +static int sdhci_st_probe(struct platform_device *pdev) > +{ > + struct device_node *np = pdev->dev.of_node; > + struct sdhci_host *host; > + struct st_mmc_platform_data *pdata; > + struct sdhci_pltfm_host *pltfm_host; > + struct clk *clk; > + int ret = 0; > + u16 host_version; > + > + dev_dbg(&pdev->dev, "SDHCI ST platform driver\n"); > + > + pdata = devm_kzalloc(&pdev->dev, sizeof(*pdata), GFP_KERNEL); > + if (!pdata) > + return -ENOMEM; > + > + pdata->rstc = devm_reset_control_get(&pdev->dev, NULL); > + if (IS_ERR(pdata->rstc)) > + pdata->rstc = NULL; > + else > + reset_control_deassert(pdata->rstc); > + > + clk = devm_clk_get(&pdev->dev, "mmc"); > + if (IS_ERR(clk)) { > + dev_err(&pdev->dev, "Perpheral clk not found\n"); > + return PTR_ERR(clk); > + } > + > + host = sdhci_pltfm_init(pdev, &sdhci_st_pdata, 0); > + if (IS_ERR(host)) { > + dev_err(&pdev->dev, "Failed sdhci_pltfm_init\n"); > + return PTR_ERR(host); > + } > + > + clk_prepare_enable(clk); > + > + host->mmc->caps |= MMC_CAP_8_BIT_DATA | MMC_CAP_BUS_WIDTH_TEST > + | MMC_CAP_1_8V_DDR; Comment below. > + > + if (of_property_read_bool(np, "non-removable")) > + host->mmc->caps |= MMC_CAP_NONREMOVABLE; MMC_CAP_1_8V_DDR, MMC_CAP_8_BIT_DATA, MMC_CAP_NONREMOVABLE aren’t those board specific capabilities? Unless there are something that prevents you from using the common mmc DT parser, I would suggest you to use it. mmc_of_parse(). Thus you can provide these capabilities through DT instead. Kind regards Ulf Hansson -- To unsubscribe from this list: send the line "unsubscribe linux-mmc" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html