Commit ba8ed121 authored by Jean Delvare's avatar Jean Delvare Committed by Jaroslav Kysela

ALSA: ASoC: Convert tlv320aic3x to a new-style i2c driver (v2)

Convert the tlv320aic3x codec driver to the new (standard) device
driver binding model.
Signed-off-by: default avatarJean Delvare <khali@linux-fr.org>
Cc: Vladimir Barinov <vbarinov@ru.mvista.com>
Tested-by: default avatarJarkko Nikula <jarkko.nikula@nokia.com>
Acked-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 b69ce01a
...@@ -1172,71 +1172,39 @@ static struct snd_soc_device *aic3x_socdev; ...@@ -1172,71 +1172,39 @@ static struct snd_soc_device *aic3x_socdev;
* AIC3X 2 wire address can be up to 4 devices with device addresses * AIC3X 2 wire address can be up to 4 devices with device addresses
* 0x18, 0x19, 0x1A, 0x1B * 0x18, 0x19, 0x1A, 0x1B
*/ */
static unsigned short normal_i2c[] = { 0, I2C_CLIENT_END };
/* Magic definition of all other variables and things */
I2C_CLIENT_INSMOD;
static struct i2c_driver aic3x_i2c_driver;
static struct i2c_client client_template;
/* /*
* If the i2c layer weren't so broken, we could pass this kind of data * If the i2c layer weren't so broken, we could pass this kind of data
* around * around
*/ */
static int aic3x_codec_probe(struct i2c_adapter *adap, int addr, int kind) static int aic3x_i2c_probe(struct i2c_client *i2c,
const struct i2c_device_id *id)
{ {
struct snd_soc_device *socdev = aic3x_socdev; struct snd_soc_device *socdev = aic3x_socdev;
struct aic3x_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) {
printk(KERN_ERR "aic3x: failed to attach codec at addr %x\n",
addr);
goto err;
}
ret = aic3x_init(socdev); ret = aic3x_init(socdev);
if (ret < 0) { if (ret < 0)
printk(KERN_ERR "aic3x: failed to initialise AIC3X\n"); printk(KERN_ERR "aic3x: failed to initialise AIC3X\n");
goto err;
}
return ret;
err:
kfree(i2c);
return ret; return ret;
} }
static int aic3x_i2c_detach(struct i2c_client *client) static int aic3x_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 aic3x_i2c_attach(struct i2c_adapter *adap) static const struct i2c_device_id aic3x_i2c_id[] = {
{ { "tlv320aic3x", 0 },
return i2c_probe(adap, &addr_data, aic3x_codec_probe); { }
} };
MODULE_DEVICE_TABLE(i2c, aic3x_i2c_id);
/* machine i2c codec control layer */ /* machine i2c codec control layer */
static struct i2c_driver aic3x_i2c_driver = { static struct i2c_driver aic3x_i2c_driver = {
...@@ -1244,13 +1212,9 @@ static struct i2c_driver aic3x_i2c_driver = { ...@@ -1244,13 +1212,9 @@ static struct i2c_driver aic3x_i2c_driver = {
.name = "aic3x I2C Codec", .name = "aic3x I2C Codec",
.owner = THIS_MODULE, .owner = THIS_MODULE,
}, },
.attach_adapter = aic3x_i2c_attach, .probe = aic3x_i2c_probe,
.detach_client = aic3x_i2c_detach, .remove = aic3x_i2c_remove,
}; .id_table = aic3x_i2c_id,
static struct i2c_client client_template = {
.name = "AIC3X",
.driver = &aic3x_i2c_driver,
}; };
static int aic3x_i2c_read(struct i2c_client *client, u8 *value, int len) static int aic3x_i2c_read(struct i2c_client *client, u8 *value, int len)
...@@ -1258,6 +1222,46 @@ static int aic3x_i2c_read(struct i2c_client *client, u8 *value, int len) ...@@ -1258,6 +1222,46 @@ static int aic3x_i2c_read(struct i2c_client *client, u8 *value, int len)
value[0] = i2c_smbus_read_byte_data(client, value[0]); value[0] = i2c_smbus_read_byte_data(client, value[0]);
return (len == 1); return (len == 1);
} }
static int aic3x_add_i2c_device(struct platform_device *pdev,
const struct aic3x_setup_data *setup)
{
struct i2c_board_info info;
struct i2c_adapter *adapter;
struct i2c_client *client;
int ret;
ret = i2c_add_driver(&aic3x_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, "tlv320aic3x", 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(&aic3x_i2c_driver);
return -ENODEV;
}
#endif #endif
static int aic3x_probe(struct platform_device *pdev) static int aic3x_probe(struct platform_device *pdev)
...@@ -1290,12 +1294,9 @@ static int aic3x_probe(struct platform_device *pdev) ...@@ -1290,12 +1294,9 @@ static int aic3x_probe(struct platform_device *pdev)
aic3x_socdev = socdev; aic3x_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;
codec->hw_read = (hw_read_t) aic3x_i2c_read; codec->hw_read = (hw_read_t) aic3x_i2c_read;
ret = i2c_add_driver(&aic3x_i2c_driver); ret = aic3x_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 */
...@@ -1320,6 +1321,7 @@ static int aic3x_remove(struct platform_device *pdev) ...@@ -1320,6 +1321,7 @@ static int aic3x_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(&aic3x_i2c_driver); i2c_del_driver(&aic3x_i2c_driver);
#endif #endif
kfree(codec->private_data); kfree(codec->private_data);
......
...@@ -224,6 +224,7 @@ int aic3x_get_gpio(struct snd_soc_codec *codec, int gpio); ...@@ -224,6 +224,7 @@ int aic3x_get_gpio(struct snd_soc_codec *codec, int gpio);
int aic3x_headset_detected(struct snd_soc_codec *codec); int aic3x_headset_detected(struct snd_soc_codec *codec);
struct aic3x_setup_data { struct aic3x_setup_data {
int i2c_bus;
unsigned short i2c_address; unsigned short i2c_address;
unsigned int gpio_func[2]; unsigned int gpio_func[2];
}; };
......
...@@ -136,6 +136,7 @@ static struct snd_soc_machine snd_soc_machine_evm = { ...@@ -136,6 +136,7 @@ static struct snd_soc_machine snd_soc_machine_evm = {
/* evm audio private data */ /* evm audio private data */
static struct aic3x_setup_data evm_aic3x_setup = { static struct aic3x_setup_data evm_aic3x_setup = {
.i2c_bus = 0,
.i2c_address = 0x1b, .i2c_address = 0x1b,
}; };
......
...@@ -290,6 +290,7 @@ static struct snd_soc_machine snd_soc_machine_n810 = { ...@@ -290,6 +290,7 @@ static struct snd_soc_machine snd_soc_machine_n810 = {
/* Audio private data */ /* Audio private data */
static struct aic3x_setup_data n810_aic33_setup = { static struct aic3x_setup_data n810_aic33_setup = {
.i2c_bus = 2,
.i2c_address = 0x18, .i2c_address = 0x18,
.gpio_func[0] = AIC3X_GPIO1_FUNC_DISABLED, .gpio_func[0] = AIC3X_GPIO1_FUNC_DISABLED,
.gpio_func[1] = AIC3X_GPIO2_FUNC_DIGITAL_MIC_INPUT, .gpio_func[1] = AIC3X_GPIO2_FUNC_DIGITAL_MIC_INPUT,
......
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