forked from luck/tmp_suning_uos_patched
Merge branch 'omap-for-v3.11/dt-fixes' into omap-for-v3.11/fixes
This commit is contained in:
commit
7956c487e4
|
@ -47,6 +47,12 @@ vmmc1: regulator-vmmc1 {
|
||||||
regulator-max-microvolt = <3150000>;
|
regulator-max-microvolt = <3150000>;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
vmmc2: regulator-vmmc2 {
|
||||||
|
compatible = "ti,twl4030-vmmc2";
|
||||||
|
regulator-min-microvolt = <1850000>;
|
||||||
|
regulator-max-microvolt = <3150000>;
|
||||||
|
};
|
||||||
|
|
||||||
vusb1v5: regulator-vusb1v5 {
|
vusb1v5: regulator-vusb1v5 {
|
||||||
compatible = "ti,twl4030-vusb1v5";
|
compatible = "ti,twl4030-vusb1v5";
|
||||||
};
|
};
|
||||||
|
|
Loading…
Reference in New Issue
Block a user