sound/aoa: Adapt to new i2c probing scheme
The i2c-powermac driver now creates the i2c devices properly from the device-tree, including workarounds for broken or missing device-tree bits, so let's just use the normal probe methods and get rid of the hand made device creation code. Signed-off-by: Andreas Schwab <schwab@linux-m68k.org> Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
This commit is contained in:
Andreas Schwab
Benjamin Herrenschmidt
parent
3a3dd0186f
commit
26b0d14106
|
|
@ -997,45 +997,10 @@ static void onyx_exit_codec(struct aoa_codec *codec)
|
|||
onyx->codec.soundbus_dev->detach_codec(onyx->codec.soundbus_dev, onyx);
|
||||
}
|
||||
|
||||
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 device_node *node = client->dev.of_node;
|
||||
struct onyx *onyx;
|
||||
u8 dummy;
|
||||
|
||||
|
|
@ -1071,40 +1036,6 @@ static int onyx_i2c_probe(struct i2c_client *client,
|
|||
return -ENODEV;
|
||||
}
|
||||
|
||||
static int onyx_i2c_attach(struct i2c_adapter *adapter)
|
||||
{
|
||||
struct device_node *busnode, *dev = NULL;
|
||||
struct pmac_i2c_bus *bus;
|
||||
|
||||
bus = pmac_i2c_adapter_to_bus(adapter);
|
||||
if (bus == NULL)
|
||||
return -ENODEV;
|
||||
busnode = pmac_i2c_get_bus_node(bus);
|
||||
|
||||
while ((dev = of_get_next_child(busnode, dev)) != NULL) {
|
||||
if (of_device_is_compatible(dev, "pcm3052")) {
|
||||
const u32 *addr;
|
||||
printk(KERN_DEBUG PFX "found pcm3052\n");
|
||||
addr = of_get_property(dev, "reg", NULL);
|
||||
if (!addr)
|
||||
return -ENODEV;
|
||||
return onyx_create(adapter, dev, (*addr)>>1);
|
||||
}
|
||||
}
|
||||
|
||||
/* if that didn't work, try desperate mode for older
|
||||
* machines that have stuff missing from the device tree */
|
||||
|
||||
if (!of_device_is_compatible(busnode, "k2-i2c"))
|
||||
return -ENODEV;
|
||||
|
||||
printk(KERN_DEBUG PFX "found k2-i2c, checking if onyx chip is on it\n");
|
||||
/* probe both possible addresses for the onyx chip */
|
||||
if (onyx_create(adapter, NULL, 0x46) == 0)
|
||||
return 0;
|
||||
return onyx_create(adapter, NULL, 0x47);
|
||||
}
|
||||
|
||||
static int onyx_i2c_remove(struct i2c_client *client)
|
||||
{
|
||||
struct onyx *onyx = i2c_get_clientdata(client);
|
||||
|
|
@ -1117,16 +1048,16 @@ static int onyx_i2c_remove(struct i2c_client *client)
|
|||
}
|
||||
|
||||
static const struct i2c_device_id onyx_i2c_id[] = {
|
||||
{ "aoa_codec_onyx", 0 },
|
||||
{ "MAC,pcm3052", 0 },
|
||||
{ }
|
||||
};
|
||||
MODULE_DEVICE_TABLE(i2c,onyx_i2c_id);
|
||||
|
||||
static struct i2c_driver onyx_driver = {
|
||||
.driver = {
|
||||
.name = "aoa_codec_onyx",
|
||||
.owner = THIS_MODULE,
|
||||
},
|
||||
.attach_adapter = onyx_i2c_attach,
|
||||
.probe = onyx_i2c_probe,
|
||||
.remove = onyx_i2c_remove,
|
||||
.id_table = onyx_i2c_id,
|
||||
|
|
|
|||
|
|
@ -883,43 +883,10 @@ static void tas_exit_codec(struct aoa_codec *codec)
|
|||
}
|
||||
|
||||
|
||||
static int tas_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_tas", 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, and then there
|
||||
* is no point in keeping the device instantiated.
|
||||
*/
|
||||
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 tas_i2c_probe(struct i2c_client *client,
|
||||
const struct i2c_device_id *id)
|
||||
{
|
||||
struct device_node *node = client->dev.platform_data;
|
||||
struct device_node *node = client->dev.of_node;
|
||||
struct tas *tas;
|
||||
|
||||
tas = kzalloc(sizeof(struct tas), GFP_KERNEL);
|
||||
|
|
@ -953,47 +920,6 @@ static int tas_i2c_probe(struct i2c_client *client,
|
|||
return -EINVAL;
|
||||
}
|
||||
|
||||
static int tas_i2c_attach(struct i2c_adapter *adapter)
|
||||
{
|
||||
struct device_node *busnode, *dev = NULL;
|
||||
struct pmac_i2c_bus *bus;
|
||||
|
||||
bus = pmac_i2c_adapter_to_bus(adapter);
|
||||
if (bus == NULL)
|
||||
return -ENODEV;
|
||||
busnode = pmac_i2c_get_bus_node(bus);
|
||||
|
||||
while ((dev = of_get_next_child(busnode, dev)) != NULL) {
|
||||
if (of_device_is_compatible(dev, "tas3004")) {
|
||||
const u32 *addr;
|
||||
printk(KERN_DEBUG PFX "found tas3004\n");
|
||||
addr = of_get_property(dev, "reg", NULL);
|
||||
if (!addr)
|
||||
continue;
|
||||
return tas_create(adapter, dev, ((*addr) >> 1) & 0x7f);
|
||||
}
|
||||
/* older machines have no 'codec' node with a 'compatible'
|
||||
* property that says 'tas3004', they just have a 'deq'
|
||||
* node without any such property... */
|
||||
if (strcmp(dev->name, "deq") == 0) {
|
||||
const u32 *_addr;
|
||||
u32 addr;
|
||||
printk(KERN_DEBUG PFX "found 'deq' node\n");
|
||||
_addr = of_get_property(dev, "i2c-address", NULL);
|
||||
if (!_addr)
|
||||
continue;
|
||||
addr = ((*_addr) >> 1) & 0x7f;
|
||||
/* now, if the address doesn't match any of the two
|
||||
* that a tas3004 can have, we cannot handle this.
|
||||
* I doubt it ever happens but hey. */
|
||||
if (addr != 0x34 && addr != 0x35)
|
||||
continue;
|
||||
return tas_create(adapter, dev, addr);
|
||||
}
|
||||
}
|
||||
return -ENODEV;
|
||||
}
|
||||
|
||||
static int tas_i2c_remove(struct i2c_client *client)
|
||||
{
|
||||
struct tas *tas = i2c_get_clientdata(client);
|
||||
|
|
@ -1011,16 +937,16 @@ static int tas_i2c_remove(struct i2c_client *client)
|
|||
}
|
||||
|
||||
static const struct i2c_device_id tas_i2c_id[] = {
|
||||
{ "aoa_codec_tas", 0 },
|
||||
{ "MAC,tas3004", 0 },
|
||||
{ }
|
||||
};
|
||||
MODULE_DEVICE_TABLE(i2c,tas_i2c_id);
|
||||
|
||||
static struct i2c_driver tas_driver = {
|
||||
.driver = {
|
||||
.name = "aoa_codec_tas",
|
||||
.owner = THIS_MODULE,
|
||||
},
|
||||
.attach_adapter = tas_i2c_attach,
|
||||
.probe = tas_i2c_probe,
|
||||
.remove = tas_i2c_remove,
|
||||
.id_table = tas_i2c_id,
|
||||
|
|
|
|||
Reference in New Issue