diff options
| author | Mike Turquette <mturquette@linaro.org> | 2014-02-25 07:21:29 +0100 |
|---|---|---|
| committer | Mike Turquette <mturquette@linaro.org> | 2014-02-25 07:21:29 +0100 |
| commit | 10b7cdc0084c27a312e59e80420c6aac70c64753 (patch) | |
| tree | ee891d6236bcd8dc988624839760aaa1846cf906 /drivers/mfd/da9055-i2c.c | |
| parent | clk: Correct handling of NULL clk in __clk_{get, put} (diff) | |
| parent | clk: shmobile: Fix typo in MSTP clock DT bindings (diff) | |
| download | linux-10b7cdc0084c27a312e59e80420c6aac70c64753.tar.xz linux-10b7cdc0084c27a312e59e80420c6aac70c64753.zip | |
Merge branch 'clocks/fixes/drivers' of git://linuxtv.org/pinchartl/fbdev into clk-fixes
Diffstat (limited to 'drivers/mfd/da9055-i2c.c')
| -rw-r--r-- | drivers/mfd/da9055-i2c.c | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/drivers/mfd/da9055-i2c.c b/drivers/mfd/da9055-i2c.c index 13af7e50021e..8103e4362132 100644 --- a/drivers/mfd/da9055-i2c.c +++ b/drivers/mfd/da9055-i2c.c @@ -53,17 +53,25 @@ static int da9055_i2c_remove(struct i2c_client *i2c) return 0; } +/* + * DO NOT change the device Ids. The naming is intentionally specific as both + * the PMIC and CODEC 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 PMIC + * and CODEC, which must be different to operate together. + */ static struct i2c_device_id da9055_i2c_id[] = { - {"da9055", 0}, + {"da9055-pmic", 0}, { } }; +MODULE_DEVICE_TABLE(i2c, da9055_i2c_id); static struct i2c_driver da9055_i2c_driver = { .probe = da9055_i2c_probe, .remove = da9055_i2c_remove, .id_table = da9055_i2c_id, .driver = { - .name = "da9055", + .name = "da9055-pmic", .owner = THIS_MODULE, }, }; |