diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2019-03-08 01:17:53 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2019-03-08 01:17:53 -0800 |
| commit | c13862478eb093907b73bb0981a0d9d7a557d57b (patch) | |
| tree | 9ac728ed9cb8bbb64fdf20bbdb684bc743eb7de1 | |
| parent | 4f5103fd124a929ea55ef9554b324882de41ce0b (diff) | |
| parent | 6e1b880a3e2568340cbdef9ae2f743f15ae57b73 (diff) | |
Merge "ARM: dts: msm: add dtbo support for MSM8996 ufs device"
| -rw-r--r-- | arch/arm/boot/dts/qcom/Makefile | 3 | ||||
| -rw-r--r-- | arch/arm/boot/dts/qcom/msm8996pro-v1.1-pmi8994.dts | 40 |
2 files changed, 42 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/qcom/Makefile b/arch/arm/boot/dts/qcom/Makefile index c5e693497838..b11b98486606 100644 --- a/arch/arm/boot/dts/qcom/Makefile +++ b/arch/arm/boot/dts/qcom/Makefile @@ -3,7 +3,8 @@ dtbo-$(CONFIG_ARCH_MSM8996) += \ msm8996-mtp-overlay.dtbo msm8996-mtp-overlay.dtbo-base := msm8996pro-v1.1-pmi8996.dtb \ - msm8996-v3-pmi8996.dtb + msm8996-v3-pmi8996.dtb \ + msm8996pro-v1.1-pmi8994.dtb else dtb-$(CONFIG_ARCH_MSM8996) += msm8996-v2-pmi8994-cdp.dtb \ diff --git a/arch/arm/boot/dts/qcom/msm8996pro-v1.1-pmi8994.dts b/arch/arm/boot/dts/qcom/msm8996pro-v1.1-pmi8994.dts new file mode 100644 index 000000000000..f54f012f9270 --- /dev/null +++ b/arch/arm/boot/dts/qcom/msm8996pro-v1.1-pmi8994.dts @@ -0,0 +1,40 @@ +/* Copyright (c) 2019, 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 + * only version 2 as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + */ + +/dts-v1/; + +#include "msm8996pro-v1.1.dtsi" +#include "msm-pm8004.dtsi" + +/ { + model = "Qualcomm Technologies, Inc. MSM 8996pro v1.1 + PMI8994"; + compatible = "qcom,msm8996"; + qcom,pmic-id = <0x20009 0x2000A 0x1000C 0x0>; + qcom,msm-id = <305 0x10001>; + qcom,pmic-name = "PMI8994"; +}; + +/* + * Override PMI8994 resources with proper PM8004 resources for MSM8996 with + * PM8004. + */ +&pmi8994_s2 { + status = "disabled"; +}; + +&pm8004_s2 { + status = "ok"; +}; + +&gfx_cpr { + vdd-supply = <&pm8004_s2>; +}; |