AOA: Convert onyx and tas codecs to new-style i2c drivers
Subsystems (2)
PATCH 1/1 AOA: Convert onyx and tas codecs to new-style i2c drivers
The legacy i2c binding model is going away soon, so convert the AOA codec drivers to the new model or they'll break.
---
Takashi, please push this patch to Linus quickly, as this is blocking the removal of the legacy i2c binding model, which is scheduled for 2.6.30.
sound/aoa/codecs/onyx.c | 76 ++++++++++++++++++++++++++++++++--------------- sound/aoa/codecs/tas.c | 66 +++++++++++++++++++++++++--------------- 2 files changed, 95 insertions(+), 47 deletions(-)
sound/aoa/codecs/onyx.c +53 -23
@@ -47,7 +47,7 @@ MODULE_DESCRIPTION("pcm3052 (onyx) codecstruct onyx {/* cache registers 65 to 80, they are write-only! */ u8 cache[16 ]; -struct i2c_client i2c; +struct i2c_client *i2c;struct aoa_codec codec;u32 initialised:1 , spdif_locked:1,
@@ -72,7 +72,7 @@ static int onyx_read_register(struct ony *value = onyx->cache[reg-FIRSTREGISTER ];return 0 ; } - v =i2c_smbus_read_byte_data (&onyx->i2c, reg); + v =i2c_smbus_read_byte_data (onyx->i2c, reg);if (v <0 )return -1 ; *value = (u8 )v;
@@ -84,7 +84,7 @@ static int onyx_write_register(struct on {int result; - result =i2c_smbus_write_byte_data (&onyx->i2c, reg, value); + result =i2c_smbus_write_byte_data (onyx->i2c, reg, value);if (!result) onyx->cache[reg-FIRSTREGISTER ] = value;return result;
@@ -996,12 +996,45 @@ static void onyx_exit_codec(struct aoa_c onyx->codec.soundbus_dev->detach_codec (onyx->codec.soundbus_dev, onyx); } -static struct i2c_driver onyx_driver; -static int onyx_create (struct i2c_adapter *adapter,struct device_node *node,int addr) { +struct i2c_board_info info; +struct i2c_client *client; + +memset (&info,0 ,sizeof (struct i2c_board_info )); +strlcpy (info.type,"aoa_codec_onyx" ,I2C_NAME_SIZE ); + info.addr = addr; + info.platform_data = node; + client =i2c_new_device (adapter, &info); +if (!client) +return -ENODEV ; + +/* +* We know the driver is already loaded, so the device should be +* already bound. If not it means binding failed, which suggests +* the device doesn't really exist and should be deleted. +* Ideally this would be replaced by better checks _before_ +* instantiating the device. +*/ +if (!client->driver) { +i2c_unregister_device (client); +return -ENODEV ; + } + +/* +* Let i2c-core delete that device on driver removal. +* This is safe because i2c-core holds the core_lock mutex for us. +*/ +list_add_tail (&client->detected, &client->driver->clients); +return 0 ; +} + +static int onyx_i2c_probe (struct i2c_client *client, +const struct i2c_device_id *id) +{ +struct device_node *node = client->dev.platform_data;struct onyx *onyx;u8 dummy;
@@ -1011,20 +1044,12 @@ static int onyx_create(struct i2c_adaptereturn -ENOMEM ;mutex_init (&onyx->mutex); - onyx->i2c.driver = &onyx_driver; - onyx->i2c.adapter = adapter; - onyx->i2c.addr = addr &0x7f ; -strlcpy (onyx->i2c.name,"onyx audio codec" ,I2C_NAME_SIZE ); - -if (i2c_attach_client (&onyx->i2c)) { - printk(KERN_ERR PFX "failed to attach to i2c\n"); - goto fail; - } + onyx->i2c = client; +i2c_set_clientdata (client, onyx);/* we try to read from register ONYX_REG_CONTROL * to check if the codec is present */ if (onyx_read_register (onyx,ONYX_REG_CONTROL , &dummy) !=0 ) { -i2c_detach_client (&onyx->i2c); printk(KERN_ERR PFX "failed to read control register\n"); goto fail; }
@@ -1036,14 +1061,14 @@ static int onyx_create(struct i2c_adapte onyx->codec.node =of_node_get (node);if (aoa_codec_register (&onyx->codec)) { -i2c_detach_client (&onyx->i2c); goto fail; } printk(KERN_DEBUG PFX "created and attached onyx instance\n");return 0 ; fail: +i2c_set_clientdata (client,NULL );kfree (onyx); -return -EINVAL ; +return -ENODEV ; }static int onyx_i2c_attach (struct i2c_adapter *adapter)
@@ -1080,28 +1105,33 @@ static int onyx_i2c_attach(struct i2c_adreturn onyx_create (adapter,NULL ,0x47 ); } -static int onyx_i2c_detach (struct i2c_client *client) +static int onyx_i2c_remove (struct i2c_client *client) { - struct onyx *onyx = container_of(client, struct onyx, i2c); -int err; +struct onyx *onyx =i2c_get_clientdata (client); -if ((err =i2c_detach_client (client))) -return err;aoa_codec_unregister (&onyx->codec);of_node_put (onyx->codec.node);if (onyx->codec_info)kfree (onyx->codec_info); +i2c_set_clientdata (client, onyx);kfree (onyx);return 0 ; } +static const struct i2c_device_id onyx_i2c_id[] = { + {"aoa_codec_onyx" ,0 }, + { } +}; +static struct i2c_driver onyx_driver = { .driver = { .name ="aoa_codec_onyx" , .owner =THIS_MODULE , }, .attach_adapter = onyx_i2c_attach, - .detach_client = onyx_i2c_detach, + .probe = onyx_i2c_probe, + .remove = onyx_i2c_remove, + .id_table = onyx_i2c_id, };static int __init onyx_init (void )
sound/aoa/codecs/tas.c +42 -24
128 lines not on this page · raw message
Signature · 1 line
Jean Delvare
Johannes Berg
maintainerQuoted 8 lines · Jean Delvare
The legacy i2c binding model is going away soon, so convert the AOA codec drivers to the new model or they'll break.
Signed-off-by Jean Delvare <[email protected]>Tested-by Johannes Berg <[email protected]>Tested-by Andreas Schwab <[email protected]>Cc Benjamin Herrenschmidt <[email protected]>Cc Takashi Iwai <[email protected]>
Quoted 4 lines
---
Takashi, please push this patch to Linus quickly, as this is blocking the removal of the legacy i2c binding model, which is scheduled for 2.6.30.
Have you taken care of snd-powermac similarly?
johannes
_______________________________________________
Alsa-devel mailing list
[email protected]
http://mailman.alsa-project.org/mailman/listinfo/alsa-devel
At Mon, 20 Apr 2009 22:54:25 +0200,
Quoted 9 lines · Jean Delvare
The legacy i2c binding model is going away soon, so convert the AOA codec drivers to the new model or they'll break.
Signed-off-by Jean Delvare <[email protected]>Tested-by Johannes Berg <[email protected]>Tested-by Andreas Schwab <[email protected]>Cc Benjamin Herrenschmidt <[email protected]>Cc Takashi Iwai <[email protected]>
Quoted 4 lines
---
Takashi, please push this patch to Linus quickly, as this is blocking the removal of the legacy i2c binding model, which is scheduled for 2.6.30.
Applied now. Thanks.
Takashi
Hi Johannes,
Quoted 14 lines · Johannes Berg
Quoted 8 lines · Jean Delvare
The legacy i2c binding model is going away soon, so convert the AOA codec drivers to the new model or they'll break.
Signed-off-by Jean Delvare <[email protected]>Tested-by Johannes Berg <[email protected]>Tested-by Andreas Schwab <[email protected]>Cc Benjamin Herrenschmidt <[email protected]>Cc Takashi Iwai <[email protected]>Quoted 4 lines
---
Takashi, please push this patch to Linus quickly, as this is blocking the removal of the legacy i2c binding model, which is scheduled for 2.6.30.
Quoted 1 line
Have you taken care of snd-powermac similarly?
Yes I did, see my patch "keywest: Convert to new-style i2c driver" to the alsa-devel and linuxppc-dev mailing lists:
http://ozlabs.org/pipermail/linuxppc-dev/2009-April/070884.html
Would you be able to test this patch? This would be very welcome. I can resend it to you if it helps.
Thanks,
Signature · 1 line
Jean Delvare
Johannes Berg
maintainerHi,
Quoted 8 lines
Quoted 1 line
Have you taken care of snd-powermac similarly?
Yes I did, see my patch "keywest: Convert to new-style i2c driver" to the alsa-devel and linuxppc-dev mailing lists:
http://ozlabs.org/pipermail/linuxppc-dev/2009-April/070884.htmlWould you be able to test this patch? This would be very welcome. I can resend it to you if it helps.
Cool. No, was just wondering, I can't test it, none of my machines can use that (which is why I wrote aoa, heh)
johannes
_______________________________________________
Alsa-devel mailing list
[email protected]
http://mailman.alsa-project.org/mailman/listinfo/alsa-devel