Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1758b358 authored Jun 17, 2016 by Linus Walleij Committed by Andy Gross Jun 27, 2016

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: Stephen Boyd <sboyd@codeaurora.org>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Andy Gross <andy.gross@linaro.org>

parent e20fd336

arch/arm/boot/dts/qcom-msm8660-surf.dts

+11 −0

Original line number	Diff line number	Diff line
		@@ -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 {
		/* eMMC */
		sdcc1: sdcc@12400000 {
		status = "okay";
		vmmc-supply = <&vsdcc_fixed>;
		};

		/* External micro SD card */
		sdcc3: sdcc@12180000 {
		status = "okay";
		vmmc-supply = <&vsdcc_fixed>;
		};
		};
		};

arch/arm/boot/dts/qcom-msm8660.dtsi

+0 −12

Original line number	Diff line number	Diff line
		@@ -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 {
		compatible = "simple-bus";
		#address-cells = <1>;
		@@ -343,7 +334,6 @@
		non-removable;
		cap-sd-highspeed;
		cap-mmc-highspeed;
		vmmc-supply = <&vsdcc_fixed>;
		};

		sdcc3: sdcc@12180000 {
		@@ -360,7 +350,6 @@
		cap-mmc-highspeed;
		max-frequency = <48000000>;
		no-1-8-v;
		vmmc-supply = <&vsdcc_fixed>;
		};

		sdcc5: sdcc@12200000 {
		@@ -376,7 +365,6 @@
		cap-sd-highspeed;
		cap-mmc-highspeed;
		max-frequency = <48000000>;
		vmmc-supply = <&vsdcc_fixed>;
		};
		};