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

Commit 788778b0 authored Jan 18, 2018 by Masahiro Yamada Committed by Ulf Hansson Mar 05, 2018

mmc: tmio: deprecate "toshiba, mmc-wrprotect-disable" DT property



This property is equivalent to "disable-wp" defined in
Documentation/devicetree/bindings/mmc/mmc.txt

The TMIO MMC core calls mmc_of_parse(), and it sets
MMC_CAP2_NO_WRITE_PROTECT if "disable-wp" property is present.

We do not need a vendor-specific property to do the same thing.

Let's remove the description from the dt-binding to prevent new boards
from using it.

I am keeping the driver code for existing DT files, but added
comments that this is deprecated.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Acked-by: Rob Herring <robh@kernel.org>
Reviewed-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
Tested-by: Wolfram Sang <wsa+renesas@sang-engineering.com>

parent 218f6024

Documentation/devicetree/bindings/mmc/tmio_mmc.txt

+0 −1

Original line number	Original line	Diff line number	Diff line
	@@ -50,7 +50,6 @@ Required properties:
	2: R7S72100		2: R7S72100

	Optional properties:		Optional properties:
	- toshiba,mmc-wrprotect-disable: write-protect detection is unavailable
	- pinctrl-names: should be "default", "state_uhs"		- pinctrl-names: should be "default", "state_uhs"
	- pinctrl-0: should contain default/high speed pin ctrl		- pinctrl-0: should contain default/high speed pin ctrl
	- pinctrl-1: should contain uhs mode pin ctrl		- pinctrl-1: should contain uhs mode pin ctrl

drivers/mmc/host/tmio_mmc_core.c

+5 −0

Original line number	Original line	Diff line number	Diff line
	@@ -1120,6 +1120,11 @@ static void tmio_mmc_of_parse(struct platform_device *pdev,
	if (!np)		if (!np)
	return;		return;

			/*
			* DEPRECATED:
			* For new platforms, please use "disable-wp" instead of
			* "toshiba,mmc-wrprotect-disable"
			*/
	if (of_get_property(np, "toshiba,mmc-wrprotect-disable", NULL))		if (of_get_property(np, "toshiba,mmc-wrprotect-disable", NULL))
	mmc->caps2 \|= MMC_CAP2_NO_WRITE_PROTECT;		mmc->caps2 \|= MMC_CAP2_NO_WRITE_PROTECT;
	}		}