diff options
| -rw-r--r-- | Documentation/devicetree/bindings/mmc/pxa-mmc.txt | 2 | ||||
| -rw-r--r-- | drivers/mmc/host/pxamci.c | 3 |
2 files changed, 1 insertions, 4 deletions
diff --git a/Documentation/devicetree/bindings/mmc/pxa-mmc.txt b/Documentation/devicetree/bindings/mmc/pxa-mmc.txt index f2687752597e..5f5c2bec2b8c 100644 --- a/Documentation/devicetree/bindings/mmc/pxa-mmc.txt +++ b/Documentation/devicetree/bindings/mmc/pxa-mmc.txt @@ -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. @@ -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>; }; diff --git a/drivers/mmc/host/pxamci.c b/drivers/mmc/host/pxamci.c index e046e684b3f9..1e7703116763 100644 --- a/drivers/mmc/host/pxamci.c +++ b/drivers/mmc/host/pxamci.c @@ -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; |