Hi Krzysztof,
On 04/14/2014 06:17 PM, Krzysztof Kozlowski wrote:
> 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.kozlow...@samsung.com>
> Cc: Kyungmin Park <kyungmin.p...@samsung.com>
> ---
> drivers/mfd/max14577.c | 9 +++++----
> include/linux/mfd/max14577-private.h | 4 +---
> 2 files changed, 6 insertions(+), 7 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",
> diff --git a/include/linux/mfd/max14577-private.h
> b/include/linux/mfd/max14577-private.h
> index c9b332fb0d5d..97b78d94f92f 100644
> --- a/include/linux/mfd/max14577-private.h
> +++ b/include/linux/mfd/max14577-private.h
> @@ -22,9 +22,7 @@
> #include <linux/i2c.h>
> #include <linux/regmap.h>
>
> -#define MAX14577_REG_INVALID (0xff)
> -
> -/* Slave addr = 0x4A: Interrupt */
> +/* Slave addr = 0x4A: MUIC and Charger */
> enum max14577_reg {
> MAX14577_REG_DEVICEID = 0x00,
> MAX14577_REG_INT1 = 0x01,
>
Reviewed-by: Chanwoo Choi <cw00.c...@samsung.com>
Cheers,
Chanwoo Choi
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
