Commit 1209842a authored by Takashi Iwai's avatar Takashi Iwai
Browse files

Merge branch 'for-2.6.40' of... 

Merge branch 'for-2.6.40' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound-2.6 into topic/asoc
parents f0a2b0cb f3eee00d

include/sound/soc-dapm.h

+43 −35
Original line number Diff line number Diff line
@@ -39,30 +39,30 @@ 


/* codec domain */

#define SND_SOC_DAPM_VMID(wname) \

{	.id = snd_soc_dapm_vmid, .name = wname, .kcontrols = NULL, \

{	.id = snd_soc_dapm_vmid, .name = wname, .kcontrol_news = NULL, \

	.num_kcontrols = 0}



/* platform domain */

#define SND_SOC_DAPM_INPUT(wname) \

{	.id = snd_soc_dapm_input, .name = wname, .kcontrols = NULL, \

{	.id = snd_soc_dapm_input, .name = wname, .kcontrol_news = NULL, \

	.num_kcontrols = 0, .reg = SND_SOC_NOPM }

#define SND_SOC_DAPM_OUTPUT(wname) \

{	.id = snd_soc_dapm_output, .name = wname, .kcontrols = NULL, \

{	.id = snd_soc_dapm_output, .name = wname, .kcontrol_news = NULL, \

	.num_kcontrols = 0, .reg = SND_SOC_NOPM }

#define SND_SOC_DAPM_MIC(wname, wevent) \

{	.id = snd_soc_dapm_mic, .name = wname, .kcontrols = NULL, \

{	.id = snd_soc_dapm_mic, .name = wname, .kcontrol_news = NULL, \

	.num_kcontrols = 0, .reg = SND_SOC_NOPM, .event = wevent, \

	.event_flags = SND_SOC_DAPM_PRE_PMU | SND_SOC_DAPM_POST_PMD}

#define SND_SOC_DAPM_HP(wname, wevent) \

{	.id = snd_soc_dapm_hp, .name = wname, .kcontrols = NULL, \

{	.id = snd_soc_dapm_hp, .name = wname, .kcontrol_news = NULL, \

	.num_kcontrols = 0, .reg = SND_SOC_NOPM, .event = wevent, \

	.event_flags = SND_SOC_DAPM_POST_PMU | SND_SOC_DAPM_PRE_PMD}

#define SND_SOC_DAPM_SPK(wname, wevent) \

{	.id = snd_soc_dapm_spk, .name = wname, .kcontrols = NULL, \

{	.id = snd_soc_dapm_spk, .name = wname, .kcontrol_news = NULL, \

	.num_kcontrols = 0, .reg = SND_SOC_NOPM, .event = wevent, \

	.event_flags = SND_SOC_DAPM_POST_PMU | SND_SOC_DAPM_PRE_PMD}

#define SND_SOC_DAPM_LINE(wname, wevent) \

{	.id = snd_soc_dapm_line, .name = wname, .kcontrols = NULL, \

{	.id = snd_soc_dapm_line, .name = wname, .kcontrol_news = NULL, \

	.num_kcontrols = 0, .reg = SND_SOC_NOPM, .event = wevent, \

	.event_flags = SND_SOC_DAPM_POST_PMU | SND_SOC_DAPM_PRE_PMD}
@@ -70,91 +70,91 @@ 
#define SND_SOC_DAPM_PGA(wname, wreg, wshift, winvert,\

	 wcontrols, wncontrols) \

{	.id = snd_soc_dapm_pga, .name = wname, .reg = wreg, .shift = wshift, \

	.invert = winvert, .kcontrols = wcontrols, .num_kcontrols = wncontrols}

	.invert = winvert, .kcontrol_news = wcontrols, .num_kcontrols = wncontrols}

#define SND_SOC_DAPM_OUT_DRV(wname, wreg, wshift, winvert,\

	 wcontrols, wncontrols) \

{	.id = snd_soc_dapm_out_drv, .name = wname, .reg = wreg, .shift = wshift, \

	.invert = winvert, .kcontrols = wcontrols, .num_kcontrols = wncontrols}

	.invert = winvert, .kcontrol_news = wcontrols, .num_kcontrols = wncontrols}

#define SND_SOC_DAPM_MIXER(wname, wreg, wshift, winvert, \

	 wcontrols, wncontrols)\

{	.id = snd_soc_dapm_mixer, .name = wname, .reg = wreg, .shift = wshift, \

	.invert = winvert, .kcontrols = wcontrols, .num_kcontrols = wncontrols}

	.invert = winvert, .kcontrol_news = wcontrols, .num_kcontrols = wncontrols}

#define SND_SOC_DAPM_MIXER_NAMED_CTL(wname, wreg, wshift, winvert, \

	 wcontrols, wncontrols)\

{       .id = snd_soc_dapm_mixer_named_ctl, .name = wname, .reg = wreg, \

	.shift = wshift, .invert = winvert, .kcontrols = wcontrols, \

	.shift = wshift, .invert = winvert, .kcontrol_news = wcontrols, \

	.num_kcontrols = wncontrols}

#define SND_SOC_DAPM_MICBIAS(wname, wreg, wshift, winvert) \

{	.id = snd_soc_dapm_micbias, .name = wname, .reg = wreg, .shift = wshift, \

	.invert = winvert, .kcontrols = NULL, .num_kcontrols = 0}

	.invert = winvert, .kcontrol_news = NULL, .num_kcontrols = 0}

#define SND_SOC_DAPM_SWITCH(wname, wreg, wshift, winvert, wcontrols) \

{	.id = snd_soc_dapm_switch, .name = wname, .reg = wreg, .shift = wshift, \

	.invert = winvert, .kcontrols = wcontrols, .num_kcontrols = 1}

	.invert = winvert, .kcontrol_news = wcontrols, .num_kcontrols = 1}

#define SND_SOC_DAPM_MUX(wname, wreg, wshift, winvert, wcontrols) \

{	.id = snd_soc_dapm_mux, .name = wname, .reg = wreg, .shift = wshift, \

	.invert = winvert, .kcontrols = wcontrols, .num_kcontrols = 1}

	.invert = winvert, .kcontrol_news = wcontrols, .num_kcontrols = 1}

#define SND_SOC_DAPM_VIRT_MUX(wname, wreg, wshift, winvert, wcontrols) \

{	.id = snd_soc_dapm_virt_mux, .name = wname, .reg = wreg, .shift = wshift, \

	.invert = winvert, .kcontrols = wcontrols, .num_kcontrols = 1}

	.invert = winvert, .kcontrol_news = wcontrols, .num_kcontrols = 1}

#define SND_SOC_DAPM_VALUE_MUX(wname, wreg, wshift, winvert, wcontrols) \

{	.id = snd_soc_dapm_value_mux, .name = wname, .reg = wreg, \

	.shift = wshift, .invert = winvert, .kcontrols = wcontrols, \

	.shift = wshift, .invert = winvert, .kcontrol_news = wcontrols, \

	.num_kcontrols = 1}



/* Simplified versions of above macros, assuming wncontrols = ARRAY_SIZE(wcontrols) */

#define SOC_PGA_ARRAY(wname, wreg, wshift, winvert,\

	 wcontrols) \

{	.id = snd_soc_dapm_pga, .name = wname, .reg = wreg, .shift = wshift, \

	.invert = winvert, .kcontrols = wcontrols, .num_kcontrols = ARRAY_SIZE(wcontrols)}

	.invert = winvert, .kcontrol_news = wcontrols, .num_kcontrols = ARRAY_SIZE(wcontrols)}

#define SOC_MIXER_ARRAY(wname, wreg, wshift, winvert, \

	 wcontrols)\

{	.id = snd_soc_dapm_mixer, .name = wname, .reg = wreg, .shift = wshift, \

	.invert = winvert, .kcontrols = wcontrols, .num_kcontrols = ARRAY_SIZE(wcontrols)}

	.invert = winvert, .kcontrol_news = wcontrols, .num_kcontrols = ARRAY_SIZE(wcontrols)}

#define SOC_MIXER_NAMED_CTL_ARRAY(wname, wreg, wshift, winvert, \

	 wcontrols)\

{       .id = snd_soc_dapm_mixer_named_ctl, .name = wname, .reg = wreg, \

	.shift = wshift, .invert = winvert, .kcontrols = wcontrols, \

	.shift = wshift, .invert = winvert, .kcontrol_news = wcontrols, \

	.num_kcontrols = ARRAY_SIZE(wcontrols)}



/* path domain with event - event handler must return 0 for success */

#define SND_SOC_DAPM_PGA_E(wname, wreg, wshift, winvert, wcontrols, \

	wncontrols, wevent, wflags) \

{	.id = snd_soc_dapm_pga, .name = wname, .reg = wreg, .shift = wshift, \

	.invert = winvert, .kcontrols = wcontrols, .num_kcontrols = wncontrols, \

	.invert = winvert, .kcontrol_news = wcontrols, .num_kcontrols = wncontrols, \

	.event = wevent, .event_flags = wflags}

#define SND_SOC_DAPM_OUT_DRV_E(wname, wreg, wshift, winvert, wcontrols, \

	wncontrols, wevent, wflags) \

{	.id = snd_soc_dapm_out_drv, .name = wname, .reg = wreg, .shift = wshift, \

	.invert = winvert, .kcontrols = wcontrols, .num_kcontrols = wncontrols, \

	.invert = winvert, .kcontrol_news = wcontrols, .num_kcontrols = wncontrols, \

	.event = wevent, .event_flags = wflags}

#define SND_SOC_DAPM_MIXER_E(wname, wreg, wshift, winvert, wcontrols, \

	wncontrols, wevent, wflags) \

{	.id = snd_soc_dapm_mixer, .name = wname, .reg = wreg, .shift = wshift, \

	.invert = winvert, .kcontrols = wcontrols, .num_kcontrols = wncontrols, \

	.invert = winvert, .kcontrol_news = wcontrols, .num_kcontrols = wncontrols, \

	.event = wevent, .event_flags = wflags}

#define SND_SOC_DAPM_MIXER_NAMED_CTL_E(wname, wreg, wshift, winvert, \

	wcontrols, wncontrols, wevent, wflags) \

{       .id = snd_soc_dapm_mixer, .name = wname, .reg = wreg, .shift = wshift, \

	.invert = winvert, .kcontrols = wcontrols, \

	.invert = winvert, .kcontrol_news = wcontrols, \

	.num_kcontrols = wncontrols, .event = wevent, .event_flags = wflags}

#define SND_SOC_DAPM_MICBIAS_E(wname, wreg, wshift, winvert, wevent, wflags) \

{	.id = snd_soc_dapm_micbias, .name = wname, .reg = wreg, .shift = wshift, \

	.invert = winvert, .kcontrols = NULL, .num_kcontrols = 0, \

	.invert = winvert, .kcontrol_news = NULL, .num_kcontrols = 0, \

	.event = wevent, .event_flags = wflags}

#define SND_SOC_DAPM_SWITCH_E(wname, wreg, wshift, winvert, wcontrols, \

	wevent, wflags) \

{	.id = snd_soc_dapm_switch, .name = wname, .reg = wreg, .shift = wshift, \

	.invert = winvert, .kcontrols = wcontrols, .num_kcontrols = 1, \

	.invert = winvert, .kcontrol_news = wcontrols, .num_kcontrols = 1, \

	.event = wevent, .event_flags = wflags}

#define SND_SOC_DAPM_MUX_E(wname, wreg, wshift, winvert, wcontrols, \

	wevent, wflags) \

{	.id = snd_soc_dapm_mux, .name = wname, .reg = wreg, .shift = wshift, \

	.invert = winvert, .kcontrols = wcontrols, .num_kcontrols = 1, \

	.invert = winvert, .kcontrol_news = wcontrols, .num_kcontrols = 1, \

	.event = wevent, .event_flags = wflags}

#define SND_SOC_DAPM_VIRT_MUX_E(wname, wreg, wshift, winvert, wcontrols, \

	wevent, wflags) \

{	.id = snd_soc_dapm_virt_mux, .name = wname, .reg = wreg, .shift = wshift, \

	.invert = winvert, .kcontrols = wcontrols, .num_kcontrols = 1, \

	.invert = winvert, .kcontrol_news = wcontrols, .num_kcontrols = 1, \

	.event = wevent, .event_flags = wflags}



/* additional sequencing control within an event type */
@@ -173,26 +173,26 @@ 
#define SOC_PGA_E_ARRAY(wname, wreg, wshift, winvert, wcontrols, \

	wevent, wflags) \

{	.id = snd_soc_dapm_pga, .name = wname, .reg = wreg, .shift = wshift, \

	.invert = winvert, .kcontrols = wcontrols, .num_kcontrols = ARRAY_SIZE(wcontrols), \

	.invert = winvert, .kcontrol_news = wcontrols, .num_kcontrols = ARRAY_SIZE(wcontrols), \

	.event = wevent, .event_flags = wflags}

#define SOC_MIXER_E_ARRAY(wname, wreg, wshift, winvert, wcontrols, \

	wevent, wflags) \

{	.id = snd_soc_dapm_mixer, .name = wname, .reg = wreg, .shift = wshift, \

	.invert = winvert, .kcontrols = wcontrols, .num_kcontrols = ARRAY_SIZE(wcontrols), \

	.invert = winvert, .kcontrol_news = wcontrols, .num_kcontrols = ARRAY_SIZE(wcontrols), \

	.event = wevent, .event_flags = wflags}

#define SOC_MIXER_NAMED_CTL_E_ARRAY(wname, wreg, wshift, winvert, \

	wcontrols, wevent, wflags) \

{       .id = snd_soc_dapm_mixer, .name = wname, .reg = wreg, .shift = wshift, \

	.invert = winvert, .kcontrols = wcontrols, \

	.invert = winvert, .kcontrol_news = wcontrols, \

	.num_kcontrols = ARRAY_SIZE(wcontrols), .event = wevent, .event_flags = wflags}



/* events that are pre and post DAPM */

#define SND_SOC_DAPM_PRE(wname, wevent) \

{	.id = snd_soc_dapm_pre, .name = wname, .kcontrols = NULL, \

{	.id = snd_soc_dapm_pre, .name = wname, .kcontrol_news = NULL, \

	.num_kcontrols = 0, .reg = SND_SOC_NOPM, .event = wevent, \

	.event_flags = SND_SOC_DAPM_PRE_PMU | SND_SOC_DAPM_PRE_PMD}

#define SND_SOC_DAPM_POST(wname, wevent) \

{	.id = snd_soc_dapm_post, .name = wname, .kcontrols = NULL, \

{	.id = snd_soc_dapm_post, .name = wname, .kcontrol_news = NULL, \

	.num_kcontrols = 0, .reg = SND_SOC_NOPM, .event = wevent, \

	.event_flags = SND_SOC_DAPM_POST_PMU | SND_SOC_DAPM_POST_PMD}
@@ -232,7 +232,7 @@ 


/* generic widgets */

#define SND_SOC_DAPM_REG(wid, wname, wreg, wshift, wmask, won_val, woff_val) \

{	.id = wid, .name = wname, .kcontrols = NULL, .num_kcontrols = 0, \

{	.id = wid, .name = wname, .kcontrol_news = NULL, .num_kcontrols = 0, \

	.reg = -((wreg) + 1), .shift = wshift, .mask = wmask, \

	.on_val = won_val, .off_val = woff_val, .event = dapm_reg_event, \

	.event_flags = SND_SOC_DAPM_PRE_PMU | SND_SOC_DAPM_POST_PMD}
@@ -356,7 +356,8 @@ void snd_soc_dapm_shutdown(struct snd_soc_card *card); 


/* dapm sys fs - used by the core */

int snd_soc_dapm_sys_add(struct device *dev);

void snd_soc_dapm_debugfs_init(struct snd_soc_dapm_context *dapm);

void snd_soc_dapm_debugfs_init(struct snd_soc_dapm_context *dapm,

				struct dentry *parent);



/* dapm audio pin control and status */

int snd_soc_dapm_enable_pin(struct snd_soc_dapm_context *dapm,
@@ -472,7 +473,8 @@ struct snd_soc_dapm_widget { 


	/* kcontrols that relate to this widget */

	int num_kcontrols;

	const struct snd_kcontrol_new *kcontrols;

	const struct snd_kcontrol_new *kcontrol_news;

	struct snd_kcontrol **kcontrols;



	/* widget input and outputs */

	struct list_head sources;
@@ -516,4 +518,10 @@ struct snd_soc_dapm_context { 
#endif

};



/* A list of widgets associated with an object, typically a snd_kcontrol */

struct snd_soc_dapm_widget_list {

	int num_widgets;

	struct snd_soc_dapm_widget *widgets[0];

};



#endif

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

+1 −1
Original line number Diff line number Diff line
@@ -120,7 +120,7 @@ 
 */

#define PM860X_DAPM_OUTPUT(wname, wevent)	\

{	.id = snd_soc_dapm_pga, .name = wname, .reg = SND_SOC_NOPM, \

	.shift = 0, .invert = 0, .kcontrols = NULL, \

	.shift = 0, .invert = 0, .kcontrol_news = NULL, \

	.num_kcontrols = 0, .event = wevent, \

	.event_flags = SND_SOC_DAPM_POST_PMU | SND_SOC_DAPM_POST_PMD, }

sound/soc/codecs/ssm2602.c

+177 −125

File changed.

Preview size limit exceeded, changes collapsed.

sound/soc/codecs/ssm2602.h

+0 −6
Original line number Diff line number Diff line
@@ -117,11 +117,5 @@ 
#define SSM2602_CACHEREGNUM 	10



#define SSM2602_SYSCLK	0

#define SSM2602_DAI		0



struct ssm2602_setup_data {

	int i2c_bus;

	unsigned short i2c_address;

};



#endif

sound/soc/codecs/uda134x.c

+0 −2
Original line number Diff line number Diff line
@@ -601,9 +601,7 @@ static struct snd_soc_codec_driver soc_codec_dev_uda134x = { 
	.reg_cache_step = 1,

	.read = uda134x_read_reg_cache,

	.write = uda134x_write,

#ifdef POWER_OFF_ON_STANDBY

	.set_bias_level = uda134x_set_bias_level,

#endif

};



static int __devinit uda134x_codec_probe(struct platform_device *pdev)