Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

authored by

Kuninori Morimoto and committed by
Chris Ball
423f6c2e 81bbbc72

+9 -1
+9 -1
drivers/mmc/host/sh_mobile_sdhi.c
··· 38 38 struct sh_mobile_sdhi_of_data { 39 39 unsigned long tmio_flags; 40 40 unsigned long capabilities; 41 + unsigned long capabilities2; 41 42 }; 42 43 43 44 static const struct sh_mobile_sdhi_of_data sh_mobile_sdhi_of_cfg[] = { ··· 52 51 .capabilities = MMC_CAP_SD_HIGHSPEED | MMC_CAP_SDIO_IRQ, 53 52 }; 54 53 54 + static const struct sh_mobile_sdhi_of_data of_rcar_gen2_compatible = { 55 + .tmio_flags = TMIO_MMC_HAS_IDLE_WAIT | TMIO_MMC_WRPROTECT_DISABLE, 56 + .capabilities = MMC_CAP_SD_HIGHSPEED | MMC_CAP_SDIO_IRQ, 57 + .capabilities2 = MMC_CAP2_NO_MULTI_READ, 58 + }; 59 + 55 60 static const struct of_device_id sh_mobile_sdhi_of_match[] = { 56 61 { .compatible = "renesas,sdhi-shmobile" }, 57 62 { .compatible = "renesas,sdhi-sh7372" }, ··· 66 59 { .compatible = "renesas,sdhi-r8a7740", .data = &sh_mobile_sdhi_of_cfg[0], }, 67 60 { .compatible = "renesas,sdhi-r8a7778", .data = &of_rcar_gen1_compatible, }, 68 61 { .compatible = "renesas,sdhi-r8a7779", .data = &of_rcar_gen1_compatible, }, 69 - { .compatible = "renesas,sdhi-r8a7790", .data = &sh_mobile_sdhi_of_cfg[0], }, 62 + { .compatible = "renesas,sdhi-r8a7790", .data = &of_rcar_gen2_compatible, }, 70 63 {}, 71 64 }; 72 65 MODULE_DEVICE_TABLE(of, sh_mobile_sdhi_of_match); ··· 226 219 const struct sh_mobile_sdhi_of_data *of_data = of_id->data; 227 220 mmc_data->flags |= of_data->tmio_flags; 228 221 mmc_data->capabilities |= of_data->capabilities; 222 + mmc_data->capabilities2 |= of_data->capabilities2; 229 223 } 230 224 231 225 /* SD control register space size is 0x100, 0x200 for bus_shift=1 */