diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2014-04-04 01:33:49 +0200 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2014-04-04 01:33:49 +0200 |
| commit | bce5669be3a8946952258a064ef26defeb887138 (patch) | |
| tree | 117386b9909882c000f822011c5ea6fdcbab3273 /sound/soc/codecs/da9055.c | |
| parent | Merge branches 'amba', 'fixes', 'misc', 'mmci', 'unstable/omap-dma' and 'unst... (diff) | |
| parent | Merge branch 'uprobes-v7' of git://git.linaro.org/people/dave.long/linux into... (diff) | |
| download | linux-bce5669be3a8946952258a064ef26defeb887138.tar.xz linux-bce5669be3a8946952258a064ef26defeb887138.zip | |
Merge branch 'devel-stable' into for-next
Diffstat (limited to 'sound/soc/codecs/da9055.c')
| -rw-r--r-- | sound/soc/codecs/da9055.c | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/sound/soc/codecs/da9055.c b/sound/soc/codecs/da9055.c index 52b79a487ac7..422812613a28 100644 --- a/sound/soc/codecs/da9055.c +++ b/sound/soc/codecs/da9055.c @@ -1523,8 +1523,15 @@ static int da9055_remove(struct i2c_client *client) return 0; } +/* + * DO NOT change the device Ids. The naming is intentionally specific as both + * the CODEC and PMIC parts of this chip are instantiated separately as I2C + * devices (both have configurable I2C addresses, and are to all intents and + * purposes separate). As a result there are specific DA9055 Ids for CODEC + * and PMIC, which must be different to operate together. + */ static const struct i2c_device_id da9055_i2c_id[] = { - { "da9055", 0 }, + { "da9055-codec", 0 }, { } }; MODULE_DEVICE_TABLE(i2c, da9055_i2c_id); @@ -1532,7 +1539,7 @@ MODULE_DEVICE_TABLE(i2c, da9055_i2c_id); /* I2C codec control layer */ static struct i2c_driver da9055_i2c_driver = { .driver = { - .name = "da9055", + .name = "da9055-codec", .owner = THIS_MODULE, }, .probe = da9055_i2c_probe, |