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

mmc: renesas_sdhi_sys_dmac: Remove all R-Car Gen3 SoCs

All R-Car Gen3 SoCs with any ES version cannot use this DMAC actually.
So, this patch removes the compatibles of R-Car Gen3 SoCs from
renesas_sdhi_sys_dmac_of_match. Since the previous code has
an empty whitelist to prevent probing of R-Car Gen3 SoCs,
no behavior changes.

Signed-off-by: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
Reviewed-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
Tested-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
Reviewed-by: Simon Horman <horms+renesas@verge.net.au>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>

authored by

Yoshihiro Shimoda and committed by
Ulf Hansson
bb716606 6e943c15

-36
-36
drivers/mmc/host/renesas_sdhi_sys_dmac.c
··· 68 68 .max_blk_count = UINT_MAX / TMIO_MAX_BLK_SIZE, 69 69 }; 70 70 71 - /* Definitions for sampling clocks */ 72 - static struct renesas_sdhi_scc rcar_gen3_scc_taps[] = { 73 - { 74 - .clk_rate = 0, 75 - .tap = 0x00000300, 76 - }, 77 - }; 78 - 79 - static const struct renesas_sdhi_of_data of_rcar_gen3_compatible = { 80 - .tmio_flags = TMIO_MMC_HAS_IDLE_WAIT | TMIO_MMC_CLK_ACTUAL | 81 - TMIO_MMC_HAVE_CBSY | TMIO_MMC_MIN_RCAR2, 82 - .capabilities = MMC_CAP_SD_HIGHSPEED | MMC_CAP_SDIO_IRQ | 83 - MMC_CAP_CMD23, 84 - .capabilities2 = MMC_CAP2_NO_WRITE_PROTECT, 85 - .bus_shift = 2, 86 - .scc_offset = 0x1000, 87 - .taps = rcar_gen3_scc_taps, 88 - .taps_num = ARRAY_SIZE(rcar_gen3_scc_taps), 89 - }; 90 - 91 71 static const struct of_device_id renesas_sdhi_sys_dmac_of_match[] = { 92 72 { .compatible = "renesas,sdhi-sh73a0", .data = &of_default_cfg, }, 93 73 { .compatible = "renesas,sdhi-r8a73a4", .data = &of_default_cfg, }, ··· 82 102 { .compatible = "renesas,sdhi-r8a7792", .data = &of_rcar_gen2_compatible, }, 83 103 { .compatible = "renesas,sdhi-r8a7793", .data = &of_rcar_gen2_compatible, }, 84 104 { .compatible = "renesas,sdhi-r8a7794", .data = &of_rcar_gen2_compatible, }, 85 - { .compatible = "renesas,sdhi-r8a7795", .data = &of_rcar_gen3_compatible, }, 86 - { .compatible = "renesas,sdhi-r8a7796", .data = &of_rcar_gen3_compatible, }, 87 105 { .compatible = "renesas,rcar-gen1-sdhi", .data = &of_rcar_gen1_compatible, }, 88 106 { .compatible = "renesas,rcar-gen2-sdhi", .data = &of_rcar_gen2_compatible, }, 89 - { .compatible = "renesas,rcar-gen3-sdhi", .data = &of_rcar_gen3_compatible, }, 90 107 { .compatible = "renesas,sdhi-shmobile" }, 91 108 {}, 92 109 }; ··· 447 470 .dataend = renesas_sdhi_sys_dmac_dataend_dma, 448 471 }; 449 472 450 - /* 451 - * Whitelist of specific R-Car Gen3 SoC ES versions to use this DMAC 452 - * implementation. Currently empty as all supported ES versions use 453 - * the internal DMAC. 454 - */ 455 - static const struct soc_device_attribute gen3_soc_whitelist[] = { 456 - { /* sentinel */ } 457 - }; 458 - 459 473 static int renesas_sdhi_sys_dmac_probe(struct platform_device *pdev) 460 474 { 461 - if (of_device_get_match_data(&pdev->dev) == &of_rcar_gen3_compatible && 462 - !soc_device_match(gen3_soc_whitelist)) 463 - return -ENODEV; 464 - 465 475 return renesas_sdhi_probe(pdev, &renesas_sdhi_sys_dmac_dma_ops); 466 476 } 467 477