3 files changed, 500 insertions, 0 deletions

diff --git a/drivers/extcon/Kconfig b/drivers/extcon/Kconfig
index 29c5cf852efc..bb385ac629a8 100644
--- a/drivers/extcon/Kconfig
+++ b/drivers/extcon/Kconfig
@@ -29,4 +29,12 @@ config EXTCON_MAX8997
           Maxim MAX8997 PMIC. The MAX8997 MUIC is a USB port accessory
           detector and switch.
 
+config EXTCON_ARIZONA
+        tristate "Wolfson Arizona EXTCON support"
+        depends on MFD_ARIZONA
+        help
+          Say Y here to enable support for external accessory detection
+          with Wolfson Arizona devices. These are audio CODECs with
+          advanced audio accessory detection support.
+
 endif # MULTISTATE_SWITCH
diff --git a/drivers/extcon/Makefile b/drivers/extcon/Makefile
index 86020bdb6da0..e932caaa311c 100644
--- a/drivers/extcon/Makefile
+++ b/drivers/extcon/Makefile
@@ -5,3 +5,4 @@
 obj-$(CONFIG_EXTCON)            += extcon_class.o
 obj-$(CONFIG_EXTCON_GPIO)       += extcon_gpio.o
 obj-$(CONFIG_EXTCON_MAX8997)    += extcon-max8997.o
+obj-$(CONFIG_EXTCON_ARIZONA)    += extcon-arizona.o
diff --git a/drivers/extcon/extcon-arizona.c b/drivers/extcon/extcon-arizona.c
new file mode 100644
index 000000000000..b068bc9defe1
--- /dev/null
+++ b/drivers/extcon/extcon-arizona.c
@@ -0,0 +1,491 @@
+/*
+ * extcon-arizona.c - Extcon driver Wolfson Arizona devices
+ *
+ *  Copyright (C) 2012 Wolfson Microelectronics plc
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ */
+
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/i2c.h>
+#include <linux/slab.h>
+#include <linux/interrupt.h>
+#include <linux/err.h>
+#include <linux/gpio.h>
+#include <linux/platform_device.h>
+#include <linux/pm_runtime.h>
+#include <linux/regulator/consumer.h>
+#include <linux/extcon.h>
+
+#include <linux/mfd/arizona/core.h>
+#include <linux/mfd/arizona/pdata.h>
+#include <linux/mfd/arizona/registers.h>
+
+struct arizona_extcon_info {
+        struct device *dev;
+        struct arizona *arizona;
+        struct mutex lock;
+        struct regulator *micvdd;
+
+        int micd_mode;
+        const struct arizona_micd_config *micd_modes;
+        int micd_num_modes;
+
+        bool micd_reva;
+
+        bool mic;
+        bool detecting;
+        int jack_flips;
+
+        struct extcon_dev edev;
+};
+
+static const struct arizona_micd_config micd_default_modes[] = {
+        { ARIZONA_ACCDET_SRC, 1 << ARIZONA_MICD_BIAS_SRC_SHIFT, 0 },
+        { 0,                  2 << ARIZONA_MICD_BIAS_SRC_SHIFT, 1 },
+};
+
+#define ARIZONA_CABLE_MECHANICAL "Mechanical"
+#define ARIZONA_CABLE_HEADPHONE  "Headphone"
+#define ARIZONA_CABLE_HEADSET    "Headset"
+
+static const char *arizona_cable[] = {
+        ARIZONA_CABLE_MECHANICAL,
+        ARIZONA_CABLE_HEADSET,
+        ARIZONA_CABLE_HEADPHONE,
+        NULL,
+};
+
+static const u32 arizona_exclusions[] = {
+        0x6,   /* Headphone and headset */
+        0,
+};
+
+static void arizona_extcon_set_mode(struct arizona_extcon_info *info, int mode)
+{
+        struct arizona *arizona = info->arizona;
+
+        gpio_set_value_cansleep(arizona->pdata.micd_pol_gpio,
+                                info->micd_modes[mode].gpio);
+        regmap_update_bits(arizona->regmap, ARIZONA_MIC_DETECT_1,
+                           ARIZONA_MICD_BIAS_SRC_MASK,
+                           info->micd_modes[mode].bias);
+        regmap_update_bits(arizona->regmap, ARIZONA_ACCESSORY_DETECT_MODE_1,
+                           ARIZONA_ACCDET_SRC, info->micd_modes[mode].src);
+
+        info->micd_mode = mode;
+
+        dev_dbg(arizona->dev, "Set jack polarity to %d\n", mode);
+}
+
+static void arizona_start_mic(struct arizona_extcon_info *info)
+{
+        struct arizona *arizona = info->arizona;
+        bool change;
+        int ret;
+
+        info->detecting = true;
+        info->mic = false;
+        info->jack_flips = 0;
+
+        /* Microphone detection can't use idle mode */
+        pm_runtime_get(info->dev);
+
+        ret = regulator_enable(info->micvdd);
+        if (ret != 0) {
+                dev_err(arizona->dev, "Failed to enable MICVDD: %d\n",
+                        ret);
+        }
+
+        if (info->micd_reva) {
+                regmap_write(arizona->regmap, 0x80, 0x3);
+                regmap_write(arizona->regmap, 0x294, 0);
+                regmap_write(arizona->regmap, 0x80, 0x0);
+        }
+
+        regmap_update_bits_check(arizona->regmap, ARIZONA_MIC_DETECT_1,
+                                 ARIZONA_MICD_ENA, ARIZONA_MICD_ENA,
+                                 &change);
+        if (!change) {
+                regulator_disable(info->micvdd);
+                pm_runtime_put_autosuspend(info->dev);
+        }
+}
+
+static void arizona_stop_mic(struct arizona_extcon_info *info)
+{
+        struct arizona *arizona = info->arizona;
+        bool change;
+
+        regmap_update_bits_check(arizona->regmap, ARIZONA_MIC_DETECT_1,
+                                 ARIZONA_MICD_ENA, 0,
+                                 &change);
+
+        if (info->micd_reva) {
+                regmap_write(arizona->regmap, 0x80, 0x3);
+                regmap_write(arizona->regmap, 0x294, 2);
+                regmap_write(arizona->regmap, 0x80, 0x0);
+        }
+
+        if (change) {
+                regulator_disable(info->micvdd);
+                pm_runtime_put_autosuspend(info->dev);
+        }
+}
+
+static irqreturn_t arizona_micdet(int irq, void *data)
+{
+        struct arizona_extcon_info *info = data;
+        struct arizona *arizona = info->arizona;
+        unsigned int val;
+        int ret;
+
+        mutex_lock(&info->lock);
+
+        ret = regmap_read(arizona->regmap, ARIZONA_MIC_DETECT_3, &val);
+        if (ret != 0) {
+                dev_err(arizona->dev, "Failed to read MICDET: %d\n", ret);
+                return IRQ_NONE;
+        }
+
+        dev_dbg(arizona->dev, "MICDET: %x\n", val);
+
+        if (!(val & ARIZONA_MICD_VALID)) {
+                dev_warn(arizona->dev, "Microphone detection state invalid\n");
+                mutex_unlock(&info->lock);
+                return IRQ_NONE;
+        }
+
+        /* Due to jack detect this should never happen */
+        if (!(val & ARIZONA_MICD_STS)) {
+                dev_warn(arizona->dev, "Detected open circuit\n");
+                info->detecting = false;