Merge branch 'for-linus' of git://opensource.wolfsonmicro.com/regmap

* 'for-linus' of git://opensource.wolfsonmicro.com/regmap: (62 commits)
  mfd: Enable rbtree cache for wm831x devices
  regmap: Support some block operations on cached devices
  regmap: Allow caches for devices with no defaults
  regmap: Ensure rbtree syncs registers set to zero properly
  regmap: Allow rbtree to cache zero default values
  regmap: Warn on raw I/O as well as bulk reads that bypass cache
  regmap: Return a sensible error code if we fail to read the cache
  regmap: Use bsearch() to search the register defaults
  regmap: Fix doc comment
  regmap: Optimize the lookup path to use binary search
  regmap: Ensure we scream if we enable cache bypass/only at the same time
  regmap: Implement regcache_cache_bypass helper function
  regmap: Save/restore the bypass state upon syncing
  regmap: Lock the sync path, ensure we use the lockless _regmap_write()
  regmap: Fix apostrophe usage
  regmap: Make _regmap_write() global
  regmap: Fix lock used for regcache_cache_only()
  regmap: Grab the lock in regcache_cache_only()
  regmap: Modify map->cache_bypass directly
  regmap: Fix regcache_sync generic implementation
  ...

1 files changed, 38 insertions, 166 deletions

diff --git a/drivers/mfd/wm831x-spi.c b/drivers/mfd/wm831x-spi.c
index eed8e4f7a5a1..8d6a9a969dbc 100644
--- a/drivers/mfd/wm831x-spi.c
+++ b/drivers/mfd/wm831x-spi.c
@@ -16,78 +16,19 @@
 #include <linux/module.h>
 #include <linux/pm.h>
 #include <linux/spi/spi.h>
+#include <linux/regmap.h>
+#include <linux/err.h>
 
 #include <linux/mfd/wm831x/core.h>
 
-static int wm831x_spi_read_device(struct wm831x *wm831x, unsigned short reg,
-                                  int bytes, void *dest)
-{
-        u16 tx_val;
-        u16 *d = dest;
-        int r, ret;
-
-        /* Go register at a time */
-        for (r = reg; r < reg + (bytes / 2); r++) {
-                tx_val = r | 0x8000;
-
-                ret = spi_write_then_read(wm831x->control_data,
-                                          (u8 *)&tx_val, 2, (u8 *)d, 2);
-                if (ret != 0)
-                        return ret;
-
-                *d = be16_to_cpu(*d);
-
-                d++;
-        }
-
-        return 0;
-}
-
-static int wm831x_spi_write_device(struct wm831x *wm831x, unsigned short reg,
-                                   int bytes, void *src)
-{
-        struct spi_device *spi = wm831x->control_data;
-        u16 *s = src;
-        u16 data[2];
-        int ret, r;
-
-        /* Go register at a time */
-        for (r = reg; r < reg + (bytes / 2); r++) {
-                data[0] = r;
-                data[1] = *s++;
-
-                ret = spi_write(spi, (char *)&data, sizeof(data));
-                if (ret != 0)
-                        return ret;
-        }
-
-        return 0;
-}
-
 static int __devinit wm831x_spi_probe(struct spi_device *spi)
 {
+        const struct spi_device_id *id = spi_get_device_id(spi);
         struct wm831x *wm831x;
         enum wm831x_parent type;
+        int ret;
 
-        /* Currently SPI support for ID tables is unmerged, we're faking it */
-        if (strcmp(spi->modalias, "wm8310") == 0)
-                type = WM8310;
-        else if (strcmp(spi->modalias, "wm8311") == 0)
-                type = WM8311;
-        else if (strcmp(spi->modalias, "wm8312") == 0)
-                type = WM8312;
-        else if (strcmp(spi->modalias, "wm8320") == 0)
-                type = WM8320;
-        else if (strcmp(spi->modalias, "wm8321") == 0)
-                type = WM8321;
-        else if (strcmp(spi->modalias, "wm8325") == 0)
-                type = WM8325;
-        else if (strcmp(spi->modalias, "wm8326") == 0)
-                type = WM8326;
-        else {
-                dev_err(&spi->dev, "Unknown device type\n");
-                return -EINVAL;
-        }
+        type = (enum wm831x_parent)id->driver_data;
 
         wm831x = kzalloc(sizeof(struct wm831x), GFP_KERNEL);
         if (wm831x == NULL)
@@ -98,9 +39,15 @@ static int __devinit wm831x_spi_probe(struct spi_device *spi)
 
         dev_set_drvdata(&spi->dev, wm831x);
         wm831x->dev = &spi->dev;
-        wm831x->control_data = spi;
-        wm831x->read_dev = wm831x_spi_read_device;
-        wm831x->write_dev = wm831x_spi_write_device;
+
+        wm831x->regmap = regmap_init_spi(spi, &wm831x_regmap_config);
+        if (IS_ERR(wm831x->regmap)) {
+                ret = PTR_ERR(wm831x->regmap);
+                dev_err(wm831x->dev, "Failed to allocate register map: %d\n",
+                        ret);
+                kfree(wm831x);
+                return ret;
+        }
 
         return wm831x_device_init(wm831x, type, spi->irq);
 }
@@ -121,119 +68,50 @@ static int wm831x_spi_suspend(struct device *dev)
         return wm831x_device_suspend(wm831x);
 }
 
+static void wm831x_spi_shutdown(struct spi_device *spi)
+{
+        struct wm831x *wm831x = dev_get_drvdata(&spi->dev);
+
+        wm831x_device_shutdown(wm831x);
+}
+
 static const struct dev_pm_ops wm831x_spi_pm = {
         .freeze = wm831x_spi_suspend,
         .suspend = wm831x_spi_suspend,
 };
 
-static struct spi_driver wm8310_spi_driver = {
-        .driver = {
-                .name   = "wm8310",
-                .bus    = &spi_bus_type,
-                .owner  = THIS_MODULE,
-                .pm     = &wm831x_spi_pm,
-        },
-        .probe          = wm831x_spi_probe,
-        .remove         = __devexit_p(wm831x_spi_remove),
+static const struct spi_device_id wm831x_spi_ids[] = {
+        { "wm8310", WM8310 },
+        { "wm8311", WM8311 },
+        { "wm8312", WM8312 },
+        { "wm8320", WM8320 },
+        { "wm8321", WM8321 },
+        { "wm8325", WM8325 },
+        { "wm8326", WM8326 },
+        { },
 };
+MODULE_DEVICE_TABLE(spi, wm831x_spi_id);
 
-static struct spi_driver wm8311_spi_driver = {
+static struct spi_driver wm831x_spi_driver = {
         .driver = {
-                .name   = "wm8311",
-                .bus    = &spi_bus_type,
-                .owner  = THIS_MODULE,
-                .pm     = &wm831x_spi_pm,
-        },
-        .probe          = wm831x_spi_probe,
-        .remove         = __devexit_p(wm831x_spi_remove),
-};
-
-static struct spi_driver wm8312_spi_driver = {
-        .driver = {
-                .name   = "wm8312",
-                .bus    = &spi_bus_type,
-                .owner  = THIS_MODULE,
-                .pm     = &wm831x_spi_pm,
-        },
-        .probe          = wm831x_spi_probe,
-        .remove         = __devexit_p(wm831x_spi_remove),
-};
-
-static struct spi_driver wm8320_spi_driver = {
-        .driver = {
-                .name   = "wm8320",
-                .bus    = &spi_bus_type,
-                .owner  = THIS_MODULE,
-                .pm     = &wm831x_spi_pm,
-        },
-        .probe          = wm831x_spi_probe,
-        .remove         = __devexit_p(wm831x_spi_remove),
-};
-
-static struct spi_driver wm8321_spi_driver = {
-        .driver = {
-                .name   = "wm8321",
-                .bus    = &spi_bus_type,
-                .owner  = THIS_MODULE,
-                .pm     = &wm831x_spi_pm,
-        },
-        .probe          = wm831x_spi_probe,
-        .remove         = __devexit_p(wm831x_spi_remove),
-};
-
-static struct spi_driver wm8325_spi_driver = {
-        .driver = {
-                .name   = "wm8325",
-                .bus    = &spi_bus_type,
-                .owner  = THIS_MODULE,
-                .pm     = &wm831x_spi_pm,
-        },
-        .probe          = wm831x_spi_probe,
-        .remove         = __devexit_p(wm831x_spi_remove),
-};
-
-static struct spi_driver wm8326_spi_driver = {
-        .driver = {
-                .name   = "wm8326",
+                .name   = "wm831x",
                 .bus    = &spi_bus_type,
                 .owner  = THIS_MODULE,
                 .pm     = &wm831x_spi_pm,
         },
+        .id_table       = wm831x_spi_ids,
         .probe          = wm831x_spi_probe,
         .remove         = __devexit_p(wm831x_spi_remove),
+        .shutdown       = wm831x_spi_shutdown,
 };
 
 static int __init wm831x_spi_init(void)
 {
         int ret;
 
-        ret = spi_register_driver(&wm8310_spi_driver);
-        if (ret != 0)
-                pr_err("Failed to register WM8310 SPI driver: %d\n", ret);
-
-        ret = spi_register_driver(&wm8311_spi_driver);
-        if (ret != 0)
-                pr_err("Failed to register WM8311 SPI driver: %d\n", ret);
-
-        ret = spi_register_driver(&wm8312_spi_driver);
-        if (ret != 0)
-                pr_err("Failed to register WM8312 SPI driver: %d\n", ret);
-
-        ret = spi_register_driver(&wm8320_spi_driver);
-        if (ret != 0)
-                pr_err("Failed to register WM8320 SPI driver: %d\n", ret);
-
-        ret = spi_register_driver(&wm8321_spi_driver);
-        if (ret != 0)
-                pr_err("Failed to register WM8321 SPI driver: %d\n", ret);
-
-        ret = spi_register_driver(&wm8325_spi_driver);
-        if (ret != 0)
-                pr_err("Failed to register WM8325 SPI driver: %d\n", ret);
-
-        ret = spi_register_driver(&wm8326_spi_driver);
+        ret = spi_register_driver(&wm831x_spi_driver);
         if (ret != 0)
-                pr_err("Failed to register WM8326 SPI driver: %d\n", ret);
+                pr_err("Failed to register WM831x SPI driver: %d\n", ret);
 
         return 0;
 }
@@ -241,13 +119,7 @@ subsys_initcall(wm831x_spi_init);
 
 static void __exit wm831x_spi_exit(void)
 {
-        spi_unregister_driver(&wm8326_spi_driver);
-        spi_unregister_driver(&wm8325_spi_driver);
-        spi_unregister_driver(&wm8321_spi_driver);
-        spi_unregister_driver(&wm8320_spi_driver);
-        spi_unregister_driver(&wm8312_spi_driver);
-        spi_unregister_driver(&wm8311_spi_driver);
-        spi_unregister_driver(&wm8310_spi_driver);
+        spi_unregister_driver(&wm831x_spi_driver);
 }
 module_exit(wm831x_spi_exit);