hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[ARM] pxa/spitz: Correctly register WM8750 

This patch registers the WM8750 codec on a proper place on the SPITZ machine
after the WM8750 driver was converted to new API.

Signed-off-by: Marek Vasut <marek.vasut@gmail.com>
Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
This commit is contained in:
Marek Vasut 2010-05-28 04:42:59 +02:00 committed by Eric Miao
parent 600ae40df7
commit d30e5d897c
2 changed files with 3 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
arch/arm/mach-pxa/spitz.c
View File

@ -818,6 +818,9 @@ static struct i2c_board_info akita_i2c_board_info[] = {
.type = "max7310", .type = "max7310",
.addr = 0x18, .addr = 0x18,
.platform_data = &akita_ioexp, .platform_data = &akita_ioexp,
}, {
.type = "wm8750",
.addr = 0x1b,
}, },
}; };

36
sound/soc/pxa/spitz.c
View File

@ -328,38 +328,6 @@ static struct snd_soc_device spitz_snd_devdata = {
.codec_dev = &soc_codec_dev_wm8750, .codec_dev = &soc_codec_dev_wm8750,
}; };
/*
* FIXME: This is a temporary bodge to avoid cross-tree merge issues.
* New drivers should register the wm8750 I2C device in the machine
* setup code (under arch/arm for ARM systems).
*/
static int wm8750_i2c_register(void)
{
struct i2c_board_info info;
struct i2c_adapter *adapter;
struct i2c_client *client;
memset(&info, 0, sizeof(struct i2c_board_info));
info.addr = 0x1b;
strlcpy(info.type, "wm8750", I2C_NAME_SIZE);
adapter = i2c_get_adapter(0);
if (!adapter) {
printk(KERN_ERR "can't get i2c adapter 0\n");
return -ENODEV;
}
client = i2c_new_device(adapter, &info);
i2c_put_adapter(adapter);
if (!client) {
printk(KERN_ERR "can't add i2c device at 0x%x\n",
(unsigned int)info.addr);
return -ENODEV;
}
return 0;
}
static struct platform_device *spitz_snd_device; static struct platform_device *spitz_snd_device;
static int __init spitz_init(void) static int __init spitz_init(void)
@ -369,10 +337,6 @@ static int __init spitz_init(void)
if (!(machine_is_spitz() || machine_is_borzoi() || machine_is_akita())) if (!(machine_is_spitz() || machine_is_borzoi() || machine_is_akita()))
return -ENODEV; return -ENODEV;
ret = wm8750_i2c_setup();
if (ret != 0)
return ret;
spitz_snd_device = platform_device_alloc("soc-audio", -1); spitz_snd_device = platform_device_alloc("soc-audio", -1);
if (!spitz_snd_device) if (!spitz_snd_device)
return -ENOMEM; return -ENOMEM;