Merge tag 'extcon-for-3.9' of git://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/extcon into char-misc-next

Chanwoo writes:
  This is patch set of extcon for v3.9.

  Update to max77693/max8997 extcon driver:
  - Using MHL_TA cable for charging.
  - Support JIG cable.
  - Support Dock-Audio device for playing music and button of device.
  - Support Dock-Smart device for desktop mode with mouse/keyboard.
  - Set default UART/USB path on probe().
  - Check the state/type of cable after completing initialization.
  - Code clean to remove duplicate code and bug fix related to sequence of interrupt.
  - Fix irq_flag of max8997/max77693 driver.

  Update to arizona extcon driver:
  - Headphone measurements.
  - Alternative detection mechanism for non-default system designs.
  - Microphone clamp integration.
  - Support for additional detection pin.
  - MICBIAS rise time configuration.

1 files changed, 12 insertions, 0 deletions

diff --git a/include/linux/mfd/arizona/pdata.h b/include/linux/mfd/arizona/pdata.h
index 8b1d1daaae16..bcbe4fda87cb 100644
--- a/include/linux/mfd/arizona/pdata.h
+++ b/include/linux/mfd/arizona/pdata.h
@@ -96,9 +96,21 @@ struct arizona_pdata {
 	/** Pin state for GPIO pins */
 	int gpio_defaults[ARIZONA_MAX_GPIO];
 
+	/** GPIO5 is used for jack detection */
+	bool jd_gpio5;
+
+	/** Use the headphone detect circuit to identify the accessory */
+	bool hpdet_acc_id;
+
+	/** GPIO used for mic isolation with HPDET */
+	int hpdet_id_gpio;
+
 	/** GPIO for mic detection polarity */
 	int micd_pol_gpio;
 
+	/** Mic detect ramp rate */
+	int micd_bias_start_time;
+
 	/** Headset polarity configurations */
 	struct arizona_micd_config *micd_configs;
 	int num_micd_configs;