Commit 07441006 authored by Peter Ujfalusi's avatar Peter Ujfalusi Committed by Mark Brown

ASoC: tpa6130a2: Model support cleanup

Use the device name and driver_data to identify
the TPA model supported by the driver.
Board files should use either "tpa6130a2" or
"tpa6140a2" as device name to specify the model
in used on the specific board.
Signed-off-by: default avatarPeter Ujfalusi <peter.ujfalusi@ti.com>
Tested-by: default avatarJarkko Nikula <jarkko.nikula@bitmer.com>
Acked-by: default avatarLiam Girdwood <lrg@ti.com>
Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
parent 17841020
...@@ -383,7 +383,7 @@ static int __devinit tpa6130a2_probe(struct i2c_client *client, ...@@ -383,7 +383,7 @@ static int __devinit tpa6130a2_probe(struct i2c_client *client,
pdata = client->dev.platform_data; pdata = client->dev.platform_data;
data->power_gpio = pdata->power_gpio; data->power_gpio = pdata->power_gpio;
data->id = pdata->id; data->id = id->driver_data;
mutex_init(&data->mutex); mutex_init(&data->mutex);
...@@ -405,7 +405,7 @@ static int __devinit tpa6130a2_probe(struct i2c_client *client, ...@@ -405,7 +405,7 @@ static int __devinit tpa6130a2_probe(struct i2c_client *client,
switch (data->id) { switch (data->id) {
default: default:
dev_warn(dev, "Unknown TPA model (%d). Assuming 6130A2\n", dev_warn(dev, "Unknown TPA model (%d). Assuming 6130A2\n",
pdata->id); data->id);
case TPA6130A2: case TPA6130A2:
regulator = "Vdd"; regulator = "Vdd";
break; break;
...@@ -469,7 +469,8 @@ static int __devexit tpa6130a2_remove(struct i2c_client *client) ...@@ -469,7 +469,8 @@ static int __devexit tpa6130a2_remove(struct i2c_client *client)
} }
static const struct i2c_device_id tpa6130a2_id[] = { static const struct i2c_device_id tpa6130a2_id[] = {
{ "tpa6130a2", 0 }, { "tpa6130a2", TPA6130A2 },
{ "tpa6140a2", TPA6140A2 },
{ } { }
}; };
MODULE_DEVICE_TABLE(i2c, tpa6130a2_id); MODULE_DEVICE_TABLE(i2c, tpa6130a2_id);
......
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