arm64: dts: db410c: add sound card from dsp

Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>

2 files changed, 181 insertions, 45 deletions

diff --git a/arch/arm64/boot/dts/qcom/apq8016-sbc.dtsi b/arch/arm64/boot/dts/qcom/apq8016-sbc.dtsi
index 9ff848792712d..daf13ec4b5e78 100644
--- a/arch/arm64/boot/dts/qcom/apq8016-sbc.dtsi
+++ b/arch/arm64/boot/dts/qcom/apq8016-sbc.dtsi
@@ -18,6 +18,8 @@
 #include <dt-bindings/gpio/gpio.h>
 #include <dt-bindings/input/input.h>
 #include <dt-bindings/sound/apq8016-lpass.h>
+#include <dt-bindings/sound/qcom,q6afe.h>
+#include <dt-bindings/sound/qcom,q6asm.h>
 
 /*
  * GPIO name legend: proper name = the GPIO line is used as GPIO
@@ -384,7 +386,7 @@
 		};
 
 		lpass@7708000 {
-			status = "okay";
+		//	status = "okay";
 		};
 
 		mdss@1a00000 {
@@ -436,49 +438,6 @@
 
 		*/
 
-                sound: sound {
-                        compatible = "qcom,apq8016-sbc-sndcard";
-                        reg = <0x07702000 0x4>, <0x07702004 0x4>;
-                        reg-names = "mic-iomux", "spkr-iomux";
-
-                        status = "okay";
-                        pinctrl-0 = <&cdc_pdm_lines_act &ext_sec_tlmm_lines_act &ext_mclk_tlmm_lines_act>;
-                        pinctrl-1 = <&cdc_pdm_lines_sus &ext_sec_tlmm_lines_sus &ext_mclk_tlmm_lines_sus>;
-                        pinctrl-names = "default", "sleep";
-                        qcom,model = "DB410c";
-                        qcom,audio-routing =
-                                "AMIC2", "MIC BIAS Internal2",
-                                "AMIC3", "MIC BIAS External1";
-			external-dai-link@0 {
-				link-name = "ADV7533";
-				cpu { /* QUAT */
-					sound-dai = <&lpass MI2S_QUATERNARY>;
-				};
-				codec {
-					sound-dai = <&adv_bridge 0>;
-				};
-			};
-
-                        internal-codec-playback-dai-link@0 {            /* I2S - Internal codec */
-                                link-name = "WCD";
-                                cpu { /* PRIMARY */
-                                        sound-dai = <&lpass MI2S_PRIMARY>;
-                                };
-                                codec {
-                                        sound-dai = <&lpass_codec 0>, <&wcd_codec 0>;
-                                };
-                        };
-
-                        internal-codec-capture-dai-link@0 {             /* I2S - Internal codec */
-                                link-name = "WCD-Capture";
-                                cpu { /* PRIMARY */
-                                        sound-dai = <&lpass MI2S_TERTIARY>;
-                                };
-                                codec {
-                                        sound-dai = <&lpass_codec 1>, <&wcd_codec 1>;
-                                };
-                        };
-                };
 
 		spmi@200f000 {
 			pm8916@0 {
@@ -545,6 +504,87 @@
 	};
 };
 
+&sound {
+		compatible = "qcom,apq8016-sbc-sndcard";
+		reg = <0x07702000 0x4>, <0x07702004 0x4>;
+		reg-names = "mic-iomux", "spkr-iomux";
+		status = "okay";
+//		pinctrl-0 = <&cdc_pdm_lines_act &ext_sec_tlmm_lines_act &ext_mclk_tlmm_lines_act>;
+//		pinctrl-1 = <&cdc_pdm_lines_sus &ext_sec_tlmm_lines_sus &ext_mclk_tlmm_lines_sus>;
+//		pinctrl-names = "default", "sleep";
+		qcom,model = "DB410cQ6DSP";
+		qcom,audio-routing =
+		"AMIC2", "MIC BIAS Internal2",
+		"AMIC3", "MIC BIAS External1";
+	
+	fe@1 {
+		link-name = "MultiMedia1";
+		cpu {
+			sound-dai = <&q6asmdai  MSM_FRONTEND_DAI_MULTIMEDIA1>;
+		};
+	};
+	
+	fe@2 {
+		link-name = "MultiMedia2";
+		cpu {
+			sound-dai = <&q6asmdai  MSM_FRONTEND_DAI_MULTIMEDIA2>;
+		};
+	};
+
+	fe@3 {
+		link-name = "MultiMedia4";
+		cpu {
+			sound-dai = <&q6asmdai  MSM_FRONTEND_DAI_MULTIMEDIA4>;
+			
+		};
+	};
+	
+	be@1 {
+		link-name = "QUAT MI2S Playback";
+		cpu {
+			sound-dai = <&q6afedai QUATERNARY_MI2S_RX>;
+		};
+	
+		platform {
+			sound-dai = <&q6routing>;
+		};
+	
+		codec {
+			sound-dai = <&adv_bridge 0>;
+		};
+	};
+
+	be@3 {
+		link-name = "TER MI2S Capture";
+		cpu {
+			sound-dai = <&q6afedai TERTIARY_MI2S_TX>;
+		};
+
+		platform {
+			sound-dai = <&q6routing>;
+		};
+	
+		codec {
+			sound-dai = <&lpass_codec 1>, <&wcd_codec 1>;
+		};
+	};
+
+	be@2 {
+		link-name = "PRI MI2S Playback";
+		cpu {
+			sound-dai = <&q6afedai PRIMARY_MI2S_RX>;
+		};
+	
+		platform {
+			sound-dai = <&q6routing>;
+		};
+	
+		codec {
+			sound-dai = <&lpass_codec 0>, <&wcd_codec 0>;
+		};
+	};
+};
+
 &wcd_codec {
         status = "okay";
         clocks = <&gcc GCC_CODEC_DIGCODEC_CLK>;
diff --git a/arch/arm64/boot/dts/qcom/msm8916.dtsi b/arch/arm64/boot/dts/qcom/msm8916.dtsi
index 66b318e1de800..1ee638d3efd32 100644
--- a/arch/arm64/boot/dts/qcom/msm8916.dtsi
+++ b/arch/arm64/boot/dts/qcom/msm8916.dtsi
@@ -16,6 +16,7 @@
 #include <dt-bindings/reset/qcom,gcc-msm8916.h>
 #include <dt-bindings/clock/qcom,rpmcc.h>
 #include <dt-bindings/thermal/thermal.h>
+#include <dt-bindings/soc/qcom,apr.h>
 
 / {
 	model = "Qualcomm Technologies, Inc. MSM8916";
@@ -847,6 +848,7 @@
 			iommus = <&gpu_iommu 1>, <&gpu_iommu 2>;
 		};
 
+
 		mdss: mdss@1a00000 {
 			compatible = "qcom,mdss";
 			reg = <0x1a00000 0x1000>,
@@ -967,12 +969,17 @@
 			};
 		};
 
+                sound: sound {
+		};
 
 		hexagon@4080000 {
 			compatible = "qcom,q6v5-pil";
 			reg = <0x04080000 0x100>,
 			      <0x04020000 0x040>;
 
+				#address-cells = <1>;
+				#size-cells = <1>;
+				ranges;
 			reg-names = "qdsp6", "rmb";
 
 			interrupts-extended = <&intc 0 24 1>,
@@ -1001,7 +1008,7 @@
 
 			qcom,halt-regs = <&tcsr 0x18000 0x19000 0x1a000>;
 
-			status = "disabled";
+			status = "okay";
 
 			mba {
 				memory-region = <&mba_mem>;
@@ -1019,6 +1026,95 @@
 				qcom,remote-pid = <1>;
 
 				label = "hexagon";
+				#address-cells = <1>;
+				#size-cells = <0>;
+
+
+				apr@4 {
+					#address-cells = <1>;
+					#size-cells = <0>;
+
+					compatible = "qcom,apr-v2";
+					qcom,smd-channels = "apr_audio_svc";
+					reg = <APR_DOMAIN_ADSP>;
+
+					q6core {
+						reg = <APR_SVC_ADSP_CORE>;
+						compatible = "qcom,q6core";
+					};
+	
+					q6afe: q6afe {
+						compatible = "qcom,q6afe";
+						reg = <APR_SVC_AFE>;
+
+						q6afedai: dais {
+							pinctrl-0 = <&cdc_pdm_lines_act &ext_sec_tlmm_lines_act &ext_mclk_tlmm_lines_act>;
+							pinctrl-1 = <&cdc_pdm_lines_sus &ext_sec_tlmm_lines_sus &ext_mclk_tlmm_lines_sus>;
+							pinctrl-names = "default", "sleep";
+							#sound-dai-cells = <1>;
+							#address-cells = <1>;
+							#size-cells = <0>;
+	
+	
+							prim-mi2s-rx@16 {
+								reg = <16>;
+								qcom,sd-lines = <1>;
+							};
+	
+							prim-mi2s-tx@17 {
+								reg = <17>;
+								qcom,sd-lines = <2>;
+							};
+							sec-mi2s-rx@18 {
+								reg = <18>;
+								qcom,sd-lines = <1>;
+							};
+	
+							sec-mi2s-tx@19 {
+								reg = <19>;
+								qcom,sd-lines = <2>;
+							};
+	
+							tert-mi2s-rx@20 {
+								reg = <20>;
+								qcom,sd-lines = <2>;
+							};
+	
+							tert-mi2s-tx@21 {
+								reg = <21>;
+								qcom,sd-lines = <1>;
+							};
+	
+							quat-mi2s-rx@22 {
+								reg = <22>;
+								qcom,sd-lines = <1>;
+							};
+	
+							quat-mi2s-tx@23 {
+								reg = <23>;
+								qcom,sd-lines = <2>;
+							};
+						};
+					};
+	
+					q6asm: q6asm {
+						compatible = "qcom,q6asm";
+						reg = <APR_SVC_ASM>;
+						q6asmdai: dais {
+							#sound-dai-cells = <1>;
+						};
+					};
+	
+					q6adm: q6adm {
+						compatible = "qcom,q6adm";
+						reg = <APR_SVC_ADM>;
+						q6routing: routing {
+							#sound-dai-cells = <0>;
+						};
+					};
+
+
+				};
 			};
 		};