Merge tag 'char-misc-3.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc

Pull char/misc driver patches from Greg Kroah-Hartman:
 "Here's the big char/misc driver patches for 3.9-rc1.

  Nothing major here, just lots of different driver updates (mei,
  hyperv, ipack, extcon, vmci, etc.).

  All of these have been in the linux-next tree for a while."

* tag 'char-misc-3.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc: (209 commits)
  w1: w1_therm: Add force-pullup option for "broken" sensors
  w1: ds2482: Added 1-Wire pull-up support to the driver
  vme: add missing put_device() after device_register() fails
  extcon: max8997: Use workqueue to check cable state after completing boot of platform
  extcon: max8997: Set default UART/USB path on probe
  extcon: max8997: Consolidate duplicate code for checking ADC/CHG cable type
  extcon: max8997: Set default of ADC debounce time during initialization
  extcon: max8997: Remove duplicate code related to set H/W line path
  extcon: max8997: Move defined constant to header file
  extcon: max77693: Make max77693_extcon_cable static
  extcon: max8997: Remove unreachable code
  extcon: max8997: Make max8997_extcon_cable static
  extcon: max77693: Remove unnecessary goto statement to improve readability
  extcon: max77693: Convert to devm_input_allocate_device()
  extcon: gpio: Rename filename of extcon-gpio.c according to kernel naming style
  CREDITS: update email and address of Harald Hoyer
  extcon: arizona: Use MICDET for final microphone identification
  extcon: arizona: Always take the first HPDET reading as the final one
  extcon: arizona: Clear _trig_sts bits after jack detection
  extcon: arizona: Don't HPDET magic when headphones are enabled
  ...

1 files changed, 10 insertions, 0 deletions

diff --git a/drivers/mfd/wm5102-tables.c b/drivers/mfd/wm5102-tables.c
index f6fcb87b3504..a9d9d41d95d3 100644
--- a/drivers/mfd/wm5102-tables.c
+++ b/drivers/mfd/wm5102-tables.c
@@ -84,6 +84,12 @@ int wm5102_patch(struct arizona *arizona)
 }
 
 static const struct regmap_irq wm5102_aod_irqs[ARIZONA_NUM_IRQ] = {
+        [ARIZONA_IRQ_MICD_CLAMP_FALL] = {
+                .mask = ARIZONA_MICD_CLAMP_FALL_EINT1
+        },
+        [ARIZONA_IRQ_MICD_CLAMP_RISE] = {
+                .mask = ARIZONA_MICD_CLAMP_RISE_EINT1
+        },
         [ARIZONA_IRQ_GP5_FALL] = { .mask = ARIZONA_GP5_FALL_EINT1 },
         [ARIZONA_IRQ_GP5_RISE] = { .mask = ARIZONA_GP5_RISE_EINT1 },
         [ARIZONA_IRQ_JD_FALL] = { .mask = ARIZONA_JD1_FALL_EINT1 },
@@ -313,6 +319,7 @@ static const struct reg_default wm5102_reg_default[] = {
         { 0x0000021A, 0x01A6 },   /* R538   - Mic Bias Ctrl 3 */ 
         { 0x00000293, 0x0000 },   /* R659   - Accessory Detect Mode 1 */ 
         { 0x0000029B, 0x0020 },   /* R667   - Headphone Detect 1 */ 
+        { 0x000002A2, 0x0000 },   /* R674   - Micd clamp control */
         { 0x000002A3, 0x1102 },   /* R675   - Mic Detect 1 */ 
         { 0x000002A4, 0x009F },   /* R676   - Mic Detect 2 */ 
         { 0x000002A5, 0x0000 },   /* R677   - Mic Detect 3 */ 
@@ -1107,6 +1114,8 @@ static bool wm5102_readable_register(struct device *dev, unsigned int reg)
         case ARIZONA_ACCESSORY_DETECT_MODE_1:
         case ARIZONA_HEADPHONE_DETECT_1:
         case ARIZONA_HEADPHONE_DETECT_2:
+        case ARIZONA_HP_DACVAL:
+        case ARIZONA_MICD_CLAMP_CONTROL:
         case ARIZONA_MIC_DETECT_1:
         case ARIZONA_MIC_DETECT_2:
         case ARIZONA_MIC_DETECT_3:
@@ -1876,6 +1885,7 @@ static bool wm5102_volatile_register(struct device *dev, unsigned int reg)
         case ARIZONA_DSP1_STATUS_2:
         case ARIZONA_DSP1_STATUS_3:
         case ARIZONA_HEADPHONE_DETECT_2:
+        case ARIZONA_HP_DACVAL:
         case ARIZONA_MIC_DETECT_3:
                 return true;
         default: