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

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

Merge "ASoC: msm8x16: Initial change for internal codec support"

parents 27d0d7b4 148a552c

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

+5 −0
Original line number Diff line number Diff line
@@ -725,6 +725,11 @@ Optional Properties: 


Example:



	msm_dig_codec: qcom,msm-int-codec {

		compatible = "qcom,msm_int_core_codec";

		qcom,dig-cdc-base-addr = <0xc0f0000>;

	};



	sound {

		compatible = "qcom,msm8x16-audio-codec";

		qcom,model = "msm8x16-snd-card";

Documentation/devicetree/bindings/sound/wcd_codec.txt

+15 −2
Original line number Diff line number Diff line
@@ -383,7 +383,9 @@ i2c@f9925000 { 


Tombak audio CODEC in SPMI mode



 - compatible = "qcom,msm8x16_wcd_codec";

 - compatible = "qcom,msm-codec-core",

 - compatible = "qcom,pmic-codec-digital"

 - compatible = "qcom,pmic-codec-analog"

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

 - interrupt-parent : The parent interrupt controller.

 - interrupts: List of interrupts in given SPMI peripheral.
@@ -435,8 +437,19 @@ Optional properties: 
				core register writes.



Example:



msm_dig_codec: qcom,msm-int-codec {

	compatible = "qcom,msm_int_core_codec";

	qcom,dig-cdc-base-addr = <0xc0f0000>;

};



msm8x16_wcd_codec@f100 {

	compatible = "qcom,msm_int_pmic_analog_codec";

	reg = <0xf100 0x100>;

};



msm8x16_wcd_codec@f000{

	compatible = "qcom,msm8x16_wcd_codec";

	compatible = "qcom,msm_int_pmic_digital_codec";

	reg = <0xf000 0x100>;

	interrupt-parent = <&spmi_bus>;

	interrupts = <0x1 0xf0 0x0>,

sound/soc/codecs/Kconfig

+3 −3
Original line number Diff line number Diff line
@@ -739,9 +739,6 @@ config SND_SOC_WSA881X_ANALOG 
        tristate

	select REGMAP_I2C



config SND_SOC_MSM8X16_WCD

	tristate



config SND_SOC_WCD9XXX

	tristate

	default y if SND_SOC_WCD9320=y || SND_SOC_WCD9330=y || SND_SOC_WCD9335=y
@@ -984,4 +981,7 @@ config SND_SOC_MSM_HDMI_CODEC_RX 
	help

	HDMI audio drivers should be built only if the platform

        supports hdmi panel.



source "sound/soc/codecs/msm8x16/Kconfig"



endmenu

sound/soc/codecs/Makefile

+1 −2
Original line number Diff line number Diff line
@@ -140,7 +140,6 @@ audio-ext-clock-objs := audio-ext-clk.o 
snd-soc-wcd-cpe-objs := wcd_cpe_services.o wcd_cpe_core.o

snd-soc-wsa881x-objs := wsa881x.o wsa881x-tables.o wsa881x-regmap.o wsa881x-temp-sensor.o

snd-soc-wcd-mbhc-objs := wcd-mbhc-v2.o

snd-soc-msm8952-wcd-objs := msm8x16-wcd.o msm8x16-wcd-tables.o

snd-soc-wsa881x-analog-objs := wsa881x-analog.o wsa881x-tables-analog.o

snd-soc-wsa881x-analog-objs += wsa881x-regmap-analog.o wsa881x-irq.o

snd-soc-wcd-dsp-utils-objs := wcd-dsp-utils.o
@@ -348,7 +347,6 @@ obj-$(CONFIG_SND_SOC_WCD934X) += wcd934x/ 
obj-$(CONFIG_AUDIO_EXT_CLK)	+= audio-ext-clock.o

obj-$(CONFIG_SND_SOC_WCD9XXX)   += snd-soc-wcd9xxx.o

obj-$(CONFIG_SND_SOC_WCD9XXX_V2) += snd-soc-wcd9xxx-v2.o

obj-$(CONFIG_SND_SOC_MSM8X16_WCD)	+= snd-soc-msm8952-wcd.o msm8916-wcd-irq.o

obj-$(CONFIG_SND_SOC_WCD_CPE)   += snd-soc-wcd-cpe.o

obj-$(CONFIG_SND_SOC_WCD_MBHC)  += snd-soc-wcd-mbhc.o

obj-$(CONFIG_SND_SOC_WSA881X)	+= snd-soc-wsa881x.o
@@ -416,3 +414,4 @@ obj-$(CONFIG_SND_SOC_MSM_STUB) += snd-soc-msm-stub.o 
# Amp

obj-$(CONFIG_SND_SOC_MAX9877)	+= snd-soc-max9877.o

obj-$(CONFIG_SND_SOC_TPA6130A2)	+= snd-soc-tpa6130a2.o

obj-y += msm8x16/

sound/soc/codecs/msm8x16/Kconfig

0 → 100644
+3 −0
Original line number Diff line number Diff line 


config SND_SOC_MSM8X16_WCD

	tristate "MSM Internal PMIC based codec"