Commit 248519c0 authored by Mark Brown's avatar Mark Brown
Browse files

Merge remote-tracking branches 'asoc/topic/simple', 'asoc/topic/sirf',... 

Merge remote-tracking branches 'asoc/topic/simple', 'asoc/topic/sirf', 'asoc/topic/spdif', 'asoc/topic/ssm2602' and 'asoc/topic/ssm4567' into asoc-next
parents 7370780c 872bbb3a 0d985b1c 58a9014a 3b2a0013 7c168d5f

Documentation/devicetree/bindings/sound/adi,ssm2602.txt

0 → 100644
+19 −0
Original line number Diff line number Diff line 
Analog Devices SSM2602, SSM2603 and SSM2604 I2S audio CODEC devices



SSM2602 support both I2C and SPI as the configuration interface,

the selection is made by the MODE strap-in pin.

SSM2603 and SSM2604 only support I2C as the configuration interface.



Required properties:



  - compatible : One of "adi,ssm2602", "adi,ssm2603" or "adi,ssm2604"



  - reg : the I2C address of the device for I2C, the chip select

          number for SPI.



 Example:



	ssm2602: ssm2602@1a {

		compatible = "adi,ssm2602";

		reg = <0x1a>;

	};

Documentation/devicetree/bindings/sound/simple-card.txt

+4 −0
Original line number Diff line number Diff line
@@ -17,6 +17,10 @@ Optional properties: 
					  source.

- simple-audio-card,mclk-fs             : Multiplication factor between stream rate and codec

  					  mclk.

- simple-audio-card,hp-det-gpio		: Reference to GPIO that signals when

					  headphones are attached.

- simple-audio-card,mic-det-gpio	: Reference to GPIO that signals when

					  a microphone is attached.



Optional subnodes:

Documentation/devicetree/bindings/sound/ssm4567.txt

0 → 100644
+15 −0
Original line number Diff line number Diff line 
Analog Devices SSM4567 audio amplifier



This device supports I2C only.



Required properties:

  - compatible : Must be "adi,ssm4567"

  - reg : the I2C address of the device. This will either be 0x34 (LR_SEL/ADDR connected to AGND),

	0x35 (LR_SEL/ADDR connected to IOVDD) or 0x36 (LR_SEL/ADDR open).



Example:



	ssm4567: ssm4567@34 {

		compatible = "adi,ssm4567";

		reg = <0x34>;

	};

sound/soc/codecs/Kconfig

+11 −2
Original line number Diff line number Diff line
@@ -94,6 +94,7 @@ config SND_SOC_ALL_CODECS 
	select SND_SOC_SSM2518 if I2C

	select SND_SOC_SSM2602_SPI if SPI_MASTER

	select SND_SOC_SSM2602_I2C if I2C

	select SND_SOC_SSM4567 if I2C

	select SND_SOC_STA32X if I2C

	select SND_SOC_STA350 if I2C

	select SND_SOC_STA529 if I2C
@@ -540,12 +541,20 @@ config SND_SOC_SSM2602 
	tristate



config SND_SOC_SSM2602_SPI

	tristate "Analog Devices SSM2602 CODEC - SPI"

	depends on SPI_MASTER

	select SND_SOC_SSM2602

	tristate

	select REGMAP_SPI



config SND_SOC_SSM2602_I2C

	tristate "Analog Devices SSM2602 CODEC - I2C"

	depends on I2C

	select SND_SOC_SSM2602

	tristate

	select REGMAP_I2C



config SND_SOC_SSM4567

	tristate "Analog Devices ssm4567 amplifier driver support"

	depends on I2C



config SND_SOC_STA32X

	tristate

sound/soc/codecs/Makefile

+2 −0
Original line number Diff line number Diff line
@@ -95,6 +95,7 @@ snd-soc-ssm2518-objs := ssm2518.o 
snd-soc-ssm2602-objs := ssm2602.o

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

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

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

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

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

snd-soc-sta529-objs := sta529.o
@@ -266,6 +267,7 @@ obj-$(CONFIG_SND_SOC_SSM2518) += snd-soc-ssm2518.o 
obj-$(CONFIG_SND_SOC_SSM2602)	+= snd-soc-ssm2602.o

obj-$(CONFIG_SND_SOC_SSM2602_SPI)	+= snd-soc-ssm2602-spi.o

obj-$(CONFIG_SND_SOC_SSM2602_I2C)	+= snd-soc-ssm2602-i2c.o

obj-$(CONFIG_SND_SOC_SSM4567)	+= snd-soc-ssm4567.o

obj-$(CONFIG_SND_SOC_STA32X)   += snd-soc-sta32x.o

obj-$(CONFIG_SND_SOC_STA350)   += snd-soc-sta350.o

obj-$(CONFIG_SND_SOC_STA529)   += snd-soc-sta529.o