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

Pull char/misc driver updates from Greg KH:
 "Here is the big char/misc driver update for 4.14-rc1.

  Lots of different stuff in here, it's been an active development cycle
  for some reason. Highlights are:

   - updated binder driver, this brings binder up to date with what
     shipped in the Android O release, plus some more changes that
     happened since then that are in the Android development trees.

   - coresight updates and fixes

   - mux driver file renames to be a bit "nicer"

   - intel_th driver updates

   - normal set of hyper-v updates and changes

   - small fpga subsystem and driver updates

   - lots of const code changes all over the driver trees

   - extcon driver updates

   - fmc driver subsystem upadates

   - w1 subsystem minor reworks and new features and drivers added

   - spmi driver updates

  Plus a smattering of other minor driver updates and fixes.

  All of these have been in linux-next with no reported issues for a
  while"

* tag 'char-misc-4.14-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc: (244 commits)
  ANDROID: binder: don't queue async transactions to thread.
  ANDROID: binder: don't enqueue death notifications to thread todo.
  ANDROID: binder: Don't BUG_ON(!spin_is_locked()).
  ANDROID: binder: Add BINDER_GET_NODE_DEBUG_INFO ioctl
  ANDROID: binder: push new transactions to waiting threads.
  ANDROID: binder: remove proc waitqueue
  android: binder: Add page usage in binder stats
  android: binder: fixup crash introduced by moving buffer hdr
  drivers: w1: add hwmon temp support for w1_therm
  drivers: w1: refactor w1_slave_show to make the temp reading functionality separate
  drivers: w1: add hwmon support structures
  eeprom: idt_89hpesx: Support both ACPI and OF probing
  mcb: Fix an error handling path in 'chameleon_parse_cells()'
  MCB: add support for SC31 to mcb-lpc
  mux: make device_type const
  char: virtio: constify attribute_group structures.
  Documentation/ABI: document the nvmem sysfs files
  lkdtm: fix spelling mistake: "incremeted" -> "incremented"
  perf: cs-etm: Fix ETMv4 CONFIGR entry in perf.data file
  nvmem: include linux/err.h from header
  ...

2 files changed, 97 insertions, 7 deletions

diff --git a/include/linux/mfd/cros_ec_commands.h b/include/linux/mfd/cros_ec_commands.h
index 190c8f4afa02..2b16e95b9bb8 100644
--- a/include/linux/mfd/cros_ec_commands.h
+++ b/include/linux/mfd/cros_ec_commands.h
@@ -285,6 +285,11 @@ enum host_event_code {
         EC_HOST_EVENT_HANG_DETECT = 20,
         /* Hang detect logic detected a hang and warm rebooted the AP */
         EC_HOST_EVENT_HANG_REBOOT = 21,
+        /* PD MCU triggering host event */
+        EC_HOST_EVENT_PD_MCU = 22,
+
+        /* EC desires to change state of host-controlled USB mux */
+        EC_HOST_EVENT_USB_MUX = 28,
 
         /*
          * The high bit of the event mask is not used as a host event code.  If
@@ -2905,6 +2910,76 @@ struct ec_params_usb_pd_control {
         uint8_t mux;
 } __packed;
 
+#define PD_CTRL_RESP_ENABLED_COMMS      (1 << 0) /* Communication enabled */
+#define PD_CTRL_RESP_ENABLED_CONNECTED  (1 << 1) /* Device connected */
+#define PD_CTRL_RESP_ENABLED_PD_CAPABLE (1 << 2) /* Partner is PD capable */
+
+struct ec_response_usb_pd_control_v1 {
+        uint8_t enabled;
+        uint8_t role;
+        uint8_t polarity;
+        char state[32];
+} __packed;
+
+#define EC_CMD_USB_PD_PORTS 0x102
+
+struct ec_response_usb_pd_ports {
+        uint8_t num_ports;
+} __packed;
+
+#define EC_CMD_USB_PD_POWER_INFO 0x103
+
+#define PD_POWER_CHARGING_PORT 0xff
+struct ec_params_usb_pd_power_info {
+        uint8_t port;
+} __packed;
+
+enum usb_chg_type {
+        USB_CHG_TYPE_NONE,
+        USB_CHG_TYPE_PD,
+        USB_CHG_TYPE_C,
+        USB_CHG_TYPE_PROPRIETARY,
+        USB_CHG_TYPE_BC12_DCP,
+        USB_CHG_TYPE_BC12_CDP,
+        USB_CHG_TYPE_BC12_SDP,
+        USB_CHG_TYPE_OTHER,
+        USB_CHG_TYPE_VBUS,
+        USB_CHG_TYPE_UNKNOWN,
+};
+
+struct usb_chg_measures {
+        uint16_t voltage_max;
+        uint16_t voltage_now;
+        uint16_t current_max;
+        uint16_t current_lim;
+} __packed;
+
+struct ec_response_usb_pd_power_info {
+        uint8_t role;
+        uint8_t type;
+        uint8_t dualrole;
+        uint8_t reserved1;
+        struct usb_chg_measures meas;
+        uint32_t max_power;
+} __packed;
+
+/* Get info about USB-C SS muxes */
+#define EC_CMD_USB_PD_MUX_INFO 0x11a
+
+struct ec_params_usb_pd_mux_info {
+        uint8_t port; /* USB-C port number */
+} __packed;
+
+/* Flags representing mux state */
+#define USB_PD_MUX_USB_ENABLED       (1 << 0)
+#define USB_PD_MUX_DP_ENABLED        (1 << 1)
+#define USB_PD_MUX_POLARITY_INVERTED (1 << 2)
+#define USB_PD_MUX_HPD_IRQ           (1 << 3)
+
+struct ec_response_usb_pd_mux_info {
+        uint8_t flags; /* USB_PD_MUX_*-encoded USB mux state */
+} __packed;
+
 /*****************************************************************************/
 /*
  * Passthru commands
diff --git a/include/linux/mfd/ds1wm.h b/include/linux/mfd/ds1wm.h
index 38a372a0e285..2227c6a75d84 100644
--- a/include/linux/mfd/ds1wm.h
+++ b/include/linux/mfd/ds1wm.h
@@ -1,13 +1,28 @@
-/* MFD cell driver data for the DS1WM driver */
+/* MFD cell driver data for the DS1WM driver
+ *
+ * to be defined in the MFD device that is
+ * using this driver for one of his sub devices
+ */
 
 struct ds1wm_driver_data {
         int active_high;
         int clock_rate;
-        /* in milliseconds, the amount of time to */
-        /* sleep following a reset pulse. Zero    */
-        /* should work if your bus devices recover*/
-        /* time respects the 1-wire spec since the*/
-        /* ds1wm implements the precise timings of*/
-        /* a reset pulse/presence detect sequence.*/
+        /* in milliseconds, the amount of time to
+         * sleep following a reset pulse. Zero
+         * should work if your bus devices recover
+         * time respects the 1-wire spec since the
+         * ds1wm implements the precise timings of
+         * a reset pulse/presence detect sequence.
+         */
         unsigned int reset_recover_delay;
+
+        /* Say 1 here for big endian Hardware
+         * (only relevant with bus-shift > 0
+         */
+        bool is_hw_big_endian;
+
+        /* left shift of register number to get register address offsett.
+         * Only 0,1,2 allowed for 8,16 or 32 bit bus width respectively
+         */
+        unsigned int bus_shift;
 };