diff options
author | Linaro CI <ci_notify@linaro.org> | 2020-10-07 20:25:23 +0000 |
---|---|---|
committer | Linaro CI <ci_notify@linaro.org> | 2020-10-07 20:25:23 +0000 |
commit | 9ac95d81ee0bd9bedbec368f8de20e240f308eb4 (patch) | |
tree | 1ac01c6d818f835e9ec67d2c857b3c7272a7494f | |
parent | 549738f15da0e5a00275977623be199fbbf7df50 (diff) | |
parent | cd3a62035fdf6f20d1aba16cd1ac406b3148af45 (diff) |
Merge remote-tracking branch 'msm8996-dt/tracking-qcomlt-msm8996-dt' into integration-linux-qcomlt
-rw-r--r-- | arch/arm64/boot/dts/qcom/msm8996.dtsi | 56 | ||||
-rw-r--r-- | arch/arm64/boot/dts/qcom/pmi8994.dtsi | 8 |
2 files changed, 59 insertions, 5 deletions
diff --git a/arch/arm64/boot/dts/qcom/msm8996.dtsi b/arch/arm64/boot/dts/qcom/msm8996.dtsi index 9951286db775..56f02d6f5c5c 100644 --- a/arch/arm64/boot/dts/qcom/msm8996.dtsi +++ b/arch/arm64/boot/dts/qcom/msm8996.dtsi @@ -154,11 +154,6 @@ no-map; }; - slpi_region: slpi@90b00000 { - reg = <0x0 0x90b00000 0x0 0xa00000>; - no-map; - }; - venus_region: venus@90400000 { reg = <0x0 0x90400000 0x0 0x700000>; no-map; @@ -2120,6 +2115,55 @@ }; }; + fastrpc { + compatible = "qcom,fastrpc"; + qcom,smd-channels = "fastrpcsmd-apps-dsp"; + /* DOMAIN_ADSP */ + label = "adsp"; + #address-cells = <1>; + #size-cells = <0>; + + cb@8 { + compatible = "qcom,fastrpc-compute-cb"; + reg = <8>; + iommus = <&lpass_q6_smmu 8>; + }; + cb@9 { + compatible = "qcom,fastrpc-compute-cb"; + reg = <9>; + iommus = <&lpass_q6_smmu 9>; + }; + cb@10 { + compatible = "qcom,fastrpc-compute-cb"; + reg = <10>; + iommus = <&lpass_q6_smmu 10>; + }; + cb@11 { + reg = <11>; + compatible = "qcom,fastrpc-compute-cb"; + iommus = <&lpass_q6_smmu 11>; + }; + cb@12 { + reg = <12>; + compatible = "qcom,fastrpc-compute-cb"; + iommus = <&lpass_q6_smmu 12>; + }; + cb@5 { + reg = <5>; + compatible = "qcom,fastrpc-compute-cb"; + iommus = <&lpass_q6_smmu 5>; + }; + cb@6 { + reg = <6>; + compatible = "qcom,fastrpc-compute-cb"; + iommus = <&lpass_q6_smmu 6>; + }; + cb@7 { + reg = <7>; + compatible = "qcom,fastrpc-compute-cb"; + iommus = <&lpass_q6_smmu 7>; + }; + }; }; }; @@ -2454,3 +2498,5 @@ }; }; #include "msm8996-pins.dtsi" +#include "pm8994.dtsi" +#include "pmi8994.dtsi" diff --git a/arch/arm64/boot/dts/qcom/pmi8994.dtsi b/arch/arm64/boot/dts/qcom/pmi8994.dtsi index e5ed28ab9b2d..29240c92b9f8 100644 --- a/arch/arm64/boot/dts/qcom/pmi8994.dtsi +++ b/arch/arm64/boot/dts/qcom/pmi8994.dtsi @@ -31,6 +31,14 @@ compatible = "qcom,pmi8994-regulators"; #address-cells = <1>; #size-cells = <1>; + + vreg_pmi8994_s2: s2@1700 { + reg = <0x1700 0x100>; + status = "ok"; + regulator-min-microvolt = <400000>; + regulator-max-microvolt = <1015000>; + regulator-always-on; + }; }; }; }; |