summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorLinux Build Service Account <lnxbuild@localhost>2017-03-24 12:12:32 -0700
committerGerrit - the friendly Code Review server <code-review@localhost>2017-03-24 12:12:31 -0700
commit3d962a00546bf7084d1892529fe1fbcc5bd248a2 (patch)
tree05b4b1fa6bce3407d9516cdf10c977311debb4cc /arch
parent27489753bffb6dcf909a49e4e32a2c974675824a (diff)
parentbe98f742085a0e3407aa2d915b0b0cd8f3530500 (diff)
Merge "ARM: dts: msm: designate LDO12 as a parent of LDO24 on msm8998"
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/boot/dts/qcom/msm8998-regulator.dtsi3
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/qcom/msm8998-regulator.dtsi b/arch/arm/boot/dts/qcom/msm8998-regulator.dtsi
index 518ad33c63ea..045cdda09d18 100644
--- a/arch/arm/boot/dts/qcom/msm8998-regulator.dtsi
+++ b/arch/arm/boot/dts/qcom/msm8998-regulator.dtsi
@@ -1,4 +1,4 @@
-/* Copyright (c) 2015-2016, The Linux Foundation. All rights reserved.
+/* Copyright (c) 2015-2017, The Linux Foundation. All rights reserved.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 and
@@ -409,6 +409,7 @@
pm8998_l24: regulator-l24 {
regulator-min-microvolt = <3088000>;
regulator-max-microvolt = <3088000>;
+ parent-supply = <&pm8998_l12>;
status = "okay";
};
};