Merge "ASoC: msm: Add msmzirc machine driver"

Documentation/devicetree/bindings/sound/qcom-audio-dev.txt

@@ -1195,3 +1195,55 @@ Example:
 		qcom,ext-ult-spk-amp-gpio = <&pmi8994_gpios 1 0>;
 		qcom,mbhc-audio-jack-type = "6-pole-jack";
 	};
+
+* MSMZIRC ASoC Machine driver
+
+Required properties:
+- compatible : "qcom,msmzirc-audio-tomtom"
+- qcom,model : The user-visible name of this sound card.
+- qcom,audio-routing : A list of the connections between audio components.
+Each entry is a pair of strings, the first being the connection's sink,
+the second being the connection's source.
+- qcom,tomtom-mclk-clk-freq : Master clock value given to codec. Some WCD9XXX
+codec can run at different mclk values. Mclk value can be 9.6MHz or 12.288MHz.
+- pinctrl-names : pinctrl state names for each pin group configuration.
+- pinctrl-x : defines pinctrl state for each pin group
+
+Example:
+
+	sound {
+		compatible = "qcom,msmzirc-audio-tomtom";
+		qcom,model = "msmzirc-tomtom-i2s-snd-card";
+
+		qcom,audio-routing =
+			"RX_BIAS", "MCLK",
+			"LDO_H", "MCLK",
+			"AIF4 MAD", "MCLK",
+			"ultrasound amp", "LINEOUT1",
+			"ultrasound amp", "LINEOUT3",
+			"AMIC1", "MIC BIAS1 Internal1",
+			"MIC BIAS1 Internal1", "Handset Mic",
+			"AMIC2", "MIC BIAS2 External",
+			"MIC BIAS2 External", "Headset Mic",
+			"AMIC3", "MIC BIAS2 External",
+			"MIC BIAS2 External", "ANCRight Headset Mic",
+			"AMIC4", "MIC BIAS2 External",
+			"MIC BIAS2 External", "ANCLeft Headset Mic",
+			"DMIC1", "MIC BIAS1 External",
+			"MIC BIAS1 External", "Digital Mic1",
+			"DMIC2", "MIC BIAS1 External",
+			"MIC BIAS1 External", "Digital Mic2",
+			"DMIC3", "MIC BIAS3 External",
+			"MIC BIAS3 External", "Digital Mic3",
+			"DMIC4", "MIC BIAS3 External",
+			"MIC BIAS3 External", "Digital Mic4",
+			"DMIC5", "MIC BIAS4 External",
+			"MIC BIAS4 External", "Digital Mic5",
+			"DMIC6", "MIC BIAS4 External",
+			"MIC BIAS4 External", "Digital Mic6";
+			qcom,tomtom-mclk-clk-freq = <12288000>;
+		pinctrl-names = "pri-mi2s-active",
+				"pri-mi2s-sleep";
+		pinctrl-0 = <&pri_mi2s_active>, <&pri_mi2s_din_active>;
+		pinctrl-1 = <&pri_mi2s_sleep>, <&pri_mi2s_din_sleep>;
+	};

arch/arm/mach-msm/Kconfig

@@ -227,6 +227,9 @@ config ARCH_MSMZIRC
 	select PCI
 	select MSM_IRQ
 	select MSM_JTAG_MM if CORESIGHT_ETM
+	select MSM_QDSP6_APRV3
+	select MSM_QDSP6V2_CODECS
+	select MSM_AUDIO_QDSP6V2 if SND_SOC
 
 config ARCH_MDMFERRUM
 	bool "MDMFERRUM"

sound/soc/msm/Kconfig

@@ -324,4 +324,20 @@ config SND_SOC_MSM8994
 	 the machine drivers and the corresponding
 	 DAI-links.
 
+config SND_SOC_MSMZIRC
+	tristate "SoC Machine driver for MSMZIRC boards"
+	depends on ARCH_MSMZIRC
+	select SND_SOC_QDSP6V2
+	select SND_SOC_MSM_STUB
+	select SND_SOC_WCD9330
+	select SND_SOC_MSM_HOSTLESS_PCM
+	select SND_DYNAMIC_MINORS
+	select MSM_QDSP6_APRV3
+	select MSM_QDSP6V2_CODECS
+        help
+	 To add support for SoC audio on MSMZIRC boards.
+	 This will enable sound soc drivers which
+	 interfaces with DSP, also it will enable
+	 the machine drivers and the corresponding
+	 DAI-links.
 endmenu

sound/soc/msm/Makefile

@@ -88,3 +88,7 @@ obj-$(CONFIG_SND_SOC_MSM8909) += snd-soc-msm8909.o
 # for MSM 8994 sound card driver
 snd-soc-msm8994-objs := msm8994.o
 obj-$(CONFIG_SND_SOC_MSM8994) += snd-soc-msm8994.o
+
+# for MSMZIRC sound card driver
+snd-soc-msmzirc-objs := msmzirc.o
+obj-$(CONFIG_SND_SOC_MSMZIRC) += snd-soc-msmzirc.o