Merge tag 'v2.6.39-rc7'

in order to pull in changes in drivers/media/dvb/firewire/ and
sound/firewire/.

1 files changed, 170 insertions, 62 deletions

diff --git a/drivers/mfd/wm8994-core.c b/drivers/mfd/wm8994-core.c
index b3b2aaf89dbe..e198d40292e7 100644
--- a/drivers/mfd/wm8994-core.c
+++ b/drivers/mfd/wm8994-core.c
@@ -18,6 +18,7 @@
 #include <linux/i2c.h>
 #include <linux/delay.h>
 #include <linux/mfd/core.h>
+#include <linux/pm_runtime.h>
 #include <linux/regulator/consumer.h>
 #include <linux/regulator/machine.h>
 
@@ -39,10 +40,8 @@ static int wm8994_read(struct wm8994 *wm8994, unsigned short reg,
                 return ret;
 
         for (i = 0; i < bytes / 2; i++) {
-                buf[i] = be16_to_cpu(buf[i]);
-
                 dev_vdbg(wm8994->dev, "Read %04x from R%d(0x%x)\n",
-                         buf[i], reg + i, reg + i);
+                         be16_to_cpu(buf[i]), reg + i, reg + i);
         }
 
         return 0;
@@ -68,7 +67,7 @@ int wm8994_reg_read(struct wm8994 *wm8994, unsigned short reg)
         if (ret < 0)
                 return ret;
         else
-                return val;
+                return be16_to_cpu(val);
 }
 EXPORT_SYMBOL_GPL(wm8994_reg_read);
 
@@ -78,7 +77,7 @@ EXPORT_SYMBOL_GPL(wm8994_reg_read);
  * @wm8994: Device to read from
  * @reg: First register
  * @count: Number of registers
- * @buf: Buffer to fill.
+ * @buf: Buffer to fill.  The data will be returned big endian.
  */
 int wm8994_bulk_read(struct wm8994 *wm8994, unsigned short reg,
                      int count, u16 *buf)
@@ -96,9 +95,9 @@ int wm8994_bulk_read(struct wm8994 *wm8994, unsigned short reg,
 EXPORT_SYMBOL_GPL(wm8994_bulk_read);
 
 static int wm8994_write(struct wm8994 *wm8994, unsigned short reg,
-                        int bytes, void *src)
+                        int bytes, const void *src)
 {
-        u16 *buf = src;
+        const u16 *buf = src;
         int i;
 
         BUG_ON(bytes % 2);
@@ -106,9 +105,7 @@ static int wm8994_write(struct wm8994 *wm8994, unsigned short reg,
 
         for (i = 0; i < bytes / 2; i++) {
                 dev_vdbg(wm8994->dev, "Write %04x to R%d(0x%x)\n",
-                         buf[i], reg + i, reg + i);
-
-                buf[i] = cpu_to_be16(buf[i]);
+                         be16_to_cpu(buf[i]), reg + i, reg + i);
         }
 
         return wm8994->write_dev(wm8994, reg, bytes, src);
@@ -126,6 +123,8 @@ int wm8994_reg_write(struct wm8994 *wm8994, unsigned short reg,
 {
         int ret;
 
+        val = cpu_to_be16(val);
+
         mutex_lock(&wm8994->io_lock);
 
         ret = wm8994_write(wm8994, reg, 2, &val);
@@ -137,6 +136,29 @@ int wm8994_reg_write(struct wm8994 *wm8994, unsigned short reg,
 EXPORT_SYMBOL_GPL(wm8994_reg_write);
 
 /**
+ * wm8994_bulk_write: Write multiple WM8994 registers
+ *
+ * @wm8994: Device to write to
+ * @reg: First register
+ * @count: Number of registers
+ * @buf: Buffer to write from.  Data must be big-endian formatted.
+ */
+int wm8994_bulk_write(struct wm8994 *wm8994, unsigned short reg,
+                      int count, const u16 *buf)
+{
+        int ret;
+
+        mutex_lock(&wm8994->io_lock);
+
+        ret = wm8994_write(wm8994, reg, count * 2, buf);
+
+        mutex_unlock(&wm8994->io_lock);
+
+        return ret;
+}
+EXPORT_SYMBOL_GPL(wm8994_bulk_write);
+
+/**
  * wm8994_set_bits: Set the value of a bitfield in a WM8994 register
  *
  * @wm8994: Device to write to.
@@ -156,9 +178,13 @@ int wm8994_set_bits(struct wm8994 *wm8994, unsigned short reg,
         if (ret < 0)
                 goto out;
 
+        r = be16_to_cpu(r);
+
         r &= ~mask;
         r |= val;
 
+        r = cpu_to_be16(r);
+
         ret = wm8994_write(wm8994, reg, 2, &r);
 
 out:
@@ -169,8 +195,16 @@ out:
 EXPORT_SYMBOL_GPL(wm8994_set_bits);
 
 static struct mfd_cell wm8994_regulator_devs[] = {
-        { .name = "wm8994-ldo", .id = 1 },
-        { .name = "wm8994-ldo", .id = 2 },
+        {
+                .name = "wm8994-ldo",
+                .id = 1,
+                .pm_runtime_no_callbacks = true,
+        },
+        {
+                .name = "wm8994-ldo",
+                .id = 2,
+                .pm_runtime_no_callbacks = true,
+        },
 };
 
 static struct resource wm8994_codec_resources[] = {
@@ -200,6 +234,7 @@ static struct mfd_cell wm8994_devs[] = {
                 .name = "wm8994-gpio",
                 .num_resources = ARRAY_SIZE(wm8994_gpio_resources),
                 .resources = wm8994_gpio_resources,
+                .pm_runtime_no_callbacks = true,
         },
 };
 
@@ -218,12 +253,34 @@ static const char *wm8994_main_supplies[] = {
         "SPKVDD2",
 };
 
+static const char *wm8958_main_supplies[] = {
+        "DBVDD1",
+        "DBVDD2",
+        "DBVDD3",
+        "DCVDD",
+        "AVDD1",
+        "AVDD2",
+        "CPVDD",
+        "SPKVDD1",
+        "SPKVDD2",
+};
+
 #ifdef CONFIG_PM
-static int wm8994_device_suspend(struct device *dev)
+static int wm8994_suspend(struct device *dev)
 {
         struct wm8994 *wm8994 = dev_get_drvdata(dev);
         int ret;
 
+        /* Don't actually go through with the suspend if the CODEC is
+         * still active (eg, for audio passthrough from CP. */
+        ret = wm8994_reg_read(wm8994, WM8994_POWER_MANAGEMENT_1);
+        if (ret < 0) {
+                dev_err(dev, "Failed to read power status: %d\n", ret);
+        } else if (ret & WM8994_VMID_SEL_MASK) {
+                dev_dbg(dev, "CODEC still active, ignoring suspend\n");
+                return 0;
+        }
+
         /* GPIO configuration state is saved here since we may be configuring
          * the GPIO alternate functions even if we're not using the gpiolib
          * driver for them.
@@ -239,7 +296,14 @@ static int wm8994_device_suspend(struct device *dev)
         if (ret < 0)
                 dev_err(dev, "Failed to save LDO registers: %d\n", ret);
 
-        ret = regulator_bulk_disable(ARRAY_SIZE(wm8994_main_supplies),
+        /* Explicitly put the device into reset in case regulators
+         * don't get disabled in order to ensure consistent restart.
+         */
+        wm8994_reg_write(wm8994, WM8994_SOFTWARE_RESET, 0x8994);
+
+        wm8994->suspended = true;
+
+        ret = regulator_bulk_disable(wm8994->num_supplies,
                                      wm8994->supplies);
         if (ret != 0) {
                 dev_err(dev, "Failed to disable supplies: %d\n", ret);
@@ -249,12 +313,16 @@ static int wm8994_device_suspend(struct device *dev)
         return 0;
 }
 
-static int wm8994_device_resume(struct device *dev)
+static int wm8994_resume(struct device *dev)
 {
         struct wm8994 *wm8994 = dev_get_drvdata(dev);
         int ret;
 
-        ret = regulator_bulk_enable(ARRAY_SIZE(wm8994_main_supplies),
+        /* We may have lied to the PM core about suspending */
+        if (!wm8994->suspended)
+                return 0;
+
+        ret = regulator_bulk_enable(wm8994->num_supplies,
                                     wm8994->supplies);
         if (ret != 0) {
                 dev_err(dev, "Failed to enable supplies: %d\n", ret);
@@ -276,6 +344,8 @@ static int wm8994_device_resume(struct device *dev)
         if (ret < 0)
                 dev_err(dev, "Failed to restore GPIO registers: %d\n", ret);
 
+        wm8994->suspended = false;
+
         return 0;
 }
 #endif
@@ -305,9 +375,10 @@ static int wm8994_ldo_in_use(struct wm8994_pdata *pdata, int ldo)
 /*
  * Instantiate the generic non-control parts of the device.
  */
-static int wm8994_device_init(struct wm8994 *wm8994, unsigned long id, int irq)
+static int wm8994_device_init(struct wm8994 *wm8994, int irq)
 {
         struct wm8994_pdata *pdata = wm8994->dev->platform_data;
+        const char *devname;
         int ret, i;
 
         mutex_init(&wm8994->io_lock);
@@ -323,25 +394,48 @@ static int wm8994_device_init(struct wm8994 *wm8994, unsigned long id, int irq)
                 goto err;
         }
 
+        switch (wm8994->type) {
+        case WM8994:
+                wm8994->num_supplies = ARRAY_SIZE(wm8994_main_supplies);
+                break;
+        case WM8958:
+                wm8994->num_supplies = ARRAY_SIZE(wm8958_main_supplies);
+                break;
+        default:
+                BUG();
+                return -EINVAL;
+        }
+
         wm8994->supplies = kzalloc(sizeof(struct regulator_bulk_data) *
-                                   ARRAY_SIZE(wm8994_main_supplies),
+                                   wm8994->num_supplies,
                                    GFP_KERNEL);
         if (!wm8994->supplies) {
                 ret = -ENOMEM;
                 goto err;
         }
 
-        for (i = 0; i < ARRAY_SIZE(wm8994_main_supplies); i++)
-                wm8994->supplies[i].supply = wm8994_main_supplies[i];
-
-        ret = regulator_bulk_get(wm8994->dev, ARRAY_SIZE(wm8994_main_supplies),
+        switch (wm8994->type) {
+        case WM8994:
+                for (i = 0; i < ARRAY_SIZE(wm8994_main_supplies); i++)
+                        wm8994->supplies[i].supply = wm8994_main_supplies[i];
+                break;
+        case WM8958:
+                for (i = 0; i < ARRAY_SIZE(wm8958_main_supplies); i++)
+                        wm8994->supplies[i].supply = wm8958_main_supplies[i];
+                break;
+        default:
+                BUG();
+                return -EINVAL;
+        }
+                
+        ret = regulator_bulk_get(wm8994->dev, wm8994->num_supplies,
                                  wm8994->supplies);
         if (ret != 0) {
                 dev_err(wm8994->dev, "Failed to get supplies: %d\n", ret);
                 goto err_supplies;
         }
 
-        ret = regulator_bulk_enable(ARRAY_SIZE(wm8994_main_supplies),
+        ret = regulator_bulk_enable(wm8994->num_supplies,
                                     wm8994->supplies);
         if (ret != 0) {
                 dev_err(wm8994->dev, "Failed to enable supplies: %d\n", ret);
@@ -353,7 +447,22 @@ static int wm8994_device_init(struct wm8994 *wm8994, unsigned long id, int irq)
                 dev_err(wm8994->dev, "Failed to read ID register\n");
                 goto err_enable;
         }
-        if (ret != 0x8994) {
+        switch (ret) {
+        case 0x8994:
+                devname = "WM8994";
+                if (wm8994->type != WM8994)
+                        dev_warn(wm8994->dev, "Device registered as type %d\n",
+                                 wm8994->type);
+                wm8994->type = WM8994;
+                break;
+        case 0x8958:
+                devname = "WM8958";
+                if (wm8994->type != WM8958)
+                        dev_warn(wm8994->dev, "Device registered as type %d\n",
+                                 wm8994->type);
+                wm8994->type = WM8958;
+                break;
+        default:
                 dev_err(wm8994->dev, "Device is not a WM8994, ID is %x\n",
                         ret);
                 ret = -EINVAL;
@@ -370,14 +479,16 @@ static int wm8994_device_init(struct wm8994 *wm8994, unsigned long id, int irq)
         switch (ret) {
         case 0:
         case 1:
-                dev_warn(wm8994->dev, "revision %c not fully supported\n",
-                        'A' + ret);
+                if (wm8994->type == WM8994)
+                        dev_warn(wm8994->dev,
+                                 "revision %c not fully supported\n",
+                                 'A' + ret);
                 break;
         default:
-                dev_info(wm8994->dev, "revision %c\n", 'A' + ret);
                 break;
         }
 
+        dev_info(wm8994->dev, "%s revision %c\n", devname, 'A' + ret);
 
         if (pdata) {
                 wm8994->irq_base = pdata->irq_base;
@@ -418,15 +529,18 @@ static int wm8994_device_init(struct wm8994 *wm8994, unsigned long id, int irq)
                 goto err_irq;
         }
 
+        pm_runtime_enable(wm8994->dev);
+        pm_runtime_resume(wm8994->dev);
+
         return 0;
 
 err_irq:
         wm8994_irq_exit(wm8994);
 err_enable:
-        regulator_bulk_disable(ARRAY_SIZE(wm8994_main_supplies),
+        regulator_bulk_disable(wm8994->num_supplies,
                                wm8994->supplies);
 err_get:
-        regulator_bulk_free(ARRAY_SIZE(wm8994_main_supplies), wm8994->supplies);
+        regulator_bulk_free(wm8994->num_supplies, wm8994->supplies);
 err_supplies:
         kfree(wm8994->supplies);
 err:
@@ -437,11 +551,12 @@ err:
 
 static void wm8994_device_exit(struct wm8994 *wm8994)
 {
+        pm_runtime_disable(wm8994->dev);
         mfd_remove_devices(wm8994->dev);
         wm8994_irq_exit(wm8994);
-        regulator_bulk_disable(ARRAY_SIZE(wm8994_main_supplies),
+        regulator_bulk_disable(wm8994->num_supplies,
                                wm8994->supplies);
-        regulator_bulk_free(ARRAY_SIZE(wm8994_main_supplies), wm8994->supplies);
+        regulator_bulk_free(wm8994->num_supplies, wm8994->supplies);
         kfree(wm8994->supplies);
         kfree(wm8994);
 }
@@ -467,25 +582,29 @@ static int wm8994_i2c_read_device(struct wm8994 *wm8994, unsigned short reg,
         return 0;
 }
 
-/* Currently we allocate the write buffer on the stack; this is OK for
- * small writes - if we need to do large writes this will need to be
- * revised.
- */
 static int wm8994_i2c_write_device(struct wm8994 *wm8994, unsigned short reg,
-                                   int bytes, void *src)
+                                   int bytes, const void *src)
 {
         struct i2c_client *i2c = wm8994->control_data;
-        unsigned char msg[bytes + 2];
+        struct i2c_msg xfer[2];
         int ret;
 
         reg = cpu_to_be16(reg);
-        memcpy(&msg[0], &reg, 2);
-        memcpy(&msg[2], src, bytes);
 
-        ret = i2c_master_send(i2c, msg, bytes + 2);
+        xfer[0].addr = i2c->addr;
+        xfer[0].flags = 0;
+        xfer[0].len = 2;
+        xfer[0].buf = (char *)&reg;
+
+        xfer[1].addr = i2c->addr;
+        xfer[1].flags = I2C_M_NOSTART;
+        xfer[1].len = bytes;
+        xfer[1].buf = (char *)src;
+
+        ret = i2c_transfer(i2c->adapter, xfer, 2);
         if (ret < 0)
                 return ret;
-        if (ret < bytes + 2)
+        if (ret != 2)
                 return -EIO;
 
         return 0;
@@ -506,8 +625,9 @@ static int wm8994_i2c_probe(struct i2c_client *i2c,
         wm8994->read_dev = wm8994_i2c_read_device;
         wm8994->write_dev = wm8994_i2c_write_device;
         wm8994->irq = i2c->irq;
+        wm8994->type = id->driver_data;
 
-        return wm8994_device_init(wm8994, id->driver_data, i2c->irq);
+        return wm8994_device_init(wm8994, i2c->irq);
 }
 
 static int wm8994_i2c_remove(struct i2c_client *i2c)
@@ -519,36 +639,24 @@ static int wm8994_i2c_remove(struct i2c_client *i2c)
         return 0;
 }
 
-#ifdef CONFIG_PM
-static int wm8994_i2c_suspend(struct i2c_client *i2c, pm_message_t state)
-{
-        return wm8994_device_suspend(&i2c->dev);
-}
-
-static int wm8994_i2c_resume(struct i2c_client *i2c)
-{
-        return wm8994_device_resume(&i2c->dev);
-}
-#else
-#define wm8994_i2c_suspend NULL
-#define wm8994_i2c_resume NULL
-#endif
-
 static const struct i2c_device_id wm8994_i2c_id[] = {
-        { "wm8994", 0 },
+        { "wm8994", WM8994 },
+        { "wm8958", WM8958 },
         { }
 };
 MODULE_DEVICE_TABLE(i2c, wm8994_i2c_id);
 
+static UNIVERSAL_DEV_PM_OPS(wm8994_pm_ops, wm8994_suspend, wm8994_resume,
+                            NULL);
+
 static struct i2c_driver wm8994_i2c_driver = {
         .driver = {
-                   .name = "wm8994",
-                   .owner = THIS_MODULE,
+                .name = "wm8994",
+                .owner = THIS_MODULE,
+                .pm = &wm8994_pm_ops,
         },
         .probe = wm8994_i2c_probe,
         .remove = wm8994_i2c_remove,
-        .suspend = wm8994_i2c_suspend,
-        .resume = wm8994_i2c_resume,
         .id_table = wm8994_i2c_id,
 };