Merge "ARM: dts: msm: change smb138x_parallel_slave node name"

This commit is contained in:
Linux Build Service Account 2017-10-05 16:10:01 -07:00 committed by Gerrit - the friendly Code Review server
commit 699891bf07
4 changed files with 5 additions and 5 deletions

View file

@ -88,7 +88,7 @@
};
};
smb138x_parallel_slave: qcom,smb138x-parallel-slave@1000 {
smb1381_charger: qcom,smb1381-charger@1000 {
compatible = "qcom,smb138x-parallel-slave";
qcom,pmic-revid = <&smb138x_revid>;
reg = <0x1000 0x700>;
@ -129,7 +129,7 @@
};
};
&smb138x_parallel_slave {
&smb1381_charger {
smb138x_vbus: qcom,smb138x-vbus {
status = "disabled";
regulator-name = "smb138x-vbus";

View file

@ -98,7 +98,7 @@
};
};
smb138x_parallel_slave: qcom,smb138x-parallel-slave@1000 {
smb1381_charger: qcom,smb1381-charger@1000 {
compatible = "qcom,smb138x-parallel-slave";
qcom,pmic-revid = <&smb138x_revid>;
reg = <0x1000 0x700>;

View file

@ -98,7 +98,7 @@
};
};
smb138x_parallel_slave: qcom,smb138x-parallel-slave@1000 {
smb1381_charger: qcom,smb1381-charger@1000 {
compatible = "qcom,smb138x-parallel-slave";
qcom,pmic-revid = <&smb138x_revid>;
reg = <0x1000 0x700>;

View file

@ -92,7 +92,7 @@
};
};
smb138x_parallel_slave: qcom,smb138x-parallel-slave@1000 {
smb1381_charger: qcom,smb1381-charger@1000 {
compatible = "qcom,smb138x-parallel-slave";
qcom,pmic-revid = <&smb138x_revid>;
reg = <0x1000 0x700>;