Commit 6ee5233a authored by Chen-Yu Tsai's avatar Chen-Yu Tsai Committed by Ulf Hansson
Browse files

mmc: mtk-sd: Limit getting top_base to SoCs that require it 



Currently the mtk-sd driver tries to get and map the second register
base, named top_base in the code, regardless of whether the SoC model
actually has it or not. This produces confusing big error messages on
the platforms that don't need it:

    mtk-msdc 11260000.mmc: error -EINVAL: invalid resource (null)

Limit it to the platforms that actually require it, based on their
device tree entries, and properly fail if it is missing.

Signed-off-by: default avatarChen-Yu Tsai <wenst@chromium.org>
Reviewed-by: default avatarAngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
Message-ID: <20241210073212.3917912-3-wenst@chromium.org>
Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
parent 6af057a8

drivers/mmc/host/mtk-sd.c

+11 −4
Original line number Diff line number Diff line
@@ -414,6 +414,7 @@ struct mtk_mmc_compatible { 
	u8 clk_div_bits;

	bool recheck_sdio_irq;

	bool hs400_tune; /* only used for MT8173 */

	bool needs_top_base;

	u32 pad_tune_reg;

	bool async_fifo;

	bool data_tune;
@@ -587,6 +588,7 @@ static const struct mtk_mmc_compatible mt7986_compat = { 
	.clk_div_bits = 12,

	.recheck_sdio_irq = true,

	.hs400_tune = false,

	.needs_top_base = true,

	.pad_tune_reg = MSDC_PAD_TUNE0,

	.async_fifo = true,

	.data_tune = true,
@@ -627,6 +629,7 @@ static const struct mtk_mmc_compatible mt8183_compat = { 
	.clk_div_bits = 12,

	.recheck_sdio_irq = false,

	.hs400_tune = false,

	.needs_top_base = true,

	.pad_tune_reg = MSDC_PAD_TUNE0,

	.async_fifo = true,

	.data_tune = true,
@@ -653,6 +656,7 @@ static const struct mtk_mmc_compatible mt8196_compat = { 
	.clk_div_bits = 12,

	.recheck_sdio_irq = false,

	.hs400_tune = false,

	.needs_top_base = true,

	.pad_tune_reg = MSDC_PAD_TUNE0,

	.async_fifo = true,

	.data_tune = true,
@@ -2887,9 +2891,13 @@ static int msdc_drv_probe(struct platform_device *pdev) 
	if (IS_ERR(host->base))

		return PTR_ERR(host->base);



	host->dev_comp = of_device_get_match_data(&pdev->dev);



	if (host->dev_comp->needs_top_base) {

		host->top_base = devm_platform_ioremap_resource(pdev, 1);

		if (IS_ERR(host->top_base))

		host->top_base = NULL;

			return PTR_ERR(host->top_base);

	}



	ret = mmc_regulator_get_supply(mmc);

	if (ret)
@@ -2951,7 +2959,6 @@ static int msdc_drv_probe(struct platform_device *pdev) 
	msdc_of_property_parse(pdev, host);



	host->dev = &pdev->dev;

	host->dev_comp = of_device_get_match_data(&pdev->dev);

	host->src_clk_freq = clk_get_rate(host->src_clk);

	/* Set host parameters to mmc */

	mmc->ops = &mt_msdc_ops;