| From f853726927961824e3e637944d17e426db5e8215 Mon Sep 17 00:00:00 2001 |
| From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> |
| Date: Thu, 20 Feb 2014 16:55:27 -0800 |
| Subject: mmc: sdhi: update sh_mobile_sdhi_of_data for r8a7790 |
| |
| This patch updates r8a7790 DT data to have SoC specific settings. |
| |
| Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> |
| Acked-by: Simon Horman <horms+renesas@verge.net.au> |
| Signed-off-by: Chris Ball <chris@printf.net> |
| (cherry picked from commit 423f6c2e977de73b8723e73d8cc585de40893f5b) |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| --- |
| drivers/mmc/host/sh_mobile_sdhi.c | 10 +++++++++- |
| 1 file changed, 9 insertions(+), 1 deletion(-) |
| |
| diff --git a/drivers/mmc/host/sh_mobile_sdhi.c b/drivers/mmc/host/sh_mobile_sdhi.c |
| index 38acf2665bdf..cfc37ec26458 100644 |
| --- a/drivers/mmc/host/sh_mobile_sdhi.c |
| +++ b/drivers/mmc/host/sh_mobile_sdhi.c |
| @@ -38,6 +38,7 @@ |
| struct sh_mobile_sdhi_of_data { |
| unsigned long tmio_flags; |
| unsigned long capabilities; |
| + unsigned long capabilities2; |
| }; |
| |
| static const struct sh_mobile_sdhi_of_data sh_mobile_sdhi_of_cfg[] = { |
| @@ -51,6 +52,12 @@ static const struct sh_mobile_sdhi_of_data of_rcar_gen1_compatible = { |
| .capabilities = MMC_CAP_SD_HIGHSPEED | MMC_CAP_SDIO_IRQ, |
| }; |
| |
| +static const struct sh_mobile_sdhi_of_data of_rcar_gen2_compatible = { |
| + .tmio_flags = TMIO_MMC_HAS_IDLE_WAIT | TMIO_MMC_WRPROTECT_DISABLE, |
| + .capabilities = MMC_CAP_SD_HIGHSPEED | MMC_CAP_SDIO_IRQ, |
| + .capabilities2 = MMC_CAP2_NO_MULTI_READ, |
| +}; |
| + |
| static const struct of_device_id sh_mobile_sdhi_of_match[] = { |
| { .compatible = "renesas,sdhi-shmobile" }, |
| { .compatible = "renesas,sdhi-sh7372" }, |
| @@ -59,7 +66,7 @@ static const struct of_device_id sh_mobile_sdhi_of_match[] = { |
| { .compatible = "renesas,sdhi-r8a7740", .data = &sh_mobile_sdhi_of_cfg[0], }, |
| { .compatible = "renesas,sdhi-r8a7778", .data = &of_rcar_gen1_compatible, }, |
| { .compatible = "renesas,sdhi-r8a7779", .data = &of_rcar_gen1_compatible, }, |
| - { .compatible = "renesas,sdhi-r8a7790", .data = &sh_mobile_sdhi_of_cfg[0], }, |
| + { .compatible = "renesas,sdhi-r8a7790", .data = &of_rcar_gen2_compatible, }, |
| {}, |
| }; |
| MODULE_DEVICE_TABLE(of, sh_mobile_sdhi_of_match); |
| @@ -219,6 +226,7 @@ static int sh_mobile_sdhi_probe(struct platform_device *pdev) |
| const struct sh_mobile_sdhi_of_data *of_data = of_id->data; |
| mmc_data->flags |= of_data->tmio_flags; |
| mmc_data->capabilities |= of_data->capabilities; |
| + mmc_data->capabilities2 |= of_data->capabilities2; |
| } |
| |
| /* SD control register space size is 0x100, 0x200 for bus_shift=1 */ |
| -- |
| 2.1.2 |
| |