public inbox for u-boot@lists.denx.de
 help / color / mirror / Atom feed
* [U-Boot] [PATCH 0/4] mmc: omap_hsmmc: add support for CONFIG_BLK
@ 2017-03-22 15:00 Jean-Jacques Hiblot
  2017-03-22 15:00 ` [U-Boot] [PATCH 1/4] drivers: omap_hsmmc: use an accessor to get the private data Jean-Jacques Hiblot
                   ` (3 more replies)
  0 siblings, 4 replies; 13+ messages in thread
From: Jean-Jacques Hiblot @ 2017-03-22 15:00 UTC (permalink / raw)
  To: u-boot

This series is based on the RFC "mmc: omap_hsmmc: convert to use dm block devies"
from Grygorii Strashko <grygorii.strashko@ti.com>.

The goal is to be able to compile u-boot with the CONFIG_BLK option. This will
be required to move the sata to the driver model.
The first 3 patches are essentially preparation work.
The last patch adds the actual support for CONFIG_BLK.

This has been tested on a DRA72 evm and buildman has been run other TI
platforms (am33x am43x dra7 omap5 am57)

Jean-Jacques Hiblot (4):
  drivers: omap_hsmmc: use an accessor to get the private data
  drivers: omap_hsmmc: use mmc_get_blk_desc() to get the block device
    desc
  drivers: omap_hsmmc: move the mmc_config to platdata when DM_MMC is
    used
  drivers: omap_hsmmc: add support for CONFIG_BLK

 drivers/mmc/omap_hsmmc.c | 100 ++++++++++++++++++++++++++++++++++-------------
 1 file changed, 73 insertions(+), 27 deletions(-)

-- 
1.9.1

^ permalink raw reply	[flat|nested] 13+ messages in thread
* [U-Boot] [PATCH 1/4] drivers: omap_hsmmc: use an accessor to get the private data
  2017-03-22 15:00 [U-Boot] [PATCH 0/4] mmc: omap_hsmmc: add support for CONFIG_BLK Jean-Jacques Hiblot
@ 2017-03-22 15:00 ` Jean-Jacques Hiblot
  2017-03-22 17:59   ` Tom Rini
  2017-03-30  4:35   ` Jaehoon Chung
  2017-03-22 15:00 ` [U-Boot] [PATCH 2/4] drivers: omap_hsmmc: use mmc_get_blk_desc() to get the block device desc Jean-Jacques Hiblot
                   ` (2 subsequent siblings)
  3 siblings, 2 replies; 13+ messages in thread
From: Jean-Jacques Hiblot @ 2017-03-22 15:00 UTC (permalink / raw)
  To: u-boot

For consistency, use an accessor to access the private data. Also for the
same reason, rename all priv_data to priv.

Signed-off-by: Jean-Jacques Hiblot <jjhiblot@ti.com>
---
 drivers/mmc/omap_hsmmc.c | 54 +++++++++++++++++++++++++++++-------------------
 1 file changed, 33 insertions(+), 21 deletions(-)

diff --git a/drivers/mmc/omap_hsmmc.c b/drivers/mmc/omap_hsmmc.c
index 7ed5328..fe92908 100644
--- a/drivers/mmc/omap_hsmmc.c
+++ b/drivers/mmc/omap_hsmmc.c
@@ -78,7 +78,16 @@ static int mmc_read_data(struct hsmmc *mmc_base, char *buf, unsigned int size);
 static int mmc_write_data(struct hsmmc *mmc_base, const char *buf,
 			unsigned int siz);
 
-#if defined(OMAP_HSMMC_USE_GPIO) && !defined(CONFIG_DM_MMC)
+static inline struct omap_hsmmc_data *omap_hsmmc_get_data(struct mmc *mmc)
+{
+#ifdef CONFIG_DM_MMC
+	return dev_get_priv(mmc->dev);
+#else
+	return (struct omap_hsmmc_data *)mmc->priv;
+#endif
+}
+
+ #if defined(OMAP_HSMMC_USE_GPIO) && !defined(CONFIG_DM_MMC)
 static int omap_mmc_setup_gpio_in(int gpio, const char *label)
 {
 	int ret;
@@ -194,12 +203,13 @@ void mmc_init_stream(struct hsmmc *mmc_base)
 
 static int omap_hsmmc_init_setup(struct mmc *mmc)
 {
+	struct omap_hsmmc_data *priv = omap_hsmmc_get_data(mmc);
 	struct hsmmc *mmc_base;
 	unsigned int reg_val;
 	unsigned int dsor;
 	ulong start;
 
-	mmc_base = ((struct omap_hsmmc_data *)mmc->priv)->base_addr;
+	mmc_base = priv->base_addr;
 	mmc_board_init(mmc);
 
 	writel(readl(&mmc_base->sysconfig) | MMC_SOFTRESET,
@@ -304,11 +314,12 @@ static void mmc_reset_controller_fsm(struct hsmmc *mmc_base, u32 bit)
 static int omap_hsmmc_send_cmd(struct mmc *mmc, struct mmc_cmd *cmd,
 			struct mmc_data *data)
 {
+	struct omap_hsmmc_data *priv = omap_hsmmc_get_data(mmc);
 	struct hsmmc *mmc_base;
 	unsigned int flags, mmc_stat;
 	ulong start;
 
-	mmc_base = ((struct omap_hsmmc_data *)mmc->priv)->base_addr;
+	mmc_base = priv->base_addr;
 	start = get_timer(0);
 	while ((readl(&mmc_base->pstate) & (DATI_MASK | CMDI_MASK)) != 0) {
 		if (get_timer(0) - start > MAX_RETRY_MS) {
@@ -533,11 +544,12 @@ static int mmc_write_data(struct hsmmc *mmc_base, const char *buf,
 
 static int omap_hsmmc_set_ios(struct mmc *mmc)
 {
+	struct omap_hsmmc_data *priv = omap_hsmmc_get_data(mmc);
 	struct hsmmc *mmc_base;
 	unsigned int dsor = 0;
 	ulong start;
 
-	mmc_base = ((struct omap_hsmmc_data *)mmc->priv)->base_addr;
+	mmc_base = priv->base_addr;
 	/* configue bus width */
 	switch (mmc->bus_width) {
 	case 8:
@@ -591,7 +603,7 @@ static int omap_hsmmc_set_ios(struct mmc *mmc)
 #ifdef CONFIG_DM_MMC
 static int omap_hsmmc_getcd(struct mmc *mmc)
 {
-	struct omap_hsmmc_data *priv = mmc->priv;
+	struct omap_hsmmc_data *priv = omap_hsmmc_get_data(mmc);
 	int value;
 
 	value = dm_gpio_get_value(&priv->cd_gpio);
@@ -606,7 +618,7 @@ static int omap_hsmmc_getcd(struct mmc *mmc)
 
 static int omap_hsmmc_getwp(struct mmc *mmc)
 {
-	struct omap_hsmmc_data *priv = mmc->priv;
+	struct omap_hsmmc_data *priv = omap_hsmmc_get_data(mmc);
 	int value;
 
 	value = dm_gpio_get_value(&priv->wp_gpio);
@@ -618,11 +630,11 @@ static int omap_hsmmc_getwp(struct mmc *mmc)
 #else
 static int omap_hsmmc_getcd(struct mmc *mmc)
 {
-	struct omap_hsmmc_data *priv_data = mmc->priv;
+	struct omap_hsmmc_data *priv = omap_hsmmc_get_data(mmc);
 	int cd_gpio;
 
 	/* if no CD return as 1 */
-	cd_gpio = priv_data->cd_gpio;
+	cd_gpio = priv->cd_gpio;
 	if (cd_gpio < 0)
 		return 1;
 
@@ -632,11 +644,11 @@ static int omap_hsmmc_getcd(struct mmc *mmc)
 
 static int omap_hsmmc_getwp(struct mmc *mmc)
 {
-	struct omap_hsmmc_data *priv_data = mmc->priv;
+	struct omap_hsmmc_data *priv = omap_hsmmc_get_data(mmc);
 	int wp_gpio;
 
 	/* if no WP return as 0 */
-	wp_gpio = priv_data->wp_gpio;
+	wp_gpio = priv->wp_gpio;
 	if (wp_gpio < 0)
 		return 0;
 
@@ -661,23 +673,23 @@ int omap_mmc_init(int dev_index, uint host_caps_mask, uint f_max, int cd_gpio,
 		int wp_gpio)
 {
 	struct mmc *mmc;
-	struct omap_hsmmc_data *priv_data;
+	struct omap_hsmmc_data *priv;
 	struct mmc_config *cfg;
 	uint host_caps_val;
 
-	priv_data = malloc(sizeof(*priv_data));
-	if (priv_data == NULL)
+	priv = malloc(sizeof(*priv));
+	if (priv == NULL)
 		return -1;
 
 	host_caps_val = MMC_MODE_4BIT | MMC_MODE_HS_52MHz | MMC_MODE_HS;
 
 	switch (dev_index) {
 	case 0:
-		priv_data->base_addr = (struct hsmmc *)OMAP_HSMMC1_BASE;
+		priv->base_addr = (struct hsmmc *)OMAP_HSMMC1_BASE;
 		break;
 #ifdef OMAP_HSMMC2_BASE
 	case 1:
-		priv_data->base_addr = (struct hsmmc *)OMAP_HSMMC2_BASE;
+		priv->base_addr = (struct hsmmc *)OMAP_HSMMC2_BASE;
 #if (defined(CONFIG_OMAP44XX) || defined(CONFIG_OMAP54XX) || \
 	defined(CONFIG_DRA7XX) || defined(CONFIG_AM33XX) || \
 	defined(CONFIG_AM43XX) || defined(CONFIG_SOC_KEYSTONE)) && \
@@ -689,7 +701,7 @@ int omap_mmc_init(int dev_index, uint host_caps_mask, uint f_max, int cd_gpio,
 #endif
 #ifdef OMAP_HSMMC3_BASE
 	case 2:
-		priv_data->base_addr = (struct hsmmc *)OMAP_HSMMC3_BASE;
+		priv->base_addr = (struct hsmmc *)OMAP_HSMMC3_BASE;
 #if defined(CONFIG_DRA7XX) && defined(CONFIG_HSMMC3_8BIT)
 		/* Enable 8-bit interface for eMMC on DRA7XX */
 		host_caps_val |= MMC_MODE_8BIT;
@@ -697,16 +709,16 @@ int omap_mmc_init(int dev_index, uint host_caps_mask, uint f_max, int cd_gpio,
 		break;
 #endif
 	default:
-		priv_data->base_addr = (struct hsmmc *)OMAP_HSMMC1_BASE;
+		priv->base_addr = (struct hsmmc *)OMAP_HSMMC1_BASE;
 		return 1;
 	}
 #ifdef OMAP_HSMMC_USE_GPIO
 	/* on error gpio values are set to -1, which is what we want */
-	priv_data->cd_gpio = omap_mmc_setup_gpio_in(cd_gpio, "mmc_cd");
-	priv_data->wp_gpio = omap_mmc_setup_gpio_in(wp_gpio, "mmc_wp");
+	priv->cd_gpio = omap_mmc_setup_gpio_in(cd_gpio, "mmc_cd");
+	priv->wp_gpio = omap_mmc_setup_gpio_in(wp_gpio, "mmc_wp");
 #endif
 
-	cfg = &priv_data->cfg;
+	cfg = &priv->cfg;
 
 	cfg->name = "OMAP SD/MMC";
 	cfg->ops = &omap_hsmmc_ops;
@@ -737,7 +749,7 @@ int omap_mmc_init(int dev_index, uint host_caps_mask, uint f_max, int cd_gpio,
 	if ((get_cpu_family() == CPU_OMAP34XX) && (get_cpu_rev() <= CPU_3XX_ES21))
 		cfg->b_max = 1;
 #endif
-	mmc = mmc_create(cfg, priv_data);
+	mmc = mmc_create(cfg, priv);
 	if (mmc == NULL)
 		return -1;
 
-- 
1.9.1

^ permalink raw reply related	[flat|nested] 13+ messages in thread
* [U-Boot] [PATCH 2/4] drivers: omap_hsmmc: use mmc_get_blk_desc() to get the block device desc
  2017-03-22 15:00 [U-Boot] [PATCH 0/4] mmc: omap_hsmmc: add support for CONFIG_BLK Jean-Jacques Hiblot
  2017-03-22 15:00 ` [U-Boot] [PATCH 1/4] drivers: omap_hsmmc: use an accessor to get the private data Jean-Jacques Hiblot
@ 2017-03-22 15:00 ` Jean-Jacques Hiblot
  2017-03-22 17:59   ` Tom Rini
  2017-03-30  4:35   ` Jaehoon Chung
  2017-03-22 15:00 ` [U-Boot] [PATCH 3/4] drivers: omap_hsmmc: move the mmc_config to platdata when DM_MMC is used Jean-Jacques Hiblot
  2017-03-22 15:00 ` [U-Boot] [PATCH 4/4] drivers: omap_hsmmc: add support for CONFIG_BLK Jean-Jacques Hiblot
  3 siblings, 2 replies; 13+ messages in thread
From: Jean-Jacques Hiblot @ 2017-03-22 15:00 UTC (permalink / raw)
  To: u-boot

Signed-off-by: Jean-Jacques Hiblot <jjhiblot@ti.com>
---
 drivers/mmc/omap_hsmmc.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/mmc/omap_hsmmc.c b/drivers/mmc/omap_hsmmc.c
index fe92908..d985ac7 100644
--- a/drivers/mmc/omap_hsmmc.c
+++ b/drivers/mmc/omap_hsmmc.c
@@ -166,7 +166,7 @@ static unsigned char mmc_board_init(struct mmc *mmc)
 
 #if defined(CONFIG_OMAP54XX) || defined(CONFIG_OMAP44XX)
 	/* PBIAS config needed for MMC1 only */
-	if (mmc->block_dev.devnum == 0)
+	if (mmc_get_blk_desc(mmc)->devnum == 0)
 		vmmc_pbias_config(LDO_VOLT_3V0);
 #endif
 
-- 
1.9.1

^ permalink raw reply related	[flat|nested] 13+ messages in thread
* [U-Boot] [PATCH 3/4] drivers: omap_hsmmc: move the mmc_config to platdata when DM_MMC is used
  2017-03-22 15:00 [U-Boot] [PATCH 0/4] mmc: omap_hsmmc: add support for CONFIG_BLK Jean-Jacques Hiblot
  2017-03-22 15:00 ` [U-Boot] [PATCH 1/4] drivers: omap_hsmmc: use an accessor to get the private data Jean-Jacques Hiblot
  2017-03-22 15:00 ` [U-Boot] [PATCH 2/4] drivers: omap_hsmmc: use mmc_get_blk_desc() to get the block device desc Jean-Jacques Hiblot
@ 2017-03-22 15:00 ` Jean-Jacques Hiblot
  2017-03-22 18:00   ` Tom Rini
  2017-03-30  4:35   ` Jaehoon Chung
  2017-03-22 15:00 ` [U-Boot] [PATCH 4/4] drivers: omap_hsmmc: add support for CONFIG_BLK Jean-Jacques Hiblot
  3 siblings, 2 replies; 13+ messages in thread
From: Jean-Jacques Hiblot @ 2017-03-22 15:00 UTC (permalink / raw)
  To: u-boot

This is a preparation work for the support of CONFIG_BLK.

Signed-off-by: Jean-Jacques Hiblot <jjhiblot@ti.com>
---
 drivers/mmc/omap_hsmmc.c | 27 ++++++++++++++++++++++-----
 1 file changed, 22 insertions(+), 5 deletions(-)

diff --git a/drivers/mmc/omap_hsmmc.c b/drivers/mmc/omap_hsmmc.c
index d985ac7..104129f 100644
--- a/drivers/mmc/omap_hsmmc.c
+++ b/drivers/mmc/omap_hsmmc.c
@@ -56,9 +56,15 @@ DECLARE_GLOBAL_DATA_PTR;
 #define SYSCTL_SRC	(1 << 25)
 #define SYSCTL_SRD	(1 << 26)
 
+struct omap_hsmmc_plat {
+	struct mmc_config cfg;
+};
+
 struct omap_hsmmc_data {
 	struct hsmmc *base_addr;
+#ifndef CONFIG_DM_MMC
 	struct mmc_config cfg;
+#endif
 #ifdef OMAP_HSMMC_USE_GPIO
 #ifdef CONFIG_DM_MMC
 	struct gpio_desc cd_gpio;	/* Change Detect GPIO */
@@ -86,6 +92,15 @@ static inline struct omap_hsmmc_data *omap_hsmmc_get_data(struct mmc *mmc)
 	return (struct omap_hsmmc_data *)mmc->priv;
 #endif
 }
+static inline struct mmc_config *omap_hsmmc_get_cfg(struct mmc *mmc)
+{
+#ifdef CONFIG_DM_MMC
+	struct omap_hsmmc_plat *plat = dev_get_platdata(mmc->dev);
+	return &plat->cfg;
+#else
+	return &((struct omap_hsmmc_data *)mmc->priv)->cfg;
+#endif
+}
 
  #if defined(OMAP_HSMMC_USE_GPIO) && !defined(CONFIG_DM_MMC)
 static int omap_mmc_setup_gpio_in(int gpio, const char *label)
@@ -111,6 +126,7 @@ static int omap_mmc_setup_gpio_in(int gpio, const char *label)
 static unsigned char mmc_board_init(struct mmc *mmc)
 {
 #if defined(CONFIG_OMAP34XX)
+	struct mmc_config *cfg = omap_hsmmc_get_cfg(mmc);
 	t2_t *t2_base = (t2_t *)T2_BASE;
 	struct prcm *prcm_base = (struct prcm *)PRCM_BASE;
 	u32 pbias_lite;
@@ -151,7 +167,7 @@ static unsigned char mmc_board_init(struct mmc *mmc)
 		&t2_base->devconf1);
 
 	/* Change from default of 52MHz to 26MHz if necessary */
-	if (!(mmc->cfg->host_caps & MMC_MODE_HS_52MHz))
+	if (!(cfg->host_caps & MMC_MODE_HS_52MHz))
 		writel(readl(&t2_base->ctl_prog_io1) & ~CTLPROGIO1SPEEDCTRL,
 			&t2_base->ctl_prog_io1);
 
@@ -759,14 +775,14 @@ int omap_mmc_init(int dev_index, uint host_caps_mask, uint f_max, int cd_gpio,
 static int omap_hsmmc_ofdata_to_platdata(struct udevice *dev)
 {
 	struct omap_hsmmc_data *priv = dev_get_priv(dev);
+	struct omap_hsmmc_plat *plat = dev_get_platdata(dev);
+	struct mmc_config *cfg = &plat->cfg;
 	const void *fdt = gd->fdt_blob;
 	int node = dev_of_offset(dev);
-	struct mmc_config *cfg;
 	int val;
 
 	priv->base_addr = map_physmem(dev_get_addr(dev), sizeof(struct hsmmc *),
 				      MAP_NOCACHE);
-	cfg = &priv->cfg;
 
 	cfg->host_caps = MMC_MODE_HS_52MHz | MMC_MODE_HS;
 	val = fdtdec_get_int(fdt, node, "bus-width", -1);
@@ -800,12 +816,12 @@ static int omap_hsmmc_ofdata_to_platdata(struct udevice *dev)
 
 static int omap_hsmmc_probe(struct udevice *dev)
 {
+	struct omap_hsmmc_plat *plat = dev_get_platdata(dev);
 	struct mmc_uclass_priv *upriv = dev_get_uclass_priv(dev);
 	struct omap_hsmmc_data *priv = dev_get_priv(dev);
-	struct mmc_config *cfg;
+	struct mmc_config *cfg = &plat->cfg;
 	struct mmc *mmc;
 
-	cfg = &priv->cfg;
 	cfg->name = "OMAP SD/MMC";
 	cfg->ops = &omap_hsmmc_ops;
 
@@ -838,5 +854,6 @@ U_BOOT_DRIVER(omap_hsmmc) = {
 	.ofdata_to_platdata = omap_hsmmc_ofdata_to_platdata,
 	.probe	= omap_hsmmc_probe,
 	.priv_auto_alloc_size = sizeof(struct omap_hsmmc_data),
+	.platdata_auto_alloc_size = sizeof(struct omap_hsmmc_plat),
 };
 #endif
-- 
1.9.1

^ permalink raw reply related	[flat|nested] 13+ messages in thread
* [U-Boot] [PATCH 4/4] drivers: omap_hsmmc: add support for CONFIG_BLK
  2017-03-22 15:00 [U-Boot] [PATCH 0/4] mmc: omap_hsmmc: add support for CONFIG_BLK Jean-Jacques Hiblot
                   ` (2 preceding siblings ...)
  2017-03-22 15:00 ` [U-Boot] [PATCH 3/4] drivers: omap_hsmmc: move the mmc_config to platdata when DM_MMC is used Jean-Jacques Hiblot
@ 2017-03-22 15:00 ` Jean-Jacques Hiblot
  2017-03-22 18:00   ` Tom Rini
  2017-03-30  4:36   ` Jaehoon Chung
  3 siblings, 2 replies; 13+ messages in thread
From: Jean-Jacques Hiblot @ 2017-03-22 15:00 UTC (permalink / raw)
  To: u-boot

Signed-off-by: Jean-Jacques Hiblot <jjhiblot@ti.com>
---
 drivers/mmc/omap_hsmmc.c | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/drivers/mmc/omap_hsmmc.c b/drivers/mmc/omap_hsmmc.c
index 104129f..83dda09 100644
--- a/drivers/mmc/omap_hsmmc.c
+++ b/drivers/mmc/omap_hsmmc.c
@@ -58,6 +58,7 @@ DECLARE_GLOBAL_DATA_PTR;
 
 struct omap_hsmmc_plat {
 	struct mmc_config cfg;
+	struct mmc mmc;
 };
 
 struct omap_hsmmc_data {
@@ -814,6 +815,15 @@ static int omap_hsmmc_ofdata_to_platdata(struct udevice *dev)
 	return 0;
 }
 
+#ifdef CONFIG_BLK
+
+static int omap_hsmmc_bind(struct udevice *dev)
+{
+	struct omap_hsmmc_plat *plat = dev_get_platdata(dev);
+
+	return mmc_bind(dev, &plat->mmc, &plat->cfg);
+}
+#endif
 static int omap_hsmmc_probe(struct udevice *dev)
 {
 	struct omap_hsmmc_plat *plat = dev_get_platdata(dev);
@@ -825,9 +835,13 @@ static int omap_hsmmc_probe(struct udevice *dev)
 	cfg->name = "OMAP SD/MMC";
 	cfg->ops = &omap_hsmmc_ops;
 
+#ifdef CONFIG_BLK
+	mmc = &plat->mmc;
+#else
 	mmc = mmc_create(cfg, priv);
 	if (mmc == NULL)
 		return -1;
+#endif
 
 #ifdef OMAP_HSMMC_USE_GPIO
 	gpio_request_by_name(dev, "cd-gpios", 0, &priv->cd_gpio, GPIOD_IS_IN);
@@ -852,6 +866,9 @@ U_BOOT_DRIVER(omap_hsmmc) = {
 	.id	= UCLASS_MMC,
 	.of_match = omap_hsmmc_ids,
 	.ofdata_to_platdata = omap_hsmmc_ofdata_to_platdata,
+#ifdef CONFIG_BLK
+	.bind = omap_hsmmc_bind,
+#endif
 	.probe	= omap_hsmmc_probe,
 	.priv_auto_alloc_size = sizeof(struct omap_hsmmc_data),
 	.platdata_auto_alloc_size = sizeof(struct omap_hsmmc_plat),
-- 
1.9.1

^ permalink raw reply related	[flat|nested] 13+ messages in thread
* [U-Boot] [PATCH 1/4] drivers: omap_hsmmc: use an accessor to get the private data
  2017-03-22 15:00 ` [U-Boot] [PATCH 1/4] drivers: omap_hsmmc: use an accessor to get the private data Jean-Jacques Hiblot
@ 2017-03-22 17:59   ` Tom Rini
  2017-03-30  4:35   ` Jaehoon Chung
  1 sibling, 0 replies; 13+ messages in thread
From: Tom Rini @ 2017-03-22 17:59 UTC (permalink / raw)
  To: u-boot

On Wed, Mar 22, 2017 at 04:00:31PM +0100, Jean-Jacques Hiblot wrote:

> For consistency, use an accessor to access the private data. Also for the
> same reason, rename all priv_data to priv.
> 
> Signed-off-by: Jean-Jacques Hiblot <jjhiblot@ti.com>

Reviewed-by: Tom Rini <trini@konsulko.com>

-- 
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20170322/af14984e/attachment.sig>

^ permalink raw reply	[flat|nested] 13+ messages in thread
* [U-Boot] [PATCH 2/4] drivers: omap_hsmmc: use mmc_get_blk_desc() to get the block device desc
  2017-03-22 15:00 ` [U-Boot] [PATCH 2/4] drivers: omap_hsmmc: use mmc_get_blk_desc() to get the block device desc Jean-Jacques Hiblot
@ 2017-03-22 17:59   ` Tom Rini
  2017-03-30  4:35   ` Jaehoon Chung
  1 sibling, 0 replies; 13+ messages in thread
From: Tom Rini @ 2017-03-22 17:59 UTC (permalink / raw)
  To: u-boot

On Wed, Mar 22, 2017 at 04:00:32PM +0100, Jean-Jacques Hiblot wrote:

> Signed-off-by: Jean-Jacques Hiblot <jjhiblot@ti.com>

Reviewed-by: Tom Rini <trini@konsulko.com>

-- 
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20170322/3b870284/attachment.sig>

^ permalink raw reply	[flat|nested] 13+ messages in thread
* [U-Boot] [PATCH 3/4] drivers: omap_hsmmc: move the mmc_config to platdata when DM_MMC is used
  2017-03-22 15:00 ` [U-Boot] [PATCH 3/4] drivers: omap_hsmmc: move the mmc_config to platdata when DM_MMC is used Jean-Jacques Hiblot
@ 2017-03-22 18:00   ` Tom Rini
  2017-03-30  4:35   ` Jaehoon Chung
  1 sibling, 0 replies; 13+ messages in thread
From: Tom Rini @ 2017-03-22 18:00 UTC (permalink / raw)
  To: u-boot

On Wed, Mar 22, 2017 at 04:00:33PM +0100, Jean-Jacques Hiblot wrote:

> This is a preparation work for the support of CONFIG_BLK.
> 
> Signed-off-by: Jean-Jacques Hiblot <jjhiblot@ti.com>

Reviewed-by: Tom Rini <trini@konsulko.com>

-- 
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20170322/14087632/attachment.sig>

^ permalink raw reply	[flat|nested] 13+ messages in thread
* [U-Boot] [PATCH 4/4] drivers: omap_hsmmc: add support for CONFIG_BLK
  2017-03-22 15:00 ` [U-Boot] [PATCH 4/4] drivers: omap_hsmmc: add support for CONFIG_BLK Jean-Jacques Hiblot
@ 2017-03-22 18:00   ` Tom Rini
  2017-03-30  4:36   ` Jaehoon Chung
  1 sibling, 0 replies; 13+ messages in thread
From: Tom Rini @ 2017-03-22 18:00 UTC (permalink / raw)
  To: u-boot

On Wed, Mar 22, 2017 at 04:00:34PM +0100, Jean-Jacques Hiblot wrote:

> Signed-off-by: Jean-Jacques Hiblot <jjhiblot@ti.com>

Reviewed-by: Tom Rini <trini@konsulko.com>

-- 
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20170322/0a6470d4/attachment.sig>

^ permalink raw reply	[flat|nested] 13+ messages in thread
* [U-Boot] [PATCH 1/4] drivers: omap_hsmmc: use an accessor to get the private data
  2017-03-22 15:00 ` [U-Boot] [PATCH 1/4] drivers: omap_hsmmc: use an accessor to get the private data Jean-Jacques Hiblot
  2017-03-22 17:59   ` Tom Rini
@ 2017-03-30  4:35   ` Jaehoon Chung
  1 sibling, 0 replies; 13+ messages in thread
From: Jaehoon Chung @ 2017-03-30  4:35 UTC (permalink / raw)
  To: u-boot

Hi,

On 03/23/2017 12:00 AM, Jean-Jacques Hiblot wrote:
> For consistency, use an accessor to access the private data. Also for the
> same reason, rename all priv_data to priv.
> 
> Signed-off-by: Jean-Jacques Hiblot <jjhiblot@ti.com>

Applied on u-boot-mmc. Thanks!

Best Regards,
Jaehoon Chung

> ---
>  drivers/mmc/omap_hsmmc.c | 54 +++++++++++++++++++++++++++++-------------------
>  1 file changed, 33 insertions(+), 21 deletions(-)
> 
> diff --git a/drivers/mmc/omap_hsmmc.c b/drivers/mmc/omap_hsmmc.c
> index 7ed5328..fe92908 100644
> --- a/drivers/mmc/omap_hsmmc.c
> +++ b/drivers/mmc/omap_hsmmc.c
> @@ -78,7 +78,16 @@ static int mmc_read_data(struct hsmmc *mmc_base, char *buf, unsigned int size);
>  static int mmc_write_data(struct hsmmc *mmc_base, const char *buf,
>  			unsigned int siz);
>  
> -#if defined(OMAP_HSMMC_USE_GPIO) && !defined(CONFIG_DM_MMC)
> +static inline struct omap_hsmmc_data *omap_hsmmc_get_data(struct mmc *mmc)
> +{
> +#ifdef CONFIG_DM_MMC
> +	return dev_get_priv(mmc->dev);
> +#else
> +	return (struct omap_hsmmc_data *)mmc->priv;
> +#endif
> +}
> +
> + #if defined(OMAP_HSMMC_USE_GPIO) && !defined(CONFIG_DM_MMC)
>  static int omap_mmc_setup_gpio_in(int gpio, const char *label)
>  {
>  	int ret;
> @@ -194,12 +203,13 @@ void mmc_init_stream(struct hsmmc *mmc_base)
>  
>  static int omap_hsmmc_init_setup(struct mmc *mmc)
>  {
> +	struct omap_hsmmc_data *priv = omap_hsmmc_get_data(mmc);
>  	struct hsmmc *mmc_base;
>  	unsigned int reg_val;
>  	unsigned int dsor;
>  	ulong start;
>  
> -	mmc_base = ((struct omap_hsmmc_data *)mmc->priv)->base_addr;
> +	mmc_base = priv->base_addr;
>  	mmc_board_init(mmc);
>  
>  	writel(readl(&mmc_base->sysconfig) | MMC_SOFTRESET,
> @@ -304,11 +314,12 @@ static void mmc_reset_controller_fsm(struct hsmmc *mmc_base, u32 bit)
>  static int omap_hsmmc_send_cmd(struct mmc *mmc, struct mmc_cmd *cmd,
>  			struct mmc_data *data)
>  {
> +	struct omap_hsmmc_data *priv = omap_hsmmc_get_data(mmc);
>  	struct hsmmc *mmc_base;
>  	unsigned int flags, mmc_stat;
>  	ulong start;
>  
> -	mmc_base = ((struct omap_hsmmc_data *)mmc->priv)->base_addr;
> +	mmc_base = priv->base_addr;
>  	start = get_timer(0);
>  	while ((readl(&mmc_base->pstate) & (DATI_MASK | CMDI_MASK)) != 0) {
>  		if (get_timer(0) - start > MAX_RETRY_MS) {
> @@ -533,11 +544,12 @@ static int mmc_write_data(struct hsmmc *mmc_base, const char *buf,
>  
>  static int omap_hsmmc_set_ios(struct mmc *mmc)
>  {
> +	struct omap_hsmmc_data *priv = omap_hsmmc_get_data(mmc);
>  	struct hsmmc *mmc_base;
>  	unsigned int dsor = 0;
>  	ulong start;
>  
> -	mmc_base = ((struct omap_hsmmc_data *)mmc->priv)->base_addr;
> +	mmc_base = priv->base_addr;
>  	/* configue bus width */
>  	switch (mmc->bus_width) {
>  	case 8:
> @@ -591,7 +603,7 @@ static int omap_hsmmc_set_ios(struct mmc *mmc)
>  #ifdef CONFIG_DM_MMC
>  static int omap_hsmmc_getcd(struct mmc *mmc)
>  {
> -	struct omap_hsmmc_data *priv = mmc->priv;
> +	struct omap_hsmmc_data *priv = omap_hsmmc_get_data(mmc);
>  	int value;
>  
>  	value = dm_gpio_get_value(&priv->cd_gpio);
> @@ -606,7 +618,7 @@ static int omap_hsmmc_getcd(struct mmc *mmc)
>  
>  static int omap_hsmmc_getwp(struct mmc *mmc)
>  {
> -	struct omap_hsmmc_data *priv = mmc->priv;
> +	struct omap_hsmmc_data *priv = omap_hsmmc_get_data(mmc);
>  	int value;
>  
>  	value = dm_gpio_get_value(&priv->wp_gpio);
> @@ -618,11 +630,11 @@ static int omap_hsmmc_getwp(struct mmc *mmc)
>  #else
>  static int omap_hsmmc_getcd(struct mmc *mmc)
>  {
> -	struct omap_hsmmc_data *priv_data = mmc->priv;
> +	struct omap_hsmmc_data *priv = omap_hsmmc_get_data(mmc);
>  	int cd_gpio;
>  
>  	/* if no CD return as 1 */
> -	cd_gpio = priv_data->cd_gpio;
> +	cd_gpio = priv->cd_gpio;
>  	if (cd_gpio < 0)
>  		return 1;
>  
> @@ -632,11 +644,11 @@ static int omap_hsmmc_getcd(struct mmc *mmc)
>  
>  static int omap_hsmmc_getwp(struct mmc *mmc)
>  {
> -	struct omap_hsmmc_data *priv_data = mmc->priv;
> +	struct omap_hsmmc_data *priv = omap_hsmmc_get_data(mmc);
>  	int wp_gpio;
>  
>  	/* if no WP return as 0 */
> -	wp_gpio = priv_data->wp_gpio;
> +	wp_gpio = priv->wp_gpio;
>  	if (wp_gpio < 0)
>  		return 0;
>  
> @@ -661,23 +673,23 @@ int omap_mmc_init(int dev_index, uint host_caps_mask, uint f_max, int cd_gpio,
>  		int wp_gpio)
>  {
>  	struct mmc *mmc;
> -	struct omap_hsmmc_data *priv_data;
> +	struct omap_hsmmc_data *priv;
>  	struct mmc_config *cfg;
>  	uint host_caps_val;
>  
> -	priv_data = malloc(sizeof(*priv_data));
> -	if (priv_data == NULL)
> +	priv = malloc(sizeof(*priv));
> +	if (priv == NULL)
>  		return -1;
>  
>  	host_caps_val = MMC_MODE_4BIT | MMC_MODE_HS_52MHz | MMC_MODE_HS;
>  
>  	switch (dev_index) {
>  	case 0:
> -		priv_data->base_addr = (struct hsmmc *)OMAP_HSMMC1_BASE;
> +		priv->base_addr = (struct hsmmc *)OMAP_HSMMC1_BASE;
>  		break;
>  #ifdef OMAP_HSMMC2_BASE
>  	case 1:
> -		priv_data->base_addr = (struct hsmmc *)OMAP_HSMMC2_BASE;
> +		priv->base_addr = (struct hsmmc *)OMAP_HSMMC2_BASE;
>  #if (defined(CONFIG_OMAP44XX) || defined(CONFIG_OMAP54XX) || \
>  	defined(CONFIG_DRA7XX) || defined(CONFIG_AM33XX) || \
>  	defined(CONFIG_AM43XX) || defined(CONFIG_SOC_KEYSTONE)) && \
> @@ -689,7 +701,7 @@ int omap_mmc_init(int dev_index, uint host_caps_mask, uint f_max, int cd_gpio,
>  #endif
>  #ifdef OMAP_HSMMC3_BASE
>  	case 2:
> -		priv_data->base_addr = (struct hsmmc *)OMAP_HSMMC3_BASE;
> +		priv->base_addr = (struct hsmmc *)OMAP_HSMMC3_BASE;
>  #if defined(CONFIG_DRA7XX) && defined(CONFIG_HSMMC3_8BIT)
>  		/* Enable 8-bit interface for eMMC on DRA7XX */
>  		host_caps_val |= MMC_MODE_8BIT;
> @@ -697,16 +709,16 @@ int omap_mmc_init(int dev_index, uint host_caps_mask, uint f_max, int cd_gpio,
>  		break;
>  #endif
>  	default:
> -		priv_data->base_addr = (struct hsmmc *)OMAP_HSMMC1_BASE;
> +		priv->base_addr = (struct hsmmc *)OMAP_HSMMC1_BASE;
>  		return 1;
>  	}
>  #ifdef OMAP_HSMMC_USE_GPIO
>  	/* on error gpio values are set to -1, which is what we want */
> -	priv_data->cd_gpio = omap_mmc_setup_gpio_in(cd_gpio, "mmc_cd");
> -	priv_data->wp_gpio = omap_mmc_setup_gpio_in(wp_gpio, "mmc_wp");
> +	priv->cd_gpio = omap_mmc_setup_gpio_in(cd_gpio, "mmc_cd");
> +	priv->wp_gpio = omap_mmc_setup_gpio_in(wp_gpio, "mmc_wp");
>  #endif
>  
> -	cfg = &priv_data->cfg;
> +	cfg = &priv->cfg;
>  
>  	cfg->name = "OMAP SD/MMC";
>  	cfg->ops = &omap_hsmmc_ops;
> @@ -737,7 +749,7 @@ int omap_mmc_init(int dev_index, uint host_caps_mask, uint f_max, int cd_gpio,
>  	if ((get_cpu_family() == CPU_OMAP34XX) && (get_cpu_rev() <= CPU_3XX_ES21))
>  		cfg->b_max = 1;
>  #endif
> -	mmc = mmc_create(cfg, priv_data);
> +	mmc = mmc_create(cfg, priv);
>  	if (mmc == NULL)
>  		return -1;
>  
> 

^ permalink raw reply	[flat|nested] 13+ messages in thread
* [U-Boot] [PATCH 2/4] drivers: omap_hsmmc: use mmc_get_blk_desc() to get the block device desc
  2017-03-22 15:00 ` [U-Boot] [PATCH 2/4] drivers: omap_hsmmc: use mmc_get_blk_desc() to get the block device desc Jean-Jacques Hiblot
  2017-03-22 17:59   ` Tom Rini
@ 2017-03-30  4:35   ` Jaehoon Chung
  1 sibling, 0 replies; 13+ messages in thread
From: Jaehoon Chung @ 2017-03-30  4:35 UTC (permalink / raw)
  To: u-boot

On 03/23/2017 12:00 AM, Jean-Jacques Hiblot wrote:
> Signed-off-by: Jean-Jacques Hiblot <jjhiblot@ti.com>

Applied on u-boot-mmc. Thanks!

Best Regards,
Jaehoon Chung

> ---
>  drivers/mmc/omap_hsmmc.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/mmc/omap_hsmmc.c b/drivers/mmc/omap_hsmmc.c
> index fe92908..d985ac7 100644
> --- a/drivers/mmc/omap_hsmmc.c
> +++ b/drivers/mmc/omap_hsmmc.c
> @@ -166,7 +166,7 @@ static unsigned char mmc_board_init(struct mmc *mmc)
>  
>  #if defined(CONFIG_OMAP54XX) || defined(CONFIG_OMAP44XX)
>  	/* PBIAS config needed for MMC1 only */
> -	if (mmc->block_dev.devnum == 0)
> +	if (mmc_get_blk_desc(mmc)->devnum == 0)
>  		vmmc_pbias_config(LDO_VOLT_3V0);
>  #endif
>  
> 

^ permalink raw reply	[flat|nested] 13+ messages in thread
* [U-Boot] [PATCH 3/4] drivers: omap_hsmmc: move the mmc_config to platdata when DM_MMC is used
  2017-03-22 15:00 ` [U-Boot] [PATCH 3/4] drivers: omap_hsmmc: move the mmc_config to platdata when DM_MMC is used Jean-Jacques Hiblot
  2017-03-22 18:00   ` Tom Rini
@ 2017-03-30  4:35   ` Jaehoon Chung
  1 sibling, 0 replies; 13+ messages in thread
From: Jaehoon Chung @ 2017-03-30  4:35 UTC (permalink / raw)
  To: u-boot

On 03/23/2017 12:00 AM, Jean-Jacques Hiblot wrote:
> This is a preparation work for the support of CONFIG_BLK.
> 
> Signed-off-by: Jean-Jacques Hiblot <jjhiblot@ti.com>

Applied on u-boot-mmc. Thanks!

Best Regards,
Jaehoon Chung

> ---
>  drivers/mmc/omap_hsmmc.c | 27 ++++++++++++++++++++++-----
>  1 file changed, 22 insertions(+), 5 deletions(-)
> 
> diff --git a/drivers/mmc/omap_hsmmc.c b/drivers/mmc/omap_hsmmc.c
> index d985ac7..104129f 100644
> --- a/drivers/mmc/omap_hsmmc.c
> +++ b/drivers/mmc/omap_hsmmc.c
> @@ -56,9 +56,15 @@ DECLARE_GLOBAL_DATA_PTR;
>  #define SYSCTL_SRC	(1 << 25)
>  #define SYSCTL_SRD	(1 << 26)
>  
> +struct omap_hsmmc_plat {
> +	struct mmc_config cfg;
> +};
> +
>  struct omap_hsmmc_data {
>  	struct hsmmc *base_addr;
> +#ifndef CONFIG_DM_MMC
>  	struct mmc_config cfg;
> +#endif
>  #ifdef OMAP_HSMMC_USE_GPIO
>  #ifdef CONFIG_DM_MMC
>  	struct gpio_desc cd_gpio;	/* Change Detect GPIO */
> @@ -86,6 +92,15 @@ static inline struct omap_hsmmc_data *omap_hsmmc_get_data(struct mmc *mmc)
>  	return (struct omap_hsmmc_data *)mmc->priv;
>  #endif
>  }
> +static inline struct mmc_config *omap_hsmmc_get_cfg(struct mmc *mmc)
> +{
> +#ifdef CONFIG_DM_MMC
> +	struct omap_hsmmc_plat *plat = dev_get_platdata(mmc->dev);
> +	return &plat->cfg;
> +#else
> +	return &((struct omap_hsmmc_data *)mmc->priv)->cfg;
> +#endif
> +}
>  
>   #if defined(OMAP_HSMMC_USE_GPIO) && !defined(CONFIG_DM_MMC)
>  static int omap_mmc_setup_gpio_in(int gpio, const char *label)
> @@ -111,6 +126,7 @@ static int omap_mmc_setup_gpio_in(int gpio, const char *label)
>  static unsigned char mmc_board_init(struct mmc *mmc)
>  {
>  #if defined(CONFIG_OMAP34XX)
> +	struct mmc_config *cfg = omap_hsmmc_get_cfg(mmc);
>  	t2_t *t2_base = (t2_t *)T2_BASE;
>  	struct prcm *prcm_base = (struct prcm *)PRCM_BASE;
>  	u32 pbias_lite;
> @@ -151,7 +167,7 @@ static unsigned char mmc_board_init(struct mmc *mmc)
>  		&t2_base->devconf1);
>  
>  	/* Change from default of 52MHz to 26MHz if necessary */
> -	if (!(mmc->cfg->host_caps & MMC_MODE_HS_52MHz))
> +	if (!(cfg->host_caps & MMC_MODE_HS_52MHz))
>  		writel(readl(&t2_base->ctl_prog_io1) & ~CTLPROGIO1SPEEDCTRL,
>  			&t2_base->ctl_prog_io1);
>  
> @@ -759,14 +775,14 @@ int omap_mmc_init(int dev_index, uint host_caps_mask, uint f_max, int cd_gpio,
>  static int omap_hsmmc_ofdata_to_platdata(struct udevice *dev)
>  {
>  	struct omap_hsmmc_data *priv = dev_get_priv(dev);
> +	struct omap_hsmmc_plat *plat = dev_get_platdata(dev);
> +	struct mmc_config *cfg = &plat->cfg;
>  	const void *fdt = gd->fdt_blob;
>  	int node = dev_of_offset(dev);
> -	struct mmc_config *cfg;
>  	int val;
>  
>  	priv->base_addr = map_physmem(dev_get_addr(dev), sizeof(struct hsmmc *),
>  				      MAP_NOCACHE);
> -	cfg = &priv->cfg;
>  
>  	cfg->host_caps = MMC_MODE_HS_52MHz | MMC_MODE_HS;
>  	val = fdtdec_get_int(fdt, node, "bus-width", -1);
> @@ -800,12 +816,12 @@ static int omap_hsmmc_ofdata_to_platdata(struct udevice *dev)
>  
>  static int omap_hsmmc_probe(struct udevice *dev)
>  {
> +	struct omap_hsmmc_plat *plat = dev_get_platdata(dev);
>  	struct mmc_uclass_priv *upriv = dev_get_uclass_priv(dev);
>  	struct omap_hsmmc_data *priv = dev_get_priv(dev);
> -	struct mmc_config *cfg;
> +	struct mmc_config *cfg = &plat->cfg;
>  	struct mmc *mmc;
>  
> -	cfg = &priv->cfg;
>  	cfg->name = "OMAP SD/MMC";
>  	cfg->ops = &omap_hsmmc_ops;
>  
> @@ -838,5 +854,6 @@ U_BOOT_DRIVER(omap_hsmmc) = {
>  	.ofdata_to_platdata = omap_hsmmc_ofdata_to_platdata,
>  	.probe	= omap_hsmmc_probe,
>  	.priv_auto_alloc_size = sizeof(struct omap_hsmmc_data),
> +	.platdata_auto_alloc_size = sizeof(struct omap_hsmmc_plat),
>  };
>  #endif
> 

^ permalink raw reply	[flat|nested] 13+ messages in thread
* [U-Boot] [PATCH 4/4] drivers: omap_hsmmc: add support for CONFIG_BLK
  2017-03-22 15:00 ` [U-Boot] [PATCH 4/4] drivers: omap_hsmmc: add support for CONFIG_BLK Jean-Jacques Hiblot
  2017-03-22 18:00   ` Tom Rini
@ 2017-03-30  4:36   ` Jaehoon Chung
  1 sibling, 0 replies; 13+ messages in thread
From: Jaehoon Chung @ 2017-03-30  4:36 UTC (permalink / raw)
  To: u-boot

On 03/23/2017 12:00 AM, Jean-Jacques Hiblot wrote:
> Signed-off-by: Jean-Jacques Hiblot <jjhiblot@ti.com>

Applied on u-boot-mmc. Thanks!

Best Regards,
Jaehoon Chung

> ---
>  drivers/mmc/omap_hsmmc.c | 17 +++++++++++++++++
>  1 file changed, 17 insertions(+)
> 
> diff --git a/drivers/mmc/omap_hsmmc.c b/drivers/mmc/omap_hsmmc.c
> index 104129f..83dda09 100644
> --- a/drivers/mmc/omap_hsmmc.c
> +++ b/drivers/mmc/omap_hsmmc.c
> @@ -58,6 +58,7 @@ DECLARE_GLOBAL_DATA_PTR;
>  
>  struct omap_hsmmc_plat {
>  	struct mmc_config cfg;
> +	struct mmc mmc;
>  };
>  
>  struct omap_hsmmc_data {
> @@ -814,6 +815,15 @@ static int omap_hsmmc_ofdata_to_platdata(struct udevice *dev)
>  	return 0;
>  }
>  
> +#ifdef CONFIG_BLK
> +
> +static int omap_hsmmc_bind(struct udevice *dev)
> +{
> +	struct omap_hsmmc_plat *plat = dev_get_platdata(dev);
> +
> +	return mmc_bind(dev, &plat->mmc, &plat->cfg);
> +}
> +#endif
>  static int omap_hsmmc_probe(struct udevice *dev)
>  {
>  	struct omap_hsmmc_plat *plat = dev_get_platdata(dev);
> @@ -825,9 +835,13 @@ static int omap_hsmmc_probe(struct udevice *dev)
>  	cfg->name = "OMAP SD/MMC";
>  	cfg->ops = &omap_hsmmc_ops;
>  
> +#ifdef CONFIG_BLK
> +	mmc = &plat->mmc;
> +#else
>  	mmc = mmc_create(cfg, priv);
>  	if (mmc == NULL)
>  		return -1;
> +#endif
>  
>  #ifdef OMAP_HSMMC_USE_GPIO
>  	gpio_request_by_name(dev, "cd-gpios", 0, &priv->cd_gpio, GPIOD_IS_IN);
> @@ -852,6 +866,9 @@ U_BOOT_DRIVER(omap_hsmmc) = {
>  	.id	= UCLASS_MMC,
>  	.of_match = omap_hsmmc_ids,
>  	.ofdata_to_platdata = omap_hsmmc_ofdata_to_platdata,
> +#ifdef CONFIG_BLK
> +	.bind = omap_hsmmc_bind,
> +#endif
>  	.probe	= omap_hsmmc_probe,
>  	.priv_auto_alloc_size = sizeof(struct omap_hsmmc_data),
>  	.platdata_auto_alloc_size = sizeof(struct omap_hsmmc_plat),
> 

^ permalink raw reply	[flat|nested] 13+ messages in thread
end of thread, other threads:[~2017-03-30  4:36 UTC | newest]

Thread overview: 13+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-03-22 15:00 [U-Boot] [PATCH 0/4] mmc: omap_hsmmc: add support for CONFIG_BLK Jean-Jacques Hiblot
2017-03-22 15:00 ` [U-Boot] [PATCH 1/4] drivers: omap_hsmmc: use an accessor to get the private data Jean-Jacques Hiblot
2017-03-22 17:59   ` Tom Rini
2017-03-30  4:35   ` Jaehoon Chung
2017-03-22 15:00 ` [U-Boot] [PATCH 2/4] drivers: omap_hsmmc: use mmc_get_blk_desc() to get the block device desc Jean-Jacques Hiblot
2017-03-22 17:59   ` Tom Rini
2017-03-30  4:35   ` Jaehoon Chung
2017-03-22 15:00 ` [U-Boot] [PATCH 3/4] drivers: omap_hsmmc: move the mmc_config to platdata when DM_MMC is used Jean-Jacques Hiblot
2017-03-22 18:00   ` Tom Rini
2017-03-30  4:35   ` Jaehoon Chung
2017-03-22 15:00 ` [U-Boot] [PATCH 4/4] drivers: omap_hsmmc: add support for CONFIG_BLK Jean-Jacques Hiblot
2017-03-22 18:00   ` Tom Rini
2017-03-30  4:36   ` Jaehoon Chung

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox