Merge tag 'extcon-next-for-3.17' of git://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/extcon into char-misc-next

Chanwoo writes:

Update extcon for v3.17

This patchset add new extcon provider driver and fix minor issue of extcon driver.

Detailed description for patchset:
1. Add new Silicon-Mitus SM5502 MUIC (Micro-USB Interface Controller) device
- extcon-sm5502 driver  is capable of identifying the type of the external power
source and attached accessory. And external power sources, such as Dedicated
charger or a standard USB port, are able to charge the battery in the smart
phone via the connector.

2. Fix minor issue of extcon driver
- extcon-arizona driver
- extcon-palmas driver
- Remove unnecessary OOM messages for all extcon device drivers

3. Fix minor issue of extcon core
- Re-order the sequence of extcon device driver in Kconfig/Makefile alphabitically
- Set parent device of extcon device automatically using devm_extcon_dev_allocate()

4. Fix MAX77693 driver
- This patchset has dependency on MFD/Regulator/Extcon. So, Lee Jones
(MFD Maintainer) created Immutable branch between MFD and Extcon due
for v3.17 merge-window and then I merged this patchset from MFD git repo[1]
to Extcon git repo.
  [1] git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd
  (branch: ib-mfd-extcon-regulator)

20 files changed, 1335 insertions, 494 deletions

diff --git a/Documentation/devicetree/bindings/extcon/extcon-sm5502.txt b/Documentation/devicetree/bindings/extcon/extcon-sm5502.txt
new file mode 100644
index 000000000000..4ecda224955f
--- /dev/null
+++ b/Documentation/devicetree/bindings/extcon/extcon-sm5502.txt
@@ -0,0 +1,23 @@
+
+* SM5502 MUIC (Micro-USB Interface Controller) device
+
+The Silicon Mitus SM5502 is a MUIC (Micro-USB Interface Controller) device
+which can detect the state of external accessory when external accessory is
+attached or detached and button is pressed or released. It is interfaced to
+the host controller using an I2C interface.
+
+Required properties:
+- compatible: Should be "siliconmitus,sm5502-muic"
+- reg: Specifies the I2C slave address of the MUIC block. It should be 0x25
+- interrupt-parent: Specifies the phandle of the interrupt controller to which
+  the interrupts from sm5502 are delivered to.
+- interrupts: Interrupt specifiers for detection interrupt sources.
+
+Example:
+
+        sm5502@25 {
+                compatible = "siliconmitus,sm5502-muic";
+                interrupt-parent = <&gpx1>;
+                interrupts = <5 0>;
+                reg = <0x25>;
+        };
diff --git a/drivers/extcon/Kconfig b/drivers/extcon/Kconfig
index aebde489c291..6f2f4727de2c 100644
--- a/drivers/extcon/Kconfig
+++ b/drivers/extcon/Kconfig
@@ -14,6 +14,20 @@ if EXTCON
 
 comment "Extcon Device Drivers"
 
+config EXTCON_ADC_JACK
+        tristate "ADC Jack extcon support"
+        depends on IIO
+        help
+          Say Y here to enable extcon device driver based on ADC values.
+
+config EXTCON_ARIZONA
+        tristate "Wolfson Arizona EXTCON support"
+        depends on MFD_ARIZONA && INPUT && SND_SOC
+        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.
+
 config EXTCON_GPIO
         tristate "GPIO extcon support"
         depends on GPIOLIB
@@ -21,12 +35,6 @@ config EXTCON_GPIO
           Say Y here to enable GPIO based extcon support. Note that GPIO
           extcon supports single state per extcon instance.
 
-config EXTCON_ADC_JACK
-        tristate "ADC Jack extcon support"
-        depends on IIO
-        help
-          Say Y here to enable extcon device driver based on ADC values.
-
 config EXTCON_MAX14577
         tristate "MAX14577/77836 EXTCON Support"
         depends on MFD_MAX14577
@@ -55,14 +63,6 @@ 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 && INPUT && SND_SOC
-        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.
-
 config EXTCON_PALMAS
         tristate "Palmas USB EXTCON support"
         depends on MFD_PALMAS
@@ -70,4 +70,14 @@ config EXTCON_PALMAS
           Say Y here to enable support for USB peripheral and USB host
           detection by palmas usb.
 
+config EXTCON_SM5502
+        tristate "SM5502 EXTCON support"
+        select IRQ_DOMAIN
+        select REGMAP_I2C
+        select REGMAP_IRQ
+        help
+          If you say yes here you get support for the MUIC device of
+          Silicon Mitus SM5502. The SM5502 is a USB port accessory
+          detector and switch.
+
 endif # MULTISTATE_SWITCH
diff --git a/drivers/extcon/Makefile b/drivers/extcon/Makefile
index bf7861ec0906..b38546eb522a 100644
--- a/drivers/extcon/Makefile
+++ b/drivers/extcon/Makefile
@@ -1,12 +1,13 @@
-#
+
 # Makefile for external connector class (extcon) devices
 #
 
 obj-$(CONFIG_EXTCON)            += extcon-class.o
-obj-$(CONFIG_EXTCON_GPIO)       += extcon-gpio.o
 obj-$(CONFIG_EXTCON_ADC_JACK)   += extcon-adc-jack.o
+obj-$(CONFIG_EXTCON_ARIZONA)    += extcon-arizona.o
+obj-$(CONFIG_EXTCON_GPIO)       += extcon-gpio.o
 obj-$(CONFIG_EXTCON_MAX14577)   += extcon-max14577.o
 obj-$(CONFIG_EXTCON_MAX77693)   += extcon-max77693.o
 obj-$(CONFIG_EXTCON_MAX8997)    += extcon-max8997.o
-obj-$(CONFIG_EXTCON_ARIZONA)    += extcon-arizona.o
 obj-$(CONFIG_EXTCON_PALMAS)     += extcon-palmas.o
+obj-$(CONFIG_EXTCON_SM5502)     += extcon-sm5502.o
diff --git a/drivers/extcon/extcon-adc-jack.c b/drivers/extcon/extcon-adc-jack.c
index e18f95be3733..d860229e4de1 100644
--- a/drivers/extcon/extcon-adc-jack.c
+++ b/drivers/extcon/extcon-adc-jack.c
@@ -112,7 +112,6 @@ static int adc_jack_probe(struct platform_device *pdev)
                 dev_err(&pdev->dev, "failed to allocate extcon device\n");
                 return -ENOMEM;
         }
-        data->edev->dev.parent = &pdev->dev;
         data->edev->name = pdata->name;
 
         /* Check the length of array and set num_cables */
diff --git a/drivers/extcon/extcon-arizona.c b/drivers/extcon/extcon-arizona.c
index 6c84e3d12043..ba51588cc000 100644
--- a/drivers/extcon/extcon-arizona.c
+++ b/drivers/extcon/extcon-arizona.c
@@ -39,6 +39,11 @@
 #define ARIZONA_ACCDET_MODE_HPL 1
 #define ARIZONA_ACCDET_MODE_HPR 2
 
+#define ARIZONA_MICD_CLAMP_MODE_JDL      0x4
+#define ARIZONA_MICD_CLAMP_MODE_JDH      0x5
+#define ARIZONA_MICD_CLAMP_MODE_JDL_GP5H 0x9
+#define ARIZONA_MICD_CLAMP_MODE_JDH_GP5H 0xb
+
 #define ARIZONA_HPDET_MAX 10000
 
 #define HPDET_DEBOUNCE 500
@@ -324,14 +329,17 @@ static void arizona_stop_mic(struct arizona_extcon_info *info)
 }
 
 static struct {
+        unsigned int threshold;