On Tue, 20 Aug 2019 at 10:44, Yoshihiro Shimoda
<[email protected]> wrote:
>
> 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 <[email protected]>
Applied for next, thanks!
Kind regards
Uffe
> ---
> drivers/mmc/host/renesas_sdhi_sys_dmac.c | 36
> --------------------------------
> 1 file changed, 36 deletions(-)
>
> diff --git a/drivers/mmc/host/renesas_sdhi_sys_dmac.c
> b/drivers/mmc/host/renesas_sdhi_sys_dmac.c
> index 1d29b82..13ff023 100644
> --- a/drivers/mmc/host/renesas_sdhi_sys_dmac.c
> +++ b/drivers/mmc/host/renesas_sdhi_sys_dmac.c
> @@ -68,26 +68,6 @@ static const struct renesas_sdhi_of_data
> of_rcar_gen2_compatible = {
> .max_blk_count = UINT_MAX / TMIO_MAX_BLK_SIZE,
> };
>
> -/* Definitions for sampling clocks */
> -static struct renesas_sdhi_scc rcar_gen3_scc_taps[] = {
> - {
> - .clk_rate = 0,
> - .tap = 0x00000300,
> - },
> -};
> -
> -static const struct renesas_sdhi_of_data of_rcar_gen3_compatible = {
> - .tmio_flags = TMIO_MMC_HAS_IDLE_WAIT | TMIO_MMC_CLK_ACTUAL |
> - TMIO_MMC_HAVE_CBSY | TMIO_MMC_MIN_RCAR2,
> - .capabilities = MMC_CAP_SD_HIGHSPEED | MMC_CAP_SDIO_IRQ |
> - MMC_CAP_CMD23,
> - .capabilities2 = MMC_CAP2_NO_WRITE_PROTECT,
> - .bus_shift = 2,
> - .scc_offset = 0x1000,
> - .taps = rcar_gen3_scc_taps,
> - .taps_num = ARRAY_SIZE(rcar_gen3_scc_taps),
> -};
> -
> static const struct of_device_id renesas_sdhi_sys_dmac_of_match[] = {
> { .compatible = "renesas,sdhi-sh73a0", .data = &of_default_cfg, },
> { .compatible = "renesas,sdhi-r8a73a4", .data = &of_default_cfg, },
> @@ -102,11 +82,8 @@ static const struct of_device_id
> renesas_sdhi_sys_dmac_of_match[] = {
> { .compatible = "renesas,sdhi-r8a7792", .data =
> &of_rcar_gen2_compatible, },
> { .compatible = "renesas,sdhi-r8a7793", .data =
> &of_rcar_gen2_compatible, },
> { .compatible = "renesas,sdhi-r8a7794", .data =
> &of_rcar_gen2_compatible, },
> - { .compatible = "renesas,sdhi-r8a7795", .data =
> &of_rcar_gen3_compatible, },
> - { .compatible = "renesas,sdhi-r8a7796", .data =
> &of_rcar_gen3_compatible, },
> { .compatible = "renesas,rcar-gen1-sdhi", .data =
> &of_rcar_gen1_compatible, },
> { .compatible = "renesas,rcar-gen2-sdhi", .data =
> &of_rcar_gen2_compatible, },
> - { .compatible = "renesas,rcar-gen3-sdhi", .data =
> &of_rcar_gen3_compatible, },
> { .compatible = "renesas,sdhi-shmobile" },
> {},
> };
> @@ -470,21 +447,8 @@ static const struct tmio_mmc_dma_ops
> renesas_sdhi_sys_dmac_dma_ops = {
> .dataend = renesas_sdhi_sys_dmac_dataend_dma,
> };
>
> -/*
> - * Whitelist of specific R-Car Gen3 SoC ES versions to use this DMAC
> - * implementation. Currently empty as all supported ES versions use
> - * the internal DMAC.
> - */
> -static const struct soc_device_attribute gen3_soc_whitelist[] = {
> - { /* sentinel */ }
> -};
> -
> static int renesas_sdhi_sys_dmac_probe(struct platform_device *pdev)
> {
> - if (of_device_get_match_data(&pdev->dev) == &of_rcar_gen3_compatible
> &&
> - !soc_device_match(gen3_soc_whitelist))
> - return -ENODEV;
> -
> return renesas_sdhi_probe(pdev, &renesas_sdhi_sys_dmac_dma_ops);
> }
>
> --
> 2.7.4
>
