Merge tag 'char-misc-3.19-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 update for 3.19-rc1

  Lots of little things all over the place in different drivers, and a
  new subsystem, "coresight" has been added.  Full details are in the
  shortlog"

* tag 'char-misc-3.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc: (73 commits)
  parport: parport_pc, do not remove parent devices early
  spmi: Remove shutdown/suspend/resume kernel-doc
  carma-fpga-program: drop videobuf dependency
  carma-fpga: drop videobuf dependency
  carma-fpga-program.c: fix compile errors
  i8k: Fix temperature bug handling in i8k_get_temp()
  cxl: Name interrupts in /proc/interrupt
  CXL: Return error to PSL if IRQ demultiplexing fails & print clearer warning
  coresight-replicator: remove .owner field for driver
  coresight: fixed comments in coresight.h
  coresight: fix typo in comment in coresight-priv.h
  coresight: bindings for coresight drivers
  coresight: Adding ABI documentation
  w1: support auto-load of w1_bq27000 module.
  w1: avoid potential u16 overflow
  cn: verify msg->len before making callback
  mei: export fw status registers through sysfs
  mei: read and print all six FW status registers
  mei: txe: add cherrytrail device id
  mei: kill cached host and me csr values
  ...

3 files changed, 17 insertions, 11 deletions

diff --git a/drivers/extcon/extcon-class.c b/drivers/extcon/extcon-class.c
index 4c2f2c543bb7..043dcd9946c9 100644
--- a/drivers/extcon/extcon-class.c
+++ b/drivers/extcon/extcon-class.c
@@ -29,6 +29,7 @@
 #include <linux/fs.h>
 #include <linux/err.h>
 #include <linux/extcon.h>
+#include <linux/of.h>
 #include <linux/slab.h>
 #include <linux/sysfs.h>
 #include <linux/of.h>
@@ -997,13 +998,16 @@ struct extcon_dev *extcon_get_edev_by_phandle(struct device *dev, int index)
                 return ERR_PTR(-ENODEV);
         }
 
-        edev = extcon_get_extcon_dev(node->name);
-        if (!edev) {
-                dev_err(dev, "unable to get extcon device : %s\n", node->name);
-                return ERR_PTR(-ENODEV);
+        mutex_lock(&extcon_dev_list_lock);
+        list_for_each_entry(edev, &extcon_dev_list, entry) {
+                if (edev->dev.parent && edev->dev.parent->of_node == node) {
+                        mutex_unlock(&extcon_dev_list_lock);
+                        return edev;
+                }
         }
+        mutex_unlock(&extcon_dev_list_lock);
 
-        return edev;
+        return ERR_PTR(-EPROBE_DEFER);
 }
 #else
 struct extcon_dev *extcon_get_edev_by_phandle(struct device *dev, int index)
diff --git a/drivers/extcon/extcon-max14577.c b/drivers/extcon/extcon-max14577.c
index dfc2fd370eb3..c1bf0cf747b0 100644
--- a/drivers/extcon/extcon-max14577.c
+++ b/drivers/extcon/extcon-max14577.c
@@ -1,7 +1,7 @@
 /*
  * extcon-max14577.c - MAX14577/77836 extcon driver to support MUIC
  *
- * Copyright (C) 2013,2014 Samsung Electrnoics
+ * Copyright (C) 2013,2014 Samsung Electronics
  * Chanwoo Choi <cw00.choi@samsung.com>
  * Krzysztof Kozlowski <k.kozlowski@samsung.com>
  *
diff --git a/drivers/extcon/extcon-max77693.c b/drivers/extcon/extcon-max77693.c
index 5bf5c5e66f16..740a14d35072 100644
--- a/drivers/extcon/extcon-max77693.c
+++ b/drivers/extcon/extcon-max77693.c
@@ -232,7 +232,7 @@ static const char *max77693_extcon_cable[] = {
         [EXTCON_CABLE_JIG_USB_ON]               = "JIG-USB-ON",
         [EXTCON_CABLE_JIG_USB_OFF]              = "JIG-USB-OFF",
         [EXTCON_CABLE_JIG_UART_OFF]             = "JIG-UART-OFF",
-        [EXTCON_CABLE_JIG_UART_ON]              = "Dock-Car",
+        [EXTCON_CABLE_JIG_UART_ON]              = "JIG-UART-ON",
         [EXTCON_CABLE_DOCK_SMART]               = "Dock-Smart",
         [EXTCON_CABLE_DOCK_DESK]                = "Dock-Desk",
         [EXTCON_CABLE_DOCK_AUDIO]               = "Dock-Audio",
@@ -532,9 +532,6 @@ static int max77693_muic_dock_handler(struct max77693_muic_info *info,
                 extcon_set_cable_state(info->edev, "Dock-Smart", attached);
                 extcon_set_cable_state(info->edev, "MHL", attached);
                 goto out;
-        case MAX77693_MUIC_ADC_FACTORY_MODE_UART_ON:    /* Dock-Car */
-                strcpy(dock_name, "Dock-Car");
-                break;
         case MAX77693_MUIC_ADC_AUDIO_MODE_REMOTE:       /* Dock-Desk */
                 strcpy(dock_name, "Dock-Desk");
                 break;
@@ -669,6 +666,11 @@ static int max77693_muic_jig_handler(struct max77693_muic_info *info,
                 strcpy(cable_name, "JIG-UART-OFF");
                 path = CONTROL1_SW_UART;
                 break;
+        case MAX77693_MUIC_ADC_FACTORY_MODE_UART_ON:    /* ADC_JIG_UART_ON */
+                /* PATH:AP_UART */
+                strcpy(cable_name, "JIG-UART-ON");
+                path = CONTROL1_SW_UART;
+                break;
         default:
                 dev_err(info->dev, "failed to detect %s jig cable\n",
                         attached ? "attached" : "detached");
@@ -708,13 +710,13 @@ static int max77693_muic_adc_handler(struct max77693_muic_info *info)
         case MAX77693_MUIC_ADC_FACTORY_MODE_USB_OFF:
         case MAX77693_MUIC_ADC_FACTORY_MODE_USB_ON:
         case MAX77693_MUIC_ADC_FACTORY_MODE_UART_OFF:
+        case MAX77693_MUIC_ADC_FACTORY_MODE_UART_ON:
                 /* JIG */
                 ret = max77693_muic_jig_handler(info, cable_type, attached);
                 if (ret < 0)
                         return ret;
                 break;
         case MAX77693_MUIC_ADC_RESERVED_ACC_3:          /* Dock-Smart */
-        case MAX77693_MUIC_ADC_FACTORY_MODE_UART_ON:    /* Dock-Car */
         case MAX77693_MUIC_ADC_AUDIO_MODE_REMOTE:       /* Dock-Desk */
         case MAX77693_MUIC_ADC_AV_CABLE_NOLOAD:         /* Dock-Audio */
                 /*