Commit 1758b358 authored by Linus Walleij's avatar Linus Walleij Committed by Andy Gross

ARM: dts: move the fixed MMC regulator to SURF board

There is currently a fixed regulator in the .dtsi file for
the MSM8660 chipset, used by the SURF board. We want to define
real regulators for a board using this chipset, so push the fixed
regulator down to the SURF board which is the only user.
Reviewed-by: default avatarStephen Boyd <sboyd@codeaurora.org>
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
Signed-off-by: default avatarAndy Gross <andy.gross@linaro.org>
parent e20fd336
...@@ -23,15 +23,26 @@ serial@19c40000 { ...@@ -23,15 +23,26 @@ serial@19c40000 {
}; };
}; };
/* Temporary fixed regulator */
vsdcc_fixed: vsdcc-regulator {
compatible = "regulator-fixed";
regulator-name = "SDCC Power";
regulator-min-microvolt = <2700000>;
regulator-max-microvolt = <2700000>;
regulator-always-on;
};
amba { amba {
/* eMMC */ /* eMMC */
sdcc1: sdcc@12400000 { sdcc1: sdcc@12400000 {
status = "okay"; status = "okay";
vmmc-supply = <&vsdcc_fixed>;
}; };
/* External micro SD card */ /* External micro SD card */
sdcc3: sdcc@12180000 { sdcc3: sdcc@12180000 {
status = "okay"; status = "okay";
vmmc-supply = <&vsdcc_fixed>;
}; };
}; };
}; };
......
...@@ -315,15 +315,6 @@ pm8058-regulators { ...@@ -315,15 +315,6 @@ pm8058-regulators {
}; };
}; };
/* Temporary fixed regulator */
vsdcc_fixed: vsdcc-regulator {
compatible = "regulator-fixed";
regulator-name = "SDCC Power";
regulator-min-microvolt = <2700000>;
regulator-max-microvolt = <2700000>;
regulator-always-on;
};
amba { amba {
compatible = "simple-bus"; compatible = "simple-bus";
#address-cells = <1>; #address-cells = <1>;
...@@ -343,7 +334,6 @@ sdcc1: sdcc@12400000 { ...@@ -343,7 +334,6 @@ sdcc1: sdcc@12400000 {
non-removable; non-removable;
cap-sd-highspeed; cap-sd-highspeed;
cap-mmc-highspeed; cap-mmc-highspeed;
vmmc-supply = <&vsdcc_fixed>;
}; };
sdcc3: sdcc@12180000 { sdcc3: sdcc@12180000 {
...@@ -360,7 +350,6 @@ sdcc3: sdcc@12180000 { ...@@ -360,7 +350,6 @@ sdcc3: sdcc@12180000 {
cap-mmc-highspeed; cap-mmc-highspeed;
max-frequency = <48000000>; max-frequency = <48000000>;
no-1-8-v; no-1-8-v;
vmmc-supply = <&vsdcc_fixed>;
}; };
sdcc5: sdcc@12200000 { sdcc5: sdcc@12200000 {
...@@ -376,7 +365,6 @@ sdcc5: sdcc@12200000 { ...@@ -376,7 +365,6 @@ sdcc5: sdcc@12200000 {
cap-sd-highspeed; cap-sd-highspeed;
cap-mmc-highspeed; cap-mmc-highspeed;
max-frequency = <48000000>; max-frequency = <48000000>;
vmmc-supply = <&vsdcc_fixed>;
}; };
}; };
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment