From d82ae2e5bf7cbd5ff99d5a58f9e574a1547e165c Mon Sep 17 00:00:00 2001
From: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Fri, 11 Jan 2013 08:55:24 +0900
Subject: [PATCH] --- yaml --- r: 354956 b: refs/heads/master c:
 b17e54625cff1b06aec9df505b46c9bcdcd4823d h: refs/heads/master v: v3

---
 [refs]                                  | 2 +-
 trunk/drivers/extcon/extcon-arizona.c   | 6 ++++++
 trunk/include/linux/mfd/arizona/pdata.h | 3 +++
 3 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 19ae3cc8f1a5..e93b6de41854 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cd74f7b3b387cbc6153b15c100982bac119af753
+refs/heads/master: b17e54625cff1b06aec9df505b46c9bcdcd4823d
diff --git a/trunk/drivers/extcon/extcon-arizona.c b/trunk/drivers/extcon/extcon-arizona.c
index 9e1d104803e7..635b7078ce5e 100644
--- a/trunk/drivers/extcon/extcon-arizona.c
+++ b/trunk/drivers/extcon/extcon-arizona.c
@@ -417,6 +417,12 @@ static int arizona_extcon_probe(struct platform_device *pdev)
 		}
 	}
 
+	if (arizona->pdata.micd_bias_start_time)
+		regmap_update_bits(arizona->regmap, ARIZONA_MIC_DETECT_1,
+				   ARIZONA_MICD_BIAS_STARTTIME_MASK,
+				   arizona->pdata.micd_bias_start_time
+				   << ARIZONA_MICD_BIAS_STARTTIME_SHIFT);
+
 	arizona_extcon_set_mode(info, 0);
 
 	info->input = devm_input_allocate_device(&pdev->dev);
diff --git a/trunk/include/linux/mfd/arizona/pdata.h b/trunk/include/linux/mfd/arizona/pdata.h
index 8b1d1daaae16..5b0508853290 100644
--- a/trunk/include/linux/mfd/arizona/pdata.h
+++ b/trunk/include/linux/mfd/arizona/pdata.h
@@ -99,6 +99,9 @@ struct arizona_pdata {
 	/** 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;