mfd: regulator: clk: Split rohm-bd718x7.h

[linux.git] / drivers / mfd / rohm-bd718x7.c

diff --git a/drivers/mfd/rohm-bd718x7.c b/drivers/mfd/rohm-bd718x7.c
index a29d529a96f4af7e4a389da280cf7d691c6845dc..7beb444a57cb7a2ce05a9f16c559d9b9e959e90b 100644 (file)
--- a/drivers/mfd/rohm-bd718x7.c
+++ b/drivers/mfd/rohm-bd718x7.c
@@ -98,18 +98,19 @@ static int bd718xx_i2c_probe(struct i2c_client *i2c,
                return -ENOMEM;
 
        bd718xx->chip_irq = i2c->irq;
-       bd718xx->chip_type = (unsigned int)(uintptr_t)
+       bd718xx->chip.chip_type = (unsigned int)(uintptr_t)
                                of_device_get_match_data(&i2c->dev);
-       bd718xx->dev = &i2c->dev;
+       bd718xx->chip.dev = &i2c->dev;
        dev_set_drvdata(&i2c->dev, bd718xx);
 
-       bd718xx->regmap = devm_regmap_init_i2c(i2c, &bd718xx_regmap_config);
-       if (IS_ERR(bd718xx->regmap)) {
+       bd718xx->chip.regmap = devm_regmap_init_i2c(i2c,
+                                                   &bd718xx_regmap_config);
+       if (IS_ERR(bd718xx->chip.regmap)) {
                dev_err(&i2c->dev, "regmap initialization failed\n");
-               return PTR_ERR(bd718xx->regmap);
+               return PTR_ERR(bd718xx->chip.regmap);
        }
 
-       ret = devm_regmap_add_irq_chip(&i2c->dev, bd718xx->regmap,
+       ret = devm_regmap_add_irq_chip(&i2c->dev, bd718xx->chip.regmap,
                                       bd718xx->chip_irq, IRQF_ONESHOT, 0,
                                       &bd718xx_irq_chip, &bd718xx->irq_data);
        if (ret) {
@@ -118,7 +119,7 @@ static int bd718xx_i2c_probe(struct i2c_client *i2c,
        }
 
        /* Configure short press to 10 milliseconds */
-       ret = regmap_update_bits(bd718xx->regmap,
+       ret = regmap_update_bits(bd718xx->chip.regmap,
                                 BD718XX_REG_PWRONCONFIG0,
                                 BD718XX_PWRBTN_PRESS_DURATION_MASK,
                                 BD718XX_PWRBTN_SHORT_PRESS_10MS);
@@ -129,7 +130,7 @@ static int bd718xx_i2c_probe(struct i2c_client *i2c,
        }
 
        /* Configure long press to 10 seconds */
-       ret = regmap_update_bits(bd718xx->regmap,
+       ret = regmap_update_bits(bd718xx->chip.regmap,
                                 BD718XX_REG_PWRONCONFIG1,
                                 BD718XX_PWRBTN_PRESS_DURATION_MASK,
                                 BD718XX_PWRBTN_LONG_PRESS_10S);
@@ -149,7 +150,7 @@ static int bd718xx_i2c_probe(struct i2c_client *i2c,
 
        button.irq = ret;
 
-       ret = devm_mfd_add_devices(bd718xx->dev, PLATFORM_DEVID_AUTO,
+       ret = devm_mfd_add_devices(bd718xx->chip.dev, PLATFORM_DEVID_AUTO,
                                   bd718xx_mfd_cells,
                                   ARRAY_SIZE(bd718xx_mfd_cells), NULL, 0,
                                   regmap_irq_get_domain(bd718xx->irq_data));
@@ -162,11 +163,11 @@ static int bd718xx_i2c_probe(struct i2c_client *i2c,
 static const struct of_device_id bd718xx_of_match[] = {
        {
                .compatible = "rohm,bd71837",
-               .data = (void *)BD718XX_TYPE_BD71837,
+               .data = (void *)ROHM_CHIP_TYPE_BD71837,
        },
        {
                .compatible = "rohm,bd71847",
-               .data = (void *)BD718XX_TYPE_BD71847,
+               .data = (void *)ROHM_CHIP_TYPE_BD71847,
        },
        { }
 };