Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-12-27 13:22:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
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: Stephen Boyd <sboyd@codeaurora.org>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Andy Gross <andy.gross@linaro.org>
This commit is contained in:
Linus Walleij 2016-06-17 22:28:11 +02:00 committed by Andy Gross
parent e20fd3364c
commit 1758b35808
2 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
arch/arm/boot/dts/qcom-msm8660-surf.dts
View File

@ -23,15 +23,26 @@
}; };
}; };
/* 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>;
}; };
}; };
}; };

12
arch/arm/boot/dts/qcom-msm8660.dtsi
View File

@ -315,15 +315,6 @@
}; };
}; };
/* 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 @@
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 @@
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 @@
cap-sd-highspeed; cap-sd-highspeed;
cap-mmc-highspeed; cap-mmc-highspeed;
max-frequency = <48000000>; max-frequency = <48000000>;
vmmc-supply = <&vsdcc_fixed>;
}; };
}; };