Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7c53b797 authored by Masahiro Yamada's avatar Masahiro Yamada Committed by Ulf Hansson
Browse files

mmc: tmio: use MMC_CAP2_NO_WRITE_PROTECT instead of TMIO own flag 



TMIO_MMC_WRPROTECT_DISABLE is equivalent to MMC_CAP2_NO_WRITE_PROTECT.

Only the difference is the TMIO_... makes tmio_mmc_get_ro() return 0
(i.e. it does not affect mmc_gpio_get_ro() at all), while MMC_CAP2_...
returns 0 before calling ->get_ro() hook (i.e. it affects both IP own
logic and GPIO detection).

The TMIO MMC drivers do not set-up gpio_ro by themselves.  Only the
possibility, if any, would be DT specifies "wp-gpios" property, and
gpio_ro is set by mmc_gpiod_request_ro() called from mmc_of_parse().
However, it does not make sense to specify "wp-gpios" property and
"toshiba,mmc-wrprotect-disable" at the same time.

I checked under arch/arm/boot/dts/ and arch/arm64/boot/dts/renesas/,
and I did not see any Renesas boards with "wp-gpios".  So, this
conversion should be safe.

Signed-off-by: default avatarMasahiro Yamada <yamada.masahiro@socionext.com>
Reviewed-by: default avatarWolfram Sang <wsa+renesas@sang-engineering.com>
Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
Tested-by: default avatarWolfram Sang <wsa+renesas@sang-engineering.com>
parent 3ca1507b

drivers/mmc/host/tmio_mmc_core.c

+3 −3
Original line number Original line Diff line number Diff line
@@ -1114,7 +1114,7 @@ static int tmio_mmc_init_ocr(struct tmio_mmc_host *host) 
}

}





static void tmio_mmc_of_parse(struct platform_device *pdev,

static void tmio_mmc_of_parse(struct platform_device *pdev,

			      struct tmio_mmc_data *pdata)

			      struct mmc_host *mmc)

{

{

	const struct device_node *np = pdev->dev.of_node;

	const struct device_node *np = pdev->dev.of_node;
@@ -1122,7 +1122,7 @@ static void tmio_mmc_of_parse(struct platform_device *pdev, 
		return;

		return;





	if (of_get_property(np, "toshiba,mmc-wrprotect-disable", NULL))

	if (of_get_property(np, "toshiba,mmc-wrprotect-disable", NULL))

		pdata->flags |= TMIO_MMC_WRPROTECT_DISABLE;

		mmc->caps2 |= MMC_CAP2_NO_WRITE_PROTECT;

}

}





struct tmio_mmc_host *tmio_mmc_host_alloc(struct platform_device *pdev,

struct tmio_mmc_host *tmio_mmc_host_alloc(struct platform_device *pdev,
@@ -1157,7 +1157,7 @@ struct tmio_mmc_host *tmio_mmc_host_alloc(struct platform_device *pdev, 
		goto free;

		goto free;

	}

	}





	tmio_mmc_of_parse(pdev, pdata);

	tmio_mmc_of_parse(pdev, mmc);





	platform_set_drvdata(pdev, host);

	platform_set_drvdata(pdev, host);