Skip to content

Commit

Permalink
ASoC: tpa6130a2: Model support cleanup
Browse files Browse the repository at this point in the history
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: Peter Ujfalusi <peter.ujfalusi@ti.com>
Tested-by: Jarkko Nikula <jarkko.nikula@bitmer.com>
Acked-by: Liam Girdwood <lrg@ti.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
  • Loading branch information
Peter Ujfalusi authored and Mark Brown committed Sep 21, 2011
1 parent 1784102 commit 0744100
Showing 1 changed file with 4 additions and 3 deletions.
7 changes: 4 additions & 3 deletions sound/soc/codecs/tpa6130a2.c
Original file line number Diff line number Diff line change
Expand Up @@ -383,7 +383,7 @@ static int __devinit tpa6130a2_probe(struct i2c_client *client,

pdata = client->dev.platform_data;
data->power_gpio = pdata->power_gpio;
data->id = pdata->id;
data->id = id->driver_data;

mutex_init(&data->mutex);

Expand All @@ -405,7 +405,7 @@ static int __devinit tpa6130a2_probe(struct i2c_client *client,
switch (data->id) {
default:
dev_warn(dev, "Unknown TPA model (%d). Assuming 6130A2\n",
pdata->id);
data->id);
case TPA6130A2:
regulator = "Vdd";
break;
Expand Down Expand Up @@ -469,7 +469,8 @@ static int __devexit tpa6130a2_remove(struct i2c_client *client)
}

static const struct i2c_device_id tpa6130a2_id[] = {
{ "tpa6130a2", 0 },
{ "tpa6130a2", TPA6130A2 },
{ "tpa6140a2", TPA6140A2 },
{ }
};
MODULE_DEVICE_TABLE(i2c, tpa6130a2_id);
Expand Down

0 comments on commit 0744100

Please sign in to comment.