mfd: Refactor DB8500 PRCMU reg access
[linux-2.6.git] / drivers / mfd / wm8350-core.c
index 9a1a0b2..e81cc31 100644 (file)
@@ -15,6 +15,7 @@
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/init.h>
+#include <linux/slab.h>
 #include <linux/bug.h>
 #include <linux/device.h>
 #include <linux/delay.h>
@@ -63,7 +64,6 @@
  */
 static DEFINE_MUTEX(io_mutex);
 static DEFINE_MUTEX(reg_lock_mutex);
-static DEFINE_MUTEX(auxadc_mutex);
 
 /* Perform a physical read from the device.
  */
@@ -80,10 +80,6 @@ static int wm8350_phys_read(struct wm8350 *wm8350, u8 reg, int num_regs,
                /* Cache is CPU endian */
                dest[i - reg] = be16_to_cpu(dest[i - reg]);
 
-               /* Satisfy non-volatile bits from cache */
-               dest[i - reg] &= wm8350_reg_io_map[i].vol;
-               dest[i - reg] |= wm8350->reg_cache[i];
-
                /* Mask out non-readable bits */
                dest[i - reg] &= wm8350_reg_io_map[i].readable;
        }
@@ -139,8 +135,7 @@ static inline int is_reg_locked(struct wm8350 *wm8350, u8 reg)
            wm8350->reg_cache[WM8350_SECURITY] == WM8350_UNLOCK_KEY)
                return 0;
 
-       if ((reg == WM8350_GPIO_CONFIGURATION_I_O) ||
-           (reg >= WM8350_GPIO_FUNCTION_SELECT_1 &&
+       if ((reg >= WM8350_GPIO_FUNCTION_SELECT_1 &&
             reg <= WM8350_GPIO_FUNCTION_SELECT_4) ||
            (reg >= WM8350_BATTERY_CHARGER_CONTROL_1 &&
             reg <= WM8350_BATTERY_CHARGER_CONTROL_3))
@@ -296,6 +291,13 @@ int wm8350_block_write(struct wm8350 *wm8350, int start_reg, int regs,
 }
 EXPORT_SYMBOL_GPL(wm8350_block_write);
 
+/**
+ * wm8350_reg_lock()
+ *
+ * The WM8350 has a hardware lock which can be used to prevent writes to
+ * some registers (generally those which can cause particularly serious
+ * problems if misused).  This function enables that lock.
+ */
 int wm8350_reg_lock(struct wm8350 *wm8350)
 {
        u16 key = WM8350_LOCK_KEY;
@@ -311,6 +313,15 @@ int wm8350_reg_lock(struct wm8350 *wm8350)
 }
 EXPORT_SYMBOL_GPL(wm8350_reg_lock);
 
+/**
+ * wm8350_reg_unlock()
+ *
+ * The WM8350 has a hardware lock which can be used to prevent writes to
+ * some registers (generally those which can cause particularly serious
+ * problems if misused).  This function disables that lock so updates
+ * can be performed.  For maximum safety this should be done only when
+ * required.
+ */
 int wm8350_reg_unlock(struct wm8350 *wm8350)
 {
        u16 key = WM8350_UNLOCK_KEY;
@@ -326,781 +337,177 @@ int wm8350_reg_unlock(struct wm8350 *wm8350)
 }
 EXPORT_SYMBOL_GPL(wm8350_reg_unlock);
 
-static void wm8350_irq_call_handler(struct wm8350 *wm8350, int irq)
+int wm8350_read_auxadc(struct wm8350 *wm8350, int channel, int scale, int vref)
 {
-       mutex_lock(&wm8350->irq_mutex);
-
-       if (wm8350->irq[irq].handler)
-               wm8350->irq[irq].handler(wm8350, irq, wm8350->irq[irq].data);
-       else {
-               dev_err(wm8350->dev, "irq %d nobody cared. now masked.\n",
-                       irq);
-               wm8350_mask_irq(wm8350, irq);
-       }
+       u16 reg, result = 0;
 
-       mutex_unlock(&wm8350->irq_mutex);
-}
-
-/*
- * wm8350_irq_worker actually handles the interrupts.  Since all
- * interrupts are clear on read the IRQ line will be reasserted and
- * the physical IRQ will be handled again if another interrupt is
- * asserted while we run - in the normal course of events this is a
- * rare occurrence so we save I2C/SPI reads.
- */
-static void wm8350_irq_worker(struct work_struct *work)
-{
-       struct wm8350 *wm8350 = container_of(work, struct wm8350, irq_work);
-       u16 level_one, status1, status2, comp;
-
-       /* TODO: Use block reads to improve performance? */
-       level_one = wm8350_reg_read(wm8350, WM8350_SYSTEM_INTERRUPTS)
-               & ~wm8350_reg_read(wm8350, WM8350_SYSTEM_INTERRUPTS_MASK);
-       status1 = wm8350_reg_read(wm8350, WM8350_INT_STATUS_1)
-               & ~wm8350_reg_read(wm8350, WM8350_INT_STATUS_1_MASK);
-       status2 = wm8350_reg_read(wm8350, WM8350_INT_STATUS_2)
-               & ~wm8350_reg_read(wm8350, WM8350_INT_STATUS_2_MASK);
-       comp = wm8350_reg_read(wm8350, WM8350_COMPARATOR_INT_STATUS)
-               & ~wm8350_reg_read(wm8350, WM8350_COMPARATOR_INT_STATUS_MASK);
-
-       /* over current */
-       if (level_one & WM8350_OC_INT) {
-               u16 oc;
-
-               oc = wm8350_reg_read(wm8350, WM8350_OVER_CURRENT_INT_STATUS);
-               oc &= ~wm8350_reg_read(wm8350,
-                                      WM8350_OVER_CURRENT_INT_STATUS_MASK);
-
-               if (oc & WM8350_OC_LS_EINT)     /* limit switch */
-                       wm8350_irq_call_handler(wm8350, WM8350_IRQ_OC_LS);
-       }
+       if (channel < WM8350_AUXADC_AUX1 || channel > WM8350_AUXADC_TEMP)
+               return -EINVAL;
+       if (channel >= WM8350_AUXADC_USB && channel <= WM8350_AUXADC_TEMP
+           && (scale != 0 || vref != 0))
+               return -EINVAL;
 
-       /* under voltage */
-       if (level_one & WM8350_UV_INT) {
-               u16 uv;
-
-               uv = wm8350_reg_read(wm8350, WM8350_UNDER_VOLTAGE_INT_STATUS);
-               uv &= ~wm8350_reg_read(wm8350,
-                                      WM8350_UNDER_VOLTAGE_INT_STATUS_MASK);
-
-               if (uv & WM8350_UV_DC1_EINT)
-                       wm8350_irq_call_handler(wm8350, WM8350_IRQ_UV_DC1);
-               if (uv & WM8350_UV_DC2_EINT)
-                       wm8350_irq_call_handler(wm8350, WM8350_IRQ_UV_DC2);
-               if (uv & WM8350_UV_DC3_EINT)
-                       wm8350_irq_call_handler(wm8350, WM8350_IRQ_UV_DC3);
-               if (uv & WM8350_UV_DC4_EINT)
-                       wm8350_irq_call_handler(wm8350, WM8350_IRQ_UV_DC4);
-               if (uv & WM8350_UV_DC5_EINT)
-                       wm8350_irq_call_handler(wm8350, WM8350_IRQ_UV_DC5);
-               if (uv & WM8350_UV_DC6_EINT)
-                       wm8350_irq_call_handler(wm8350, WM8350_IRQ_UV_DC6);
-               if (uv & WM8350_UV_LDO1_EINT)
-                       wm8350_irq_call_handler(wm8350, WM8350_IRQ_UV_LDO1);
-               if (uv & WM8350_UV_LDO2_EINT)
-                       wm8350_irq_call_handler(wm8350, WM8350_IRQ_UV_LDO2);
-               if (uv & WM8350_UV_LDO3_EINT)
-                       wm8350_irq_call_handler(wm8350, WM8350_IRQ_UV_LDO3);
-               if (uv & WM8350_UV_LDO4_EINT)
-                       wm8350_irq_call_handler(wm8350, WM8350_IRQ_UV_LDO4);
-       }
+       mutex_lock(&wm8350->auxadc_mutex);
 
-       /* charger, RTC */
-       if (status1) {
-               if (status1 & WM8350_CHG_BAT_HOT_EINT)
-                       wm8350_irq_call_handler(wm8350,
-                                               WM8350_IRQ_CHG_BAT_HOT);
-               if (status1 & WM8350_CHG_BAT_COLD_EINT)
-                       wm8350_irq_call_handler(wm8350,
-                                               WM8350_IRQ_CHG_BAT_COLD);
-               if (status1 & WM8350_CHG_BAT_FAIL_EINT)
-                       wm8350_irq_call_handler(wm8350,
-                                               WM8350_IRQ_CHG_BAT_FAIL);
-               if (status1 & WM8350_CHG_TO_EINT)
-                       wm8350_irq_call_handler(wm8350, WM8350_IRQ_CHG_TO);
-               if (status1 & WM8350_CHG_END_EINT)
-                       wm8350_irq_call_handler(wm8350, WM8350_IRQ_CHG_END);
-               if (status1 & WM8350_CHG_START_EINT)
-                       wm8350_irq_call_handler(wm8350, WM8350_IRQ_CHG_START);
-               if (status1 & WM8350_CHG_FAST_RDY_EINT)
-                       wm8350_irq_call_handler(wm8350,
-                                               WM8350_IRQ_CHG_FAST_RDY);
-               if (status1 & WM8350_CHG_VBATT_LT_3P9_EINT)
-                       wm8350_irq_call_handler(wm8350,
-                                               WM8350_IRQ_CHG_VBATT_LT_3P9);
-               if (status1 & WM8350_CHG_VBATT_LT_3P1_EINT)
-                       wm8350_irq_call_handler(wm8350,
-                                               WM8350_IRQ_CHG_VBATT_LT_3P1);
-               if (status1 & WM8350_CHG_VBATT_LT_2P85_EINT)
-                       wm8350_irq_call_handler(wm8350,
-                                               WM8350_IRQ_CHG_VBATT_LT_2P85);
-               if (status1 & WM8350_RTC_ALM_EINT)
-                       wm8350_irq_call_handler(wm8350, WM8350_IRQ_RTC_ALM);
-               if (status1 & WM8350_RTC_SEC_EINT)
-                       wm8350_irq_call_handler(wm8350, WM8350_IRQ_RTC_SEC);
-               if (status1 & WM8350_RTC_PER_EINT)
-                       wm8350_irq_call_handler(wm8350, WM8350_IRQ_RTC_PER);
-       }
+       /* Turn on the ADC */
+       reg = wm8350_reg_read(wm8350, WM8350_POWER_MGMT_5);
+       wm8350_reg_write(wm8350, WM8350_POWER_MGMT_5, reg | WM8350_AUXADC_ENA);
 
-       /* current sink, system, aux adc */
-       if (status2) {
-               if (status2 & WM8350_CS1_EINT)
-                       wm8350_irq_call_handler(wm8350, WM8350_IRQ_CS1);
-               if (status2 & WM8350_CS2_EINT)
-                       wm8350_irq_call_handler(wm8350, WM8350_IRQ_CS2);
-
-               if (status2 & WM8350_SYS_HYST_COMP_FAIL_EINT)
-                       wm8350_irq_call_handler(wm8350,
-                                               WM8350_IRQ_SYS_HYST_COMP_FAIL);
-               if (status2 & WM8350_SYS_CHIP_GT115_EINT)
-                       wm8350_irq_call_handler(wm8350,
-                                               WM8350_IRQ_SYS_CHIP_GT115);
-               if (status2 & WM8350_SYS_CHIP_GT140_EINT)
-                       wm8350_irq_call_handler(wm8350,
-                                               WM8350_IRQ_SYS_CHIP_GT140);
-               if (status2 & WM8350_SYS_WDOG_TO_EINT)
-                       wm8350_irq_call_handler(wm8350,
-                                               WM8350_IRQ_SYS_WDOG_TO);
-
-               if (status2 & WM8350_AUXADC_DATARDY_EINT)
-                       wm8350_irq_call_handler(wm8350,
-                                               WM8350_IRQ_AUXADC_DATARDY);
-               if (status2 & WM8350_AUXADC_DCOMP4_EINT)
-                       wm8350_irq_call_handler(wm8350,
-                                               WM8350_IRQ_AUXADC_DCOMP4);
-               if (status2 & WM8350_AUXADC_DCOMP3_EINT)
-                       wm8350_irq_call_handler(wm8350,
-                                               WM8350_IRQ_AUXADC_DCOMP3);
-               if (status2 & WM8350_AUXADC_DCOMP2_EINT)
-                       wm8350_irq_call_handler(wm8350,
-                                               WM8350_IRQ_AUXADC_DCOMP2);
-               if (status2 & WM8350_AUXADC_DCOMP1_EINT)
-                       wm8350_irq_call_handler(wm8350,
-                                               WM8350_IRQ_AUXADC_DCOMP1);
-
-               if (status2 & WM8350_USB_LIMIT_EINT)
-                       wm8350_irq_call_handler(wm8350, WM8350_IRQ_USB_LIMIT);
+       if (scale || vref) {
+               reg = scale << 13;
+               reg |= vref << 12;
+               wm8350_reg_write(wm8350, WM8350_AUX1_READBACK + channel, reg);
        }
 
-       /* wake, codec, ext */
-       if (comp) {
-               if (comp & WM8350_WKUP_OFF_STATE_EINT)
-                       wm8350_irq_call_handler(wm8350,
-                                               WM8350_IRQ_WKUP_OFF_STATE);
-               if (comp & WM8350_WKUP_HIB_STATE_EINT)
-                       wm8350_irq_call_handler(wm8350,
-                                               WM8350_IRQ_WKUP_HIB_STATE);
-               if (comp & WM8350_WKUP_CONV_FAULT_EINT)
-                       wm8350_irq_call_handler(wm8350,
-                                               WM8350_IRQ_WKUP_CONV_FAULT);
-               if (comp & WM8350_WKUP_WDOG_RST_EINT)
-                       wm8350_irq_call_handler(wm8350,
-                                               WM8350_IRQ_WKUP_WDOG_RST);
-               if (comp & WM8350_WKUP_GP_PWR_ON_EINT)
-                       wm8350_irq_call_handler(wm8350,
-                                               WM8350_IRQ_WKUP_GP_PWR_ON);
-               if (comp & WM8350_WKUP_ONKEY_EINT)
-                       wm8350_irq_call_handler(wm8350, WM8350_IRQ_WKUP_ONKEY);
-               if (comp & WM8350_WKUP_GP_WAKEUP_EINT)
-                       wm8350_irq_call_handler(wm8350,
-                                               WM8350_IRQ_WKUP_GP_WAKEUP);
-
-               if (comp & WM8350_CODEC_JCK_DET_L_EINT)
-                       wm8350_irq_call_handler(wm8350,
-                                               WM8350_IRQ_CODEC_JCK_DET_L);
-               if (comp & WM8350_CODEC_JCK_DET_R_EINT)
-                       wm8350_irq_call_handler(wm8350,
-                                               WM8350_IRQ_CODEC_JCK_DET_R);
-               if (comp & WM8350_CODEC_MICSCD_EINT)
-                       wm8350_irq_call_handler(wm8350,
-                                               WM8350_IRQ_CODEC_MICSCD);
-               if (comp & WM8350_CODEC_MICD_EINT)
-                       wm8350_irq_call_handler(wm8350, WM8350_IRQ_CODEC_MICD);
-
-               if (comp & WM8350_EXT_USB_FB_EINT)
-                       wm8350_irq_call_handler(wm8350, WM8350_IRQ_EXT_USB_FB);
-               if (comp & WM8350_EXT_WALL_FB_EINT)
-                       wm8350_irq_call_handler(wm8350,
-                                               WM8350_IRQ_EXT_WALL_FB);
-               if (comp & WM8350_EXT_BAT_FB_EINT)
-                       wm8350_irq_call_handler(wm8350, WM8350_IRQ_EXT_BAT_FB);
-       }
+       reg = wm8350_reg_read(wm8350, WM8350_DIGITISER_CONTROL_1);
+       reg |= 1 << channel | WM8350_AUXADC_POLL;
+       wm8350_reg_write(wm8350, WM8350_DIGITISER_CONTROL_1, reg);
 
-       if (level_one & WM8350_GP_INT) {
-               int i;
-               u16 gpio;
+       /* If a late IRQ left the completion signalled then consume
+        * the completion. */
+       try_wait_for_completion(&wm8350->auxadc_done);
 
-               gpio = wm8350_reg_read(wm8350, WM8350_GPIO_INT_STATUS);
-               gpio &= ~wm8350_reg_read(wm8350,
-                                        WM8350_GPIO_INT_STATUS_MASK);
+       /* We ignore the result of the completion and just check for a
+        * conversion result, allowing us to soldier on if the IRQ
+        * infrastructure is not set up for the chip. */
+       wait_for_completion_timeout(&wm8350->auxadc_done, msecs_to_jiffies(5));
 
-               for (i = 0; i < 12; i++) {
-                       if (gpio & (1 << i))
-                               wm8350_irq_call_handler(wm8350,
-                                                       WM8350_IRQ_GPIO(i));
-               }
-       }
+       reg = wm8350_reg_read(wm8350, WM8350_DIGITISER_CONTROL_1);
+       if (reg & WM8350_AUXADC_POLL)
+               dev_err(wm8350->dev, "adc chn %d read timeout\n", channel);
+       else
+               result = wm8350_reg_read(wm8350,
+                                        WM8350_AUX1_READBACK + channel);
 
-       enable_irq(wm8350->chip_irq);
-}
+       /* Turn off the ADC */
+       reg = wm8350_reg_read(wm8350, WM8350_POWER_MGMT_5);
+       wm8350_reg_write(wm8350, WM8350_POWER_MGMT_5,
+                        reg & ~WM8350_AUXADC_ENA);
 
-static irqreturn_t wm8350_irq(int irq, void *data)
-{
-       struct wm8350 *wm8350 = data;
+       mutex_unlock(&wm8350->auxadc_mutex);
 
-       disable_irq_nosync(irq);
-       schedule_work(&wm8350->irq_work);
-
-       return IRQ_HANDLED;
+       return result & WM8350_AUXADC_DATA1_MASK;
 }
+EXPORT_SYMBOL_GPL(wm8350_read_auxadc);
 
-int wm8350_register_irq(struct wm8350 *wm8350, int irq,
-                       void (*handler) (struct wm8350 *, int, void *),
-                       void *data)
+static irqreturn_t wm8350_auxadc_irq(int irq, void *irq_data)
 {
-       if (irq < 0 || irq > WM8350_NUM_IRQ || !handler)
-               return -EINVAL;
-
-       if (wm8350->irq[irq].handler)
-               return -EBUSY;
-
-       mutex_lock(&wm8350->irq_mutex);
-       wm8350->irq[irq].handler = handler;
-       wm8350->irq[irq].data = data;
-       mutex_unlock(&wm8350->irq_mutex);
-
-       return 0;
-}
-EXPORT_SYMBOL_GPL(wm8350_register_irq);
-
-int wm8350_free_irq(struct wm8350 *wm8350, int irq)
-{
-       if (irq < 0 || irq > WM8350_NUM_IRQ)
-               return -EINVAL;
-
-       mutex_lock(&wm8350->irq_mutex);
-       wm8350->irq[irq].handler = NULL;
-       mutex_unlock(&wm8350->irq_mutex);
-       return 0;
-}
-EXPORT_SYMBOL_GPL(wm8350_free_irq);
+       struct wm8350 *wm8350 = irq_data;
 
-int wm8350_mask_irq(struct wm8350 *wm8350, int irq)
-{
-       switch (irq) {
-       case WM8350_IRQ_CHG_BAT_HOT:
-               return wm8350_set_bits(wm8350, WM8350_INT_STATUS_1_MASK,
-                                      WM8350_IM_CHG_BAT_HOT_EINT);
-       case WM8350_IRQ_CHG_BAT_COLD:
-               return wm8350_set_bits(wm8350, WM8350_INT_STATUS_1_MASK,
-                                      WM8350_IM_CHG_BAT_COLD_EINT);
-       case WM8350_IRQ_CHG_BAT_FAIL:
-               return wm8350_set_bits(wm8350, WM8350_INT_STATUS_1_MASK,
-                                      WM8350_IM_CHG_BAT_FAIL_EINT);
-       case WM8350_IRQ_CHG_TO:
-               return wm8350_set_bits(wm8350, WM8350_INT_STATUS_1_MASK,
-                                      WM8350_IM_CHG_TO_EINT);
-       case WM8350_IRQ_CHG_END:
-               return wm8350_set_bits(wm8350, WM8350_INT_STATUS_1_MASK,
-                                      WM8350_IM_CHG_END_EINT);
-       case WM8350_IRQ_CHG_START:
-               return wm8350_set_bits(wm8350, WM8350_INT_STATUS_1_MASK,
-                                      WM8350_IM_CHG_START_EINT);
-       case WM8350_IRQ_CHG_FAST_RDY:
-               return wm8350_set_bits(wm8350, WM8350_INT_STATUS_1_MASK,
-                                      WM8350_IM_CHG_FAST_RDY_EINT);
-       case WM8350_IRQ_RTC_PER:
-               return wm8350_set_bits(wm8350, WM8350_INT_STATUS_1_MASK,
-                                      WM8350_IM_RTC_PER_EINT);
-       case WM8350_IRQ_RTC_SEC:
-               return wm8350_set_bits(wm8350, WM8350_INT_STATUS_1_MASK,
-                                      WM8350_IM_RTC_SEC_EINT);
-       case WM8350_IRQ_RTC_ALM:
-               return wm8350_set_bits(wm8350, WM8350_INT_STATUS_1_MASK,
-                                      WM8350_IM_RTC_ALM_EINT);
-       case WM8350_IRQ_CHG_VBATT_LT_3P9:
-               return wm8350_set_bits(wm8350, WM8350_INT_STATUS_1_MASK,
-                                      WM8350_IM_CHG_VBATT_LT_3P9_EINT);
-       case WM8350_IRQ_CHG_VBATT_LT_3P1:
-               return wm8350_set_bits(wm8350, WM8350_INT_STATUS_1_MASK,
-                                      WM8350_IM_CHG_VBATT_LT_3P1_EINT);
-       case WM8350_IRQ_CHG_VBATT_LT_2P85:
-               return wm8350_set_bits(wm8350, WM8350_INT_STATUS_1_MASK,
-                                      WM8350_IM_CHG_VBATT_LT_2P85_EINT);
-       case WM8350_IRQ_CS1:
-               return wm8350_set_bits(wm8350, WM8350_INT_STATUS_2_MASK,
-                                      WM8350_IM_CS1_EINT);
-       case WM8350_IRQ_CS2:
-               return wm8350_set_bits(wm8350, WM8350_INT_STATUS_2_MASK,
-                                      WM8350_IM_CS2_EINT);
-       case WM8350_IRQ_USB_LIMIT:
-               return wm8350_set_bits(wm8350, WM8350_INT_STATUS_2_MASK,
-                                      WM8350_IM_USB_LIMIT_EINT);
-       case WM8350_IRQ_AUXADC_DATARDY:
-               return wm8350_set_bits(wm8350, WM8350_INT_STATUS_2_MASK,
-                                      WM8350_IM_AUXADC_DATARDY_EINT);
-       case WM8350_IRQ_AUXADC_DCOMP4:
-               return wm8350_set_bits(wm8350, WM8350_INT_STATUS_2_MASK,
-                                      WM8350_IM_AUXADC_DCOMP4_EINT);
-       case WM8350_IRQ_AUXADC_DCOMP3:
-               return wm8350_set_bits(wm8350, WM8350_INT_STATUS_2_MASK,
-                                      WM8350_IM_AUXADC_DCOMP3_EINT);
-       case WM8350_IRQ_AUXADC_DCOMP2:
-               return wm8350_set_bits(wm8350, WM8350_INT_STATUS_2_MASK,
-                                      WM8350_IM_AUXADC_DCOMP2_EINT);
-       case WM8350_IRQ_AUXADC_DCOMP1:
-               return wm8350_set_bits(wm8350, WM8350_INT_STATUS_2_MASK,
-                                      WM8350_IM_AUXADC_DCOMP1_EINT);
-       case WM8350_IRQ_SYS_HYST_COMP_FAIL:
-               return wm8350_set_bits(wm8350, WM8350_INT_STATUS_2_MASK,
-                                      WM8350_IM_SYS_HYST_COMP_FAIL_EINT);
-       case WM8350_IRQ_SYS_CHIP_GT115:
-               return wm8350_set_bits(wm8350, WM8350_INT_STATUS_2_MASK,
-                                      WM8350_IM_SYS_CHIP_GT115_EINT);
-       case WM8350_IRQ_SYS_CHIP_GT140:
-               return wm8350_set_bits(wm8350, WM8350_INT_STATUS_2_MASK,
-                                      WM8350_IM_SYS_CHIP_GT140_EINT);
-       case WM8350_IRQ_SYS_WDOG_TO:
-               return wm8350_set_bits(wm8350, WM8350_INT_STATUS_2_MASK,
-                                      WM8350_IM_SYS_WDOG_TO_EINT);
-       case WM8350_IRQ_UV_LDO4:
-               return wm8350_set_bits(wm8350,
-                                      WM8350_UNDER_VOLTAGE_INT_STATUS_MASK,
-                                      WM8350_IM_UV_LDO4_EINT);
-       case WM8350_IRQ_UV_LDO3:
-               return wm8350_set_bits(wm8350,
-                                      WM8350_UNDER_VOLTAGE_INT_STATUS_MASK,
-                                      WM8350_IM_UV_LDO3_EINT);
-       case WM8350_IRQ_UV_LDO2:
-               return wm8350_set_bits(wm8350,
-                                      WM8350_UNDER_VOLTAGE_INT_STATUS_MASK,
-                                      WM8350_IM_UV_LDO2_EINT);
-       case WM8350_IRQ_UV_LDO1:
-               return wm8350_set_bits(wm8350,
-                                      WM8350_UNDER_VOLTAGE_INT_STATUS_MASK,
-                                      WM8350_IM_UV_LDO1_EINT);
-       case WM8350_IRQ_UV_DC6:
-               return wm8350_set_bits(wm8350,
-                                      WM8350_UNDER_VOLTAGE_INT_STATUS_MASK,
-                                      WM8350_IM_UV_DC6_EINT);
-       case WM8350_IRQ_UV_DC5:
-               return wm8350_set_bits(wm8350,
-                                      WM8350_UNDER_VOLTAGE_INT_STATUS_MASK,
-                                      WM8350_IM_UV_DC5_EINT);
-       case WM8350_IRQ_UV_DC4:
-               return wm8350_set_bits(wm8350,
-                                      WM8350_UNDER_VOLTAGE_INT_STATUS_MASK,
-                                      WM8350_IM_UV_DC4_EINT);
-       case WM8350_IRQ_UV_DC3:
-               return wm8350_set_bits(wm8350,
-                                      WM8350_UNDER_VOLTAGE_INT_STATUS_MASK,
-                                      WM8350_IM_UV_DC3_EINT);
-       case WM8350_IRQ_UV_DC2:
-               return wm8350_set_bits(wm8350,
-                                      WM8350_UNDER_VOLTAGE_INT_STATUS_MASK,
-                                      WM8350_IM_UV_DC2_EINT);
-       case WM8350_IRQ_UV_DC1:
-               return wm8350_set_bits(wm8350,
-                                      WM8350_UNDER_VOLTAGE_INT_STATUS_MASK,
-                                      WM8350_IM_UV_DC1_EINT);
-       case WM8350_IRQ_OC_LS:
-               return wm8350_set_bits(wm8350,
-                                      WM8350_OVER_CURRENT_INT_STATUS_MASK,
-                                      WM8350_IM_OC_LS_EINT);
-       case WM8350_IRQ_EXT_USB_FB:
-               return wm8350_set_bits(wm8350,
-                                      WM8350_COMPARATOR_INT_STATUS_MASK,
-                                      WM8350_IM_EXT_USB_FB_EINT);
-       case WM8350_IRQ_EXT_WALL_FB:
-               return wm8350_set_bits(wm8350,
-                                      WM8350_COMPARATOR_INT_STATUS_MASK,
-                                      WM8350_IM_EXT_WALL_FB_EINT);
-       case WM8350_IRQ_EXT_BAT_FB:
-               return wm8350_set_bits(wm8350,
-                                      WM8350_COMPARATOR_INT_STATUS_MASK,
-                                      WM8350_IM_EXT_BAT_FB_EINT);
-       case WM8350_IRQ_CODEC_JCK_DET_L:
-               return wm8350_set_bits(wm8350,
-                                      WM8350_COMPARATOR_INT_STATUS_MASK,
-                                      WM8350_IM_CODEC_JCK_DET_L_EINT);
-       case WM8350_IRQ_CODEC_JCK_DET_R:
-               return wm8350_set_bits(wm8350,
-                                      WM8350_COMPARATOR_INT_STATUS_MASK,
-                                      WM8350_IM_CODEC_JCK_DET_R_EINT);
-       case WM8350_IRQ_CODEC_MICSCD:
-               return wm8350_set_bits(wm8350,
-                                      WM8350_COMPARATOR_INT_STATUS_MASK,
-                                      WM8350_IM_CODEC_MICSCD_EINT);
-       case WM8350_IRQ_CODEC_MICD:
-               return wm8350_set_bits(wm8350,
-                                      WM8350_COMPARATOR_INT_STATUS_MASK,
-                                      WM8350_IM_CODEC_MICD_EINT);
-       case WM8350_IRQ_WKUP_OFF_STATE:
-               return wm8350_set_bits(wm8350,
-                                      WM8350_COMPARATOR_INT_STATUS_MASK,
-                                      WM8350_IM_WKUP_OFF_STATE_EINT);
-       case WM8350_IRQ_WKUP_HIB_STATE:
-               return wm8350_set_bits(wm8350,
-                                      WM8350_COMPARATOR_INT_STATUS_MASK,
-                                      WM8350_IM_WKUP_HIB_STATE_EINT);
-       case WM8350_IRQ_WKUP_CONV_FAULT:
-               return wm8350_set_bits(wm8350,
-                                      WM8350_COMPARATOR_INT_STATUS_MASK,
-                                      WM8350_IM_WKUP_CONV_FAULT_EINT);
-       case WM8350_IRQ_WKUP_WDOG_RST:
-               return wm8350_set_bits(wm8350,
-                                      WM8350_COMPARATOR_INT_STATUS_MASK,
-                                      WM8350_IM_WKUP_OFF_STATE_EINT);
-       case WM8350_IRQ_WKUP_GP_PWR_ON:
-               return wm8350_set_bits(wm8350,
-                                      WM8350_COMPARATOR_INT_STATUS_MASK,
-                                      WM8350_IM_WKUP_GP_PWR_ON_EINT);
-       case WM8350_IRQ_WKUP_ONKEY:
-               return wm8350_set_bits(wm8350,
-                                      WM8350_COMPARATOR_INT_STATUS_MASK,
-                                      WM8350_IM_WKUP_ONKEY_EINT);
-       case WM8350_IRQ_WKUP_GP_WAKEUP:
-               return wm8350_set_bits(wm8350,
-                                      WM8350_COMPARATOR_INT_STATUS_MASK,
-                                      WM8350_IM_WKUP_GP_WAKEUP_EINT);
-       case WM8350_IRQ_GPIO(0):
-               return wm8350_set_bits(wm8350,
-                                      WM8350_GPIO_INT_STATUS_MASK,
-                                      WM8350_IM_GP0_EINT);
-       case WM8350_IRQ_GPIO(1):
-               return wm8350_set_bits(wm8350,
-                                      WM8350_GPIO_INT_STATUS_MASK,
-                                      WM8350_IM_GP1_EINT);
-       case WM8350_IRQ_GPIO(2):
-               return wm8350_set_bits(wm8350,
-                                      WM8350_GPIO_INT_STATUS_MASK,
-                                      WM8350_IM_GP2_EINT);
-       case WM8350_IRQ_GPIO(3):
-               return wm8350_set_bits(wm8350,
-                                      WM8350_GPIO_INT_STATUS_MASK,
-                                      WM8350_IM_GP3_EINT);
-       case WM8350_IRQ_GPIO(4):
-               return wm8350_set_bits(wm8350,
-                                      WM8350_GPIO_INT_STATUS_MASK,
-                                      WM8350_IM_GP4_EINT);
-       case WM8350_IRQ_GPIO(5):
-               return wm8350_set_bits(wm8350,
-                                      WM8350_GPIO_INT_STATUS_MASK,
-                                      WM8350_IM_GP5_EINT);
-       case WM8350_IRQ_GPIO(6):
-               return wm8350_set_bits(wm8350,
-                                      WM8350_GPIO_INT_STATUS_MASK,
-                                      WM8350_IM_GP6_EINT);
-       case WM8350_IRQ_GPIO(7):
-               return wm8350_set_bits(wm8350,
-                                      WM8350_GPIO_INT_STATUS_MASK,
-                                      WM8350_IM_GP7_EINT);
-       case WM8350_IRQ_GPIO(8):
-               return wm8350_set_bits(wm8350,
-                                      WM8350_GPIO_INT_STATUS_MASK,
-                                      WM8350_IM_GP8_EINT);
-       case WM8350_IRQ_GPIO(9):
-               return wm8350_set_bits(wm8350,
-                                      WM8350_GPIO_INT_STATUS_MASK,
-                                      WM8350_IM_GP9_EINT);
-       case WM8350_IRQ_GPIO(10):
-               return wm8350_set_bits(wm8350,
-                                      WM8350_GPIO_INT_STATUS_MASK,
-                                      WM8350_IM_GP10_EINT);
-       case WM8350_IRQ_GPIO(11):
-               return wm8350_set_bits(wm8350,
-                                      WM8350_GPIO_INT_STATUS_MASK,
-                                      WM8350_IM_GP11_EINT);
-       case WM8350_IRQ_GPIO(12):
-               return wm8350_set_bits(wm8350,
-                                      WM8350_GPIO_INT_STATUS_MASK,
-                                      WM8350_IM_GP12_EINT);
-       default:
-               dev_warn(wm8350->dev, "Attempting to mask unknown IRQ %d\n",
-                        irq);
-               return -EINVAL;
-       }
-       return 0;
-}
-EXPORT_SYMBOL_GPL(wm8350_mask_irq);
+       complete(&wm8350->auxadc_done);
 
-int wm8350_unmask_irq(struct wm8350 *wm8350, int irq)
-{
-       switch (irq) {
-       case WM8350_IRQ_CHG_BAT_HOT:
-               return wm8350_clear_bits(wm8350, WM8350_INT_STATUS_1_MASK,
-                                        WM8350_IM_CHG_BAT_HOT_EINT);
-       case WM8350_IRQ_CHG_BAT_COLD:
-               return wm8350_clear_bits(wm8350, WM8350_INT_STATUS_1_MASK,
-                                        WM8350_IM_CHG_BAT_COLD_EINT);
-       case WM8350_IRQ_CHG_BAT_FAIL:
-               return wm8350_clear_bits(wm8350, WM8350_INT_STATUS_1_MASK,
-                                        WM8350_IM_CHG_BAT_FAIL_EINT);
-       case WM8350_IRQ_CHG_TO:
-               return wm8350_clear_bits(wm8350, WM8350_INT_STATUS_1_MASK,
-                                        WM8350_IM_CHG_TO_EINT);
-       case WM8350_IRQ_CHG_END:
-               return wm8350_clear_bits(wm8350, WM8350_INT_STATUS_1_MASK,
-                                        WM8350_IM_CHG_END_EINT);
-       case WM8350_IRQ_CHG_START:
-               return wm8350_clear_bits(wm8350, WM8350_INT_STATUS_1_MASK,
-                                        WM8350_IM_CHG_START_EINT);
-       case WM8350_IRQ_CHG_FAST_RDY:
-               return wm8350_clear_bits(wm8350, WM8350_INT_STATUS_1_MASK,
-                                        WM8350_IM_CHG_FAST_RDY_EINT);
-       case WM8350_IRQ_RTC_PER:
-               return wm8350_clear_bits(wm8350, WM8350_INT_STATUS_1_MASK,
-                                        WM8350_IM_RTC_PER_EINT);
-       case WM8350_IRQ_RTC_SEC:
-               return wm8350_clear_bits(wm8350, WM8350_INT_STATUS_1_MASK,
-                                        WM8350_IM_RTC_SEC_EINT);
-       case WM8350_IRQ_RTC_ALM:
-               return wm8350_clear_bits(wm8350, WM8350_INT_STATUS_1_MASK,
-                                        WM8350_IM_RTC_ALM_EINT);
-       case WM8350_IRQ_CHG_VBATT_LT_3P9:
-               return wm8350_clear_bits(wm8350, WM8350_INT_STATUS_1_MASK,
-                                        WM8350_IM_CHG_VBATT_LT_3P9_EINT);
-       case WM8350_IRQ_CHG_VBATT_LT_3P1:
-               return wm8350_clear_bits(wm8350, WM8350_INT_STATUS_1_MASK,
-                                        WM8350_IM_CHG_VBATT_LT_3P1_EINT);
-       case WM8350_IRQ_CHG_VBATT_LT_2P85:
-               return wm8350_clear_bits(wm8350, WM8350_INT_STATUS_1_MASK,
-                                        WM8350_IM_CHG_VBATT_LT_2P85_EINT);
-       case WM8350_IRQ_CS1:
-               return wm8350_clear_bits(wm8350, WM8350_INT_STATUS_2_MASK,
-                                        WM8350_IM_CS1_EINT);
-       case WM8350_IRQ_CS2:
-               return wm8350_clear_bits(wm8350, WM8350_INT_STATUS_2_MASK,
-                                        WM8350_IM_CS2_EINT);
-       case WM8350_IRQ_USB_LIMIT:
-               return wm8350_clear_bits(wm8350, WM8350_INT_STATUS_2_MASK,
-                                        WM8350_IM_USB_LIMIT_EINT);
-       case WM8350_IRQ_AUXADC_DATARDY:
-               return wm8350_clear_bits(wm8350, WM8350_INT_STATUS_2_MASK,
-                                        WM8350_IM_AUXADC_DATARDY_EINT);
-       case WM8350_IRQ_AUXADC_DCOMP4:
-               return wm8350_clear_bits(wm8350, WM8350_INT_STATUS_2_MASK,
-                                        WM8350_IM_AUXADC_DCOMP4_EINT);
-       case WM8350_IRQ_AUXADC_DCOMP3:
-               return wm8350_clear_bits(wm8350, WM8350_INT_STATUS_2_MASK,
-                                        WM8350_IM_AUXADC_DCOMP3_EINT);
-       case WM8350_IRQ_AUXADC_DCOMP2:
-               return wm8350_clear_bits(wm8350, WM8350_INT_STATUS_2_MASK,
-                                        WM8350_IM_AUXADC_DCOMP2_EINT);
-       case WM8350_IRQ_AUXADC_DCOMP1:
-               return wm8350_clear_bits(wm8350, WM8350_INT_STATUS_2_MASK,
-                                        WM8350_IM_AUXADC_DCOMP1_EINT);
-       case WM8350_IRQ_SYS_HYST_COMP_FAIL:
-               return wm8350_clear_bits(wm8350, WM8350_INT_STATUS_2_MASK,
-                                        WM8350_IM_SYS_HYST_COMP_FAIL_EINT);
-       case WM8350_IRQ_SYS_CHIP_GT115:
-               return wm8350_clear_bits(wm8350, WM8350_INT_STATUS_2_MASK,
-                                        WM8350_IM_SYS_CHIP_GT115_EINT);
-       case WM8350_IRQ_SYS_CHIP_GT140:
-               return wm8350_clear_bits(wm8350, WM8350_INT_STATUS_2_MASK,
-                                        WM8350_IM_SYS_CHIP_GT140_EINT);
-       case WM8350_IRQ_SYS_WDOG_TO:
-               return wm8350_clear_bits(wm8350, WM8350_INT_STATUS_2_MASK,
-                                        WM8350_IM_SYS_WDOG_TO_EINT);
-       case WM8350_IRQ_UV_LDO4:
-               return wm8350_clear_bits(wm8350,
-                                        WM8350_UNDER_VOLTAGE_INT_STATUS_MASK,
-                                        WM8350_IM_UV_LDO4_EINT);
-       case WM8350_IRQ_UV_LDO3:
-               return wm8350_clear_bits(wm8350,
-                                        WM8350_UNDER_VOLTAGE_INT_STATUS_MASK,
-                                        WM8350_IM_UV_LDO3_EINT);
-       case WM8350_IRQ_UV_LDO2:
-               return wm8350_clear_bits(wm8350,
-                                        WM8350_UNDER_VOLTAGE_INT_STATUS_MASK,
-                                        WM8350_IM_UV_LDO2_EINT);
-       case WM8350_IRQ_UV_LDO1:
-               return wm8350_clear_bits(wm8350,
-                                        WM8350_UNDER_VOLTAGE_INT_STATUS_MASK,
-                                        WM8350_IM_UV_LDO1_EINT);
-       case WM8350_IRQ_UV_DC6:
-               return wm8350_clear_bits(wm8350,
-                                        WM8350_UNDER_VOLTAGE_INT_STATUS_MASK,
-                                        WM8350_IM_UV_DC6_EINT);
-       case WM8350_IRQ_UV_DC5:
-               return wm8350_clear_bits(wm8350,
-                                        WM8350_UNDER_VOLTAGE_INT_STATUS_MASK,
-                                        WM8350_IM_UV_DC5_EINT);
-       case WM8350_IRQ_UV_DC4:
-               return wm8350_clear_bits(wm8350,
-                                        WM8350_UNDER_VOLTAGE_INT_STATUS_MASK,
-                                        WM8350_IM_UV_DC4_EINT);
-       case WM8350_IRQ_UV_DC3:
-               return wm8350_clear_bits(wm8350,
-                                        WM8350_UNDER_VOLTAGE_INT_STATUS_MASK,
-                                        WM8350_IM_UV_DC3_EINT);
-       case WM8350_IRQ_UV_DC2:
-               return wm8350_clear_bits(wm8350,
-                                        WM8350_UNDER_VOLTAGE_INT_STATUS_MASK,
-                                        WM8350_IM_UV_DC2_EINT);
-       case WM8350_IRQ_UV_DC1:
-               return wm8350_clear_bits(wm8350,
-                                        WM8350_UNDER_VOLTAGE_INT_STATUS_MASK,
-                                        WM8350_IM_UV_DC1_EINT);
-       case WM8350_IRQ_OC_LS:
-               return wm8350_clear_bits(wm8350,
-                                        WM8350_OVER_CURRENT_INT_STATUS_MASK,
-                                        WM8350_IM_OC_LS_EINT);
-       case WM8350_IRQ_EXT_USB_FB:
-               return wm8350_clear_bits(wm8350,
-                                        WM8350_COMPARATOR_INT_STATUS_MASK,
-                                        WM8350_IM_EXT_USB_FB_EINT);
-       case WM8350_IRQ_EXT_WALL_FB:
-               return wm8350_clear_bits(wm8350,
-                                        WM8350_COMPARATOR_INT_STATUS_MASK,
-                                        WM8350_IM_EXT_WALL_FB_EINT);
-       case WM8350_IRQ_EXT_BAT_FB:
-               return wm8350_clear_bits(wm8350,
-                                        WM8350_COMPARATOR_INT_STATUS_MASK,
-                                        WM8350_IM_EXT_BAT_FB_EINT);
-       case WM8350_IRQ_CODEC_JCK_DET_L:
-               return wm8350_clear_bits(wm8350,
-                                        WM8350_COMPARATOR_INT_STATUS_MASK,
-                                        WM8350_IM_CODEC_JCK_DET_L_EINT);
-       case WM8350_IRQ_CODEC_JCK_DET_R:
-               return wm8350_clear_bits(wm8350,
-                                        WM8350_COMPARATOR_INT_STATUS_MASK,
-                                        WM8350_IM_CODEC_JCK_DET_R_EINT);
-       case WM8350_IRQ_CODEC_MICSCD:
-               return wm8350_clear_bits(wm8350,
-                                        WM8350_COMPARATOR_INT_STATUS_MASK,
-                                        WM8350_IM_CODEC_MICSCD_EINT);
-       case WM8350_IRQ_CODEC_MICD:
-               return wm8350_clear_bits(wm8350,
-                                        WM8350_COMPARATOR_INT_STATUS_MASK,
-                                        WM8350_IM_CODEC_MICD_EINT);
-       case WM8350_IRQ_WKUP_OFF_STATE:
-               return wm8350_clear_bits(wm8350,
-                                        WM8350_COMPARATOR_INT_STATUS_MASK,
-                                        WM8350_IM_WKUP_OFF_STATE_EINT);
-       case WM8350_IRQ_WKUP_HIB_STATE:
-               return wm8350_clear_bits(wm8350,
-                                        WM8350_COMPARATOR_INT_STATUS_MASK,
-                                        WM8350_IM_WKUP_HIB_STATE_EINT);
-       case WM8350_IRQ_WKUP_CONV_FAULT:
-               return wm8350_clear_bits(wm8350,
-                                        WM8350_COMPARATOR_INT_STATUS_MASK,
-                                        WM8350_IM_WKUP_CONV_FAULT_EINT);
-       case WM8350_IRQ_WKUP_WDOG_RST:
-               return wm8350_clear_bits(wm8350,
-                                        WM8350_COMPARATOR_INT_STATUS_MASK,
-                                        WM8350_IM_WKUP_OFF_STATE_EINT);
-       case WM8350_IRQ_WKUP_GP_PWR_ON:
-               return wm8350_clear_bits(wm8350,
-                                        WM8350_COMPARATOR_INT_STATUS_MASK,
-                                        WM8350_IM_WKUP_GP_PWR_ON_EINT);
-       case WM8350_IRQ_WKUP_ONKEY:
-               return wm8350_clear_bits(wm8350,
-                                        WM8350_COMPARATOR_INT_STATUS_MASK,
-                                        WM8350_IM_WKUP_ONKEY_EINT);
-       case WM8350_IRQ_WKUP_GP_WAKEUP:
-               return wm8350_clear_bits(wm8350,
-                                        WM8350_COMPARATOR_INT_STATUS_MASK,
-                                        WM8350_IM_WKUP_GP_WAKEUP_EINT);
-       case WM8350_IRQ_GPIO(0):
-               return wm8350_clear_bits(wm8350,
-                                        WM8350_GPIO_INT_STATUS_MASK,
-                                        WM8350_IM_GP0_EINT);
-       case WM8350_IRQ_GPIO(1):
-               return wm8350_clear_bits(wm8350,
-                                        WM8350_GPIO_INT_STATUS_MASK,
-                                        WM8350_IM_GP1_EINT);
-       case WM8350_IRQ_GPIO(2):
-               return wm8350_clear_bits(wm8350,
-                                        WM8350_GPIO_INT_STATUS_MASK,
-                                        WM8350_IM_GP2_EINT);
-       case WM8350_IRQ_GPIO(3):
-               return wm8350_clear_bits(wm8350,
-                                        WM8350_GPIO_INT_STATUS_MASK,
-                                        WM8350_IM_GP3_EINT);
-       case WM8350_IRQ_GPIO(4):
-               return wm8350_clear_bits(wm8350,
-                                        WM8350_GPIO_INT_STATUS_MASK,
-                                        WM8350_IM_GP4_EINT);
-       case WM8350_IRQ_GPIO(5):
-               return wm8350_clear_bits(wm8350,
-                                        WM8350_GPIO_INT_STATUS_MASK,
-                                        WM8350_IM_GP5_EINT);
-       case WM8350_IRQ_GPIO(6):
-               return wm8350_clear_bits(wm8350,
-                                        WM8350_GPIO_INT_STATUS_MASK,
-                                        WM8350_IM_GP6_EINT);
-       case WM8350_IRQ_GPIO(7):
-               return wm8350_clear_bits(wm8350,
-                                        WM8350_GPIO_INT_STATUS_MASK,
-                                        WM8350_IM_GP7_EINT);
-       case WM8350_IRQ_GPIO(8):
-               return wm8350_clear_bits(wm8350,
-                                        WM8350_GPIO_INT_STATUS_MASK,
-                                        WM8350_IM_GP8_EINT);
-       case WM8350_IRQ_GPIO(9):
-               return wm8350_clear_bits(wm8350,
-                                        WM8350_GPIO_INT_STATUS_MASK,
-                                        WM8350_IM_GP9_EINT);
-       case WM8350_IRQ_GPIO(10):
-               return wm8350_clear_bits(wm8350,
-                                        WM8350_GPIO_INT_STATUS_MASK,
-                                        WM8350_IM_GP10_EINT);
-       case WM8350_IRQ_GPIO(11):
-               return wm8350_clear_bits(wm8350,
-                                        WM8350_GPIO_INT_STATUS_MASK,
-                                        WM8350_IM_GP11_EINT);
-       case WM8350_IRQ_GPIO(12):
-               return wm8350_clear_bits(wm8350,
-                                        WM8350_GPIO_INT_STATUS_MASK,
-                                        WM8350_IM_GP12_EINT);
-       default:
-               dev_warn(wm8350->dev, "Attempting to unmask unknown IRQ %d\n",
-                        irq);
-               return -EINVAL;
-       }
-       return 0;
+       return IRQ_HANDLED;
 }
-EXPORT_SYMBOL_GPL(wm8350_unmask_irq);
 
 /*
  * Cache is always host endian.
  */
-static int wm8350_create_cache(struct wm8350 *wm8350, int mode)
+static int wm8350_create_cache(struct wm8350 *wm8350, int type, int mode)
 {
        int i, ret = 0;
        u16 value;
        const u16 *reg_map;
 
-       switch (mode) {
-#ifdef CONFIG_MFD_WM8350_CONFIG_MODE_0
+       switch (type) {
        case 0:
-               reg_map = wm8350_mode0_defaults;
-               break;
+               switch (mode) {
+#ifdef CONFIG_MFD_WM8350_CONFIG_MODE_0
+               case 0:
+                       reg_map = wm8350_mode0_defaults;
+                       break;
 #endif
 #ifdef CONFIG_MFD_WM8350_CONFIG_MODE_1
-       case 1:
-               reg_map = wm8350_mode1_defaults;
-               break;
+               case 1:
+                       reg_map = wm8350_mode1_defaults;
+                       break;
 #endif
 #ifdef CONFIG_MFD_WM8350_CONFIG_MODE_2
-       case 2:
-               reg_map = wm8350_mode2_defaults;
-               break;
+               case 2:
+                       reg_map = wm8350_mode2_defaults;
+                       break;
 #endif
 #ifdef CONFIG_MFD_WM8350_CONFIG_MODE_3
-       case 3:
-               reg_map = wm8350_mode3_defaults;
+               case 3:
+                       reg_map = wm8350_mode3_defaults;
+                       break;
+#endif
+               default:
+                       dev_err(wm8350->dev,
+                               "WM8350 configuration mode %d not supported\n",
+                               mode);
+                       return -EINVAL;
+               }
+               break;
+
+       case 1:
+               switch (mode) {
+#ifdef CONFIG_MFD_WM8351_CONFIG_MODE_0
+               case 0:
+                       reg_map = wm8351_mode0_defaults;
+                       break;
+#endif
+#ifdef CONFIG_MFD_WM8351_CONFIG_MODE_1
+               case 1:
+                       reg_map = wm8351_mode1_defaults;
+                       break;
+#endif
+#ifdef CONFIG_MFD_WM8351_CONFIG_MODE_2
+               case 2:
+                       reg_map = wm8351_mode2_defaults;
+                       break;
+#endif
+#ifdef CONFIG_MFD_WM8351_CONFIG_MODE_3
+               case 3:
+                       reg_map = wm8351_mode3_defaults;
+                       break;
+#endif
+               default:
+                       dev_err(wm8350->dev,
+                               "WM8351 configuration mode %d not supported\n",
+                               mode);
+                       return -EINVAL;
+               }
                break;
+
+       case 2:
+               switch (mode) {
+#ifdef CONFIG_MFD_WM8352_CONFIG_MODE_0
+               case 0:
+                       reg_map = wm8352_mode0_defaults;
+                       break;
 #endif
+#ifdef CONFIG_MFD_WM8352_CONFIG_MODE_1
+               case 1:
+                       reg_map = wm8352_mode1_defaults;
+                       break;
+#endif
+#ifdef CONFIG_MFD_WM8352_CONFIG_MODE_2
+               case 2:
+                       reg_map = wm8352_mode2_defaults;
+                       break;
+#endif
+#ifdef CONFIG_MFD_WM8352_CONFIG_MODE_3
+               case 3:
+                       reg_map = wm8352_mode3_defaults;
+                       break;
+#endif
+               default:
+                       dev_err(wm8350->dev,
+                               "WM8352 configuration mode %d not supported\n",
+                               mode);
+                       return -EINVAL;
+               }
+               break;
+
        default:
-               dev_err(wm8350->dev, "Configuration mode %d not supported\n",
+               dev_err(wm8350->dev,
+                       "WM835x configuration mode %d not supported\n",
                        mode);
                return -EINVAL;
        }
 
        wm8350->reg_cache =
-           kzalloc(sizeof(u16) * (WM8350_MAX_REGISTER + 1), GFP_KERNEL);
+               kmalloc(sizeof(u16) * (WM8350_MAX_REGISTER + 1), GFP_KERNEL);
        if (wm8350->reg_cache == NULL)
                return -ENOMEM;
 
@@ -1108,17 +515,20 @@ static int wm8350_create_cache(struct wm8350 *wm8350, 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);
+       if (ret < 0) {
+               dev_err(wm8350->dev,
+                       "failed to read initial cache values\n");
+               goto out;
+       }
+
+       /* Mask out uncacheable/unreadable bits and the audio. */
        for (i = 0; i < WM8350_MAX_REGISTER; i++) {
-               /* audio register range */
                if (wm8350_reg_io_map[i].readable &&
                    (i < WM8350_CLOCK_CONTROL_1 || i > WM8350_AIF_TEST)) {
-                       ret = wm8350->read_dev(wm8350, i, 2, (char *)&value);
-                       if (ret < 0) {
-                               dev_err(wm8350->dev,
-                                      "failed to read initial cache value\n");
-                               goto out;
-                       }
-                       value = be16_to_cpu(value);
+                       value = be16_to_cpu(wm8350->reg_cache[i]);
                        value &= wm8350_reg_io_map[i].readable;
                        wm8350->reg_cache[i] = value;
                } else
@@ -1126,92 +536,212 @@ static int wm8350_create_cache(struct wm8350 *wm8350, int mode)
        }
 
 out:
+       kfree(wm8350->reg_cache);
        return ret;
 }
-EXPORT_SYMBOL_GPL(wm8350_create_cache);
+
+/*
+ * Register a client device.  This is non-fatal since there is no need to
+ * fail the entire device init due to a single platform device failing.
+ */
+static void wm8350_client_dev_register(struct wm8350 *wm8350,
+                                      const char *name,
+                                      struct platform_device **pdev)
+{
+       int ret;
+
+       *pdev = platform_device_alloc(name, -1);
+       if (*pdev == NULL) {
+               dev_err(wm8350->dev, "Failed to allocate %s\n", name);
+               return;
+       }
+
+       (*pdev)->dev.parent = wm8350->dev;
+       platform_set_drvdata(*pdev, wm8350);
+       ret = platform_device_add(*pdev);
+       if (ret != 0) {
+               dev_err(wm8350->dev, "Failed to register %s: %d\n", name, ret);
+               platform_device_put(*pdev);
+               *pdev = NULL;
+       }
+}
 
 int wm8350_device_init(struct wm8350 *wm8350, int irq,
                       struct wm8350_platform_data *pdata)
 {
-       int ret = -EINVAL;
-       u16 id1, id2, mask, mode;
-       int i;
+       int ret;
+       u16 id1, id2, mask_rev;
+       u16 cust_id, mode, chip_rev;
 
        /* get WM8350 revision and config mode */
-       wm8350->read_dev(wm8350, WM8350_RESET_ID, sizeof(id1), &id1);
-       wm8350->read_dev(wm8350, WM8350_ID, sizeof(id2), &id2);
+       ret = wm8350->read_dev(wm8350, WM8350_RESET_ID, sizeof(id1), &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);
+       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);
+       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);
+               ret = -ENODEV;
+               goto err;
+       }
 
-       if (id1 == 0x6143) {
-               switch ((id2 & WM8350_CHIP_REV_MASK) >> 12) {
+       mode = id2 & WM8350_CONF_STS_MASK >> 10;
+       cust_id = id2 & WM8350_CUST_ID_MASK;
+       chip_rev = (id2 & WM8350_CHIP_REV_MASK) >> 12;
+       dev_info(wm8350->dev,
+                "CONF_STS %d, CUST_ID %d, MASK_REV %d, CHIP_REV %d\n",
+                mode, cust_id, mask_rev, chip_rev);
+
+       if (cust_id != 0) {
+               dev_err(wm8350->dev, "Unsupported CUST_ID\n");
+               ret = -ENODEV;
+               goto err;
+       }
+
+       switch (mask_rev) {
+       case 0:
+               wm8350->pmic.max_dcdc = WM8350_DCDC_6;
+               wm8350->pmic.max_isink = WM8350_ISINK_B;
+
+               switch (chip_rev) {
                case WM8350_REV_E:
-                       dev_info(wm8350->dev, "Found Rev E device\n");
-                       wm8350->rev = WM8350_REV_E;
+                       dev_info(wm8350->dev, "WM8350 Rev E\n");
                        break;
                case WM8350_REV_F:
-                       dev_info(wm8350->dev, "Found Rev F device\n");
-                       wm8350->rev = WM8350_REV_F;
+                       dev_info(wm8350->dev, "WM8350 Rev F\n");
                        break;
                case WM8350_REV_G:
-                       dev_info(wm8350->dev, "Found Rev G device\n");
-                       wm8350->rev = WM8350_REV_G;
+                       dev_info(wm8350->dev, "WM8350 Rev G\n");
+                       wm8350->power.rev_g_coeff = 1;
+                       break;
+               case WM8350_REV_H:
+                       dev_info(wm8350->dev, "WM8350 Rev H\n");
+                       wm8350->power.rev_g_coeff = 1;
                        break;
                default:
                        /* For safety we refuse to run on unknown hardware */
-                       dev_info(wm8350->dev, "Found unknown rev\n");
+                       dev_err(wm8350->dev, "Unknown WM8350 CHIP_REV\n");
+                       ret = -ENODEV;
+                       goto err;
+               }
+               break;
+
+       case 1:
+               wm8350->pmic.max_dcdc = WM8350_DCDC_4;
+               wm8350->pmic.max_isink = WM8350_ISINK_A;
+
+               switch (chip_rev) {
+               case 0:
+                       dev_info(wm8350->dev, "WM8351 Rev A\n");
+                       wm8350->power.rev_g_coeff = 1;
+                       break;
+
+               case 1:
+                       dev_info(wm8350->dev, "WM8351 Rev B\n");
+                       wm8350->power.rev_g_coeff = 1;
+                       break;
+
+               default:
+                       dev_err(wm8350->dev, "Unknown WM8351 CHIP_REV\n");
+                       ret = -ENODEV;
+                       goto err;
+               }
+               break;
+
+       case 2:
+               wm8350->pmic.max_dcdc = WM8350_DCDC_6;
+               wm8350->pmic.max_isink = WM8350_ISINK_B;
+
+               switch (chip_rev) {
+               case 0:
+                       dev_info(wm8350->dev, "WM8352 Rev A\n");
+                       wm8350->power.rev_g_coeff = 1;
+                       break;
+
+               default:
+                       dev_err(wm8350->dev, "Unknown WM8352 CHIP_REV\n");
                        ret = -ENODEV;
                        goto err;
                }
-       } else {
-               dev_info(wm8350->dev, "Device with ID %x is not a WM8350\n",
-                        id1);
+               break;
+
+       default:
+               dev_err(wm8350->dev, "Unknown MASK_REV\n");
                ret = -ENODEV;
                goto err;
        }
 
-       mode = id2 & WM8350_CONF_STS_MASK >> 10;
-       mask = id2 & WM8350_CUST_ID_MASK;
-       dev_info(wm8350->dev, "Config mode %d, ROM mask %d\n", mode, mask);
-
-       ret = wm8350_create_cache(wm8350, mode);
+       ret = wm8350_create_cache(wm8350, mask_rev, mode);
        if (ret < 0) {
-               printk(KERN_ERR "wm8350: failed to create register cache\n");
+               dev_err(wm8350->dev, "Failed to create register cache\n");
                return ret;
        }
 
-       if (pdata->init) {
-               ret = pdata->init(wm8350);
-               if (ret != 0) {
-                       dev_err(wm8350->dev, "Platform init() failed: %d\n",
-                               ret);
-                       goto err;
-               }
+       mutex_init(&wm8350->auxadc_mutex);
+       init_completion(&wm8350->auxadc_done);
+
+       ret = wm8350_irq_init(wm8350, irq, pdata);
+       if (ret < 0)
+               goto err_free;
+
+       if (wm8350->irq_base) {
+               ret = request_threaded_irq(wm8350->irq_base +
+                                          WM8350_IRQ_AUXADC_DATARDY,
+                                          NULL, wm8350_auxadc_irq, 0,
+                                          "auxadc", wm8350);
+               if (ret < 0)
+                       dev_warn(wm8350->dev,
+                                "Failed to request AUXADC IRQ: %d\n", ret);
        }
 
-       mutex_init(&wm8350->irq_mutex);
-       INIT_WORK(&wm8350->irq_work, wm8350_irq_worker);
-       if (irq != NO_IRQ) {
-               ret = request_irq(irq, wm8350_irq, 0,
-                                 "wm8350", wm8350);
+       if (pdata && pdata->init) {
+               ret = pdata->init(wm8350);
                if (ret != 0) {
-                       dev_err(wm8350->dev, "Failed to request IRQ: %d\n",
+                       dev_err(wm8350->dev, "Platform init() failed: %d\n",
                                ret);
-                       goto err;
+                       goto err_irq;
                }
-       } else {
-               dev_err(wm8350->dev, "No IRQ configured\n");
-               goto err;
        }
-       wm8350->chip_irq = irq;
 
        wm8350_reg_write(wm8350, WM8350_SYSTEM_INTERRUPTS_MASK, 0x0);
 
+       wm8350_client_dev_register(wm8350, "wm8350-codec",
+                                  &(wm8350->codec.pdev));
+       wm8350_client_dev_register(wm8350, "wm8350-gpio",
+                                  &(wm8350->gpio.pdev));
+       wm8350_client_dev_register(wm8350, "wm8350-hwmon",
+                                  &(wm8350->hwmon.pdev));
+       wm8350_client_dev_register(wm8350, "wm8350-power",
+                                  &(wm8350->power.pdev));
+       wm8350_client_dev_register(wm8350, "wm8350-rtc", &(wm8350->rtc.pdev));
+       wm8350_client_dev_register(wm8350, "wm8350-wdt", &(wm8350->wdt.pdev));
+
        return 0;
 
-err:
+err_irq:
+       wm8350_irq_exit(wm8350);
+err_free:
        kfree(wm8350->reg_cache);
+err:
        return ret;
 }
 EXPORT_SYMBOL_GPL(wm8350_device_init);
@@ -1220,12 +750,24 @@ void wm8350_device_exit(struct wm8350 *wm8350)
 {
        int i;
 
+       for (i = 0; i < ARRAY_SIZE(wm8350->pmic.led); i++)
+               platform_device_unregister(wm8350->pmic.led[i].pdev);
+
        for (i = 0; i < ARRAY_SIZE(wm8350->pmic.pdev); i++)
-               if (wm8350->pmic.pdev[i] != NULL)
-                       platform_device_unregister(wm8350->pmic.pdev[i]);
+               platform_device_unregister(wm8350->pmic.pdev[i]);
+
+       platform_device_unregister(wm8350->wdt.pdev);
+       platform_device_unregister(wm8350->rtc.pdev);
+       platform_device_unregister(wm8350->power.pdev);
+       platform_device_unregister(wm8350->hwmon.pdev);
+       platform_device_unregister(wm8350->gpio.pdev);
+       platform_device_unregister(wm8350->codec.pdev);
+
+       if (wm8350->irq_base)
+               free_irq(wm8350->irq_base + WM8350_IRQ_AUXADC_DATARDY, wm8350);
+
+       wm8350_irq_exit(wm8350);
 
-       free_irq(wm8350->chip_irq, wm8350);
-       flush_work(&wm8350->irq_work);
        kfree(wm8350->reg_cache);
 }
 EXPORT_SYMBOL_GPL(wm8350_device_exit);