[U-Boot] [PATCH 0/5] device model bringup of hsmmc on am335x bone black and gp evm

[U-Boot] [PATCH 0/5] device model bringup of hsmmc on am335x bone black and gp evm

[Mugunthan V N]

This patch seires enables omap_hsmmc to adopt driver model. This
has been tested on AM335x beagle bone black and GP EVM (logs [1]).
Also pushed a branch for testing [2]

[1]: http://pastebin.ubuntu.com/12417667/
[2]: git://git.ti.com/~mugunthanvnm/ti-u-boot/mugunth-ti-u-boot.git mmc-dm

TODO:
Gpio get is always returning zero, so I have dropped request GPIO
for card detect. Even tried with non-dm gpio driver and it is
broken. Also non of the TI platforms uses card detect GPIO for
hsmmc in u-boot, so dropped parsing DT for card detect and write
protect gpio. Card detect and write protect can be added after
fixing the omap gpio driver.

Mugunthan V N (5):
  omap_hsmmc: update struct hsmmc to accomodate base address from DT
  am335x_evm: mmc: do not define DM_MMC for spl
  drivers: mmc: omap_hsmmc: convert driver to adopt device driver model
  defconfig: am335x: bbb: enable ethernet driver model
  defconfig: am335x: gp_evm: enable ethernet driver model

 arch/arm/include/asm/omap_mmc.h          |   3 +
 configs/am335x_boneblack_vboot_defconfig |   1 +
 configs/am335x_gp_evm_defconfig          |   1 +
 drivers/mmc/omap_hsmmc.c                 | 115 ++++++++++++++++++++++++++++++-
 include/configs/am335x_evm.h             |   8 +++
 5 files changed, 127 insertions(+), 1 deletion(-)

-- 
2.6.0.rc2.10.gf4d9753

[U-Boot] [PATCH 1/5] omap_hsmmc: update struct hsmmc to accomodate base address from DT

[Mugunthan V N]

Existing driver gets the actual omap hammc base address + 0x100
bytes as the first 0x100 bytes is not used by the driver. But
with DM conversion the base address from DT is different, to
accommodate the offset adding res0[0x100] to struct hsmmc.

Signed-off-by: Mugunthan V N <mugunthanvnm@ti.com>
---
 arch/arm/include/asm/omap_mmc.h | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/arch/arm/include/asm/omap_mmc.h b/arch/arm/include/asm/omap_mmc.h
index 617e22f..b69d073 100644
--- a/arch/arm/include/asm/omap_mmc.h
+++ b/arch/arm/include/asm/omap_mmc.h
@@ -26,6 +26,9 @@
 #define OMAP_MMC_H_
 
 struct hsmmc {
+#ifdef CONFIG_DM_MMC
+	unsigned char res0[0x100];
+#endif
 	unsigned char res1[0x10];
 	unsigned int sysconfig;		/* 0x10 */
 	unsigned int sysstatus;		/* 0x14 */
-- 
2.6.0.rc2.10.gf4d9753

[U-Boot] [PATCH 2/5] am335x_evm: mmc: do not define DM_MMC for spl

[Mugunthan V N]

Since spl doesn't support DM currently, do not define DM_MMC
for spl build.

Signed-off-by: Mugunthan V N <mugunthanvnm@ti.com>
---
 include/configs/am335x_evm.h | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/include/configs/am335x_evm.h b/include/configs/am335x_evm.h
index 56de3d4..6253037 100644
--- a/include/configs/am335x_evm.h
+++ b/include/configs/am335x_evm.h
@@ -328,6 +328,14 @@
 #define CONFIG_G_DNL_MANUFACTURER "Texas Instruments"
 #endif /* CONFIG_USB_MUSB_GADGET */
 
+/*
+ * Disable MMC DM for SPL build and can be re-enabled after adding
+ * DM support in SPL
+ */
+#ifdef CONFIG_SPL_BUILD
+#undef CONFIG_DM_MMC
+#endif
+
 #if defined(CONFIG_SPL_BUILD) && defined(CONFIG_SPL_USBETH_SUPPORT)
 /* Remove other SPL modes. */
 #undef CONFIG_SPL_YMODEM_SUPPORT
-- 
2.6.0.rc2.10.gf4d9753

[U-Boot] [PATCH 3/5] drivers: mmc: omap_hsmmc: convert driver to adopt device driver model

[Mugunthan V N]

adopt omap_hsmmc driver to device driver model

Signed-off-by: Mugunthan V N <mugunthanvnm@ti.com>
---
 drivers/mmc/omap_hsmmc.c | 115 ++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 114 insertions(+), 1 deletion(-)

diff --git a/drivers/mmc/omap_hsmmc.c b/drivers/mmc/omap_hsmmc.c
index d7b388f..d392302 100644
--- a/drivers/mmc/omap_hsmmc.c
+++ b/drivers/mmc/omap_hsmmc.c
@@ -35,6 +35,9 @@
 #include <asm/io.h>
 #include <asm/arch/mmc_host_def.h>
 #include <asm/arch/sys_proto.h>
+#include <dm.h>
+
+DECLARE_GLOBAL_DATA_PTR;
 
 /* simplify defines to OMAP_HSMMC_USE_GPIO */
 #if (defined(CONFIG_OMAP_GPIO) && !defined(CONFIG_SPL_BUILD)) || \
@@ -52,9 +55,15 @@ struct omap_hsmmc_data {
 	struct hsmmc *base_addr;
 	struct mmc_config cfg;
 #ifdef OMAP_HSMMC_USE_GPIO
+#ifdef CONFIG_DM_MMC
+	struct gpio_desc cd_gpio;	/* Change Detect GPIO */
+	struct gpio_desc wp_gpio;	/* Write Protect GPIO */
+	bool cd_inverted;
+#else
 	int cd_gpio;
 	int wp_gpio;
 #endif
+#endif
 };
 
 /* If we fail after 1 second wait, something is really bad */
@@ -64,7 +73,7 @@ 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);
 
-#ifdef OMAP_HSMMC_USE_GPIO
+#if defined(OMAP_HSMMC_USE_GPIO) && !defined(CONFIG_DM_MMC)
 static int omap_mmc_setup_gpio_in(int gpio, const char *label)
 {
 	int ret;
@@ -600,6 +609,34 @@ static void omap_hsmmc_set_ios(struct mmc *mmc)
 }
 
 #ifdef OMAP_HSMMC_USE_GPIO
+#ifdef CONFIG_DM_MMC
+static int omap_hsmmc_getcd(struct mmc *mmc)
+{
+	struct omap_hsmmc_data *priv = mmc->priv;
+	int value;
+
+	value = dm_gpio_get_value(&priv->cd_gpio);
+	/* if no CD return as 1 */
+	if (value < 0)
+		return 1;
+
+	if (priv->cd_inverted)
+		return !value;
+	return value;
+}
+
+static int omap_hsmmc_getwp(struct mmc *mmc)
+{
+	struct omap_hsmmc_data *priv = mmc->priv;
+	int value;
+
+	value = dm_gpio_get_value(&priv->wp_gpio);
+	/* if no WP return as 0 */
+	if (value < 0)
+		return 0;
+	return value;
+}
+#else
 static int omap_hsmmc_getcd(struct mmc *mmc)
 {
 	struct omap_hsmmc_data *priv_data = mmc->priv;
@@ -628,6 +665,7 @@ static int omap_hsmmc_getwp(struct mmc *mmc)
 	return gpio_get_value(wp_gpio);
 }
 #endif
+#endif
 
 static const struct mmc_ops omap_hsmmc_ops = {
 	.send_cmd	= omap_hsmmc_send_cmd,
@@ -639,6 +677,7 @@ static const struct mmc_ops omap_hsmmc_ops = {
 #endif
 };
 
+#ifndef CONFIG_DM_MMC
 int omap_mmc_init(int dev_index, uint host_caps_mask, uint f_max, int cd_gpio,
 		int wp_gpio)
 {
@@ -724,3 +763,77 @@ int omap_mmc_init(int dev_index, uint host_caps_mask, uint f_max, int cd_gpio,
 
 	return 0;
 }
+#else
+static int omap_hsmmc_ofdata_to_platdata(struct udevice *dev)
+{
+	struct omap_hsmmc_data *priv = dev_get_priv(dev);
+	const void *fdt = gd->fdt_blob;
+	int node = dev->of_offset;
+	struct mmc_config *cfg;
+	int val;
+
+	priv->base_addr = (struct hsmmc *)dev_get_addr(dev);
+	cfg = &priv->cfg;
+
+	cfg->host_caps = MMC_MODE_HS_52MHz | MMC_MODE_HS;
+	val = fdtdec_get_int(fdt, node, "bus-width", -1);
+	if (val < 0) {
+		printf("error: bus-width property missing\n");
+		return -ENOENT;
+	}
+
+	switch (val) {
+	case 0x8:
+		cfg->host_caps |= MMC_MODE_8BIT;
+	case 0x4:
+		cfg->host_caps |= MMC_MODE_4BIT;
+		break;
+	default:
+		printf("error: invalid bus-width property\n");
+		return -ENOENT;
+	}
+
+	cfg->f_min = 400000;
+	cfg->f_max = fdtdec_get_int(fdt, node, "max-frequency", 52000000);
+	cfg->voltages = MMC_VDD_32_33 | MMC_VDD_33_34 | MMC_VDD_165_195;
+	cfg->b_max = CONFIG_SYS_MMC_MAX_BLK_COUNT;
+
+	priv->cd_inverted = fdtdec_get_bool(fdt, node, "cd-inverted");
+
+	return 0;
+}
+
+static int omap_hsmmc_probe(struct udevice *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 *mmc;
+
+	cfg = &priv->cfg;
+	cfg->name = "OMAP SD/MMC";
+	cfg->ops = &omap_hsmmc_ops;
+
+	mmc = mmc_create(cfg, priv);
+	if (mmc == NULL)
+		return -1;
+
+	upriv->mmc = mmc;
+
+	return 0;
+}
+
+static const struct udevice_id omap_hsmmc_ids[] = {
+	{ .compatible = "ti,omap4-hsmmc" },
+	{ }
+};
+
+U_BOOT_DRIVER(omap_hsmmc) = {
+	.name	= "omap_hsmmc",
+	.id	= UCLASS_MMC,
+	.of_match = omap_hsmmc_ids,
+	.ofdata_to_platdata = omap_hsmmc_ofdata_to_platdata,
+	.probe	= omap_hsmmc_probe,
+	.priv_auto_alloc_size = sizeof(struct omap_hsmmc_data),
+};
+#endif
-- 
2.6.0.rc2.10.gf4d9753

[U-Boot] [PATCH 4/5] defconfig: am335x: bbb: enable ethernet driver model

[Mugunthan V N]

enable mmc driver model for am335x bbb as omap_hsmmc
supports driver model

Signed-off-by: Mugunthan V N <mugunthanvnm@ti.com>
---
 configs/am335x_boneblack_vboot_defconfig | 1 +
 1 file changed, 1 insertion(+)

diff --git a/configs/am335x_boneblack_vboot_defconfig b/configs/am335x_boneblack_vboot_defconfig
index 117a146..011239b 100644
--- a/configs/am335x_boneblack_vboot_defconfig
+++ b/configs/am335x_boneblack_vboot_defconfig
@@ -14,3 +14,4 @@ CONFIG_SYS_EXTRA_OPTIONS="EMMC_BOOT,ENABLE_VBOOT"
 CONFIG_OF_CONTROL=y
 CONFIG_SPI_FLASH=y
 CONFIG_DM_ETH=y
+CONFIG_DM_MMC=y
-- 
2.6.0.rc2.10.gf4d9753

[U-Boot] [PATCH 5/5] defconfig: am335x: gp_evm: enable ethernet driver model

[Mugunthan V N]

enable mmc driver model for am335x gp_evm as omap_hsmmc
supports driver model

Signed-off-by: Mugunthan V N <mugunthanvnm@ti.com>
---
 configs/am335x_gp_evm_defconfig | 1 +
 1 file changed, 1 insertion(+)

diff --git a/configs/am335x_gp_evm_defconfig b/configs/am335x_gp_evm_defconfig
index c87d7a9..50e7d3f 100644
--- a/configs/am335x_gp_evm_defconfig
+++ b/configs/am335x_gp_evm_defconfig
@@ -13,3 +13,4 @@ CONFIG_SPL_DISABLE_OF_CONTROL=y
 CONFIG_SPI_FLASH=y
 CONFIG_RSA=y
 CONFIG_DM_ETH=y
+CONFIG_DM_MMC=y
-- 
2.6.0.rc2.10.gf4d9753

[U-Boot] [PATCH 0/5] device model bringup of hsmmc on am335x bone black and gp evm

[Peter Robinson]

On Tue, Sep 15, 2015 at 3:11 PM, Mugunthan V N <mugunthanvnm@ti.com> wrote:
> This patch seires enables omap_hsmmc to adopt driver model. This
> has been tested on AM335x beagle bone black and GP EVM (logs [1]).
> Also pushed a branch for testing [2]

Are you going to migrate omap3/omap4/omap5 and any of the other TI
devices that use the driver too?

Peter

> [1]: http://pastebin.ubuntu.com/12417667/
> [2]: git://git.ti.com/~mugunthanvnm/ti-u-boot/mugunth-ti-u-boot.git mmc-dm
>
> TODO:
> Gpio get is always returning zero, so I have dropped request GPIO
> for card detect. Even tried with non-dm gpio driver and it is
> broken. Also non of the TI platforms uses card detect GPIO for
> hsmmc in u-boot, so dropped parsing DT for card detect and write
> protect gpio. Card detect and write protect can be added after
> fixing the omap gpio driver.
>
> Mugunthan V N (5):
>   omap_hsmmc: update struct hsmmc to accomodate base address from DT
>   am335x_evm: mmc: do not define DM_MMC for spl
>   drivers: mmc: omap_hsmmc: convert driver to adopt device driver model
>   defconfig: am335x: bbb: enable ethernet driver model
>   defconfig: am335x: gp_evm: enable ethernet driver model
>
>  arch/arm/include/asm/omap_mmc.h          |   3 +
>  configs/am335x_boneblack_vboot_defconfig |   1 +
>  configs/am335x_gp_evm_defconfig          |   1 +
>  drivers/mmc/omap_hsmmc.c                 | 115 ++++++++++++++++++++++++++++++-
>  include/configs/am335x_evm.h             |   8 +++
>  5 files changed, 127 insertions(+), 1 deletion(-)
>
> --
> 2.6.0.rc2.10.gf4d9753
>
> _______________________________________________
> U-Boot mailing list
> U-Boot at lists.denx.de
> http://lists.denx.de/mailman/listinfo/u-boot

[U-Boot] [PATCH 0/5] device model bringup of hsmmc on am335x bone black and gp evm

[Tom Rini]

On Tue, Sep 15, 2015 at 05:02:58PM +0100, Peter Robinson wrote:
> On Tue, Sep 15, 2015 at 3:11 PM, Mugunthan V N <mugunthanvnm@ti.com> wrote:
> > This patch seires enables omap_hsmmc to adopt driver model. This
> > has been tested on AM335x beagle bone black and GP EVM (logs [1]).
> > Also pushed a branch for testing [2]
> 
> Are you going to migrate omap3/omap4/omap5 and any of the other TI
> devices that use the driver too?

In due time, yes.  Most other boards there aren't converted to DM period
(and I need to see why omap5/dra7xx is now just hanging with DM+GPIO
only, that worked when I submitted the patches...).

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

[U-Boot] [PATCH 0/5] device model bringup of hsmmc on am335x bone black and gp evm

[Mugunthan V N]

On Tuesday 15 September 2015 07:41 PM, Mugunthan V N wrote:
> This patch seires enables omap_hsmmc to adopt driver model. This
> has been tested on AM335x beagle bone black and GP EVM (logs [1]).
> Also pushed a branch for testing [2]
> 
> [1]: http://pastebin.ubuntu.com/12417667/
> [2]: git://git.ti.com/~mugunthanvnm/ti-u-boot/mugunth-ti-u-boot.git mmc-dm
> 
> TODO:
> Gpio get is always returning zero, so I have dropped request GPIO
> for card detect. Even tried with non-dm gpio driver and it is
> broken. Also non of the TI platforms uses card detect GPIO for
> hsmmc in u-boot, so dropped parsing DT for card detect and write
> protect gpio. Card detect and write protect can be added after
> fixing the omap gpio driver.
> 
> Mugunthan V N (5):
>   omap_hsmmc: update struct hsmmc to accomodate base address from DT
>   am335x_evm: mmc: do not define DM_MMC for spl
>   drivers: mmc: omap_hsmmc: convert driver to adopt device driver model
>   defconfig: am335x: bbb: enable ethernet driver model
>   defconfig: am335x: gp_evm: enable ethernet driver model
> 
>  arch/arm/include/asm/omap_mmc.h          |   3 +
>  configs/am335x_boneblack_vboot_defconfig |   1 +
>  configs/am335x_gp_evm_defconfig          |   1 +
>  drivers/mmc/omap_hsmmc.c                 | 115 ++++++++++++++++++++++++++++++-
>  include/configs/am335x_evm.h             |   8 +++
>  5 files changed, 127 insertions(+), 1 deletion(-)
> 

Tom/All

Any comments on this patch series?

Regards
Mugunthan V N

[U-Boot] [PATCH 1/5] omap_hsmmc: update struct hsmmc to accomodate base address from DT

[Tom Rini]

On Tue, Sep 15, 2015 at 07:41:46PM +0530, Mugunthan V N wrote:

> Existing driver gets the actual omap hammc base address + 0x100
> bytes as the first 0x100 bytes is not used by the driver. But
> with DM conversion the base address from DT is different, to
> accommodate the offset adding res0[0x100] to struct hsmmc.
> 
> Signed-off-by: Mugunthan V N <mugunthanvnm@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: 836 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20150922/31cef62e/attachment.sig>

[U-Boot] [PATCH 2/5] am335x_evm: mmc: do not define DM_MMC for spl

[Tom Rini]

On Tue, Sep 15, 2015 at 07:41:47PM +0530, Mugunthan V N wrote:

> Since spl doesn't support DM currently, do not define DM_MMC
> for spl build.
> 
> Signed-off-by: Mugunthan V N <mugunthanvnm@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: 836 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20150922/a556fd64/attachment.sig>

[U-Boot] [PATCH 3/5] drivers: mmc: omap_hsmmc: convert driver to adopt device driver model

[Tom Rini]

On Tue, Sep 15, 2015 at 07:41:48PM +0530, Mugunthan V N wrote:

> adopt omap_hsmmc driver to device driver model
> 
> Signed-off-by: Mugunthan V N <mugunthanvnm@ti.com>
[snip]
> +static const struct udevice_id omap_hsmmc_ids[] = {
> +	{ .compatible = "ti,omap4-hsmmc" },

I think we can safely include ti,omap3-hsmmc and ti,am33xx-hsmmc here as
well.

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

[U-Boot] [PATCH 4/5] defconfig: am335x: bbb: enable ethernet driver model

[Tom Rini]

On Tue, Sep 15, 2015 at 07:41:49PM +0530, Mugunthan V N wrote:

> enable mmc driver model for am335x bbb as omap_hsmmc
> supports driver model
> 
> Signed-off-by: Mugunthan V N <mugunthanvnm@ti.com>

Aside from subject mis-match:
Reviewed-by: Tom Rini <trini@konsulko.com>

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

[U-Boot] [PATCH 5/5] defconfig: am335x: gp_evm: enable ethernet driver model

[Tom Rini]

On Tue, Sep 15, 2015 at 07:41:50PM +0530, Mugunthan V N wrote:

> enable mmc driver model for am335x gp_evm as omap_hsmmc
> supports driver model
> 
> Signed-off-by: Mugunthan V N <mugunthanvnm@ti.com>

Aside from subject mis-match:
Reviewed-by: Tom Rini <trini@konsulko.com>

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

[U-Boot] [PATCH 3/5] drivers: mmc: omap_hsmmc: convert driver to adopt device driver model

[Mugunthan V N]

On Tuesday 22 September 2015 07:20 PM, Tom Rini wrote:
> On Tue, Sep 15, 2015 at 07:41:48PM +0530, Mugunthan V N wrote:
> 
>> adopt omap_hsmmc driver to device driver model
>>
>> Signed-off-by: Mugunthan V N <mugunthanvnm@ti.com>
> [snip]
>> +static const struct udevice_id omap_hsmmc_ids[] = {
>> +	{ .compatible = "ti,omap4-hsmmc" },
> 
> I think we can safely include ti,omap3-hsmmc and ti,am33xx-hsmmc here as
> well.
> 

Will include this and submit a v2 with the other comments in the series.

Regards
Mugunthan V N