openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

mmc: pxamci: remove pxa-mmc, gpio-power from devicetree bindings 

Devicetree-enabled boards should use proper regulators to control the
power of cards, not GPIOs, so let's remove this property. The regulator
properties are supported by the MMC core and are described in the
generic MMC document:

  Documentation/devicetree/bindings/mmc/mmc.txt

Note that devicetree support for PXA platforms hasn't fully landed yet,
so this binding does not have any users at this point.

Signed-off-by: Daniel Mack <daniel@zonque.org>
Acked-by: Robert Jarzmik <robert.jarzmik@free.fr>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
This commit is contained in:
Daniel Mack 2018-06-30 20:14:04 +02:00 committed by Ulf Hansson
parent fa3a511546
commit f37216de6e
2 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Documentation/devicetree/bindings/mmc/pxa-mmc.txt
View File

@ -8,7 +8,6 @@ Required properties:
Optional properties: Optional properties:
- marvell,detect-delay-ms: sets the detection delay timeout in ms. - marvell,detect-delay-ms: sets the detection delay timeout in ms.
- marvell,gpio-power: GPIO spec for the card power enable pin
In addition to the properties described in this docuent, the details In addition to the properties described in this docuent, the details
described in mmc.txt are supported. described in mmc.txt are supported.
@ -19,6 +18,7 @@ mmc0: mmc@41100000 {
compatible = "marvell,pxa-mmc"; compatible = "marvell,pxa-mmc";
reg = <0x41100000 0x1000>; reg = <0x41100000 0x1000>;
interrupts = <23>; interrupts = <23>;
vmmc-supply = <&mmc_regulator>;
cd-gpios = <&gpio 23 0>; cd-gpios = <&gpio 23 0>;
wp-gpios = <&gpio 24 0>; wp-gpios = <&gpio 24 0>;
}; };

3
drivers/mmc/host/pxamci.c
View File

@ -607,9 +607,6 @@ static int pxamci_of_init(struct platform_device *pdev,
return -ENOMEM; return -ENOMEM;
/* pxa-mmc specific */ /* pxa-mmc specific */
pdata->gpio_power =
of_get_named_gpio(np, "pxa-mmc,gpio-power", 0);
if (of_property_read_u32(np, "pxa-mmc,detect-delay-ms", &tmp) == 0) if (of_property_read_u32(np, "pxa-mmc,detect-delay-ms", &tmp) == 0)
pdata->detect_delay_ms = tmp; pdata->detect_delay_ms = tmp;