Merge "ARM: dts: msm: Add dt entries for kona stub"
diff --git a/arch/arm64/boot/dts/qcom/kona-audio.dtsi b/arch/arm64/boot/dts/qcom/kona-audio.dtsi
new file mode 100644
index 0000000..c5b380d
--- /dev/null
+++ b/arch/arm64/boot/dts/qcom/kona-audio.dtsi
@@ -0,0 +1,22 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
+ * Copyright (c) 2018, The Linux Foundation. All rights reserved.
+ */
+
+#include "msm-audio-lpass.dtsi"
+
+&msm_audio_ion {
+ iommus = <&apps_smmu 0x1801 0x0>;
+ qcom,smmu-sid-mask = /bits/ 64 <0xf>;
+};
+
+&soc {
+ qcom,avtimer@39ef000 {
+ compatible = "qcom,avtimer";
+ reg = <0x039ef00c 0x4>,
+ <0x039ef010 0x4>;
+ reg-names = "avtimer_lsb_addr", "avtimer_msb_addr";
+ qcom,clk-div = <192>;
+ qcom,clk-mult = <10>;
+ };
+};
diff --git a/arch/arm64/boot/dts/qcom/kona-rumi.dtsi b/arch/arm64/boot/dts/qcom/kona-rumi.dtsi
index 0c0a68f..ca8e194 100644
--- a/arch/arm64/boot/dts/qcom/kona-rumi.dtsi
+++ b/arch/arm64/boot/dts/qcom/kona-rumi.dtsi
@@ -3,6 +3,8 @@
* Copyright (c) 2018, The Linux Foundation. All rights reserved.
*/
+#include "msm-audio-lpass.dtsi"
+
&arch_timer {
clock-frequency = <1000000>;
};
@@ -74,3 +76,20 @@
maximum-speed = "high-speed";
};
};
+
+&audio_apr {
+ sound-stub {
+ compatible = "qcom,kona-asoc-snd-stub";
+ qcom,model = "kona-stub-snd-card";
+
+ qcom,audio-routing =
+ "AIF4 VI", "MCLK";
+
+ asoc-platform = <&pcm0>, <&routing>;
+ asoc-platform-names = "msm-pcm-dsp.0", "msm-pcm-routing";
+ asoc-cpu = <&dai_pri_auxpcm>;
+ asoc-cpu-names = "msm-dai-q6-auxpcm.1";
+ asoc-codec = <&stub_codec>;
+ asoc-codec-names = "msm-stub-codec.1";
+ };
+};
diff --git a/arch/arm64/boot/dts/qcom/kona.dtsi b/arch/arm64/boot/dts/qcom/kona.dtsi
index 4cbe759..1398a16 100644
--- a/arch/arm64/boot/dts/qcom/kona.dtsi
+++ b/arch/arm64/boot/dts/qcom/kona.dtsi
@@ -1297,3 +1297,4 @@
#include "kona-sde.dtsi"
#include "kona-sde-pll.dtsi"
#include "kona-sde-display.dtsi"
+#include "kona-audio.dtsi"