Skip to content

Commit

Permalink
mmc: pxamci: remove pxa-mmc, gpio-power from devicetree bindings
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Daniel Mack authored and Ulf Hansson committed Jul 16, 2018
1 parent fa3a511 commit f37216d
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 4 deletions.
2 changes: 1 addition & 1 deletion Documentation/devicetree/bindings/mmc/pxa-mmc.txt
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ Required properties:

Optional properties:
- 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
described in mmc.txt are supported.
Expand All @@ -19,6 +18,7 @@ mmc0: mmc@41100000 {
compatible = "marvell,pxa-mmc";
reg = <0x41100000 0x1000>;
interrupts = <23>;
vmmc-supply = <&mmc_regulator>;
cd-gpios = <&gpio 23 0>;
wp-gpios = <&gpio 24 0>;
};
Expand Down
3 changes: 0 additions & 3 deletions drivers/mmc/host/pxamci.c
Original file line number Diff line number Diff line change
Expand Up @@ -607,9 +607,6 @@ static int pxamci_of_init(struct platform_device *pdev,
return -ENOMEM;

/* 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)
pdata->detect_delay_ms = tmp;

Expand Down

0 comments on commit f37216d

Please sign in to comment.