diff options
| author | Krzysztof Kozlowski <k.kozlowski@samsung.com> | 2014-09-12 08:53:58 +0200 |
|---|---|---|
| committer | Lee Jones <lee.jones@linaro.org> | 2014-09-24 16:25:52 +0200 |
| commit | 2c33e9296202cd11bf2e2f801b69ffba0953748a (patch) | |
| tree | b3c7194462ff0a966d0b604c116a56d06576afba /drivers/power/max17040_battery.c | |
| parent | charger: max14577: Configure battery-dependent settings from DTS and sysfs (diff) | |
| download | linux-2c33e9296202cd11bf2e2f801b69ffba0953748a.tar.xz linux-2c33e9296202cd11bf2e2f801b69ffba0953748a.zip | |
power: max17040: Add ID for MAX77836 Fuel Gauge block
MAX77836 has the same Fuel Gauge as MAX17040/17048. The max17040 driver
can be safely re-used. The patch adds MAX77836 device to the array of
i2c_device_id. Additionally it removes the id associated with MAX17040
device as the value is not used.
Signed-off-by: Krzysztof Kozlowski <k.kozlowski@samsung.com>
Acked-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Lee Jones <lee.jones@linaro.org>
Diffstat (limited to 'drivers/power/max17040_battery.c')
| -rw-r--r-- | drivers/power/max17040_battery.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/power/max17040_battery.c b/drivers/power/max17040_battery.c index 0fbac861080d..14d44706327b 100644 --- a/drivers/power/max17040_battery.c +++ b/drivers/power/max17040_battery.c @@ -277,7 +277,8 @@ static SIMPLE_DEV_PM_OPS(max17040_pm_ops, max17040_suspend, max17040_resume); #endif /* CONFIG_PM_SLEEP */ static const struct i2c_device_id max17040_id[] = { - { "max17040", 0 }, + { "max17040" }, + { "max77836-battery" }, { } }; MODULE_DEVICE_TABLE(i2c, max17040_id); |