From 90f71171d251397bf6bc6be37a6937e551b7fc76 Mon Sep 17 00:00:00 2001 From: Rajendra Nayak Date: Wed, 14 Sep 2016 09:10:52 +0530 Subject: arm64: dts: Add s2 regulator in pmi8994 Mark this as always-on. Needed by GPU gdsc, maybe this will have to be requested explicetly by the GPU driver? Signed-off-by: Rajendra Nayak --- arch/arm64/boot/dts/qcom/msm8996.dtsi | 2 ++ arch/arm64/boot/dts/qcom/pmi8994.dtsi | 8 ++++++++ 2 files changed, 10 insertions(+) diff --git a/arch/arm64/boot/dts/qcom/msm8996.dtsi b/arch/arm64/boot/dts/qcom/msm8996.dtsi index 9951286db775..a421aee27b28 100644 --- a/arch/arm64/boot/dts/qcom/msm8996.dtsi +++ b/arch/arm64/boot/dts/qcom/msm8996.dtsi @@ -2454,3 +2454,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..6682727fe00c 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>; + + pmi8994_s2: s2@1700 { + reg = <0x1700 0x100>; + status = "ok"; + regulator-min-microvolt = <400000>; + regulator-max-microvolt = <1015000>; + regulator-always-on; + }; }; }; }; -- cgit v1.2.3 From a9236093d64290f85873a0538ff1517babc207db Mon Sep 17 00:00:00 2001 From: Srinivas Kandagatla Date: Mon, 18 Jun 2018 17:43:35 +0100 Subject: arm64: msm8996: fix memory region overlap This patch fixes memory region overlap between adsp and gpu. Fix this by reusing the slpi memory region for gpu zap shader. Signed-off-by: Srinivas Kandagatla --- arch/arm64/boot/dts/qcom/msm8996.dtsi | 5 ----- 1 file changed, 5 deletions(-) diff --git a/arch/arm64/boot/dts/qcom/msm8996.dtsi b/arch/arm64/boot/dts/qcom/msm8996.dtsi index a421aee27b28..0fb3f43bb328 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; -- cgit v1.2.3 From fe758ae1c05345903388cdff5213da9548fe8f72 Mon Sep 17 00:00:00 2001 From: Srinivas Kandagatla Date: Wed, 19 Dec 2018 18:06:45 +0000 Subject: arm64: dts: msm8996: add fastrpc nodes Signed-off-by: Srinivas Kandagatla --- arch/arm64/boot/dts/qcom/msm8996.dtsi | 49 +++++++++++++++++++++++++++++++++++ 1 file changed, 49 insertions(+) diff --git a/arch/arm64/boot/dts/qcom/msm8996.dtsi b/arch/arm64/boot/dts/qcom/msm8996.dtsi index 0fb3f43bb328..56f02d6f5c5c 100644 --- a/arch/arm64/boot/dts/qcom/msm8996.dtsi +++ b/arch/arm64/boot/dts/qcom/msm8996.dtsi @@ -2115,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>; + }; + }; }; }; -- cgit v1.2.3 From cd3a62035fdf6f20d1aba16cd1ac406b3148af45 Mon Sep 17 00:00:00 2001 From: Dmitry Baryshkov Date: Wed, 19 Aug 2020 17:12:36 +0300 Subject: arm64: dts: pmi8994: fix regulator name to resolve dtsi conflict 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 --- arch/arm64/boot/dts/qcom/pmi8994.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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>; -- cgit v1.2.3