mfd: Add regmap cache support for wm8350

[cascardo/linux.git] / drivers / mfd / wm8350-core.c

diff --git a/drivers/mfd/wm8350-core.c b/drivers/mfd/wm8350-core.c
index dd1caaa..fadcbbe 100644 (file)
--- a/drivers/mfd/wm8350-core.c
+++ b/drivers/mfd/wm8350-core.c
@@ -20,6 +20,7 @@
 #include <linux/device.h>
 #include <linux/delay.h>
 #include <linux/interrupt.h>
+#include <linux/regmap.h>
 #include <linux/workqueue.h>
 
 #include <linux/mfd/wm8350/core.h>
@@ -31,9 +32,6 @@
 #include <linux/mfd/wm8350/supply.h>
 #include <linux/mfd/wm8350/wdt.h>
 
-#define WM8350_UNLOCK_KEY              0x0013
-#define WM8350_LOCK_KEY                        0x0000
-
 #define WM8350_CLOCK_CONTROL_1         0x28
 #define WM8350_AIF_TEST                        0x74
 
@@ -74,7 +72,7 @@ static int wm8350_phys_read(struct wm8350 *wm8350, u8 reg, int num_regs,
        int bytes = num_regs * 2;
 
        dev_dbg(wm8350->dev, "volatile read\n");
-       ret = wm8350->read_dev(wm8350, reg, bytes, (char *)dest);
+       ret = regmap_raw_read(wm8350->regmap, reg, dest, bytes);
 
        for (i = reg; i < reg + num_regs; i++) {
                /* Cache is CPU endian */
@@ -96,9 +94,6 @@ static int wm8350_read(struct wm8350 *wm8350, u8 reg, int num_regs, u16 *dest)
        int ret = 0;
        int bytes = num_regs * 2;
 
-       if (wm8350->read_dev == NULL)
-               return -ENODEV;
-
        if ((reg + num_regs - 1) > WM8350_MAX_REGISTER) {
                dev_err(wm8350->dev, "invalid reg %x\n",
                        reg + num_regs - 1);
@@ -149,9 +144,6 @@ static int wm8350_write(struct wm8350 *wm8350, u8 reg, int num_regs, u16 *src)
        int end = reg + num_regs;
        int bytes = num_regs * 2;
 
-       if (wm8350->write_dev == NULL)
-               return -ENODEV;
-
        if ((reg + num_regs - 1) > WM8350_MAX_REGISTER) {
                dev_err(wm8350->dev, "invalid reg %x\n",
                        reg + num_regs - 1);
@@ -182,7 +174,7 @@ static int wm8350_write(struct wm8350 *wm8350, u8 reg, int num_regs, u16 *src)
        }
 
        /* Actually write it out */
-       return wm8350->write_dev(wm8350, reg, bytes, (char *)src);
+       return regmap_raw_write(wm8350->regmap, reg, src, bytes);
 }
 
 /*
@@ -300,15 +292,20 @@ EXPORT_SYMBOL_GPL(wm8350_block_write);
  */
 int wm8350_reg_lock(struct wm8350 *wm8350)
 {
-       u16 key = WM8350_LOCK_KEY;
        int ret;
 
+       mutex_lock(&reg_lock_mutex);
+
        ldbg(__func__);
-       mutex_lock(&io_mutex);
-       ret = wm8350_write(wm8350, WM8350_SECURITY, 1, &key);
+
+       ret = wm8350_reg_write(wm8350, WM8350_SECURITY, WM8350_LOCK_KEY);
        if (ret)
                dev_err(wm8350->dev, "lock failed\n");
-       mutex_unlock(&io_mutex);
+
+       wm8350->unlocked = false;
+
+       mutex_unlock(&reg_lock_mutex);
+
        return ret;
 }
 EXPORT_SYMBOL_GPL(wm8350_reg_lock);
@@ -324,15 +321,20 @@ EXPORT_SYMBOL_GPL(wm8350_reg_lock);
  */
 int wm8350_reg_unlock(struct wm8350 *wm8350)
 {
-       u16 key = WM8350_UNLOCK_KEY;
        int ret;
 
+       mutex_lock(&reg_lock_mutex);
+
        ldbg(__func__);
-       mutex_lock(&io_mutex);
-       ret = wm8350_write(wm8350, WM8350_SECURITY, 1, &key);
+
+       ret = wm8350_reg_write(wm8350, WM8350_SECURITY, WM8350_UNLOCK_KEY);
        if (ret)
                dev_err(wm8350->dev, "unlock failed\n");
-       mutex_unlock(&io_mutex);
+
+       wm8350->unlocked = true;
+
+       mutex_unlock(&reg_lock_mutex);
+
        return ret;
 }
 EXPORT_SYMBOL_GPL(wm8350_reg_unlock);
@@ -515,9 +517,8 @@ static int wm8350_create_cache(struct wm8350 *wm8350, int type, int mode)
         * a PMIC so the device many not be in a virgin state and we
         * can't rely on the silicon values.
         */
-       ret = wm8350->read_dev(wm8350, 0,
-                              sizeof(u16) * (WM8350_MAX_REGISTER + 1),
-                              wm8350->reg_cache);
+       ret = regmap_raw_read(wm8350->regmap, 0, wm8350->reg_cache,
+                             sizeof(u16) * (WM8350_MAX_REGISTER + 1));
        if (ret < 0) {
                dev_err(wm8350->dev,
                        "failed to read initial cache values\n");
@@ -570,35 +571,30 @@ int wm8350_device_init(struct wm8350 *wm8350, int irq,
                       struct wm8350_platform_data *pdata)
 {
        int ret;
-       u16 id1, id2, mask_rev;
-       u16 cust_id, mode, chip_rev;
+       unsigned int id1, id2, mask_rev;
+       unsigned int cust_id, mode, chip_rev;
 
        dev_set_drvdata(wm8350->dev, wm8350);
 
        /* get WM8350 revision and config mode */
-       ret = wm8350->read_dev(wm8350, WM8350_RESET_ID, sizeof(id1), &id1);
+       ret = regmap_read(wm8350->regmap, WM8350_RESET_ID, &id1);
        if (ret != 0) {
                dev_err(wm8350->dev, "Failed to read ID: %d\n", ret);
                goto err;
        }
 
-       ret = wm8350->read_dev(wm8350, WM8350_ID, sizeof(id2), &id2);
+       ret = regmap_read(wm8350->regmap, WM8350_ID, &id2);
        if (ret != 0) {
                dev_err(wm8350->dev, "Failed to read ID: %d\n", ret);
                goto err;
        }
 
-       ret = wm8350->read_dev(wm8350, WM8350_REVISION, sizeof(mask_rev),
-                              &mask_rev);
+       ret = regmap_read(wm8350->regmap, WM8350_REVISION, &mask_rev);
        if (ret != 0) {
                dev_err(wm8350->dev, "Failed to read revision: %d\n", ret);
                goto err;
        }
 
-       id1 = be16_to_cpu(id1);
-       id2 = be16_to_cpu(id2);
-       mask_rev = be16_to_cpu(mask_rev);
-
        if (id1 != 0x6143) {
                dev_err(wm8350->dev,
                        "Device with ID %x is not a WM8350\n", id1);