Commit 971dec82 authored by Mark Brown's avatar Mark Brown
Browse files

Merge remote-tracking branches 'asoc/topic/nau8810', 'asoc/topic/of-bool',... 

Merge remote-tracking branches 'asoc/topic/nau8810', 'asoc/topic/of-bool', 'asoc/topic/omap' and 'asoc/topic/platform-drvdata' into asoc-next
parents 3b495e4b ec103964 51930295 9be072a6 1e814030

Documentation/devicetree/bindings/sound/nau8810.txt

0 → 100644
+16 −0
Original line number Diff line number Diff line 
NAU8810 audio CODEC



This device supports I2C only.



Required properties:



  - compatible : "nuvoton,nau8810"



  - reg : the I2C address of the device.



Example:



codec: nau8810@1a {

	compatible = "nuvoton,nau8810";

	reg = <0x1a>;

};

include/sound/soc.h

+0 −11
Original line number Diff line number Diff line
@@ -1539,17 +1539,6 @@ static inline void *snd_soc_platform_get_drvdata(struct snd_soc_platform *platfo 
	return snd_soc_component_get_drvdata(&platform->component);

}



static inline void snd_soc_pcm_set_drvdata(struct snd_soc_pcm_runtime *rtd,

		void *data)

{

	dev_set_drvdata(rtd->dev, data);

}



static inline void *snd_soc_pcm_get_drvdata(struct snd_soc_pcm_runtime *rtd)

{

	return dev_get_drvdata(rtd->dev);

}



static inline void snd_soc_initialize_card_lists(struct snd_soc_card *card)

{

	INIT_LIST_HEAD(&card->codec_dev_list);

sound/soc/codecs/Kconfig

+5 −0
Original line number Diff line number Diff line
@@ -92,6 +92,7 @@ config SND_SOC_ALL_CODECS 
	select SND_SOC_MAX9877 if I2C

	select SND_SOC_MC13783 if MFD_MC13XXX

	select SND_SOC_ML26124 if I2C

	select SND_SOC_NAU8810 if I2C

	select SND_SOC_NAU8825 if I2C

	select SND_SOC_HDMI_CODEC

	select SND_SOC_PCM1681 if I2C
@@ -1064,6 +1065,10 @@ config SND_SOC_MC13783 
config SND_SOC_ML26124

	tristate



config SND_SOC_NAU8810

	tristate "Nuvoton Technology Corporation NAU88C10 CODEC"

	depends on I2C



config SND_SOC_NAU8825

	tristate

sound/soc/codecs/Makefile

+2 −0
Original line number Diff line number Diff line
@@ -86,6 +86,7 @@ snd-soc-max9850-objs := max9850.o 
snd-soc-max9860-objs := max9860.o

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

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

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

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

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

snd-soc-pcm1681-objs := pcm1681.o
@@ -307,6 +308,7 @@ obj-$(CONFIG_SND_SOC_MAX9850) += snd-soc-max9850.o 
obj-$(CONFIG_SND_SOC_MAX9860)	+= snd-soc-max9860.o

obj-$(CONFIG_SND_SOC_MC13783)	+= snd-soc-mc13783.o

obj-$(CONFIG_SND_SOC_ML26124)	+= snd-soc-ml26124.o

obj-$(CONFIG_SND_SOC_NAU8810)   += snd-soc-nau8810.o

obj-$(CONFIG_SND_SOC_NAU8825)   += snd-soc-nau8825.o

obj-$(CONFIG_SND_SOC_HDMI_CODEC)	+= snd-soc-hdmi-codec.o

obj-$(CONFIG_SND_SOC_PCM1681)	+= snd-soc-pcm1681.o

sound/soc/codecs/ab8500-codec.c

+5 −5
Original line number Diff line number Diff line
@@ -2408,28 +2408,28 @@ static void ab8500_codec_of_probe(struct device *dev, struct device_node *np, 
{

	u32 value;



	if (of_get_property(np, "stericsson,amic1-type-single-ended", NULL))

	if (of_property_read_bool(np, "stericsson,amic1-type-single-ended"))

		codec->amics.mic1_type = AMIC_TYPE_SINGLE_ENDED;

	else

		codec->amics.mic1_type = AMIC_TYPE_DIFFERENTIAL;



	if (of_get_property(np, "stericsson,amic2-type-single-ended", NULL))

	if (of_property_read_bool(np, "stericsson,amic2-type-single-ended"))

		codec->amics.mic2_type = AMIC_TYPE_SINGLE_ENDED;

	else

		codec->amics.mic2_type = AMIC_TYPE_DIFFERENTIAL;



	/* Has a non-standard Vamic been requested? */

	if (of_get_property(np, "stericsson,amic1a-bias-vamic2", NULL))

	if (of_property_read_bool(np, "stericsson,amic1a-bias-vamic2"))

		codec->amics.mic1a_micbias = AMIC_MICBIAS_VAMIC2;

	else

		codec->amics.mic1a_micbias = AMIC_MICBIAS_VAMIC1;



	if (of_get_property(np, "stericsson,amic1b-bias-vamic2", NULL))

	if (of_property_read_bool(np, "stericsson,amic1b-bias-vamic2"))

		codec->amics.mic1b_micbias = AMIC_MICBIAS_VAMIC2;

	else

		codec->amics.mic1b_micbias = AMIC_MICBIAS_VAMIC1;



	if (of_get_property(np, "stericsson,amic2-bias-vamic1", NULL))

	if (of_property_read_bool(np, "stericsson,amic2-bias-vamic1"))

		codec->amics.mic2_micbias = AMIC_MICBIAS_VAMIC1;

	else

		codec->amics.mic2_micbias = AMIC_MICBIAS_VAMIC2;