Commit 246647ee authored by Mark Brown's avatar Mark Brown
Browse files

Merge remote-tracking branches 'asoc/topic/fsl-spdif', 'asoc/topic/fsl-ssi',... 

Merge remote-tracking branches 'asoc/topic/fsl-spdif', 'asoc/topic/fsl-ssi', 'asoc/topic/gtm601', 'asoc/topic/ics43432' and 'asoc/topic/ids' into asoc-next
parents bb85d373 89e0e250 dce0332c 2002e904 b37bfdaa bf08f39e

Documentation/devicetree/bindings/sound/ics43432.txt

0 → 100644
+17 −0
Original line number Diff line number Diff line 
Invensense ICS-43432 MEMS microphone with I2S output.



There are no software configuration options for this device, indeed, the only

host connection is the I2S interface. Apart from requirements on clock

frequency (460 kHz to 3.379 MHz according to the data sheet) there must be

64 clock cycles in each stereo output frame; 24 of the 32 available bits

contain audio data. A hardware pin determines if the device outputs data

on the left or right channel of the I2S frame.



Required properties:

  - compatible : Must be "invensense,ics43432"



Example:



	ics43432: ics43432 {

		compatible = "invensense,ics43432";

	};

Documentation/devicetree/bindings/vendor-prefixes.txt

+2 −0
Original line number Diff line number Diff line
@@ -110,6 +110,7 @@ ingenic Ingenic Semiconductor 
innolux	Innolux Corporation

intel	Intel Corporation

intercontrol	Inter Control Group

invensense	InvenSense Inc.

isee	ISEE 2007 S.L.

isil	Intersil

karo	Ka-Ro electronics GmbH
@@ -150,6 +151,7 @@ nvidia NVIDIA 
nxp	NXP Semiconductors

onnn	ON Semiconductor Corp.

opencores	OpenCores.org

option	Option NV

ortustech	Ortus Technology Co., Ltd.

ovti	OmniVision Technologies

panasonic	Panasonic Corporation

sound/soc/codecs/Kconfig

+8 −0
Original line number Diff line number Diff line
@@ -63,6 +63,8 @@ config SND_SOC_ALL_CODECS 
	select SND_SOC_BT_SCO

	select SND_SOC_ES8328_SPI if SPI_MASTER

	select SND_SOC_ES8328_I2C if I2C

	select SND_SOC_GTM601

	select SND_SOC_ICS43432

	select SND_SOC_ISABELLE if I2C

	select SND_SOC_JZ4740_CODEC

	select SND_SOC_LM4857 if I2C
@@ -453,6 +455,12 @@ config SND_SOC_ES8328_SPI 
	tristate

	select SND_SOC_ES8328



config SND_SOC_GTM601

	tristate 'GTM601 UMTS modem audio codec'



config SND_SOC_ICS43432

	tristate



config SND_SOC_ISABELLE

        tristate

sound/soc/codecs/Makefile

+4 −0
Original line number Diff line number Diff line
@@ -56,6 +56,8 @@ snd-soc-dmic-objs := dmic.o 
snd-soc-es8328-objs := es8328.o

snd-soc-es8328-i2c-objs := es8328-i2c.o

snd-soc-es8328-spi-objs := es8328-spi.o

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

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

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

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

snd-soc-l3-objs := l3.o
@@ -245,6 +247,8 @@ obj-$(CONFIG_SND_SOC_DMIC) += snd-soc-dmic.o 
obj-$(CONFIG_SND_SOC_ES8328)	+= snd-soc-es8328.o

obj-$(CONFIG_SND_SOC_ES8328_I2C)+= snd-soc-es8328-i2c.o

obj-$(CONFIG_SND_SOC_ES8328_SPI)+= snd-soc-es8328-spi.o

obj-$(CONFIG_SND_SOC_GTM601)    += snd-soc-gtm601.o

obj-$(CONFIG_SND_SOC_ICS43432)	+= snd-soc-ics43432.o

obj-$(CONFIG_SND_SOC_ISABELLE)	+= snd-soc-isabelle.o

obj-$(CONFIG_SND_SOC_JZ4740_CODEC)	+= snd-soc-jz4740-codec.o

obj-$(CONFIG_SND_SOC_L3)	+= snd-soc-l3.o

sound/soc/codecs/da9055.c

+1 −0
Original line number Diff line number Diff line
@@ -1533,6 +1533,7 @@ static const struct of_device_id da9055_of_match[] = { 
	{ .compatible = "dlg,da9055-codec", },

	{ }

};

MODULE_DEVICE_TABLE(of, da9055_of_match);



/* I2C codec control layer */

static struct i2c_driver da9055_i2c_driver = {