diff options
| author |   Krzysztof Kozlowski <k.kozlowski@samsung.com> | 2014-04-14 11:17:13 +0200 |
|---|---|---|
| committer |   Lee Jones <lee.jones@linaro.org> | 2014-04-23 14:07:50 +0100 |
| commit | 575343d161d75dc1516f53436b9eb47d04eda938 (patch) | |
| tree | 52a133e94bb7e9ade87e4139b0e25f14a4faa780 /drivers/mfd/max14577.c | |
| parent | extcon: max14577: Change extcon name instead of static name according to device type (diff) | |
| download | linux-dev-575343d161d75dc1516f53436b9eb47d04eda938.tar.xz linux-dev-575343d161d75dc1516f53436b9eb47d04eda938.zip | |
mfd: max14577: Add muic prefix to regmap config
Add muic prefix to regmap config to differentiate between another regmap
config for MAX77836 PMIC node. Additionally remove unused
symbols: MAX14577_REG_INVALID and max14577_irq_source.
Signed-off-by: Krzysztof Kozlowski <k.kozlowski@samsung.com>
Signed-off-by: Lee Jones <lee.jones@linaro.org>
Diffstat (limited to 'drivers/mfd/max14577.c')
| -rw-r--r-- | drivers/mfd/max14577.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/drivers/mfd/max14577.c b/drivers/mfd/max14577.c index 5f13cefe8def..d180fae8e317 100644 --- a/drivers/mfd/max14577.c +++ b/drivers/mfd/max14577.c @@ -37,7 +37,7 @@ static struct mfd_cell max14577_devs[] = { { .name = "max14577-charger", }, }; -static bool max14577_volatile_reg(struct device *dev, unsigned int reg) +static bool max14577_muic_volatile_reg(struct device *dev, unsigned int reg) { switch (reg) { case MAX14577_REG_INT1 ... MAX14577_REG_STATUS3: @@ -48,10 +48,10 @@ static bool max14577_volatile_reg(struct device *dev, unsigned int reg) return false; } -static const struct regmap_config max14577_regmap_config = { +static const struct regmap_config max14577_muic_regmap_config = { .reg_bits = 8, .val_bits = 8, - .volatile_reg = max14577_volatile_reg, + .volatile_reg = max14577_muic_volatile_reg, .max_register = MAX14577_REG_END, }; @@ -113,7 +113,8 @@ static int max14577_i2c_probe(struct i2c_client *i2c, max14577->i2c = i2c; max14577->irq = i2c->irq; - max14577->regmap = devm_regmap_init_i2c(i2c, &max14577_regmap_config); + max14577->regmap = devm_regmap_init_i2c(i2c, + &max14577_muic_regmap_config); if (IS_ERR(max14577->regmap)) { ret = PTR_ERR(max14577->regmap); dev_err(max14577->dev, "Failed to allocate register map: %d\n", |