Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

authored by

Daniel Mack and committed by
Ulf Hansson
f37216de fa3a5115

+1 -4
+1 -1
Documentation/devicetree/bindings/mmc/pxa-mmc.txt
··· 8 8 9 9 Optional properties: 10 10 - marvell,detect-delay-ms: sets the detection delay timeout in ms. 11 - - marvell,gpio-power: GPIO spec for the card power enable pin 12 11 13 12 In addition to the properties described in this docuent, the details 14 13 described in mmc.txt are supported. ··· 18 19 compatible = "marvell,pxa-mmc"; 19 20 reg = <0x41100000 0x1000>; 20 21 interrupts = <23>; 22 + vmmc-supply = <&mmc_regulator>; 21 23 cd-gpios = <&gpio 23 0>; 22 24 wp-gpios = <&gpio 24 0>; 23 25 };
-3
drivers/mmc/host/pxamci.c
··· 607 607 return -ENOMEM; 608 608 609 609 /* pxa-mmc specific */ 610 - pdata->gpio_power = 611 - of_get_named_gpio(np, "pxa-mmc,gpio-power", 0); 612 - 613 610 if (of_property_read_u32(np, "pxa-mmc,detect-delay-ms", &tmp) == 0) 614 611 pdata->detect_delay_ms = tmp; 615 612