mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-23 01:10:04 +00:00
ASoC: davinci: i2c device creation moved into board files
Also, the codec setup data structure has to remain for successful probe. Signed-off-by: Chaithrika U S <chaithrika@ti.com> Signed-off-by: Kevin Hilman <khilman@deeprootsystems.com> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
This commit is contained in:
parent
f1e887de2d
commit
f4890b5c04
1 changed files with 5 additions and 27 deletions
|
@ -206,57 +206,37 @@ static struct snd_soc_card da850_snd_soc_card = {
|
|||
.num_links = 1,
|
||||
};
|
||||
|
||||
/* evm audio private data */
|
||||
static struct aic3x_setup_data evm_aic3x_setup = {
|
||||
};
|
||||
|
||||
/* dm6467 evm audio private data */
|
||||
static struct aic3x_setup_data dm6467_evm_aic3x_setup = {
|
||||
.i2c_bus = 1,
|
||||
.i2c_address = 0x18,
|
||||
};
|
||||
|
||||
static struct aic3x_setup_data da8xx_evm_aic3x_setup = {
|
||||
.i2c_bus = 1,
|
||||
.i2c_address = 0x18,
|
||||
};
|
||||
static struct aic3x_setup_data aic3x_setup;
|
||||
|
||||
/* evm audio subsystem */
|
||||
static struct snd_soc_device evm_snd_devdata = {
|
||||
.card = &snd_soc_card_evm,
|
||||
.codec_dev = &soc_codec_dev_aic3x,
|
||||
.codec_data = &evm_aic3x_setup,
|
||||
.codec_data = &aic3x_setup,
|
||||
};
|
||||
|
||||
/* evm audio subsystem */
|
||||
static struct snd_soc_device dm6467_evm_snd_devdata = {
|
||||
.card = &dm6467_snd_soc_card_evm,
|
||||
.codec_dev = &soc_codec_dev_aic3x,
|
||||
.codec_data = &dm6467_evm_aic3x_setup,
|
||||
.codec_data = &aic3x_setup,
|
||||
};
|
||||
|
||||
/* evm audio subsystem */
|
||||
static struct snd_soc_device da830_evm_snd_devdata = {
|
||||
.card = &da830_snd_soc_card,
|
||||
.codec_dev = &soc_codec_dev_aic3x,
|
||||
.codec_data = &da8xx_evm_aic3x_setup,
|
||||
.codec_data = &aic3x_setup,
|
||||
};
|
||||
|
||||
static struct snd_soc_device da850_evm_snd_devdata = {
|
||||
.card = &da850_snd_soc_card,
|
||||
.codec_dev = &soc_codec_dev_aic3x,
|
||||
.codec_data = &da8xx_evm_aic3x_setup,
|
||||
.codec_data = &aic3x_setup,
|
||||
};
|
||||
|
||||
static struct platform_device *evm_snd_device;
|
||||
|
||||
/* temporary i2c device creation until this can be moved into the machine
|
||||
* support file.
|
||||
*/
|
||||
static struct i2c_board_info i2c_device[] = {
|
||||
{ I2C_BOARD_INFO("tlv320aic33", 0x1b), }
|
||||
};
|
||||
|
||||
static int __init evm_init(void)
|
||||
{
|
||||
struct snd_soc_device *evm_snd_dev_data;
|
||||
|
@ -281,8 +261,6 @@ static int __init evm_init(void)
|
|||
} else
|
||||
return -EINVAL;
|
||||
|
||||
i2c_register_board_info(1, i2c_device, ARRAY_SIZE(i2c_device));
|
||||
|
||||
evm_snd_device = platform_device_alloc("soc-audio", index);
|
||||
if (!evm_snd_device)
|
||||
return -ENOMEM;
|
||||
|
|
Loading…
Reference in a new issue