Merge branch 'omap-for-v3.11/dt-fixes' into omap-for-v3.11/fixes

7956c487 · Tony Lindgren · 741532c4 · 13782a7e · 7956c487
隐藏空白更改
内联并排

Showing with 6 addition and 0 deletion

arch/arm/boot/dts/twl4030.dtsi arch/arm/boot/dts/twl4030.dtsi +6 -0

未找到文件。
--- a/arch/arm/boot/dts/twl4030.dtsi
+++ b/arch/arm/boot/dts/twl4030.dtsi
@@ -47,6 +47,12 @@ vmmc1: regulator-vmmc1 {
 		regulator-max-microvolt = <3150000>;
 	};

+	vmmc2: regulator-vmmc2 {
+		compatible = "ti,twl4030-vmmc2";
+		regulator-min-microvolt = <1850000>;
+		regulator-max-microvolt = <3150000>;
+	};
+
 	vusb1v5: regulator-vusb1v5 {
 		compatible = "ti,twl4030-vusb1v5";
 	};