mfd: Initialise WM8994 register cache after reading chip ID registers

The different devices handled by the WM8994 can be distinguished using
their ID registers so we don't need to rely on the user having registered
the device correctly. Instead do the initial regmap setup with a minimal
configuration only supporting physical I/O and then configure the cache
once we have identified the device.

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: Samuel Ortiz <sameo@linux.intel.com>

diff --git a/drivers/mfd/wm8994-core.c b/drivers/mfd/wm8994-core.c
index aafac5b5f3a54bfa47193d36a72740663c0388ef..f9c4016baea6dac88368408374aeef30d971aafd 100644 (file)
--- a/drivers/mfd/wm8994-core.c
+++ b/drivers/mfd/wm8994-core.c
@@ -334,6 +334,7 @@ static int wm8994_ldo_in_use(struct wm8994_pdata *pdata, int ldo)
 static int wm8994_device_init(struct wm8994 *wm8994, int irq)
 {
        struct wm8994_pdata *pdata = wm8994->dev->platform_data;
+       struct regmap_config *regmap_config;
        const char *devname;
        int ret, i;
        int pulls = 0;
@@ -465,6 +466,28 @@ static int wm8994_device_init(struct wm8994 *wm8994, int irq)
 
        dev_info(wm8994->dev, "%s revision %c\n", devname, 'A' + ret);
 
+       switch (wm8994->type) {
+       case WM1811:
+               regmap_config = &wm1811_regmap_config;
+               break;
+       case WM8994:
+               regmap_config = &wm8994_regmap_config;
+               break;
+       case WM8958:
+               regmap_config = &wm8958_regmap_config;
+               break;
+       default:
+               dev_err(wm8994->dev, "Unknown device type %d\n", wm8994->type);
+               return -EINVAL;
+       }
+
+       ret = regmap_reinit_cache(wm8994->regmap, regmap_config);
+       if (ret != 0) {
+               dev_err(wm8994->dev, "Failed to reinit register cache: %d\n",
+                       ret);
+               return ret;
+       }
+
        if (pdata) {
                wm8994->irq_base = pdata->irq_base;
                wm8994->gpio_base = pdata->gpio_base;
@@ -556,7 +579,6 @@ static int wm8994_i2c_probe(struct i2c_client *i2c,
                            const struct i2c_device_id *id)
 {
        struct wm8994 *wm8994;
-       struct regmap_config *regmap_config;
        int ret;
 
        wm8994 = devm_kzalloc(&i2c->dev, sizeof(struct wm8994), GFP_KERNEL);
@@ -568,22 +590,7 @@ static int wm8994_i2c_probe(struct i2c_client *i2c,
        wm8994->irq = i2c->irq;
        wm8994->type = id->driver_data;
 
-       switch (wm8994->type) {
-       case WM1811:
-               regmap_config = &wm1811_regmap_config;
-               break;
-       case WM8994:
-               regmap_config = &wm8994_regmap_config;
-               break;
-       case WM8958:
-               regmap_config = &wm8958_regmap_config;
-               break;
-       default:
-               dev_err(wm8994->dev, "Unknown device type %d\n", wm8994->type);
-               return -EINVAL;
-       }
-
-       wm8994->regmap = regmap_init_i2c(i2c, regmap_config);
+       wm8994->regmap = regmap_init_i2c(i2c, &wm8994_base_regmap_config);
        if (IS_ERR(wm8994->regmap)) {
                ret = PTR_ERR(wm8994->regmap);
                dev_err(wm8994->dev, "Failed to allocate register map: %d\n",

diff --git a/drivers/mfd/wm8994-regmap.c b/drivers/mfd/wm8994-regmap.c
index d98a70e260761d3afc96381ec349735f031b5a44..03594c257ef22a9364eb3bd68cc7b122d532e32e 100644 (file)
--- a/drivers/mfd/wm8994-regmap.c
+++ b/drivers/mfd/wm8994-regmap.c
@@ -1216,3 +1216,8 @@ struct regmap_config wm8958_regmap_config = {
        .volatile_reg = wm8958_volatile_register,
        .readable_reg = wm8958_readable_register,
 };
+
+struct regmap_config wm8994_base_regmap_config = {
+       .reg_bits = 16,
+       .val_bits = 16,
+};

diff --git a/drivers/mfd/wm8994.h b/drivers/mfd/wm8994.h
index bf2bdc1ede384f270b93ccc62a065de57371e88c..6f39a84eeadf28dd90b67e0db69fd50b159122ea 100644 (file)
--- a/drivers/mfd/wm8994.h
+++ b/drivers/mfd/wm8994.h
@@ -20,5 +20,6 @@
 extern struct regmap_config wm1811_regmap_config;
 extern struct regmap_config wm8994_regmap_config;
 extern struct regmap_config wm8958_regmap_config;
+extern struct regmap_config wm8994_base_regmap_config;
 
 #endif