diff mbox

[U-Boot,5/5] mmc: sh_sdhi: Add SDHI support

Message ID 20170513135118.8134-5-marek.vasut+renesas@gmail.com
State Accepted
Commit a5950f8dfb87622176e01be41642db66bef8b817
Delegated to: Jaehoon Chung
Headers show

Commit Message

Marek Vasut May 13, 2017, 1:51 p.m. UTC 
From: Kouei Abe <kouei.abe.cp@renesas.com>

R-Car Gen3 series have four SD card interfaces (SDHI0 to SDHI3),
two of which can also be used as MMC interfaces (SDHI2 and SDHI3).
This adds High-speed mode SD clock frequency between 25MHz and 50MHz,
8bit/4bit bus width, high capacity and low voltage device support.

Signed-off-by: Kouei Abe <kouei.abe.cp@renesas.com>
Cc: Hiroyuki Yokoyama <hiroyuki.yokoyama.vx@renesas.com>
Cc: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
Cc: Jaehoon Chung <jh80.chung@samsung.com>
---
 drivers/mmc/sh_sdhi.c | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

Comments

Nobuhiro Iwamatsu May 13, 2017, 9:49 p.m. UTC | #1 
Hi,

2017-05-13 22:51 GMT+09:00 Marek Vasut <marek.vasut@gmail.com>:
> From: Kouei Abe <kouei.abe.cp@renesas.com>
>
> R-Car Gen3 series have four SD card interfaces (SDHI0 to SDHI3),
> two of which can also be used as MMC interfaces (SDHI2 and SDHI3).
> This adds High-speed mode SD clock frequency between 25MHz and 50MHz,
> 8bit/4bit bus width, high capacity and low voltage device support.
>
> Signed-off-by: Kouei Abe <kouei.abe.cp@renesas.com>
> Cc: Hiroyuki Yokoyama <hiroyuki.yokoyama.vx@renesas.com>
> Cc: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
> Cc: Jaehoon Chung <jh80.chung@samsung.com>

Reviewed-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>

> ---
>  drivers/mmc/sh_sdhi.c | 14 ++++++++++++++
>  1 file changed, 14 insertions(+)
>
> diff --git a/drivers/mmc/sh_sdhi.c b/drivers/mmc/sh_sdhi.c
> index c64beb6e2a..d181b63905 100644
> --- a/drivers/mmc/sh_sdhi.c
> +++ b/drivers/mmc/sh_sdhi.c
> @@ -698,6 +698,19 @@ static const struct mmc_ops sh_sdhi_ops = {
>         .init           = sh_sdhi_initialize,
>  };
>
> +#ifdef CONFIG_RCAR_GEN3
> +static struct mmc_config sh_sdhi_cfg = {
> +       .name           = DRIVER_NAME,
> +       .ops            = &sh_sdhi_ops,
> +       .f_min          = CLKDEV_INIT,
> +       .f_max          = CLKDEV_HS_DATA,
> +       .voltages       = MMC_VDD_165_195 | MMC_VDD_32_33 | MMC_VDD_33_34,
> +       .host_caps      = MMC_MODE_4BIT | MMC_MODE_8BIT | MMC_MODE_HS |
> +                         MMC_MODE_HS_52MHz,
> +       .part_type      = PART_TYPE_DOS,
> +       .b_max          = CONFIG_SYS_MMC_MAX_BLK_COUNT,
> +};
> +#else
>  static struct mmc_config sh_sdhi_cfg = {
>         .name           = DRIVER_NAME,
>         .ops            = &sh_sdhi_ops,
> @@ -708,6 +721,7 @@ static struct mmc_config sh_sdhi_cfg = {
>         .part_type      = PART_TYPE_DOS,
>         .b_max          = CONFIG_SYS_MMC_MAX_BLK_COUNT,
>  };
> +#endif
>
>  int sh_sdhi_init(unsigned long addr, int ch, unsigned long quirks)
>  {
> --
> 2.11.0
>
Jaehoon Chung May 25, 2017, 1:45 p.m. UTC | #2 
On 05/13/2017 10:51 PM, Marek Vasut wrote:
> From: Kouei Abe <kouei.abe.cp@renesas.com>
> 
> R-Car Gen3 series have four SD card interfaces (SDHI0 to SDHI3),
> two of which can also be used as MMC interfaces (SDHI2 and SDHI3).
> This adds High-speed mode SD clock frequency between 25MHz and 50MHz,
> 8bit/4bit bus width, high capacity and low voltage device support.
> 
> Signed-off-by: Kouei Abe <kouei.abe.cp@renesas.com>
> Cc: Hiroyuki Yokoyama <hiroyuki.yokoyama.vx@renesas.com>
> Cc: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
> Cc: Jaehoon Chung <jh80.chung@samsung.com>

Reviewed-by: Jaehoon Chung <jh80.chung@samsung.com>

> ---
>  drivers/mmc/sh_sdhi.c | 14 ++++++++++++++
>  1 file changed, 14 insertions(+)
> 
> diff --git a/drivers/mmc/sh_sdhi.c b/drivers/mmc/sh_sdhi.c
> index c64beb6e2a..d181b63905 100644
> --- a/drivers/mmc/sh_sdhi.c
> +++ b/drivers/mmc/sh_sdhi.c
> @@ -698,6 +698,19 @@ static const struct mmc_ops sh_sdhi_ops = {
>  	.init           = sh_sdhi_initialize,
>  };
>  
> +#ifdef CONFIG_RCAR_GEN3
> +static struct mmc_config sh_sdhi_cfg = {
> +	.name           = DRIVER_NAME,
> +	.ops            = &sh_sdhi_ops,
> +	.f_min          = CLKDEV_INIT,
> +	.f_max          = CLKDEV_HS_DATA,
> +	.voltages       = MMC_VDD_165_195 | MMC_VDD_32_33 | MMC_VDD_33_34,
> +	.host_caps      = MMC_MODE_4BIT | MMC_MODE_8BIT | MMC_MODE_HS |
> +			  MMC_MODE_HS_52MHz,
> +	.part_type      = PART_TYPE_DOS,
> +	.b_max          = CONFIG_SYS_MMC_MAX_BLK_COUNT,
> +};
> +#else
>  static struct mmc_config sh_sdhi_cfg = {
>  	.name           = DRIVER_NAME,
>  	.ops            = &sh_sdhi_ops,
> @@ -708,6 +721,7 @@ static struct mmc_config sh_sdhi_cfg = {
>  	.part_type      = PART_TYPE_DOS,
>  	.b_max          = CONFIG_SYS_MMC_MAX_BLK_COUNT,
>  };
> +#endif
>  
>  int sh_sdhi_init(unsigned long addr, int ch, unsigned long quirks)
>  {
>
diff mbox

Patch

diff --git a/drivers/mmc/sh_sdhi.c b/drivers/mmc/sh_sdhi.c
index c64beb6e2a..d181b63905 100644
--- a/drivers/mmc/sh_sdhi.c
+++ b/drivers/mmc/sh_sdhi.c
@@ -698,6 +698,19 @@  static const struct mmc_ops sh_sdhi_ops = {
 	.init           = sh_sdhi_initialize,
 };
 
+#ifdef CONFIG_RCAR_GEN3
+static struct mmc_config sh_sdhi_cfg = {
+	.name           = DRIVER_NAME,
+	.ops            = &sh_sdhi_ops,
+	.f_min          = CLKDEV_INIT,
+	.f_max          = CLKDEV_HS_DATA,
+	.voltages       = MMC_VDD_165_195 | MMC_VDD_32_33 | MMC_VDD_33_34,
+	.host_caps      = MMC_MODE_4BIT | MMC_MODE_8BIT | MMC_MODE_HS |
+			  MMC_MODE_HS_52MHz,
+	.part_type      = PART_TYPE_DOS,
+	.b_max          = CONFIG_SYS_MMC_MAX_BLK_COUNT,
+};
+#else
 static struct mmc_config sh_sdhi_cfg = {
 	.name           = DRIVER_NAME,
 	.ops            = &sh_sdhi_ops,
@@ -708,6 +721,7 @@  static struct mmc_config sh_sdhi_cfg = {
 	.part_type      = PART_TYPE_DOS,
 	.b_max          = CONFIG_SYS_MMC_MAX_BLK_COUNT,
 };
+#endif
 
 int sh_sdhi_init(unsigned long addr, int ch, unsigned long quirks)
 {