leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
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>
This commit is contained in:
Masahiro Yamada 2018-01-18 01:28:11 +09:00 committed by Ulf Hansson
parent 218f6024ab
commit 788778b0d2
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Documentation/devicetree/bindings/mmc/tmio_mmc.txt
View File

@ -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

5
drivers/mmc/host/tmio_mmc_core.c
View File

@ -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;
} }