aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/extcon/extcon-arizona.c12
-rw-r--r--include/linux/mfd/arizona/pdata.h6
2 files changed, 18 insertions, 0 deletions
diff --git a/drivers/extcon/extcon-arizona.c b/drivers/extcon/extcon-arizona.c
index ab8b9c7359fb..d7e1047ad68e 100644
--- a/drivers/extcon/extcon-arizona.c
+++ b/drivers/extcon/extcon-arizona.c
@@ -907,6 +907,18 @@ static int arizona_extcon_probe(struct platform_device *pdev)
907 arizona->pdata.micd_bias_start_time 907 arizona->pdata.micd_bias_start_time
908 << ARIZONA_MICD_BIAS_STARTTIME_SHIFT); 908 << ARIZONA_MICD_BIAS_STARTTIME_SHIFT);
909 909
910 if (arizona->pdata.micd_rate)
911 regmap_update_bits(arizona->regmap, ARIZONA_MIC_DETECT_1,
912 ARIZONA_MICD_RATE_MASK,
913 arizona->pdata.micd_rate
914 << ARIZONA_MICD_RATE_SHIFT);
915
916 if (arizona->pdata.micd_dbtime)
917 regmap_update_bits(arizona->regmap, ARIZONA_MIC_DETECT_1,
918 ARIZONA_MICD_DBTIME_MASK,
919 arizona->pdata.micd_dbtime
920 << ARIZONA_MICD_DBTIME_SHIFT);
921
910 /* 922 /*
911 * If we have a clamp use it, activating in conjunction with 923 * If we have a clamp use it, activating in conjunction with
912 * GPIO5 if that is connected for jack detect operation. 924 * GPIO5 if that is connected for jack detect operation.
diff --git a/include/linux/mfd/arizona/pdata.h b/include/linux/mfd/arizona/pdata.h
index bcbe4fda87cb..2f5f08e10b79 100644
--- a/include/linux/mfd/arizona/pdata.h
+++ b/include/linux/mfd/arizona/pdata.h
@@ -111,6 +111,12 @@ struct arizona_pdata {
111 /** Mic detect ramp rate */ 111 /** Mic detect ramp rate */
112 int micd_bias_start_time; 112 int micd_bias_start_time;
113 113
114 /** Mic detect sample rate */
115 int micd_rate;
116
117 /** Mic detect debounce level */
118 int micd_dbtime;
119
114 /** Headset polarity configurations */ 120 /** Headset polarity configurations */
115 struct arizona_micd_config *micd_configs; 121 struct arizona_micd_config *micd_configs;
116 int num_micd_configs; 122 int num_micd_configs;