diff options
author | Linaro CI <ci_notify@linaro.org> | 2020-04-28 15:33:44 +0000 |
---|---|---|
committer | Linaro CI <ci_notify@linaro.org> | 2020-04-28 15:33:44 +0000 |
commit | 5b256f6adbb83e7c4f8cfac81ee9e033bda6c91f (patch) | |
tree | 68a6a8e7bee7a051fc3effd3c57872da25f7f4ba | |
parent | 6a8b55ed4056ea5559ebe4f6a4b247f627870d4c (diff) | |
parent | 9a695a80b85ce0cf850078d6cf1019b5bb4b4ab4 (diff) |
Merge remote-tracking branch 'msm8996-dt/tracking-qcomlt-msm8996-dt' into integration-linux-qcomlt
-rw-r--r-- | arch/arm64/boot/dts/qcom/apq8096-db820c.dtsi | 29 | ||||
-rw-r--r-- | arch/arm64/boot/dts/qcom/msm8996.dtsi | 56 | ||||
-rw-r--r-- | arch/arm64/boot/dts/qcom/pmi8994.dtsi | 14 |
3 files changed, 93 insertions, 6 deletions
diff --git a/arch/arm64/boot/dts/qcom/apq8096-db820c.dtsi b/arch/arm64/boot/dts/qcom/apq8096-db820c.dtsi index af87350b5547..b064a3d3b2ed 100644 --- a/arch/arm64/boot/dts/qcom/apq8096-db820c.dtsi +++ b/arch/arm64/boot/dts/qcom/apq8096-db820c.dtsi @@ -911,7 +911,34 @@ &sound { compatible = "qcom,apq8096-sndcard"; model = "DB820c"; - audio-routing = "RX_BIAS", "MCLK"; + audio-routing = + "RX_BIAS", "MCLK", + "MIC BIAS1", "MCLK", + "MIC BIAS2", "MCLK", + "MIC BIAS3", "MCLK", + "MIC BIAS4", "MCLK", + "AMIC1", "MIC BIAS2", + "MIC BIAS2", "Headset Mic", + "AMIC2", "MIC BIAS2", + "MIC BIAS2", "Headset Mic", + "AMIC3", "MIC BIAS2", + "MIC BIAS2", "ANCLeft Headset Mic", + "AMIC4", "MIC BIAS2", + "MIC BIAS2", "ANCRight Headset Mic", + "AMIC5", "MIC BIAS2", + "MIC BIAS2", "Analog Mic6", + "AMIC6", "MIC BIAS2", + "MIC BIAS2", "Analog Mic7", + "DMIC2", "MIC BIAS1", + "MIC BIAS1", "Digital Mic2", + "DMIC3", "MIC BIAS1", + "MIC BIAS1", "Digital Mic3", + "DMIC4", "MIC BIAS3", + "MIC BIAS3", "Digital Mic4", + "DMIC5", "MIC BIAS3", + "MIC BIAS3", "Digital Mic5", + "SpkrLeft IN", "SPK1 OUT", + "SpkrRight IN", "SPK2 OUT"; mm1-dai-link { link-name = "MultiMedia1"; diff --git a/arch/arm64/boot/dts/qcom/msm8996.dtsi b/arch/arm64/boot/dts/qcom/msm8996.dtsi index 14827adebd94..d5b7cdce1bb0 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; @@ -2081,6 +2076,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>; + }; + }; }; }; @@ -2415,3 +2459,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 21e05215abe4..132ad02105ba 100644 --- a/arch/arm64/boot/dts/qcom/pmi8994.dtsi +++ b/arch/arm64/boot/dts/qcom/pmi8994.dtsi @@ -26,5 +26,19 @@ reg = <0x3 SPMI_USID>; #address-cells = <1>; #size-cells = <0>; + + regulators { + 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; + }; + }; }; }; |