mfd: Use regmap for the mc13xxx-core register access

This change converts the mc13xxx core to use regmap rather than direct
spi r/w.
The spidev member of mc13xxx struct becomes redundant and is removed.
Extra debugging aids are added to mc13xxx_reg_rmw.
Mutex init is moved to before regmap init.

Signed-off-by: Marc Reilly <marc@cpdesign.com.au>
Reviewed-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>

diff --git a/drivers/mfd/Kconfig b/drivers/mfd/Kconfig
index c6edba69678aad8aab6b5fef9d3720d28d9b900a..411a61a9940411b64c45980a7b18c9ea6625cb60 100644 (file)
--- a/drivers/mfd/Kconfig
+++ b/drivers/mfd/Kconfig
@@ -600,6 +600,7 @@ config MFD_MC13XXX
        depends on SPI_MASTER
        select MFD_CORE
        select MFD_MC13783
+       select REGMAP_SPI
        help
          Support for the Freescale (Atlas) PMIC and audio CODECs
          MC13783 and MC13892.

diff --git a/drivers/mfd/mc13xxx-core.c b/drivers/mfd/mc13xxx-core.c
index c8b7a28b2669095b57251e66fbd057b00bffebdb..d761a2e54b98fb7d00323843c9245e5ee5f26cbc 100644 (file)
--- a/drivers/mfd/mc13xxx-core.c
+++ b/drivers/mfd/mc13xxx-core.c
@@ -21,6 +21,8 @@
 #include <linux/of.h>
 #include <linux/of_device.h>
 #include <linux/of_gpio.h>
+#include <linux/regmap.h>
+#include <linux/err.h>
 
 enum mc13xxx_id {
        MC13XXX_ID_MC13783,
@@ -29,7 +31,7 @@ enum mc13xxx_id {
 };
 
 struct mc13xxx {
-       struct spi_device *spidev;
+       struct regmap *regmap;
 
        struct device *dev;
        enum mc13xxx_id ictype;
@@ -172,67 +174,6 @@ void mc13xxx_unlock(struct mc13xxx *mc13xxx)
 }
 EXPORT_SYMBOL(mc13xxx_unlock);
 
-#define MC13XXX_REGOFFSET_SHIFT 25
-static int mc13xxx_spi_reg_read(struct mc13xxx *mc13xxx,
-                               unsigned int offset, u32 *val)
-{
-       struct spi_transfer t;
-       struct spi_message m;
-       int ret;
-
-       *val = offset << MC13XXX_REGOFFSET_SHIFT;
-
-       memset(&t, 0, sizeof(t));
-
-       t.tx_buf = val;
-       t.rx_buf = val;
-       t.len = sizeof(u32);
-
-       spi_message_init(&m);
-       spi_message_add_tail(&t, &m);
-
-       ret = spi_sync(mc13xxx->spidev, &m);
-
-       /* error in message.status implies error return from spi_sync */
-       BUG_ON(!ret && m.status);
-
-       if (ret)
-               return ret;
-
-       *val &= 0xffffff;
-
-       return 0;
-}
-
-static int mc13xxx_spi_reg_write(struct mc13xxx *mc13xxx, unsigned int offset,
-               u32 val)
-{
-       u32 buf;
-       struct spi_transfer t;
-       struct spi_message m;
-       int ret;
-
-       buf = 1 << 31 | offset << MC13XXX_REGOFFSET_SHIFT | val;
-
-       memset(&t, 0, sizeof(t));
-
-       t.tx_buf = &buf;
-       t.rx_buf = &buf;
-       t.len = sizeof(u32);
-
-       spi_message_init(&m);
-       spi_message_add_tail(&t, &m);
-
-       ret = spi_sync(mc13xxx->spidev, &m);
-
-       BUG_ON(!ret && m.status);
-
-       if (ret)
-               return ret;
-
-       return 0;
-}
-
 int mc13xxx_reg_read(struct mc13xxx *mc13xxx, unsigned int offset, u32 *val)
 {
        int ret;
@@ -242,7 +183,7 @@ int mc13xxx_reg_read(struct mc13xxx *mc13xxx, unsigned int offset, u32 *val)
        if (offset > MC13XXX_NUMREGS)
                return -EINVAL;
 
-       ret = mc13xxx_spi_reg_read(mc13xxx, offset, val);
+       ret = regmap_read(mc13xxx->regmap, offset, val);
        dev_vdbg(mc13xxx->dev, "[0x%02x] -> 0x%06x\n", offset, *val);
 
        return ret;
@@ -258,25 +199,19 @@ int mc13xxx_reg_write(struct mc13xxx *mc13xxx, unsigned int offset, u32 val)
        if (offset > MC13XXX_NUMREGS || val > 0xffffff)
                return -EINVAL;
 
-       return mc13xxx_spi_reg_write(mc13xxx, offset, val);
+       return regmap_write(mc13xxx->regmap, offset, val);
 }
 EXPORT_SYMBOL(mc13xxx_reg_write);
 
 int mc13xxx_reg_rmw(struct mc13xxx *mc13xxx, unsigned int offset,
                u32 mask, u32 val)
 {
-       int ret;
-       u32 valread;
-
+       BUG_ON(!mutex_is_locked(&mc13xxx->lock));
        BUG_ON(val & ~mask);
+       dev_vdbg(mc13xxx->dev, "[0x%02x] <- 0x%06x (mask: 0x%06x)\n",
+                       offset, val, mask);
 
-       ret = mc13xxx_reg_read(mc13xxx, offset, &valread);
-       if (ret)
-               return ret;
-
-       valread = (valread & ~mask) | val;
-
-       return mc13xxx_reg_write(mc13xxx, offset, valread);
+       return regmap_update_bits(mc13xxx->regmap, offset, mask, val);
 }
 EXPORT_SYMBOL(mc13xxx_reg_rmw);
 
@@ -713,7 +648,7 @@ static int mc13xxx_add_subdevice(struct mc13xxx *mc13xxx, const char *format)
 #ifdef CONFIG_OF
 static int mc13xxx_probe_flags_dt(struct mc13xxx *mc13xxx)
 {
-       struct device_node *np = mc13xxx->dev.of_node;
+       struct device_node *np = mc13xxx->dev->of_node;
 
        if (!np)
                return -ENODEV;
@@ -759,6 +694,16 @@ static const struct of_device_id mc13xxx_dt_ids[] = {
 };
 MODULE_DEVICE_TABLE(of, mc13xxx_dt_ids);
 
+static struct regmap_config mc13xxx_regmap_spi_config = {
+       .reg_bits = 7,
+       .pad_bits = 1,
+       .val_bits = 24,
+
+       .max_register = MC13XXX_NUMREGS,
+
+       .cache_type = REGCACHE_NONE,
+};
+
 static int mc13xxx_common_init(struct mc13xxx *mc13xxx,
                struct mc13xxx_platform_data *pdata, int irq);
 
@@ -783,10 +728,19 @@ static int mc13xxx_spi_probe(struct spi_device *spi)
        dev_set_drvdata(&spi->dev, mc13xxx);
        spi->mode = SPI_MODE_0 | SPI_CS_HIGH;
        spi->bits_per_word = 32;
-       spi_setup(spi);
 
        mc13xxx->dev = &spi->dev;
-       mc13xxx->spidev = spi;
+       mutex_init(&mc13xxx->lock);
+
+       mc13xxx->regmap = regmap_init_spi(spi, &mc13xxx_regmap_spi_config);
+       if (IS_ERR(mc13xxx->regmap)) {
+               ret = PTR_ERR(mc13xxx->regmap);
+               dev_err(mc13xxx->dev, "Failed to initialize register map: %d\n",
+                               ret);
+               dev_set_drvdata(&spi->dev, NULL);
+               kfree(mc13xxx);
+               return ret;
+       }
 
        ret = mc13xxx_common_init(mc13xxx, pdata, spi->irq);
 
@@ -794,7 +748,7 @@ static int mc13xxx_spi_probe(struct spi_device *spi)
                dev_set_drvdata(&spi->dev, NULL);
        } else {
                const struct spi_device_id *devid =
-                       spi_get_device_id(mc13xxx->spidev);
+                       spi_get_device_id(spi);
                if (!devid || devid->driver_data != mc13xxx->ictype)
                        dev_warn(mc13xxx->dev,
                                "device id doesn't match auto detection!\n");
@@ -808,7 +762,6 @@ static int mc13xxx_common_init(struct mc13xxx *mc13xxx,
 {
        int ret;
 
-       mutex_init(&mc13xxx->lock);
        mc13xxx_lock(mc13xxx);
 
        ret = mc13xxx_identify(mc13xxx);
@@ -886,6 +839,8 @@ static void mc13xxx_common_cleanup(struct mc13xxx *mc13xxx)
 
        mfd_remove_devices(mc13xxx->dev);
 
+       regmap_exit(mc13xxx->regmap);
+
        kfree(mc13xxx);
 }