| From 53d2669844263fd5fdc70f0eb6a2eb8a21086d8e Mon Sep 17 00:00:00 2001 |
| From: Ulf Hansson <ulf.hansson@linaro.org> |
| Date: Mon, 20 Apr 2015 16:02:31 +0200 |
| Subject: ARM: ux500: Move GPIO regulator for SD-card into board DTSs |
| |
| From: Ulf Hansson <ulf.hansson@linaro.org> |
| |
| commit 53d2669844263fd5fdc70f0eb6a2eb8a21086d8e upstream. |
| |
| The GPIO regulator for the SD-card isn't a ux500 SOC configuration, but |
| instead it's specific to the board. Move the definition of it, into the |
| board DTSs. |
| |
| Fixes: c94a4ab7af3f ("ARM: ux500: Disable the MMCI gpio-regulator by default") |
| Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org> |
| Reviewed-by: Bjorn Andersson <bjorn.andersson@sonymobile.com> |
| Signed-off-by: Linus Walleij <linus.walleij@linaro.org> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| --- |
| arch/arm/boot/dts/ste-dbx5x0.dtsi | 17 ----------------- |
| arch/arm/boot/dts/ste-href.dtsi | 17 +++++++++++++++++ |
| arch/arm/boot/dts/ste-snowball.dts | 15 +++++++++++++++ |
| 3 files changed, 32 insertions(+), 17 deletions(-) |
| |
| --- a/arch/arm/boot/dts/ste-dbx5x0.dtsi |
| +++ b/arch/arm/boot/dts/ste-dbx5x0.dtsi |
| @@ -1017,23 +1017,6 @@ |
| status = "disabled"; |
| }; |
| |
| - vmmci: regulator-gpio { |
| - compatible = "regulator-gpio"; |
| - |
| - regulator-min-microvolt = <1800000>; |
| - regulator-max-microvolt = <2900000>; |
| - regulator-name = "mmci-reg"; |
| - regulator-type = "voltage"; |
| - |
| - startup-delay-us = <100>; |
| - enable-active-high; |
| - |
| - states = <1800000 0x1 |
| - 2900000 0x0>; |
| - |
| - status = "disabled"; |
| - }; |
| - |
| mcde@a0350000 { |
| compatible = "stericsson,mcde"; |
| reg = <0xa0350000 0x1000>, /* MCDE */ |
| --- a/arch/arm/boot/dts/ste-href.dtsi |
| +++ b/arch/arm/boot/dts/ste-href.dtsi |
| @@ -111,6 +111,23 @@ |
| pinctrl-1 = <&i2c3_sleep_mode>; |
| }; |
| |
| + vmmci: regulator-gpio { |
| + compatible = "regulator-gpio"; |
| + |
| + regulator-min-microvolt = <1800000>; |
| + regulator-max-microvolt = <2900000>; |
| + regulator-name = "mmci-reg"; |
| + regulator-type = "voltage"; |
| + |
| + startup-delay-us = <100>; |
| + enable-active-high; |
| + |
| + states = <1800000 0x1 |
| + 2900000 0x0>; |
| + |
| + status = "disabled"; |
| + }; |
| + |
| // External Micro SD slot |
| sdi0_per1@80126000 { |
| arm,primecell-periphid = <0x10480180>; |
| --- a/arch/arm/boot/dts/ste-snowball.dts |
| +++ b/arch/arm/boot/dts/ste-snowball.dts |
| @@ -146,8 +146,23 @@ |
| }; |
| |
| vmmci: regulator-gpio { |
| + compatible = "regulator-gpio"; |
| + |
| gpios = <&gpio7 4 0x4>; |
| enable-gpio = <&gpio6 25 0x4>; |
| + |
| + regulator-min-microvolt = <1800000>; |
| + regulator-max-microvolt = <2900000>; |
| + regulator-name = "mmci-reg"; |
| + regulator-type = "voltage"; |
| + |
| + startup-delay-us = <100>; |
| + enable-active-high; |
| + |
| + states = <1800000 0x1 |
| + 2900000 0x0>; |
| + |
| + status = "disabled"; |
| }; |
| |
| // External Micro SD slot |