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

Commit 585e881e authored by Srinivas Kandagatla's avatar Srinivas Kandagatla Committed by Mark Brown
Browse files

ASoC: codecs: Add msm8916-wcd analog codec 



msm8916-wcd codec is found in Qualcomm msm8916 and apq8016 processors.
This codec IP is split in to two parts (Digital & Analog).
Analog part is integrated in to PMIC PM8916 and the digital part is
integrated into Application processor. Data transfer between Analog and
Digital Die is done via a internal bus called PDM.

This patch adds support to Analog part of the Codec which is integrated
into PMIC PM8916.

Signed-off-by: default avatarSrinivas Kandagatla <srinivas.kandagatla@linaro.org>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 1001354c

Documentation/devicetree/bindings/sound/qcom,msm8916-wcd-analog.txt

0 → 100644
+85 −0
Original line number Original line Diff line number Diff line 
msm8916 analog audio CODEC



Bindings for codec Analog IP which is integrated in pmic pm8916,



## Bindings for codec core on pmic:



Required properties

 - compatible = "qcom,pm8916-wcd-analog-codec";

 - reg: represents the slave base address provided to the peripheral.

 - interrupt-parent : The parent interrupt controller.

 - interrupts: List of interrupts in given SPMI peripheral.

 - interrupt-names: Names specified to above list of interrupts in same

		    order. List of supported interrupt names are:

  "cdc_spk_cnp_int" - Speaker click and pop interrupt.

  "cdc_spk_clip_int" - Speaker clip interrupt.

  "cdc_spk_ocp_int" - Speaker over current protect interrupt.

  "mbhc_ins_rem_det1" - jack insert removal detect interrupt 1.

  "mbhc_but_rel_det" - button release interrupt.

  "mbhc_but_press_det" - button press event

  "mbhc_ins_rem_det" - jack insert removal detect interrupt.

  "mbhc_switch_int"	- multi button headset interrupt.

  "cdc_ear_ocp_int" - Earphone over current protect interrupt.

  "cdc_hphr_ocp_int" - Headphone R over current protect interrupt.

  "cdc_hphl_ocp_det" - Headphone L over current protect interrupt.

  "cdc_ear_cnp_int" - earphone cnp interrupt.

  "cdc_hphr_cnp_int" - hphr click and pop interrupt.

  "cdc_hphl_cnp_int" - hphl click and pop interrupt.



 - clocks: Handle to mclk.

 - clock-names: should be "mclk"

 - vdd-cdc-io-supply: phandle to VDD_CDC_IO regulator DT node.

 - vdd-cdc-tx-rx-cx-supply: phandle to VDD_CDC_TX/RX/CX regulator DT node.

 - vdd-micbias-supply: phandle of VDD_MICBIAS supply's regulator DT node.



Optional Properties:

- qcom,micbias1-ext-cap: boolean, present if micbias1 has external capacitor

			 connected.

- qcom,micbias2-ext-cap: boolean, present if micbias2 has external capacitor

			 connected.



Example:



spmi_bus {

	...

	audio-codec@f000{

		compatible = "qcom,pm8916-wcd-analog-codec";

		reg = <0xf000 0x200>;

		reg-names = "pmic-codec-core";

		clocks = <&gcc GCC_CODEC_DIGCODEC_CLK>;

		clock-names = "mclk";

		interrupt-parent = <&spmi_bus>;

		interrupts = <0x1 0xf0 0x0 IRQ_TYPE_NONE>,

			     <0x1 0xf0 0x1 IRQ_TYPE_NONE>,

			     <0x1 0xf0 0x2 IRQ_TYPE_NONE>,

			     <0x1 0xf0 0x3 IRQ_TYPE_NONE>,

			     <0x1 0xf0 0x4 IRQ_TYPE_NONE>,

			     <0x1 0xf0 0x5 IRQ_TYPE_NONE>,

			     <0x1 0xf0 0x6 IRQ_TYPE_NONE>,

			     <0x1 0xf0 0x7 IRQ_TYPE_NONE>,

			     <0x1 0xf1 0x0 IRQ_TYPE_NONE>,

			     <0x1 0xf1 0x1 IRQ_TYPE_NONE>,

			     <0x1 0xf1 0x2 IRQ_TYPE_NONE>,

			     <0x1 0xf1 0x3 IRQ_TYPE_NONE>,

			     <0x1 0xf1 0x4 IRQ_TYPE_NONE>,

			     <0x1 0xf1 0x5 IRQ_TYPE_NONE>;

		interrupt-names = "cdc_spk_cnp_int",

				  "cdc_spk_clip_int",

				  "cdc_spk_ocp_int",

				  "mbhc_ins_rem_det1",

				  "mbhc_but_rel_det",

				  "mbhc_but_press_det",

				  "mbhc_ins_rem_det",

				  "mbhc_switch_int",

				  "cdc_ear_ocp_int",

				  "cdc_hphr_ocp_int",

				  "cdc_hphl_ocp_det",

				  "cdc_ear_cnp_int",

				  "cdc_hphr_cnp_int",

				  "cdc_hphl_cnp_int";

	               VDD-CDC-IO-supply = <&pm8916_l5>;

	               VDD-CDC-TX-RX-CX-supply = <&pm8916_l5>;

	               VDD-MICBIAS-supply = <&pm8916_l13>;

	               #sound-dai-cells = <1>;

	};

};

sound/soc/codecs/Kconfig

+4 −0
Original line number Original line Diff line number Diff line
@@ -581,6 +581,10 @@ config SND_SOC_MAX9860 
	depends on I2C

	depends on I2C

	select REGMAP_I2C

	select REGMAP_I2C





config SND_SOC_MSM8916_WCD_ANALOG

	tristate "Qualcomm MSM8916 WCD Analog Codec"

	depends on SPMI || COMPILE_TEST



config SND_SOC_PCM1681

config SND_SOC_PCM1681

	tristate "Texas Instruments PCM1681 CODEC"

	tristate "Texas Instruments PCM1681 CODEC"

	depends on I2C

	depends on I2C

sound/soc/codecs/Makefile

+2 −1
Original line number Original line Diff line number Diff line
@@ -86,6 +86,7 @@ snd-soc-max9850-objs := max9850.o 
snd-soc-max9860-objs := max9860.o

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

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

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

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

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

snd-soc-msm8916-analog-objs := msm8916-wcd-analog.o

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

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

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

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

snd-soc-hdmi-codec-objs := hdmi-codec.o

snd-soc-hdmi-codec-objs := hdmi-codec.o
@@ -214,7 +215,6 @@ snd-soc-wm9705-objs := wm9705.o 
snd-soc-wm9712-objs := wm9712.o

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

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

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

snd-soc-wm-hubs-objs := wm_hubs.o

snd-soc-wm-hubs-objs := wm_hubs.o



# Amp

# Amp

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

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

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

snd-soc-max98504-objs := max98504.o
@@ -310,6 +310,7 @@ obj-$(CONFIG_SND_SOC_MAX9850) += snd-soc-max9850.o 
obj-$(CONFIG_SND_SOC_MAX9860)	+= snd-soc-max9860.o

obj-$(CONFIG_SND_SOC_MAX9860)	+= snd-soc-max9860.o

obj-$(CONFIG_SND_SOC_MC13783)	+= snd-soc-mc13783.o

obj-$(CONFIG_SND_SOC_MC13783)	+= snd-soc-mc13783.o

obj-$(CONFIG_SND_SOC_ML26124)	+= snd-soc-ml26124.o

obj-$(CONFIG_SND_SOC_ML26124)	+= snd-soc-ml26124.o

obj-$(CONFIG_SND_SOC_MSM8916_WCD_ANALOG) +=snd-soc-msm8916-analog.o

obj-$(CONFIG_SND_SOC_NAU8810)   += snd-soc-nau8810.o

obj-$(CONFIG_SND_SOC_NAU8810)   += snd-soc-nau8810.o

obj-$(CONFIG_SND_SOC_NAU8825)   += snd-soc-nau8825.o

obj-$(CONFIG_SND_SOC_NAU8825)   += snd-soc-nau8825.o

obj-$(CONFIG_SND_SOC_HDMI_CODEC)	+= snd-soc-hdmi-codec.o

obj-$(CONFIG_SND_SOC_HDMI_CODEC)	+= snd-soc-hdmi-codec.o

sound/soc/codecs/msm8916-wcd-analog.c

0 → 100644
+890 −0

File added.

Preview size limit exceeded, changes collapsed.