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

Pull char/misc driver updates from Greg KH:
 "Here's the big char/misc driver patchset for 4.1-rc1.

  Lots of different driver subsystem updates here, nothing major, full
  details are in the shortlog.

  All of this has been in linux-next for a while"

* tag 'char-misc-4.1-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc: (133 commits)
  mei: trace: remove unused TRACE_SYSTEM_STRING
  DTS: ARM: OMAP3-N900: Add lis3lv02d support
  Documentation: DT: lis302: update wakeup binding
  lis3lv02d: DT: add wakeup unit 2 and wakeup threshold
  lis3lv02d: DT: use s32 to support negative values
  Drivers: hv: hv_balloon: correctly handle num_pages>INT_MAX case
  Drivers: hv: hv_balloon: correctly handle val.freeram<num_pages case
  mei: replace check for connection instead of transitioning
  mei: use mei_cl_is_connected consistently
  mei: fix mei_poll operation
  hv_vmbus: Add gradually increased delay for retries in vmbus_post_msg()
  Drivers: hv: hv_balloon: survive ballooning request with num_pages=0
  Drivers: hv: hv_balloon: eliminate jumps in piecewiese linear floor function
  Drivers: hv: hv_balloon: do not online pages in offline blocks
  hv: remove the per-channel workqueue
  hv: don't schedule new works in vmbus_onoffer()/vmbus_onoffer_rescind()
  hv: run non-blocking message handlers in the dispatch tasklet
  coresight: moving to new "hwtracing" directory
  coresight-tmc: Adding a status interface to sysfs
  coresight: remove the unnecessary configuration coresight-default-sink
  ...

11 files changed, 1227 insertions, 56 deletions

diff --git a/drivers/extcon/Kconfig b/drivers/extcon/Kconfig
index 6a1f7de6fa54..fdc0bf0543ce 100644
--- a/drivers/extcon/Kconfig
+++ b/drivers/extcon/Kconfig
@@ -55,6 +55,16 @@ config EXTCON_MAX77693
           Maxim MAX77693 PMIC. The MAX77693 MUIC is a USB port accessory
           detector and switch.
 
+config EXTCON_MAX77843
+        tristate "MAX77843 EXTCON Support"
+        depends on MFD_MAX77843
+        select IRQ_DOMAIN
+        select REGMAP_I2C
+        help
+          If you say yes here you get support for the MUIC device of
+          Maxim MAX77843. The MAX77843 MUIC is a USB port accessory
+          detector add switch.
+
 config EXTCON_MAX8997
         tristate "MAX8997 EXTCON Support"
         depends on MFD_MAX8997 && IRQ_DOMAIN
@@ -93,4 +103,11 @@ config EXTCON_SM5502
           Silicon Mitus SM5502. The SM5502 is a USB port accessory
           detector and switch.
 
+config EXTCON_USB_GPIO
+        tristate "USB GPIO extcon support"
+        depends on GPIOLIB
+        help
+          Say Y here to enable GPIO based USB cable detection extcon support.
+          Used typically if GPIO is used for USB ID pin detection.
+
 endif # MULTISTATE_SWITCH
diff --git a/drivers/extcon/Makefile b/drivers/extcon/Makefile
index 0370b42e5a27..9204114791a3 100644
--- a/drivers/extcon/Makefile
+++ b/drivers/extcon/Makefile
@@ -2,13 +2,15 @@
 # Makefile for external connector class (extcon) devices
 #
 
-obj-$(CONFIG_EXTCON)            += extcon-class.o
+obj-$(CONFIG_EXTCON)            += extcon.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_MAX77843)   += extcon-max77843.o
 obj-$(CONFIG_EXTCON_MAX8997)    += extcon-max8997.o
 obj-$(CONFIG_EXTCON_PALMAS)     += extcon-palmas.o
 obj-$(CONFIG_EXTCON_RT8973A)    += extcon-rt8973a.o
 obj-$(CONFIG_EXTCON_SM5502)     += extcon-sm5502.o
+obj-$(CONFIG_EXTCON_USB_GPIO)   += extcon-usb-gpio.o
diff --git a/drivers/extcon/extcon-arizona.c b/drivers/extcon/extcon-arizona.c
index 6b5e795f3fe2..a0ed35b336e4 100644
--- a/drivers/extcon/extcon-arizona.c
+++ b/drivers/extcon/extcon-arizona.c
@@ -136,18 +136,35 @@ static const char *arizona_cable[] = {
 
 static void arizona_start_hpdet_acc_id(struct arizona_extcon_info *info);
 
-static void arizona_extcon_do_magic(struct arizona_extcon_info *info,
-                                    unsigned int magic)
+static void arizona_extcon_hp_clamp(struct arizona_extcon_info *info,
+                                    bool clamp)
 {
         struct arizona *arizona = info->arizona;
+        unsigned int mask = 0, val = 0;
         int ret;
 
+        switch (arizona->type) {
+        case WM5110:
+                mask = ARIZONA_HP1L_SHRTO | ARIZONA_HP1L_FLWR |
+                       ARIZONA_HP1L_SHRTI;
+                if (clamp)
+                        val = ARIZONA_HP1L_SHRTO;
+                else
+                        val = ARIZONA_HP1L_FLWR | ARIZONA_HP1L_SHRTI;
+                break;
+        default:
+                mask = ARIZONA_RMV_SHRT_HP1L;
+                if (clamp)
+                        val = ARIZONA_RMV_SHRT_HP1L;
+                break;
+        };
+
         mutex_lock(&arizona->dapm->card->dapm_mutex);
 
-        arizona->hpdet_magic = magic;
+        arizona->hpdet_clamp = clamp;
 
-        /* Keep the HP output stages disabled while doing the magic */
-        if (magic) {
+        /* Keep the HP output stages disabled while doing the clamp */
+        if (clamp) {
                 ret = regmap_update_bits(arizona->regmap,
                                          ARIZONA_OUTPUT_ENABLES_1,
                                          ARIZONA_OUT1L_ENA |
@@ -158,20 +175,20 @@ static void arizona_extcon_do_magic(struct arizona_extcon_info *info,
                                  ret);
         }
 
-        ret = regmap_update_bits(arizona->regmap, 0x225, 0x4000,
-                                 magic);
+        ret = regmap_update_bits(arizona->regmap, ARIZONA_HP_CTRL_1L,
+                                 mask, val);
         if (ret != 0)
-                dev_warn(arizona->dev, "Failed to do magic: %d\n",
+                dev_warn(arizona->dev, "Failed to do clamp: %d\n",
                                  ret);
 
-        ret = regmap_update_bits(arizona->regmap, 0x226, 0x4000,
-                                 magic);
+        ret = regmap_update_bits(arizona->regmap, ARIZONA_HP_CTRL_1R,
+                                 mask, val);
         if (ret != 0)
-                dev_warn(arizona->dev, "Failed to do magic: %d\n",
+                dev_warn(arizona->dev, "Failed to do clamp: %d\n",
                          ret);
 
-        /* Restore the desired state while not doing the magic */
-        if (!magic) {
+        /* Restore the desired state while not doing the clamp */
+        if (!clamp) {
                 ret = regmap_update_bits(arizona->regmap,
                                          ARIZONA_OUTPUT_ENABLES_1,
                                          ARIZONA_OUT1L_ENA |
@@ -603,7 +620,7 @@ done:
                            ARIZONA_HP_IMPEDANCE_RANGE_MASK | ARIZONA_HP_POLL,
                            0);
 
-        arizona_extcon_do_magic(info, 0);
+        arizona_extcon_hp_clamp(info, false);
 
         if (id_gpio)
                 gpio_set_value_cansleep(id_gpio, 0);
@@ -648,7 +665,7 @@ static void arizona_identify_headphone(struct arizona_extcon_info *info)
         if (info->mic)
                 arizona_stop_mic(info);
 
-        arizona_extcon_do_magic(info, 0x4000);
+        arizona_extcon_hp_clamp(info, true);
 
         ret = regmap_update_bits(arizona->regmap,
                                  ARIZONA_ACCESSORY_DETECT_MODE_1,
@@ -699,7 +716,7 @@ static void arizona_start_hpdet_acc_id(struct arizona_extcon_info *info)