Lubancat2/kernel
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ARM: ux500: Move GPIO regulator for SD-card into board DTSs

Browse Source 
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: c94a4ab7af ("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>
This commit is contained in:
Ulf Hansson
2015-04-20 16:02:31 +02:00
committed by Linus Walleij
parent b787f68c36
commit 53d2669844
3 changed files with 32 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
arch/arm/boot/dts/ste-dbx5x0.dtsi
View File

@ -1017,23 +1017,6 @@
status = "disabled"; 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 { mcde@a0350000 {
compatible = "stericsson,mcde"; compatible = "stericsson,mcde";
reg = <0xa0350000 0x1000>, /* MCDE */ reg = <0xa0350000 0x1000>, /* MCDE */

17
arch/arm/boot/dts/ste-href.dtsi
View File

@ -111,6 +111,23 @@
pinctrl-1 = <&i2c3_sleep_mode>; 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 // External Micro SD slot
sdi0_per1@80126000 { sdi0_per1@80126000 {
arm,primecell-periphid = <0x10480180>; arm,primecell-periphid = <0x10480180>;

15
arch/arm/boot/dts/ste-snowball.dts
View File

@ -146,8 +146,23 @@
}; };
vmmci: regulator-gpio { vmmci: regulator-gpio {
compatible = "regulator-gpio";
gpios = <&gpio7 4 0x4>; gpios = <&gpio7 4 0x4>;
enable-gpio = <&gpio6 25 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 // External Micro SD slot