Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3598bad0 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ASoC: msmsamarium: Add machine driver for msmsamarium"

parents a3753f09 b1fd6bb3

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

+43 −0
Original line number Original line Diff line number Diff line
@@ -697,3 +697,46 @@ sound { 
	qcom,cdc-lineout-spkr-gpios = <&pm8226_gpios 2 0>;

	qcom,cdc-lineout-spkr-gpios = <&pm8226_gpios 2 0>;

	qcom,cdc-vdd-spkr-gpios = <&pm8226_gpios 3 0>;

	qcom,cdc-vdd-spkr-gpios = <&pm8226_gpios 3 0>;

};

};



* MSMSAMARIUM ASoC Machine driver



Required properties:

- compatible : "qcom,msmsamarium-audio-tapan"



Required properties:

- compatible : "qcom,msmsamarium-audio-tapan"

- qcom,model : The user-visible name of this sound card.

- qcom,tapan-mclk-clk-freq : Tapan mclk Freq in Hz. currently only 9600000Hz

				is supported.

- 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,cdc-mclk-gpios : GPIO on which mclk signal is comming.



Example:



sound {

	compatible = "qcom,msmsamarium-audio-tapan";

	qcom,model = "msmsamarium-tapan-snd-card";

	qcom,tapan-mclk-clk-freq = <9600000>;

	audio-routing =

		"RX_BIAS", "MCLK",

		"LDO_H", "MCLK",

		"SPK_OUT", "MCLK",

		"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",

};

arch/arm/mach-msm/Kconfig

+3 −0
Original line number Original line Diff line number Diff line
@@ -556,6 +556,9 @@ config ARCH_MSMSAMARIUM 
	select MSM_L2_SPM

	select MSM_L2_SPM

	select MSM_NATIVE_RESTART

	select MSM_NATIVE_RESTART

	select MSM_RESTART_V2

	select MSM_RESTART_V2

	select MSM_QDSP6_APRV2

	select MSM_QDSP6V2_CODECS

	select MSM_AUDIO_QDSP6V2 if SND_SOC

	select MSM_PM8X60 if PM

	select MSM_PM8X60 if PM

	select MSM_RPM_SMD

	select MSM_RPM_SMD

	select REGULATOR

	select REGULATOR

sound/soc/msm/Kconfig

+18 −0
Original line number Original line Diff line number Diff line
@@ -287,4 +287,22 @@ config SND_SOC_APQ8084 
	 interfaces with DSP, also it will enable

	 interfaces with DSP, also it will enable

	 the machine drivers and the corresponding

	 the machine drivers and the corresponding

	 DAI-links.

	 DAI-links.



config SND_SOC_MSMSAMARIUM

	tristate "SoC Machine driver for MSMSAMARIUM boards"

	depends on ARCH_MSMSAMARIUM

	select SND_SOC_QDSP6V2

	select SND_SOC_MSM_STUB

	select SND_SOC_MSM_HOSTLESS_PCM

	select SND_SOC_WCD9306

	select SND_DYNAMIC_MINORS

	select AUDIO_OCMEM

	select DOLBY_DAP

	help

	 To add support for SoC audio on MSMSAMARIUM.

	 This will enable sound soc drivers which

	 interfaces with DSP, also it will enable

	 the machine drivers and the corresponding

	 DAI-links.



endmenu
 
endmenu

sound/soc/msm/Makefile

+4 −0
Original line number Original line Diff line number Diff line
@@ -104,3 +104,7 @@ obj-$(CONFIG_SND_SOC_MSM8X10) += snd-soc-msm8x10.o 
#for APQ 8084 sound card driver

#for APQ 8084 sound card driver

snd-soc-apq8084-objs := apq8084.o

snd-soc-apq8084-objs := apq8084.o

obj-$(CONFIG_SND_SOC_APQ8084) += snd-soc-apq8084.o

obj-$(CONFIG_SND_SOC_APQ8084) += snd-soc-apq8084.o



#for MSM SAMARIUM sound card driver

snd-soc-msmsamarium-objs := msmsamarium.o

obj-$(CONFIG_SND_SOC_MSMSAMARIUM) += snd-soc-msmsamarium.o