Merge "ASoC: sdw-codec: Add support for MSM soundwire codec" into msm-4.9 (4f911a82) · Commits · e / devices / android_kernel_fairphone_FP3

Documentation/devicetree/bindings/sound/wcd_codec.txt

+35 −0

Original line number	Original line	Diff line number	Diff line
	@@ -504,6 +504,41 @@ msm8x16_wcd_codec@f000{
	qcom,dig-cdc-base-addr = <0xc0f0000>;		qcom,dig-cdc-base-addr = <0xc0f0000>;
	};		};

			MSM based Soundwire audio codec

			Required properties:
			- compatible = "qcom,msm-sdw-codec";
			- reg: Specifies the soundwire codec base address for MSM digital
			soundwire core registers.
			- interrupts: Specifies the soundwire master interrupt number to Apps processor.
			- interrupt-names: Specify the interrupt name from soundwire master.
			- swr_master: This node is added as a child of MSM soundwire codec
			and uses already existing driver soundwire master.
			And there is/are subchild node(s) under soundwire master
			which is also existing driver WSA881x that represents
			soundwire slave devices.

			Example:

			msm_sdw_codec: qcom,msm-sdw-codec@152c1000 {
			compatible = "qcom,msm-sdw-codec";
			reg = <0x152c1000 0x0>;
			interrupts = <0 161 0>;
			interrupt-names = "swr_master_irq";

			swr_master {
			compatible = "qcom,swr-wcd";
			#address-cells = <2>;
			#size-cells = <0>;

			wsa881x_1: wsa881x@20170212 {
			compatible = "qcom,wsa881x";
			reg = <0x00 0x20170212>;
			qcom,spkr-sd-n-gpio = <&tlmm 80 0>;
			};
			};
			};

	Tasha audio CODEC in I2C mode		Tasha audio CODEC in I2C mode

	- compatible = "qcom,tasha-i2c-pgd";		- compatible = "qcom,tasha-i2c-pgd";

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -1165,5 +1165,6 @@ config SND_SOC_MSM_HDMI_CODEC_RX
	supports hdmi panel.		supports hdmi panel.

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

	endmenu		endmenu

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -483,3 +483,4 @@ obj-$(CONFIG_SND_SOC_MAX9877) += snd-soc-max9877.o
	obj-$(CONFIG_SND_SOC_MAX98504) += snd-soc-max98504.o		obj-$(CONFIG_SND_SOC_MAX98504) += snd-soc-max98504.o
	obj-$(CONFIG_SND_SOC_TPA6130A2) += snd-soc-tpa6130a2.o		obj-$(CONFIG_SND_SOC_TPA6130A2) += snd-soc-tpa6130a2.o
	obj-y += msm8x16/		obj-y += msm8x16/
			obj-y += msm_sdw/

0 → 100644

+6 −0

Original line number	Original line	Diff line number	Diff line
			config SND_SOC_MSM_SDW
			tristate "MSM Internal soundwire codec"
			help
			MSM-based soundwire codec core driver
			supported along with internal digital
			codec core.

0 → 100644

+3 −0

Original line number	Original line	Diff line number	Diff line
			snd-soc-msm-sdw-objs := msm_sdw_cdc.o msm_sdw_regmap.o msm-sdw-tables.o msm_sdw_cdc_utils.o
			obj-$(CONFIG_SND_SOC_MSM_SDW) += snd-soc-msm-sdw.o
			ccflags-y += -I$(srctree)/sound/soc/msm