Commit c0a43968 authored by Wolfram Sang's avatar Wolfram Sang Committed by Ulf Hansson
Browse files

mmc: renesas_sdhi: make 'fixed_addr_mode' a quirk 



After Shimoda-san's much appreciated refactoring of the quirk handling,
we can convert now the 'fixed_addr_mode' from an ugly global flag to a
regular quirk. This makes quirk handling more consistent and easier to
maintain.

Signed-off-by: default avatarWolfram Sang <wsa+renesas@sang-engineering.com>
Reviewed-by: default avatarGeert Uytterhoeven <geert+renesas@glider.be>
Link: https://lore.kernel.org/r/20220320123016.57991-6-wsa+renesas@sang-engineering.com


Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
parent 254b7d12

drivers/mmc/host/renesas_sdhi.h

+1 −0
Original line number Diff line number Diff line
@@ -41,6 +41,7 @@ struct renesas_sdhi_of_data { 
struct renesas_sdhi_quirks {

	bool hs400_disabled;

	bool hs400_4taps;

	bool fixed_addr_mode;

	u32 hs400_bad_taps;

	const u8 (*hs400_calib_table)[SDHI_CALIB_TABLE_MAX];

};

drivers/mmc/host/renesas_sdhi_internal_dmac.c

+11 −10
Original line number Diff line number Diff line
@@ -81,9 +81,6 @@ static unsigned long global_flags; 
#define SDHI_INTERNAL_DMAC_ONE_RX_ONLY	0

#define SDHI_INTERNAL_DMAC_RX_IN_USE	1



/* RZ/A2 does not have the ADRR_MODE bit */

#define SDHI_INTERNAL_DMAC_ADDR_MODE_FIXED_ONLY 2



/* Definitions for sampling clocks */

static struct renesas_sdhi_scc rcar_gen3_scc_taps[] = {

	{
@@ -108,10 +105,6 @@ static const struct renesas_sdhi_of_data of_data_rza2 = { 
	.max_segs	= 1,

};



static const struct renesas_sdhi_of_data_with_quirks of_rza2_compatible = {

	.of_data	= &of_data_rza2,

};



static const struct renesas_sdhi_of_data of_data_rcar_gen3 = {

	.tmio_flags	= TMIO_MMC_HAS_IDLE_WAIT | TMIO_MMC_CLK_ACTUAL |

			  TMIO_MMC_HAVE_CBSY | TMIO_MMC_MIN_RCAR2,
@@ -178,6 +171,10 @@ static const struct renesas_sdhi_quirks sdhi_quirks_nohs400 = { 
	.hs400_disabled = true,

};



static const struct renesas_sdhi_quirks sdhi_quirks_fixed_addr = {

	.fixed_addr_mode = true,

};



static const struct renesas_sdhi_quirks sdhi_quirks_bad_taps1357 = {

	.hs400_bad_taps = BIT(1) | BIT(3) | BIT(5) | BIT(7),

};
@@ -248,6 +245,11 @@ static const struct renesas_sdhi_of_data_with_quirks of_rcar_gen3_nohs400_compat 
	.quirks = &sdhi_quirks_nohs400,

};



static const struct renesas_sdhi_of_data_with_quirks of_rza2_compatible = {

	.of_data	= &of_data_rza2,

	.quirks		= &sdhi_quirks_fixed_addr,

};



static const struct of_device_id renesas_sdhi_internal_dmac_of_match[] = {

	{ .compatible = "renesas,sdhi-r7s9210", .data = &of_rza2_compatible, },

	{ .compatible = "renesas,sdhi-mmc-r8a77470", .data = &of_rcar_gen3_compatible, },
@@ -358,10 +360,11 @@ static void 
renesas_sdhi_internal_dmac_start_dma(struct tmio_mmc_host *host,

				     struct mmc_data *data)

{

	struct renesas_sdhi *priv = host_to_priv(host);

	struct scatterlist *sg = host->sg_ptr;

	u32 dtran_mode = DTRAN_MODE_BUS_WIDTH;



	if (!test_bit(SDHI_INTERNAL_DMAC_ADDR_MODE_FIXED_ONLY, &global_flags))

	if (!priv->quirks->fixed_addr_mode)

		dtran_mode |= DTRAN_MODE_ADDR_MODE;



	if (!renesas_sdhi_internal_dmac_map(host, data, COOKIE_MAPPED))
@@ -522,8 +525,6 @@ static const struct tmio_mmc_dma_ops renesas_sdhi_internal_dmac_dma_ops = { 
};



static const struct soc_device_attribute soc_dma_quirks[] = {

	{ .soc_id = "r7s9210",

	  .data = (void *)BIT(SDHI_INTERNAL_DMAC_ADDR_MODE_FIXED_ONLY) },

	{ .soc_id = "r8a7795", .revision = "ES1.*",

	  .data = (void *)BIT(SDHI_INTERNAL_DMAC_ONE_RX_ONLY) },

	{ .soc_id = "r8a7796", .revision = "ES1.0",