lkml.org 
[lkml]   [2015]   [May]   [16]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.12 127/142] ARM: ux500: Move GPIO regulator for SD-card into board DTSs
    Date
    From: Ulf Hansson <ulf.hansson@linaro.org>

    3.12-stable review patch. If anyone has any objections, please let me know.

    ===============

    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: Jiri Slaby <jslaby@suse.cz>
    ---
    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, 31 insertions(+), 18 deletions(-)

    diff --git a/arch/arm/boot/dts/ste-dbx5x0.dtsi b/arch/arm/boot/dts/ste-dbx5x0.dtsi
    index 1c1091eedade..faa64cd3ab73 100644
    --- a/arch/arm/boot/dts/ste-dbx5x0.dtsi
    +++ b/arch/arm/boot/dts/ste-dbx5x0.dtsi
    @@ -774,23 +774,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";
    - };
    -
    cryp@a03cb000 {
    compatible = "stericsson,ux500-cryp";
    reg = <0xa03cb000 0x1000>;
    diff --git a/arch/arm/boot/dts/ste-href.dtsi b/arch/arm/boot/dts/ste-href.dtsi
    index 370e03f5e7b2..b2d900157bb4 100644
    --- a/arch/arm/boot/dts/ste-href.dtsi
    +++ b/arch/arm/boot/dts/ste-href.dtsi
    @@ -106,6 +106,23 @@
    };
    };

    + 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>;
    diff --git a/arch/arm/boot/dts/ste-snowball.dts b/arch/arm/boot/dts/ste-snowball.dts
    index f1fc128e249d..3d85253369c7 100644
    --- a/arch/arm/boot/dts/ste-snowball.dts
    +++ b/arch/arm/boot/dts/ste-snowball.dts
    @@ -121,10 +121,23 @@
    };

    vmmci: regulator-gpio {
    + compatible = "regulator-gpio";
    +
    gpios = <&gpio6 25 0x4>;
    enable-gpio = <&gpio7 4 0x4>;

    - status = "okay";
    + 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
    --
    2.3.7


    \
     
     \ /
      Last update: 2015-05-16 11:21    [W:2.050 / U:0.108 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site