Merge tag 'v4.4-rc2' into drm-intel-next-queued

Linux 4.4-rc2

Backmerge to get at

commit 1b0e3a049efe471c399674fd954500ce97438d30
Author: Imre Deak <imre.deak@intel.com>
Date:   Thu Nov 5 23:04:11 2015 +0200

    drm/i915/skl: disable display side power well support for now

so that we can proplery re-eanble skl power wells in -next.

Conflicts are just adjacent lines changed, except for intel_fbdev.c
where we need to interleave the changs. Nothing nefarious.

Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>

1 files changed, 6 insertions, 18 deletions

diff --git a/include/linux/extcon/extcon-gpio.h b/include/linux/extcon/extcon-gpio.h
index 0b17ad43fbfc..7cacafb78b09 100644
--- a/include/linux/extcon/extcon-gpio.h
+++ b/include/linux/extcon/extcon-gpio.h
@@ -1,5 +1,5 @@
 /*
- *  External connector (extcon) class generic GPIO driver
+ * Single-state GPIO extcon driver based on extcon class
  *
  * Copyright (C) 2012 Samsung Electronics
  * Author: MyungJoo Ham <myungjoo.ham@samsung.com>
@@ -16,43 +16,31 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- *
-*/
+ */
 #ifndef __EXTCON_GPIO_H__
 #define __EXTCON_GPIO_H__ __FILE__
 
 #include <linux/extcon.h>
 
 /**
- * struct gpio_extcon_platform_data - A simple GPIO-controlled extcon device.
- * @name:               The name of this GPIO extcon device.
+ * struct gpio_extcon_pdata - A simple GPIO-controlled extcon device.
+ * @extcon_id:          The unique id of specific external connector.
  * @gpio:               Corresponding GPIO.
  * @gpio_active_low:    Boolean describing whether gpio active state is 1 or 0
  *                      If true, low state of gpio means active.
  *                      If false, high state of gpio means active.
  * @debounce:           Debounce time for GPIO IRQ in ms.
  * @irq_flags:          IRQ Flags (e.g., IRQF_TRIGGER_LOW).
- * @state_on:           print_state is overriden with state_on if attached.
- *                      If NULL, default method of extcon class is used.
- * @state_off:          print_state is overriden with state_off if detached.
- *                      If NUll, default method of extcon class is used.
  * @check_on_resume:    Boolean describing whether to check the state of gpio
  *                      while resuming from sleep.
- *
- * Note that in order for state_on or state_off to be valid, both state_on
- * and state_off should be not NULL. If at least one of them is NULL,
- * the print_state is not overriden.
  */
-struct gpio_extcon_platform_data {
-        const char *name;
+struct gpio_extcon_pdata {
+        unsigned int extcon_id;
         unsigned gpio;
         bool gpio_active_low;
         unsigned long debounce;
         unsigned long irq_flags;
 
-        /* if NULL, "0" or "1" will be printed */
-        const char *state_on;
-        const char *state_off;
         bool check_on_resume;
 };