Merge tag 'char-misc-4.2-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 pull request for 4.2-rc1.

  Lots of mei, extcon, coresight, uio, mic, and other driver updates in
  here.  Full details in the shortlog.  All of these have been in
  linux-next for some time with no reported problems"

* tag 'char-misc-4.2-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc: (176 commits)
  mei: me: wait for power gating exit confirmation
  mei: reset flow control on the last client disconnection
  MAINTAINERS: mei: add mei_cl_bus.h to maintained file list
  misc: sram: sort and clean up included headers
  misc: sram: move reserved block logic out of probe function
  misc: sram: add private struct device and virt_base members
  misc: sram: report correct SRAM pool size
  misc: sram: bump error message level on unclean driver unbinding
  misc: sram: fix device node reference leak on error
  misc: sram: fix enabled clock leak on error path
  misc: mic: Fix reported static checker warning
  misc: mic: Fix randconfig build error by including errno.h
  uio: pruss: Drop depends on ARCH_DAVINCI_DA850 from config
  uio: pruss: Add CONFIG_HAS_IOMEM dependence
  uio: pruss: Include <linux/sizes.h>
  extcon: Redefine the unique id of supported external connectors without 'enum extcon' type
  char:xilinx_hwicap:buffer_icap - change 1/0 to true/false for bool type variable in function buffer_icap_set_configuration().
  Drivers: hv: vmbus: Allocate ring buffer memory in NUMA aware fashion
  parport: check exclusive access before register
  w1: use correct lock on error in w1_seq_show()
  ...

14 files changed, 1322 insertions, 115 deletions

diff --git a/include/dt-bindings/mfd/arizona.h b/include/dt-bindings/mfd/arizona.h
index 555609910acb..7b2000cead43 100644
--- a/include/dt-bindings/mfd/arizona.h
+++ b/include/dt-bindings/mfd/arizona.h
@@ -104,4 +104,8 @@
 #define ARIZONA_MICD_TIME_256MS                      11
 #define ARIZONA_MICD_TIME_512MS                      12
 
+#define ARIZONA_ACCDET_MODE_MIC 0
+#define ARIZONA_ACCDET_MODE_HPL 1
+#define ARIZONA_ACCDET_MODE_HPR 2
+
 #endif
diff --git a/include/linux/extcon.h b/include/linux/extcon.h
index 36f49c405dfb..b16d929fa75f 100644
--- a/include/linux/extcon.h
+++ b/include/linux/extcon.h
@@ -1,6 +1,9 @@
 /*
  *  External connector (extcon) class driver
  *
+ * Copyright (C) 2015 Samsung Electronics
+ * Author: Chanwoo Choi <cw00.choi@samsung.com>
+ *
  * Copyright (C) 2012 Samsung Electronics
  * Author: Donggeun Kim <dg77.kim@samsung.com>
  * Author: MyungJoo Ham <myungjoo.ham@samsung.com>
@@ -27,50 +30,35 @@
 #include <linux/notifier.h>
 #include <linux/sysfs.h>
 
-#define SUPPORTED_CABLE_MAX     32
-#define CABLE_NAME_MAX          30
-
 /*
- * The standard cable name is to help support general notifier
- * and notifiee device drivers to share the common names.
- * Please use standard cable names unless your notifier device has
- * a very unique and abnormal cable or
- * the cable type is supposed to be used with only one unique
- * pair of notifier/notifiee devices.
- *
- * Please add any other "standard" cables used with extcon dev.
- *
- * You may add a dot and number to specify version or specification
- * of the specific cable if it is required. (e.g., "Fast-charger.18"
- * and "Fast-charger.10" for 1.8A and 1.0A chargers)
- * However, the notifiee and notifier should be able to handle such
- * string and if the notifiee can negotiate the protocol or identify,
- * you don't need such convention. This convention is helpful when
- * notifier can distinguish but notifiee cannot.
+ * Define the unique id of supported external connectors
  */
-enum extcon_cable_name {
-        EXTCON_USB = 0,
-        EXTCON_USB_HOST,
-        EXTCON_TA,                      /* Travel Adaptor */
-        EXTCON_FAST_CHARGER,
-        EXTCON_SLOW_CHARGER,
-        EXTCON_CHARGE_DOWNSTREAM,       /* Charging an external device */
-        EXTCON_HDMI,
-        EXTCON_MHL,
-        EXTCON_DVI,
-        EXTCON_VGA,
-        EXTCON_DOCK,
-        EXTCON_LINE_IN,
-        EXTCON_LINE_OUT,
-        EXTCON_MIC_IN,
-        EXTCON_HEADPHONE_OUT,
-        EXTCON_SPDIF_IN,
-        EXTCON_SPDIF_OUT,
-        EXTCON_VIDEO_IN,
-        EXTCON_VIDEO_OUT,
-        EXTCON_MECHANICAL,
-};
-extern const char extcon_cable_name[][CABLE_NAME_MAX + 1];
+#define EXTCON_NONE                     0
+
+#define EXTCON_USB                      1       /* USB connector */
+#define EXTCON_USB_HOST                 2
+
+#define EXTCON_TA                       3       /* Charger connector */
+#define EXTCON_FAST_CHARGER             4
+#define EXTCON_SLOW_CHARGER             5
+#define EXTCON_CHARGE_DOWNSTREAM        6
+
+#define EXTCON_LINE_IN                  7       /* Audio/Video connector */
+#define EXTCON_LINE_OUT                 8
+#define EXTCON_MICROPHONE               9
+#define EXTCON_HEADPHONE                10
+#define EXTCON_HDMI                     11
+#define EXTCON_MHL                      12
+#define EXTCON_DVI                      13
+#define EXTCON_VGA                      14
+#define EXTCON_SPDIF_IN                 15
+#define EXTCON_SPDIF_OUT                16
+#define EXTCON_VIDEO_IN                 17
+#define EXTCON_VIDEO_OUT                18
+
+#define EXTCON_DOCK                     19      /* Misc connector */
+#define EXTCON_JIG                      20
+#define EXTCON_MECHANICAL               21
 
 struct extcon_cable;
 
@@ -78,7 +66,7 @@ struct extcon_cable;
  * struct extcon_dev - An extcon device represents one external connector.
  * @name:               The name of this extcon device. Parent device name is
  *                      used if NULL.
- * @supported_cable:    Array of supported cable names ending with NULL.
+ * @supported_cable:    Array of supported cable names ending with EXTCON_NONE.
  *                      If supported_cable is NULL, cable name related APIs
  *                      are disabled.
  * @mutually_exclusive: Array of mutually exclusive set of cables that cannot
@@ -89,16 +77,14 @@ struct extcon_cable;
  *                      be attached simulataneously. {0x7, 0} is equivalent to
  *                      {0x3, 0x6, 0x5, 0}. If it is {0xFFFFFFFF, 0}, there
  *                      can be no simultaneous connections.
- * @print_name:         An optional callback to override the method to print the
- *                      name of the extcon device.
  * @print_state:        An optional callback to override the method to print the
  *                      status of the extcon device.
  * @dev:                Device of this extcon.
  * @state:              Attach/detach state of this extcon. Do not provide at
  *                      register-time.
  * @nh:                 Notifier for the state change events from this extcon
- * @entry:              To support list of extcon devices so that users can search
- *                      for extcon devices based on the extcon name.
+ * @entry:              To support list of extcon devices so that users can
+ *                      search for extcon devices based on the extcon name.
  * @lock:
  * @max_supported:      Internal value to store the number of cables.
  * @extcon_dev_type:    Device_type struct to provide attribute_groups
@@ -113,16 +99,15 @@ struct extcon_cable;
 struct extcon_dev {
         /* Optional user initializing data */
         const char *name;
-        const char **supported_cable;
+        const unsigned int *supported_cable;
         const u32 *mutually_exclusive;
 
         /* Optional callbacks to override class functions */
-        ssize_t (*print_name)(struct extcon_dev *edev, char *buf);
         ssize_t (*print_state)(struct extcon_dev *edev, char *buf);
 
         /* Internal data. Please do not set. */
         struct device dev;
-        struct raw_notifier_head nh;
+        struct raw_notifier_head *nh;
         struct list_head entry;
         int max_supported;
         spinlock_t lock;        /* could be called by irq handler */
@@ -161,8 +146,6 @@ struct extcon_cable {
 /**
  * struct extcon_specific_cable_nb - An internal data for
  *                                   extcon_register_interest().
- * @internal_nb:        A notifier block bridging extcon notifier
- *                      and cable notifier.
  * @user_nb:            user provided notifier block for events from
  *                      a specific cable.
  * @cable_index:        the target cable.
@@ -170,7 +153,6 @@ struct extcon_cable {
  * @previous_value:     the saved previous event value.
  */
 struct extcon_specific_cable_nb {
-        struct notifier_block internal_nb;