Commit 81297c8a authored by Jean Delvare's avatar Jean Delvare Committed by Jaroslav Kysela

ALSA: ASoC: Convert wm8731 to a new-style i2c driver

Convert the wm8731 codec driver to the new (standard) device driver
binding model.
Signed-off-by: default avatarJean Delvare <khali@linux-fr.org>
Tested-by: default avatarManuel Lauss <mano@roarinelk.homelinux.net>
Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
Signed-off-by: default avatarJaroslav Kysela <perex@perex.cz>
parent ee1d0099
...@@ -243,6 +243,7 @@ static struct snd_soc_machine snd_soc_machine_eti_b1 = { ...@@ -243,6 +243,7 @@ static struct snd_soc_machine snd_soc_machine_eti_b1 = {
}; };
static struct wm8731_setup_data eti_b1_wm8731_setup = { static struct wm8731_setup_data eti_b1_wm8731_setup = {
.i2c_bus = 0,
.i2c_address = 0x1a, .i2c_address = 0x1a,
}; };
......
...@@ -570,86 +570,86 @@ static struct snd_soc_device *wm8731_socdev; ...@@ -570,86 +570,86 @@ static struct snd_soc_device *wm8731_socdev;
* low = 0x1a * low = 0x1a
* high = 0x1b * high = 0x1b
*/ */
static unsigned short normal_i2c[] = { 0, I2C_CLIENT_END };
/* Magic definition of all other variables and things */ static int wm8731_i2c_probe(struct i2c_client *i2c,
I2C_CLIENT_INSMOD; const struct i2c_device_id *id)
static struct i2c_driver wm8731_i2c_driver;
static struct i2c_client client_template;
/* If the i2c layer weren't so broken, we could pass this kind of data
around */
static int wm8731_codec_probe(struct i2c_adapter *adap, int addr, int kind)
{ {
struct snd_soc_device *socdev = wm8731_socdev; struct snd_soc_device *socdev = wm8731_socdev;
struct wm8731_setup_data *setup = socdev->codec_data;
struct snd_soc_codec *codec = socdev->codec; struct snd_soc_codec *codec = socdev->codec;
struct i2c_client *i2c;
int ret; int ret;
if (addr != setup->i2c_address)
return -ENODEV;
client_template.adapter = adap;
client_template.addr = addr;
i2c = kmemdup(&client_template, sizeof(client_template), GFP_KERNEL);
if (i2c == NULL)
return -ENOMEM;
i2c_set_clientdata(i2c, codec); i2c_set_clientdata(i2c, codec);
codec->control_data = i2c; codec->control_data = i2c;
ret = i2c_attach_client(i2c);
if (ret < 0) {
pr_err("failed to attach codec at addr %x\n", addr);
goto err;
}
ret = wm8731_init(socdev); ret = wm8731_init(socdev);
if (ret < 0) { if (ret < 0)
pr_err("failed to initialise WM8731\n"); pr_err("failed to initialise WM8731\n");
goto err;
}
return ret;
err:
kfree(i2c);
return ret; return ret;
} }
static int wm8731_i2c_detach(struct i2c_client *client) static int wm8731_i2c_remove(struct i2c_client *client)
{ {
struct snd_soc_codec *codec = i2c_get_clientdata(client); struct snd_soc_codec *codec = i2c_get_clientdata(client);
i2c_detach_client(client);
kfree(codec->reg_cache); kfree(codec->reg_cache);
kfree(client);
return 0; return 0;
} }
static int wm8731_i2c_attach(struct i2c_adapter *adap) static const struct i2c_device_id wm8731_i2c_id[] = {
{ { "wm8731", 0 },
return i2c_probe(adap, &addr_data, wm8731_codec_probe); { }
} };
MODULE_DEVICE_TABLE(i2c, wm8731_i2c_id);
/* corgi i2c codec control layer */
static struct i2c_driver wm8731_i2c_driver = { static struct i2c_driver wm8731_i2c_driver = {
.driver = { .driver = {
.name = "WM8731 I2C Codec", .name = "WM8731 I2C Codec",
.owner = THIS_MODULE, .owner = THIS_MODULE,
}, },
.id = I2C_DRIVERID_WM8731, .probe = wm8731_i2c_probe,
.attach_adapter = wm8731_i2c_attach, .remove = wm8731_i2c_remove,
.detach_client = wm8731_i2c_detach, .id_table = wm8731_i2c_id,
.command = NULL,
}; };
static struct i2c_client client_template = { static int wm8731_add_i2c_device(struct platform_device *pdev,
.name = "WM8731", const struct wm8731_setup_data *setup)
.driver = &wm8731_i2c_driver, {
}; struct i2c_board_info info;
struct i2c_adapter *adapter;
struct i2c_client *client;
int ret;
ret = i2c_add_driver(&wm8731_i2c_driver);
if (ret != 0) {
dev_err(&pdev->dev, "can't add i2c driver\n");
return ret;
}
memset(&info, 0, sizeof(struct i2c_board_info));
info.addr = setup->i2c_address;
strlcpy(info.type, "wm8731", I2C_NAME_SIZE);
adapter = i2c_get_adapter(setup->i2c_bus);
if (!adapter) {
dev_err(&pdev->dev, "can't get i2c adapter %d\n",
setup->i2c_bus);
goto err_driver;
}
client = i2c_new_device(adapter, &info);
i2c_put_adapter(adapter);
if (!client) {
dev_err(&pdev->dev, "can't add i2c device at 0x%x\n",
(unsigned int)info.addr);
goto err_driver;
}
return 0;
err_driver:
i2c_del_driver(&wm8731_i2c_driver);
return -ENODEV;
}
#endif #endif
static int wm8731_probe(struct platform_device *pdev) static int wm8731_probe(struct platform_device *pdev)
...@@ -682,11 +682,8 @@ static int wm8731_probe(struct platform_device *pdev) ...@@ -682,11 +682,8 @@ static int wm8731_probe(struct platform_device *pdev)
wm8731_socdev = socdev; wm8731_socdev = socdev;
#if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE) #if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE)
if (setup->i2c_address) { if (setup->i2c_address) {
normal_i2c[0] = setup->i2c_address;
codec->hw_write = (hw_write_t)i2c_master_send; codec->hw_write = (hw_write_t)i2c_master_send;
ret = i2c_add_driver(&wm8731_i2c_driver); ret = wm8731_add_i2c_device(pdev, setup);
if (ret != 0)
printk(KERN_ERR "can't add i2c driver");
} }
#else #else
/* Add other interfaces here */ /* Add other interfaces here */
...@@ -711,6 +708,7 @@ static int wm8731_remove(struct platform_device *pdev) ...@@ -711,6 +708,7 @@ static int wm8731_remove(struct platform_device *pdev)
snd_soc_free_pcms(socdev); snd_soc_free_pcms(socdev);
snd_soc_dapm_free(socdev); snd_soc_dapm_free(socdev);
#if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE) #if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE)
i2c_unregister_device(codec->control_data);
i2c_del_driver(&wm8731_i2c_driver); i2c_del_driver(&wm8731_i2c_driver);
#endif #endif
kfree(codec->private_data); kfree(codec->private_data);
......
...@@ -35,6 +35,7 @@ ...@@ -35,6 +35,7 @@
#define WM8731_DAI 0 #define WM8731_DAI 0
struct wm8731_setup_data { struct wm8731_setup_data {
int i2c_bus;
unsigned short i2c_address; unsigned short i2c_address;
}; };
......
...@@ -330,6 +330,7 @@ static struct snd_soc_machine snd_soc_machine_corgi = { ...@@ -330,6 +330,7 @@ static struct snd_soc_machine snd_soc_machine_corgi = {
/* corgi audio private data */ /* corgi audio private data */
static struct wm8731_setup_data corgi_wm8731_setup = { static struct wm8731_setup_data corgi_wm8731_setup = {
.i2c_bus = 0,
.i2c_address = 0x1b, .i2c_address = 0x1b,
}; };
......
...@@ -284,6 +284,7 @@ static struct snd_soc_machine snd_soc_machine_poodle = { ...@@ -284,6 +284,7 @@ static struct snd_soc_machine snd_soc_machine_poodle = {
/* poodle audio private data */ /* poodle audio private data */
static struct wm8731_setup_data poodle_wm8731_setup = { static struct wm8731_setup_data poodle_wm8731_setup = {
.i2c_bus = 0,
.i2c_address = 0x1b, .i2c_address = 0x1b,
}; };
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment