From: Kishon Vijay Abraham I <kishon@ti.com>
Date: Thu, 15 Sep 2016 10:16:11 +0000 (+0530)
Subject: Merge branch 'next' into resolution
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=cb9850d092f7d2c86662d71fbfe10685cbddda21;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git

Merge branch 'next' into resolution

Conflicts:
	drivers/extcon/extcon-adc-jack.c
	drivers/extcon/extcon-arizona.c
	drivers/extcon/extcon-gpio.c
	include/linux/extcon.h
---

cb9850d092f7d2c86662d71fbfe10685cbddda21
diff --cc drivers/extcon/extcon-gpio.c
index e7aebbc945f6,b1b0264eb12d..ebed22f22d75
--- a/drivers/extcon/extcon-gpio.c
+++ b/drivers/extcon/extcon-gpio.c
@@@ -49,7 -49,7 +49,8 @@@ static void gpio_extcon_work(struct wor
  	state = gpiod_get_value_cansleep(data->id_gpiod);
  	if (data->pdata->gpio_active_low)
  		state = !state;
 -	extcon_set_cable_state_(data->edev, data->pdata->extcon_id, state);
++
 +	extcon_set_state_sync(data->edev, data->pdata->extcon_id, state);
  }
  
  static irqreturn_t gpio_irq_handler(int irq, void *dev_id)
diff --cc include/linux/extcon.h
index 5c35f9d1822c,b34d1ae9011f..2b9f15156115
--- a/include/linux/extcon.h
+++ b/include/linux/extcon.h
@@@ -249,7 -238,7 +249,6 @@@ extern int extcon_set_state(struct extc
  				   bool cable_state);
  extern int extcon_set_state_sync(struct extcon_dev *edev, unsigned int id,
  				bool cable_state);
--
  /*
   * Synchronize the state and property data for a specific external connector.
   */
@@@ -359,10 -348,10 +358,27 @@@ static inline int extcon_set_state_sync
  }
  
  static inline int extcon_sync(struct extcon_dev *edev, unsigned int id)
++<<<<<<< HEAD
++=======
++{
++	return 0;
++}
++
++static inline int extcon_get_property(struct extcon_dev *edev, unsigned int id,
++					unsigned int prop,
++					union extcon_property_value *prop_val)
++{
++	return 0;
++}
++static inline int extcon_set_property(struct extcon_dev *edev, unsigned int id,
++					unsigned int prop,
++					union extcon_property_value prop_val)
++>>>>>>> next
  {
  	return 0;
  }
  
++<<<<<<< HEAD
  static inline int extcon_get_property(struct extcon_dev *edev, unsigned int id,
  					unsigned int prop,
  					union extcon_property_value *prop_val)
@@@ -371,24 -360,24 +387,36 @@@
  }
  static inline int extcon_set_property(struct extcon_dev *edev, unsigned int id,
  					unsigned int prop,
++=======
++static inline int extcon_set_property_sync(struct extcon_dev *edev,
++					unsigned int id, unsigned int prop,
++>>>>>>> next
  					union extcon_property_value prop_val)
  {
  	return 0;
  }
  
++<<<<<<< HEAD
  static inline int extcon_set_property_sync(struct extcon_dev *edev,
  					unsigned int id, unsigned int prop,
  					union extcon_property_value prop_val)
++=======
++static inline int extcon_get_property_capability(struct extcon_dev *edev,
++					unsigned int id, unsigned int prop)
++>>>>>>> next
  {
  	return 0;
  }
  
++<<<<<<< HEAD
  static inline int extcon_get_property_capability(struct extcon_dev *edev,
  					unsigned int id, unsigned int prop)
  {
  	return 0;
  }
  
++=======
++>>>>>>> next
  static inline int extcon_set_property_capability(struct extcon_dev *edev,
  					unsigned int id, unsigned int prop)
  {