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

Merge remote-tracking branches 'asoc/topic/link-param', 'asoc/topic/max98090',... 

Merge remote-tracking branches 'asoc/topic/link-param', 'asoc/topic/max98090', 'asoc/topic/max98925' and 'asoc/topic/nuc900' into asoc-next
parents 626761ad 46172b6c c6b424fe 5116ede1 fa41181f

Documentation/devicetree/bindings/sound/max98925.txt

0 → 100644
+22 −0
Original line number Diff line number Diff line 
max98925 audio CODEC



This device supports I2C.



Required properties:



  - compatible : "maxim,max98925"



  - vmon-slot-no : slot number used to send voltage information



  - imon-slot-no : slot number used to send current information



  - reg : the I2C address of the device for I2C



Example:



codec: max98925@1a {

	compatible = "maxim,max98925";

	vmon-slot-no = <0>;

	imon-slot-no = <2>;

	reg = <0x1a>;

};

include/sound/soc-dapm.h

+3 −0
Original line number Diff line number Diff line
@@ -378,6 +378,7 @@ int snd_soc_dapm_link_dai_widgets(struct snd_soc_card *card); 
void snd_soc_dapm_connect_dai_link_widgets(struct snd_soc_card *card);

int snd_soc_dapm_new_pcm(struct snd_soc_card *card,

			 const struct snd_soc_pcm_stream *params,

			 unsigned int num_params,

			 struct snd_soc_dapm_widget *source,

			 struct snd_soc_dapm_widget *sink);
@@ -530,6 +531,8 @@ struct snd_soc_dapm_widget { 
	void *priv;				/* widget specific data */

	struct regulator *regulator;		/* attached regulator */

	const struct snd_soc_pcm_stream *params; /* params for dai links */

	unsigned int num_params; /* number of params for dai links */

	unsigned int params_select; /* currently selected param for dai link */



	/* dapm control */

	int reg;				/* negative reg = no direct dapm */

include/sound/soc.h

+1 −0
Original line number Diff line number Diff line
@@ -943,6 +943,7 @@ struct snd_soc_dai_link { 
	int be_id;	/* optional ID for machine driver BE identification */



	const struct snd_soc_pcm_stream *params;

	unsigned int num_params;



	unsigned int dai_fmt;           /* format to set on init */

sound/soc/codecs/Kconfig

+4 −0
Original line number Diff line number Diff line
@@ -70,6 +70,7 @@ config SND_SOC_ALL_CODECS 
	select SND_SOC_MAX98090 if I2C

	select SND_SOC_MAX98095 if I2C

	select SND_SOC_MAX98357A if GPIOLIB

	select SND_SOC_MAX98925 if I2C

	select SND_SOC_MAX9850 if I2C

	select SND_SOC_MAX9768 if I2C

	select SND_SOC_MAX9877 if I2C
@@ -461,6 +462,9 @@ config SND_SOC_MAX98095 
config SND_SOC_MAX98357A

       tristate



config SND_SOC_MAX98925

       tristate



config SND_SOC_MAX9850

	tristate

sound/soc/codecs/Makefile

+2 −0
Original line number Diff line number Diff line
@@ -65,6 +65,7 @@ snd-soc-max98088-objs := max98088.o 
snd-soc-max98090-objs := max98090.o

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

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

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

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

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

snd-soc-ml26124-objs := ml26124.o
@@ -249,6 +250,7 @@ obj-$(CONFIG_SND_SOC_MAX98088) += snd-soc-max98088.o 
obj-$(CONFIG_SND_SOC_MAX98090)	+= snd-soc-max98090.o

obj-$(CONFIG_SND_SOC_MAX98095)	+= snd-soc-max98095.o

obj-$(CONFIG_SND_SOC_MAX98357A)	+= snd-soc-max98357a.o

obj-$(CONFIG_SND_SOC_MAX98925)	+= snd-soc-max98925.o

obj-$(CONFIG_SND_SOC_MAX9850)	+= snd-soc-max9850.o

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

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