Skip to contentSkip to conversation

mmc: tangier: Add Intel Tangier eMMC/SDHCI driver

PATCH New Andy Shevchenko 3 participants 3 messages Feb 14, 2017 – Feb 15, 2017 MMC, SD and SDIO

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 mmc: tangier: Add Intel Tangier eMMC/SDHCI driver

From: Felipe Balbi <[email protected]>

This patch adds Intel Tangier eMMC/SDHCI driver.

---
 drivers/mmc/Kconfig         |  5 ++++
 drivers/mmc/Makefile        |  1 +
 drivers/mmc/tangier_sdhci.c | 73 +++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 79 insertions(+)
 create mode 100644 drivers/mmc/tangier_sdhci.c
drivers/mmc/Kconfig +5 -0
index 01d1dbfb1b..42a44f9888 100644
@@ -310,6 +310,11 @@ config MMC_SDHCI_XENON
 
 	  If unsure, say N.
 
+config MMC_SDHCI_TANGIER
+	bool "Tangier SDHCI controller supprt"
+	depends on DM_MMC && BLK && DM_MMC_OPS
+	depends on MMC_SDHCI
+
 config MMC_SDHCI_TEGRA
 	bool "SDHCI platform support for the Tegra SD/MMC Controller"
 	depends on TEGRA
drivers/mmc/Makefile +1 -0
index ef27d55088..019b587441 100644
@@ -63,6 +63,7 @@ obj-$(CONFIG_MMC_SDHCI_PIC32)		+= pic32_sdhci.o
 obj-$(CONFIG_MMC_SDHCI_ROCKCHIP)	+= rockchip_sdhci.o
 obj-$(CONFIG_MMC_SDHCI_S5P)		+= s5p_sdhci.o
 obj-$(CONFIG_MMC_SDHCI_SPEAR)		+= spear_sdhci.o
+obj-$(CONFIG_MMC_SDHCI_TANGIER)		+= tangier_sdhci.o
 obj-$(CONFIG_MMC_SDHCI_TEGRA)		+= tegra_mmc.o
 obj-$(CONFIG_MMC_SDHCI_XENON)		+= xenon_sdhci.o
 obj-$(CONFIG_MMC_SDHCI_ZYNQ)		+= zynq_sdhci.o
drivers/mmc/tangier_sdhci.c new file +73 -0

73 lines not on this page · raw message

Signature · 1 line
2.11.0
#1 lore raw

PATCH 1/1 mmc: tangier: Add Intel Tangier eMMC/SDHCI driver

Hi Andy,

Quoted 19 lines · Andy Shevchenko

From: Felipe Balbi <[email protected]>

This patch adds Intel Tangier eMMC/SDHCI driver.

---
 drivers/mmc/Kconfig         |  5 ++++
 drivers/mmc/Makefile        |  1 +
 drivers/mmc/tangier_sdhci.c | 73 +++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 79 insertions(+)
 create mode 100644 drivers/mmc/tangier_sdhci.c
drivers/mmc/Kconfig +0 -0
index 01d1dbfb1b..42a44f9888 100644

drivers/mmc/Kconfig config MMC_SDHCI_XENON · line 315

Quoted 6 lines
drivers/mmc/Kconfig +3 -0
@@ -310,6 +310,11 @@ config MMC_SDHCI_XENON
 
 	  If unsure, say N.
 
+config MMC_SDHCI_TANGIER
+	bool "Tangier SDHCI controller supprt"
+	depends on DM_MMC && BLK && DM_MMC_OPS

DM_MMC_OPS is enabled by default when DM_MMC is enabled.

Quoted 23 lines
drivers/mmc/Kconfig +2 -0
+	depends on MMC_SDHCI
+
 config MMC_SDHCI_TEGRA
 	bool "SDHCI platform support for the Tegra SD/MMC Controller"
 	depends on TEGRA
drivers/mmc/Makefile +1 -0
index ef27d55088..019b587441 100644
@@ -63,6 +63,7 @@ obj-$(CONFIG_MMC_SDHCI_PIC32)		+= pic32_sdhci.o
 obj-$(CONFIG_MMC_SDHCI_ROCKCHIP)	+= rockchip_sdhci.o
 obj-$(CONFIG_MMC_SDHCI_S5P)		+= s5p_sdhci.o
 obj-$(CONFIG_MMC_SDHCI_SPEAR)		+= spear_sdhci.o
+obj-$(CONFIG_MMC_SDHCI_TANGIER)		+= tangier_sdhci.o
 obj-$(CONFIG_MMC_SDHCI_TEGRA)		+= tegra_mmc.o
 obj-$(CONFIG_MMC_SDHCI_XENON)		+= xenon_sdhci.o
 obj-$(CONFIG_MMC_SDHCI_ZYNQ)		+= zynq_sdhci.o
drivers/mmc/tangier_sdhci.c new file +0 -0
new file mode 100644
index 0000000000..6a8a6270a9

drivers/mmc/tangier_sdhci.c line 8

Quoted 8 lines
drivers/mmc/tangier_sdhci.c new file +8 -0
@@ -0,0 +1,73 @@
+#include <common.h>
+#include <linux/io.h>
+#include <linux/sizes.h>
+#include <mmc.h>
+#include <dm.h>
+#include <dm/device.h>
+#include <malloc.h>
+#include <sdhci.h>

Ordering.

Quoted 25 lines
drivers/mmc/tangier_sdhci.c new file +25 -0
+
+struct sdhci_tangier_plat {
+	struct mmc_config cfg;
+	struct mmc mmc;
+	void __iomem *ioaddr;
+};
+
+static int sdhci_tangier_bind(struct udevice *dev)
+{
+	struct sdhci_tangier_plat *plat = dev_get_platdata(dev);
+
+	return sdhci_bind(dev, &plat->mmc, &plat->cfg);
+}
+
+static int sdhci_tangier_probe(struct udevice *dev)
+{
+	struct mmc_uclass_priv *upriv = dev_get_uclass_priv(dev);
+	struct sdhci_tangier_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;

drivers/mmc/tangier_sdhci.c line 43

Quoted 10 lines
drivers/mmc/tangier_sdhci.c new file +10 -0
+
+	plat->ioaddr = devm_ioremap(dev, base, SZ_1K);
+	if (!plat->ioaddr)
+		return -ENOMEM;
+
+	host->name = dev->name;
+	host->ioaddr = plat->ioaddr;
+	host->quirks = SDHCI_QUIRK_NO_HISPD_BIT | SDHCI_QUIRK_BROKEN_VOLTAGE |
+	    SDHCI_QUIRK_BROKEN_R1B | SDHCI_QUIRK_32BIT_DMA_ADDR |
+	    SDHCI_QUIRK_WAIT_SEND_CMD;

I really wonder whether BROKEN_R1B is need.

commit 17ea3c862865c0d704646f67dbf8412f9ff54f59

Refs: v2016.09-rc1-248-g17ea3c8
Author:     Jaehoon Chung <[email protected]>
AuthorDate: Tue Jul 12 21:18:46 2016 +0900
Commit:     Jaehoon Chung <[email protected]>
CommitDate: Fri Aug 5 11:21:24 2016 +0900

mmc: sdhci: set to INT_DATA_END when there are data

http://git.denx.de/?p=u-boot/u-boot-mmc.git;a=commitdiff;h=17ea3c862865c0d704646f67dbf8412f9ff54f59

I'm thinking this patch might be fixed about broken R1b. Actually, i want to remove SDHCI_QUIRK_BROKEN_R1B..

Doesn't Your host controller use HISPD bit?

Quoted 31 lines
drivers/mmc/tangier_sdhci.c new file +30 -0
+
+	/* MMC_VDD_32_33 | MMC_VDD_33_34 | MMC_VDD_165_195 */
+	host->voltages = MMC_VDD_165_195;
+
+	ret = sdhci_setup_cfg(&plat->cfg, host, 200000000, 400000);
+	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_tangier_match[] = {
+	{ .compatible = "intel,sdhci-tangier" },
+	{ /* sentinel */ }
+};
+
+U_BOOT_DRIVER(sdhci_tangier) = {
+	.name		= "sdhci-tangier",
+	.id		= UCLASS_MMC,
+	.of_match	= sdhci_tangier_match,
+	.bind		= sdhci_tangier_bind,
+	.probe		= sdhci_tangier_probe,
+	.ops		= &sdhci_ops,
+	.priv_auto_alloc_size = sizeof(struct sdhci_host),
+	.platdata_auto_alloc_size = sizeof(struct sdhci_tangier_plat),
+};
#2 lore raw

PATCH 1/1 mmc: tangier: Add Intel Tangier eMMC/SDHCI driver

Hi,

Quoted 23 lines · Jaehoon Chung

Hi Andy,

Quoted 20 lines · Andy Shevchenko

From: Felipe Balbi <[email protected]>

This patch adds Intel Tangier eMMC/SDHCI driver.

---
 drivers/mmc/Kconfig         |  5 ++++
 drivers/mmc/Makefile        |  1 +
 drivers/mmc/tangier_sdhci.c | 73 +++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 79 insertions(+)
 create mode 100644 drivers/mmc/tangier_sdhci.c
drivers/mmc/Kconfig +0 -0
index 01d1dbfb1b..42a44f9888 100644
@@ -310,6 +310,11 @@ config MMC_SDHCI_XENON
 
Quoted 7 lines

drivers/mmc/Kconfig config MMC_SDHCI_XENON · line 315

Quoted 5 lines
drivers/mmc/Kconfig +3 -0
 	  If unsure, say N.
 
+config MMC_SDHCI_TANGIER
+	bool "Tangier SDHCI controller supprt"
+	depends on DM_MMC && BLK && DM_MMC_OPS

DM_MMC_OPS is enabled by default when DM_MMC is enabled.

removed from dependency list

Quoted 20 lines
Quoted 20 lines
drivers/mmc/Makefile +1 -0
index ef27d55088..019b587441 100644
@@ -63,6 +63,7 @@ obj-$(CONFIG_MMC_SDHCI_PIC32)		+= pic32_sdhci.o
 obj-$(CONFIG_MMC_SDHCI_ROCKCHIP)	+= rockchip_sdhci.o
 obj-$(CONFIG_MMC_SDHCI_S5P)		+= s5p_sdhci.o
 obj-$(CONFIG_MMC_SDHCI_SPEAR)		+= spear_sdhci.o
+obj-$(CONFIG_MMC_SDHCI_TANGIER)		+= tangier_sdhci.o
 obj-$(CONFIG_MMC_SDHCI_TEGRA)		+= tegra_mmc.o
 obj-$(CONFIG_MMC_SDHCI_XENON)		+= xenon_sdhci.o
 obj-$(CONFIG_MMC_SDHCI_ZYNQ)		+= zynq_sdhci.o
drivers/mmc/tangier_sdhci.c new file +2 -0
new file mode 100644
index 0000000000..6a8a6270a9
@@ -0,0 +1,73 @@
+#include <common.h>
+#include <linux/io.h>
Quoted 8 lines

drivers/mmc/tangier_sdhci.c line 8

Quoted 6 lines
drivers/mmc/tangier_sdhci.c new file +6 -0
+#include <linux/sizes.h>
+#include <mmc.h>
+#include <dm.h>
+#include <dm/device.h>
+#include <malloc.h>
+#include <sdhci.h>

Ordering.

sorted

Quoted 31 lines
Quoted 11 lines
drivers/mmc/tangier_sdhci.c new file +11 -0
+static int sdhci_tangier_probe(struct udevice *dev)
+{
+	struct mmc_uclass_priv *upriv = dev_get_uclass_priv(dev);
+	struct sdhci_tangier_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;

drivers/mmc/tangier_sdhci.c line 43

Quoted 10 lines
drivers/mmc/tangier_sdhci.c new file +10 -0
+
+	plat->ioaddr = devm_ioremap(dev, base, SZ_1K);
+	if (!plat->ioaddr)
+		return -ENOMEM;
+
+	host->name = dev->name;
+	host->ioaddr = plat->ioaddr;
+	host->quirks = SDHCI_QUIRK_NO_HISPD_BIT | SDHCI_QUIRK_BROKEN_VOLTAGE |
+	    SDHCI_QUIRK_BROKEN_R1B | SDHCI_QUIRK_32BIT_DMA_ADDR |
+	    SDHCI_QUIRK_WAIT_SEND_CMD;

I really wonder whether BROKEN_R1B is need.

commit 17ea3c862865c0d704646f67dbf8412f9ff54f59

Refs: v2016.09-rc1-248-g17ea3c8
Author:     Jaehoon Chung <[email protected]>
AuthorDate: Tue Jul 12 21:18:46 2016 +0900
Commit:     Jaehoon Chung <[email protected]>
CommitDate: Fri Aug 5 11:21:24 2016 +0900
Quoted 6 lines

mmc: sdhci: set to INT_DATA_END when there are data

http://git.denx.de/?p=u-boot/u-boot-mmc.git;a=commitdiff;h=17ea3c862865c0d704646f67dbf8412f9ff54f59

I'm thinking this patch might be fixed about broken R1b. Actually, i want to remove SDHCI_QUIRK_BROKEN_R1B..

yeah, worked just fine without it.

Signature · 8 lines
balbi
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 832 bytes
Desc: not available
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20170215/13a7a749/attachment.sig>