Commit 62b1653e authored by Takashi Iwai's avatar Takashi Iwai
Browse files

Merge branch 'for-2.6.32' of... 

Merge branch 'for-2.6.32' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound-2.6 into topic/asoc
parents 10121a12 d5fc3b5f

include/sound/soc-dapm.h

+1 −0
Original line number Diff line number Diff line
@@ -279,6 +279,7 @@ int snd_soc_dapm_add_routes(struct snd_soc_codec *codec, 
/* dapm events */

int snd_soc_dapm_stream_event(struct snd_soc_codec *codec, char *stream,

	int event);

void snd_soc_dapm_shutdown(struct snd_soc_device *socdev);



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

int snd_soc_dapm_sys_add(struct device *dev);

include/sound/soc.h

+7 −4
Original line number Diff line number Diff line
@@ -192,6 +192,11 @@ void snd_soc_unregister_platform(struct snd_soc_platform *platform); 
int snd_soc_register_codec(struct snd_soc_codec *codec);

void snd_soc_unregister_codec(struct snd_soc_codec *codec);



#ifdef CONFIG_PM

int snd_soc_suspend_device(struct device *dev);

int snd_soc_resume_device(struct device *dev);

#endif



/* pcm <-> DAI connect */

void snd_soc_free_pcms(struct snd_soc_device *socdev);

int snd_soc_new_pcms(struct snd_soc_device *socdev, int idx, const char *xid);
@@ -216,9 +221,9 @@ void snd_soc_jack_free_gpios(struct snd_soc_jack *jack, int count, 


/* codec register bit access */

int snd_soc_update_bits(struct snd_soc_codec *codec, unsigned short reg,

				unsigned short mask, unsigned short value);

				unsigned int mask, unsigned int value);

int snd_soc_test_bits(struct snd_soc_codec *codec, unsigned short reg,

				unsigned short mask, unsigned short value);

				unsigned int mask, unsigned int value);



int snd_soc_new_ac97_codec(struct snd_soc_codec *codec,

	struct snd_ac97_bus_ops *ops, int num);
@@ -369,8 +374,6 @@ struct snd_soc_codec { 
	enum snd_soc_bias_level bias_level;

	enum snd_soc_bias_level suspend_bias_level;

	struct delayed_work delayed_work;

	struct list_head up_list;

	struct list_head down_list;



	/* codec DAI's */

	struct snd_soc_dai *dai;

include/sound/uda1380.h

0 → 100644
+22 −0
Original line number Diff line number Diff line 
/*

 * UDA1380 ALSA SoC Codec driver

 *

 * Copyright 2009 Philipp Zabel

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 as

 * published by the Free Software Foundation.

 */



#ifndef __UDA1380_H

#define __UDA1380_H



struct uda1380_platform_data {

	int gpio_power;

	int gpio_reset;

	int dac_clk;

#define UDA1380_DAC_CLK_SYSCLK 0

#define UDA1380_DAC_CLK_WSPLL  1

};



#endif /* __UDA1380_H */

sound/soc/blackfin/bf5xx-ad73311.c

+8 −8
Original line number Diff line number Diff line
@@ -203,23 +203,23 @@ static struct snd_soc_device bf5xx_ad73311_snd_devdata = { 
	.codec_dev = &soc_codec_dev_ad73311,

};



static struct platform_device *bf52x_ad73311_snd_device;

static struct platform_device *bf5xx_ad73311_snd_device;



static int __init bf5xx_ad73311_init(void)

{

	int ret;



	pr_debug("%s enter\n", __func__);

	bf52x_ad73311_snd_device = platform_device_alloc("soc-audio", -1);

	if (!bf52x_ad73311_snd_device)

	bf5xx_ad73311_snd_device = platform_device_alloc("soc-audio", -1);

	if (!bf5xx_ad73311_snd_device)

		return -ENOMEM;



	platform_set_drvdata(bf52x_ad73311_snd_device, &bf5xx_ad73311_snd_devdata);

	bf5xx_ad73311_snd_devdata.dev = &bf52x_ad73311_snd_device->dev;

	ret = platform_device_add(bf52x_ad73311_snd_device);

	platform_set_drvdata(bf5xx_ad73311_snd_device, &bf5xx_ad73311_snd_devdata);

	bf5xx_ad73311_snd_devdata.dev = &bf5xx_ad73311_snd_device->dev;

	ret = platform_device_add(bf5xx_ad73311_snd_device);



	if (ret)

		platform_device_put(bf52x_ad73311_snd_device);

		platform_device_put(bf5xx_ad73311_snd_device);



	return ret;

}
@@ -227,7 +227,7 @@ static int __init bf5xx_ad73311_init(void) 
static void __exit bf5xx_ad73311_exit(void)

{

	pr_debug("%s enter\n", __func__);

	platform_device_unregister(bf52x_ad73311_snd_device);

	platform_device_unregister(bf5xx_ad73311_snd_device);

}



module_init(bf5xx_ad73311_init);

sound/soc/blackfin/bf5xx-ssm2602.c

+8 −8
Original line number Diff line number Diff line
@@ -148,24 +148,24 @@ static struct snd_soc_device bf5xx_ssm2602_snd_devdata = { 
	.codec_data = &bf5xx_ssm2602_setup,

};



static struct platform_device *bf52x_ssm2602_snd_device;

static struct platform_device *bf5xx_ssm2602_snd_device;



static int __init bf5xx_ssm2602_init(void)

{

	int ret;



	pr_debug("%s enter\n", __func__);

	bf52x_ssm2602_snd_device = platform_device_alloc("soc-audio", -1);

	if (!bf52x_ssm2602_snd_device)

	bf5xx_ssm2602_snd_device = platform_device_alloc("soc-audio", -1);

	if (!bf5xx_ssm2602_snd_device)

		return -ENOMEM;



	platform_set_drvdata(bf52x_ssm2602_snd_device,

	platform_set_drvdata(bf5xx_ssm2602_snd_device,

				&bf5xx_ssm2602_snd_devdata);

	bf5xx_ssm2602_snd_devdata.dev = &bf52x_ssm2602_snd_device->dev;

	ret = platform_device_add(bf52x_ssm2602_snd_device);

	bf5xx_ssm2602_snd_devdata.dev = &bf5xx_ssm2602_snd_device->dev;

	ret = platform_device_add(bf5xx_ssm2602_snd_device);



	if (ret)

		platform_device_put(bf52x_ssm2602_snd_device);

		platform_device_put(bf5xx_ssm2602_snd_device);



	return ret;

}
@@ -173,7 +173,7 @@ static int __init bf5xx_ssm2602_init(void) 
static void __exit bf5xx_ssm2602_exit(void)

{

	pr_debug("%s enter\n", __func__);

	platform_device_unregister(bf52x_ssm2602_snd_device);

	platform_device_unregister(bf5xx_ssm2602_snd_device);

}



module_init(bf5xx_ssm2602_init);