evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "ARM: dts: msm: correct pmicobalt_bob regulator name for msmcobalt"

Browse source
This commit is contained in:
Linux Build Service Account 2016-10-31 13:04:11 -07:00 • committed by Gerrit - the friendly Code Review server
commit 3fb3076e3a
3 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
arch/arm/boot/dts/qcom/msm-pmcobalt-rpm-regulator.dtsi
View file

@ -592,7 +592,7 @@
regulator-bob {
compatible = "qcom,rpm-smd-regulator";
regulator-name = "pmcobalt_bob";
regulator-name = "pmicobalt_bob";
qcom,set = <3>;
status = "disabled";
};

4
arch/arm/boot/dts/qcom/msm-pmicobalt.dtsi
View file

@ -741,7 +741,7 @@
qcom,led-mask = <3>;
qcom,default-led-trigger = "switch0_trigger";
reg0 {
regulator-name = "pmcobalt_bob";
regulator-name = "pmicobalt_bob";
max-voltage-uv = <3600000>;
};
};
@ -752,7 +752,7 @@
qcom,led-mask = <4>;
qcom,default-led-trigger = "switch1_trigger";
reg0 {
regulator-name = "pmcobalt_bob";
regulator-name = "pmicobalt_bob";
max-voltage-uv = <3600000>;
};
};

6
arch/arm/boot/dts/qcom/msmcobalt-regulator.dtsi
View file

@ -501,7 +501,7 @@
};
pmicobalt_bob_pin1: regulator-bob-pin1 {
compatible = "qcom,rpm-smd-regulator";
regulator-name = "pmcobalt_bob_pin1";
regulator-name = "pmicobalt_bob_pin1";
qcom,set = <3>;
regulator-min-microvolt = <3312000>;
regulator-max-microvolt = <3600000>;
@ -509,7 +509,7 @@
};
pmicobalt_bob_pin2: regulator-bob-pin2 {
compatible = "qcom,rpm-smd-regulator";
regulator-name = "pmcobalt_bob_pin2";
regulator-name = "pmicobalt_bob_pin2";
qcom,set = <3>;
regulator-min-microvolt = <3312000>;
regulator-max-microvolt = <3600000>;
@ -517,7 +517,7 @@
};
pmicobalt_bob_pin3: regulator-bob-pin3 {
compatible = "qcom,rpm-smd-regulator";
regulator-name = "pmcobalt_bob_pin3";
regulator-name = "pmicobalt_bob_pin3";
qcom,set = <3>;
regulator-min-microvolt = <3312000>;
regulator-max-microvolt = <3600000>;