diff options
| author | Dmitry Baryshkov <dbaryshkov@gmail.com> | 2020-08-19 17:12:36 +0300 |
|---|---|---|
| committer | Dmitry Baryshkov <dbaryshkov@gmail.com> | 2020-08-19 17:12:36 +0300 |
| commit | cd3a62035fdf6f20d1aba16cd1ac406b3148af45 (patch) | |
| tree | d4dd59e65d1b001409a83d169bf0f36fd2068d58 | |
| parent | fe758ae1c05345903388cdff5213da9548fe8f72 (diff) | |
arm64: dts: pmi8994: fix regulator name to resolve dtsi conflicttracking-qcomlt-msm8996-dt
There is a conflict with upstream's msm8994-sony-xperia-kitakami.dtsi
which also got pmi8994_s2 label, so fix regulator name.
Signed-off-by: Dmitry Baryshkov <dbaryshkov@gmail.com>
| -rw-r--r-- | arch/arm64/boot/dts/qcom/pmi8994.dtsi | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm64/boot/dts/qcom/pmi8994.dtsi b/arch/arm64/boot/dts/qcom/pmi8994.dtsi index 6682727fe00c..29240c92b9f8 100644 --- a/arch/arm64/boot/dts/qcom/pmi8994.dtsi +++ b/arch/arm64/boot/dts/qcom/pmi8994.dtsi @@ -32,7 +32,7 @@ #address-cells = <1>; #size-cells = <1>; - pmi8994_s2: s2@1700 { + vreg_pmi8994_s2: s2@1700 { reg = <0x1700 0x100>; status = "ok"; regulator-min-microvolt = <400000>; |