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

Commit a46f1cfa authored by Mark Brown's avatar Mark Brown
Browse files

Merge branch 'topic/const' of... 

Merge branch 'topic/const' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into asoc-dmic
parents 23c7159a 6e37f933

Documentation/devicetree/bindings/sound/rt274.txt

0 → 100644
+33 −0
Original line number Diff line number Diff line 
RT274 audio CODEC



This device supports I2C only.



Required properties:



- compatible : "realtek,rt274".



- reg : The I2C address of the device.



Optional properties:



- interrupts : The CODEC's interrupt output.





Pins on the device (for linking into audio routes) for RT274:



  * DMIC1 Pin

  * DMIC2 Pin

  * MIC

  * LINE1

  * LINE2

  * HPO Pin

  * SPDIF

  * LINE3



Example:



codec: rt274@1c {

	compatible = "realtek,rt274";

	reg = <0x1c>;

	interrupts = <7 IRQ_TYPE_EDGE_FALLING>;

};

sound/soc/codecs/88pm860x-codec.c

+1 −1
Original line number Diff line number Diff line
@@ -1355,7 +1355,7 @@ static struct regmap *pm860x_get_regmap(struct device *dev) 
	return pm860x->regmap;

}



static struct snd_soc_codec_driver soc_codec_dev_pm860x = {

static const struct snd_soc_codec_driver soc_codec_dev_pm860x = {

	.probe		= pm860x_probe,

	.remove		= pm860x_remove,

	.set_bias_level	= pm860x_set_bias_level,

sound/soc/codecs/Kconfig

+7 −0
Original line number Diff line number Diff line
@@ -114,6 +114,7 @@ config SND_SOC_ALL_CODECS 
	select SND_SOC_PCM5102A

	select SND_SOC_PCM512x_I2C if I2C

	select SND_SOC_PCM512x_SPI if SPI_MASTER

	select SND_SOC_RT274 if I2C

	select SND_SOC_RT286 if I2C

	select SND_SOC_RT298 if I2C

	select SND_SOC_RT5514 if I2C
@@ -716,11 +717,17 @@ config SND_SOC_RL6231 


config SND_SOC_RL6347A

	tristate

	default y if SND_SOC_RT274=y

	default y if SND_SOC_RT286=y

	default y if SND_SOC_RT298=y

	default m if SND_SOC_RT274=m

	default m if SND_SOC_RT286=m

	default m if SND_SOC_RT298=m



config SND_SOC_RT274

	tristate

	depends on I2C



config SND_SOC_RT286

	tristate

	depends on I2C

sound/soc/codecs/Makefile

+2 −0
Original line number Diff line number Diff line
@@ -113,6 +113,7 @@ snd-soc-pcm512x-i2c-objs := pcm512x-i2c.o 
snd-soc-pcm512x-spi-objs := pcm512x-spi.o

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

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

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

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

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

snd-soc-rt5514-objs := rt5514.o
@@ -349,6 +350,7 @@ obj-$(CONFIG_SND_SOC_PCM512x_I2C) += snd-soc-pcm512x-i2c.o 
obj-$(CONFIG_SND_SOC_PCM512x_SPI)	+= snd-soc-pcm512x-spi.o

obj-$(CONFIG_SND_SOC_RL6231)	+= snd-soc-rl6231.o

obj-$(CONFIG_SND_SOC_RL6347A)	+= snd-soc-rl6347a.o

obj-$(CONFIG_SND_SOC_RT274)	+= snd-soc-rt274.o

obj-$(CONFIG_SND_SOC_RT286)	+= snd-soc-rt286.o

obj-$(CONFIG_SND_SOC_RT298)	+= snd-soc-rt298.o

obj-$(CONFIG_SND_SOC_RT5514)	+= snd-soc-rt5514.o

sound/soc/codecs/ab8500-codec.c

+1 −1
Original line number Diff line number Diff line
@@ -2523,7 +2523,7 @@ static int ab8500_codec_probe(struct snd_soc_codec *codec) 
	return status;

}



static struct snd_soc_codec_driver ab8500_codec_driver = {

static const struct snd_soc_codec_driver ab8500_codec_driver = {

	.probe =		ab8500_codec_probe,

	.component_driver = {

		.controls =		ab8500_ctrls,