Unverified Commit 5eed6fe3 authored by Mark Brown's avatar Mark Brown
Browse files

Merge remote-tracking branches 'asoc/topic/adav80x', 'asoc/topic/ads117x',... 

Merge remote-tracking branches 'asoc/topic/adav80x', 'asoc/topic/ads117x', 'asoc/topic/ak4104', 'asoc/topic/ak4458' and 'asoc/topic/ak4535' into asoc-next
parents 231b5607 a0565587 93101617 61feead8 de03af56 d229c0be

Documentation/devicetree/bindings/sound/ak4458.txt

0 → 100644
+23 −0
Original line number Diff line number Diff line 
AK4458 audio DAC



This device supports I2C mode.



Required properties:



- compatible : "asahi-kasei,ak4458"

- reg : The I2C address of the device for I2C



Optional properties:

- reset-gpios: A GPIO specifier for the power down & reset pin

- mute-gpios: A GPIO specifier for the soft mute pin



Example:



&i2c {

	ak4458: dac@10 {

		compatible = "asahi-kasei,ak4458";

		reg = <0x10>;

		reset-gpios = <&gpio1 10 GPIO_ACTIVE_LOW>

		mute-gpios = <&gpio1 11 GPIO_ACTIVE_HIGH>

	};

};

sound/soc/codecs/Kconfig

+6 −0
Original line number Diff line number Diff line
@@ -35,6 +35,7 @@ config SND_SOC_ALL_CODECS 
	select SND_SOC_ADAU7002

	select SND_SOC_ADS117X

	select SND_SOC_AK4104 if SPI_MASTER

	select SND_SOC_AK4458 if I2C

	select SND_SOC_AK4535 if I2C

	select SND_SOC_AK4554

	select SND_SOC_AK4613 if I2C
@@ -376,6 +377,11 @@ config SND_SOC_AK4104 
	tristate "AKM AK4104 CODEC"

	depends on SPI_MASTER



config SND_SOC_AK4458

	tristate "AKM AK4458 CODEC"

	depends on I2C

	select REGMAP_I2C



config SND_SOC_AK4535

	tristate

sound/soc/codecs/Makefile

+2 −0
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ snd-soc-adav801-objs := adav801.o 
snd-soc-adav803-objs := adav803.o

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

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

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

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

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

snd-soc-ak4613-objs := ak4613.o
@@ -272,6 +273,7 @@ obj-$(CONFIG_SND_SOC_ADAV801) += snd-soc-adav801.o 
obj-$(CONFIG_SND_SOC_ADAV803)  += snd-soc-adav803.o

obj-$(CONFIG_SND_SOC_ADS117X)	+= snd-soc-ads117x.o

obj-$(CONFIG_SND_SOC_AK4104)	+= snd-soc-ak4104.o

obj-$(CONFIG_SND_SOC_AK4458)	+= snd-soc-ak4458.o

obj-$(CONFIG_SND_SOC_AK4535)	+= snd-soc-ak4535.o

obj-$(CONFIG_SND_SOC_AK4554)	+= snd-soc-ak4554.o

obj-$(CONFIG_SND_SOC_AK4613)	+= snd-soc-ak4613.o

sound/soc/codecs/adav801.c

+0 −7
Original line number Diff line number Diff line
@@ -30,18 +30,11 @@ static int adav80x_spi_probe(struct spi_device *spi) 
	return adav80x_bus_probe(&spi->dev, devm_regmap_init_spi(spi, &config));

}



static int adav80x_spi_remove(struct spi_device *spi)

{

	snd_soc_unregister_codec(&spi->dev);

	return 0;

}



static struct spi_driver adav80x_spi_driver = {

	.driver = {

		.name	= "adav801",

	},

	.probe		= adav80x_spi_probe,

	.remove		= adav80x_spi_remove,

	.id_table	= adav80x_spi_id,

};

module_spi_driver(adav80x_spi_driver);

sound/soc/codecs/adav803.c

+0 −7
Original line number Diff line number Diff line
@@ -27,18 +27,11 @@ static int adav803_probe(struct i2c_client *client, 
		devm_regmap_init_i2c(client, &adav80x_regmap_config));

}



static int adav803_remove(struct i2c_client *client)

{

	snd_soc_unregister_codec(&client->dev);

	return 0;

}



static struct i2c_driver adav803_driver = {

	.driver = {

		.name = "adav803",

	},

	.probe = adav803_probe,

	.remove = adav803_remove,

	.id_table = adav803_id,

};

module_i2c_driver(adav803_driver);