extcon-arizona updates
Subsystems (3)
cover extcon-arizona updates
The following changes since commit 689557d3c7045320958d5bc4141088f7b4dff7ba:
mfd: wm5102: Add microphone clamp control registers (2013-01-15 15:42:18 +0900)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/broonie/misc.git tags/extcon-arizona-3.9
for you to fetch changes up to bf14ee5a460276a99ed35f9034bae9e74b01600f:
extcon: arizona: Use MICDET for final microphone identification (2013-02-11 16:06:25 +0000)
It'd be nice to get these into v3.9 if we can.
----------------------------------------------------------------
extcon: arizona: Updates for v3.9
More updates for v3.9, a mix of fixes for the code that's already there and a few new features.
----------------------------------------------------------------
Charles Keepax (2):
extcon: arizona: Remove extra jack flip increment
extcon: arizona: Clear _trig_sts bits after jack detection
Mark Brown (9):
extcon: arizona: Disable debouce for accessory removal detection
extcon: arizona: Retry failed HP measurements
extcon: arizona: Remove duplicate rate configuration
extcon: arizona: Support additional configuration of microphone detection
extcon: arizona: Use regulated mode for microphone supply when detecting
extcon: arizona: Add some debounce time before starting HPDET identification
extcon: arizona: Don't HPDET magic when headphones are enabled
extcon: arizona: Always take the first HPDET reading as the final one
extcon: arizona: Use MICDET for final microphone identification
drivers/extcon/Kconfig | 2 +- drivers/extcon/extcon-arizona.c | 240 ++++++++++++++++++++++++++++----- include/linux/mfd/arizona/pdata.h | 9 ++ include/linux/mfd/arizona/registers.h | 8 ++ 4 files changed, 221 insertions(+), 38 deletions(-)
PATCH 1/11 extcon: arizona: Disable debouce for accessory removal detection
Ensure we clamp as quickly as possible after removal by disabling the debounce while there is an accessory present.
--- drivers/extcon/extcon-arizona.c | 9 +++++++++ 1 file changed, 9 insertions(+)
drivers/extcon/extcon-arizona.c +9 -0
@@ -773,6 +773,10 @@ static irqreturn_t arizona_jackdet(int irq, void *data) }else {arizona_start_hpdet_acc_id (info); } + +regmap_update_bits (arizona->regmap, +ARIZONA_JACK_DETECT_DEBOUNCE , +ARIZONA_MICD_CLAMP_DB |ARIZONA_JD1_DB ,0 ); }else {dev_dbg (arizona->dev,"Detected jack removal\n" );
@@ -792,6 +796,11 @@ static irqreturn_t arizona_jackdet(int irq, void *data)if (ret !=0 )dev_err (arizona->dev,"Removal report failed: %d\n" , ret); + +regmap_update_bits (arizona->regmap, +ARIZONA_JACK_DETECT_DEBOUNCE , +ARIZONA_MICD_CLAMP_DB |ARIZONA_JD1_DB , +ARIZONA_MICD_CLAMP_DB |ARIZONA_JD1_DB ); }mutex_unlock (&info->lock);
Signature · 1 line
1.7.10.4
PATCH 2/11 extcon: arizona: Retry failed HP measurements
We now have mechanisms in place to allow retries so let's use them rather than guessing.
--- drivers/extcon/extcon-arizona.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-)
drivers/extcon/extcon-arizona.c +4 -6
@@ -31,8 +31,6 @@#include <linux/mfd/arizona/pdata.h> #include <linux/mfd/arizona/registers.h> -#define ARIZONA_DEFAULT_HP 32 -#define ARIZONA_NUM_BUTTONS 6#define ARIZONA_ACCDET_MODE_MIC 0
@@ -208,7 +206,7 @@ static int arizona_hpdet_read(struct arizona_extcon_info *info)if (!(val &ARIZONA_HP_DONE )) {dev_err (arizona->dev,"HPDET did not complete: %x\n" , val); - val =ARIZONA_DEFAULT_HP ; +return -EAGAIN ; } val &=ARIZONA_HP_LVL_MASK ;
@@ -218,14 +216,14 @@ static int arizona_hpdet_read(struct arizona_extcon_info *info)if (!(val &ARIZONA_HP_DONE_B )) {dev_err (arizona->dev,"HPDET did not complete: %x\n" , val); -return ARIZONA_DEFAULT_HP ; +return -EAGAIN ; } ret =regmap_read (arizona->regmap,ARIZONA_HP_DACVAL , &val);if (ret !=0 ) {dev_err (arizona->dev,"Failed to read HP value: %d\n" , ret); -return ARIZONA_DEFAULT_HP ; +return -EAGAIN ; } regmap_read(arizona->regmap, ARIZONA_HEADPHONE_DETECT_1,
@@ -267,7 +265,7 @@ static int arizona_hpdet_read(struct arizona_extcon_info *info)if (!(val &ARIZONA_HP_DONE_B )) {dev_err (arizona->dev,"HPDET did not complete: %x\n" , val); -return ARIZONA_DEFAULT_HP ; +return -EAGAIN ; } val &=ARIZONA_HP_LVL_B_MASK ;
Signature · 1 line
1.7.10.4
PATCH 3/11 extcon: arizona: Remove duplicate rate configuration
In reply to Mark Brown--- drivers/extcon/extcon-arizona.c | 4 ---- 1 file changed, 4 deletions(-)
drivers/extcon/extcon-arizona.c +0 -4
@@ -1003,10 +1003,6 @@ static int arizona_extcon_probe(struct platform_device *pdev) goto err_micdet; } -regmap_update_bits (arizona->regmap,ARIZONA_MIC_DETECT_1 , -ARIZONA_MICD_RATE_MASK , -8 <<ARIZONA_MICD_RATE_SHIFT ); -arizona_clk32k_enable (arizona);regmap_update_bits (arizona->regmap,ARIZONA_JACK_DETECT_DEBOUNCE ,ARIZONA_JD1_DB ,ARIZONA_JD1_DB );
Signature · 1 line
1.7.10.4
PATCH 4/11 extcon: arizona: Support additional configuration of microphone detection
In reply to Mark BrownAllow systems to tune detection rate and debounce suitably for their mechanical parameters.
--- drivers/extcon/extcon-arizona.c | 12 ++++++++++++ include/linux/mfd/arizona/pdata.h | 6 ++++++ 2 files changed, 18 insertions(+)
drivers/extcon/extcon-arizona.c +12 -0
@@ -907,6 +907,18 @@ static int arizona_extcon_probe(struct platform_device *pdev) arizona->pdata.micd_bias_start_time << ARIZONA_MICD_BIAS_STARTTIME_SHIFT); +if (arizona->pdata.micd_rate) +regmap_update_bits (arizona->regmap,ARIZONA_MIC_DETECT_1 , +ARIZONA_MICD_RATE_MASK , + arizona->pdata.micd_rate + <<ARIZONA_MICD_RATE_SHIFT ); + +if (arizona->pdata.micd_dbtime) +regmap_update_bits (arizona->regmap,ARIZONA_MIC_DETECT_1 , +ARIZONA_MICD_DBTIME_MASK , + arizona->pdata.micd_dbtime + <<ARIZONA_MICD_DBTIME_SHIFT ); +/* * If we have a clamp use it, activating in conjunction with * GPIO5 if that is connected for jack detect operation.
include/linux/mfd/arizona/pdata.h +6 -0
@@ -111,6 +111,12 @@ struct arizona_pdata {/** Mic detect ramp rate */ int micd_bias_start_time; +/** Mic detect sample rate */ +int micd_rate; + +/** Mic detect debounce level */ +int micd_dbtime; +/** Headset polarity configurations */ struct arizona_micd_config *micd_configs;int num_micd_configs;
Signature · 1 line
1.7.10.4
PATCH 5/11 extcon: arizona: Use regulated mode for microphone supply when detecting
In reply to Mark BrownWhen starting microphone detection some headsets should be exposed to the fully regulated microphone bias in order to ensure that they behave in an optimal fashion.
--- drivers/extcon/Kconfig | 2 +- drivers/extcon/extcon-arizona.c | 93 +++++++++++++++++++++++++++++++++++++ include/linux/mfd/arizona/pdata.h | 3 ++ 3 files changed, 97 insertions(+), 1 deletion(-)
drivers/extcon/Kconfig +1 -1
@@ -47,7 +47,7 @@ config EXTCON_MAX8997 config EXTCON_ARIZONA tristate "Wolfson Arizona EXTCON support" - depends on MFD_ARIZONA && INPUT + depends on MFD_ARIZONA && INPUT && SND_SOC help Say Y here to enable support for external accessory detection with Wolfson Arizona devices. These are audio CODECs with
drivers/extcon/extcon-arizona.c +93 -0
159 lines not on this page · raw message
include/linux/mfd/arizona/pdata.h +3 -0
@@ -117,6 +117,9 @@ struct arizona_pdata {/** Mic detect debounce level */ int micd_dbtime; +/** Force MICBIAS on for mic detect */ +bool micd_force_micbias; +/** Headset polarity configurations */ struct arizona_micd_config *micd_configs;int num_micd_configs;
Signature · 1 line
1.7.10.4
PATCH 6/11 extcon: arizona: Remove extra jack flip increment
In reply to Mark BrownFrom: Charles Keepax <[email protected]>
--- drivers/extcon/extcon-arizona.c | 2 -- 1 file changed, 2 deletions(-)
drivers/extcon/extcon-arizona.c +0 -2
@@ -750,8 +750,6 @@ static irqreturn_t arizona_micdet(int irq, void *data)* impedence then give up and report headphones. */ if (info->detecting && (val &0x3f8 )) { - info->jack_flips++; -if (info->jack_flips >= info->micd_num_modes) {dev_dbg (arizona->dev,"Detected HP/line\n" );arizona_identify_headphone (info);
Signature · 1 line
1.7.10.4
PATCH 7/11 extcon: arizona: Add some debounce time before starting HPDET identification
In reply to Mark BrownThe HPDET identification method does not have the same natural debounce built into it that the standard MICDET method does so add some extra on top of what the jack detection does in hardware to make sure we get a robust result.
--- drivers/extcon/extcon-arizona.c | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-)
drivers/extcon/extcon-arizona.c +20 -2
@@ -53,6 +53,8 @@ struct arizona_extcon_info {bool micd_reva;bool micd_clamp; +struct delayed_work hpdet_work; +bool hpdet_active;int num_hpdet_res;
@@ -640,7 +642,7 @@ static void arizona_start_hpdet_acc_id(struct arizona_extcon_info *info)dev_dbg (arizona->dev,"Starting identification via HPDET\n" );/* Make sure we keep the device enabled during the measurement */ -pm_runtime_get (info->dev); +pm_runtime_get_sync (info->dev); info->hpdet_active = true;
@@ -813,6 +815,17 @@ handled:return IRQ_HANDLED ; } +static void arizona_hpdet_work (struct work_struct *work) +{ +struct arizona_extcon_info *info =container_of (work, + struct arizona_extcon_info, + hpdet_work.work); + +mutex_lock (&info->lock); +arizona_start_hpdet_acc_id (info); +mutex_unlock (&info->lock); +} +static irqreturn_t arizona_jackdet (int irq,void *data) {struct arizona_extcon_info *info = data;
@@ -822,6 +835,8 @@ static irqreturn_t arizona_jackdet(int irq, void *data)pm_runtime_get_sync (info->dev); +cancel_delayed_work_sync (&info->hpdet_work); +mutex_lock (&info->lock);if (arizona->pdata.jd_gpio5) {
@@ -857,7 +872,8 @@ static irqreturn_t arizona_jackdet(int irq, void *data)arizona_start_mic (info); }else { -arizona_start_hpdet_acc_id (info); +schedule_delayed_work (&info->hpdet_work, +msecs_to_jiffies (250 )); } regmap_update_bits(arizona->regmap,
@@ -927,6 +943,7 @@ static int arizona_extcon_probe(struct platform_device *pdev)mutex_init (&info->lock); info->arizona = arizona; info->dev = &pdev->dev; +INIT_DELAYED_WORK (&info->hpdet_work, arizona_hpdet_work);platform_set_drvdata (pdev, info);switch (arizona->type) {
@@ -1173,6 +1190,7 @@ static int arizona_extcon_remove(struct platform_device *pdev)arizona_free_irq (arizona,ARIZONA_IRQ_MICDET , info);arizona_free_irq (arizona, jack_irq_rise, info);arizona_free_irq (arizona, jack_irq_fall, info); +cancel_delayed_work_sync (&info->hpdet_work);regmap_update_bits (arizona->regmap,ARIZONA_JACK_DETECT_ANALOGUE ,ARIZONA_JD1_ENA ,0 );arizona_clk32k_disable (arizona);
Signature · 1 line
1.7.10.4
PATCH 8/11 extcon: arizona: Don't HPDET magic when headphones are enabled
In reply to Mark BrownThe magic is already done as part of enabling the headphone output so does not need to be done when the headphone outputs are enabled. We hold the DAPM lock so the headphone status can't be changed underneath us.
--- drivers/extcon/extcon-arizona.c | 58 +++++++++++++++++++++++++++++++-------- 1 file changed, 46 insertions(+), 12 deletions(-)
drivers/extcon/extcon-arizona.c +46 -12
@@ -489,6 +489,7 @@ static irqreturn_t arizona_hpdet_irq(int irq, void *data)struct arizona *arizona = info->arizona;int id_gpio = arizona->pdata.hpdet_id_gpio;int report =ARIZONA_CABLE_HEADPHONE ; +unsigned int val;int ret, reading;mutex_lock (&info->lock);
@@ -543,13 +544,28 @@ static irqreturn_t arizona_hpdet_irq(int irq, void *data)dev_err (arizona->dev,"Failed to report HP/line: %d\n" , ret); - ret =regmap_update_bits (arizona->regmap,0x225 ,0x4000 ,0 ); -if (ret !=0 ) -dev_warn (arizona->dev,"Failed to undo magic: %d\n" , ret); +mutex_lock (&arizona->dapm->card->dapm_mutex); - ret =regmap_update_bits (arizona->regmap,0x226 ,0x4000 ,0 ); -if (ret !=0 ) -dev_warn (arizona->dev,"Failed to undo magic: %d\n" , ret); + ret =regmap_read (arizona->regmap,ARIZONA_OUTPUT_ENABLES_1 , &val); +if (ret !=0 ) { +dev_err (arizona->dev,"Failed to read output enables: %d\n" , + ret); + val =0 ; + } + +if (!(val & (ARIZONA_OUT1L_ENA |ARIZONA_OUT1R_ENA ))) { + ret =regmap_update_bits (arizona->regmap,0x225 ,0x4000 ,0 ); +if (ret !=0 ) +dev_warn (arizona->dev,"Failed to undo magic: %d\n" , + ret); + + ret =regmap_update_bits (arizona->regmap,0x226 ,0x4000 ,0 ); +if (ret !=0 ) +dev_warn (arizona->dev,"Failed to undo magic: %d\n" , + ret); + } + +mutex_unlock (&arizona->dapm->card->dapm_mutex); done:if (id_gpio)
@@ -637,6 +653,7 @@ err:static void arizona_start_hpdet_acc_id (struct arizona_extcon_info *info) {struct arizona *arizona = info->arizona; +unsigned int val;int ret;dev_dbg (arizona->dev,"Starting identification via HPDET\n" );
@@ -648,13 +665,30 @@ static void arizona_start_hpdet_acc_id(struct arizona_extcon_info *info)arizona_extcon_pulse_micbias (info); - ret =regmap_update_bits (arizona->regmap,0x225 ,0x4000 ,0x4000 ); -if (ret !=0 ) -dev_warn (arizona->dev,"Failed to do magic: %d\n" , ret); +mutex_lock (&arizona->dapm->card->dapm_mutex); - ret =regmap_update_bits (arizona->regmap,0x226 ,0x4000 ,0x4000 ); -if (ret !=0 ) -dev_warn (arizona->dev,"Failed to do magic: %d\n" , ret); + ret =regmap_read (arizona->regmap,ARIZONA_OUTPUT_ENABLES_1 , &val); +if (ret !=0 ) { +dev_err (arizona->dev,"Failed to read output enables: %d\n" , + ret); + val =0 ; + } + +if (!(val & (ARIZONA_OUT1L_ENA |ARIZONA_OUT1R_ENA ))) { + ret =regmap_update_bits (arizona->regmap,0x225 ,0x4000 , +0x4000 ); +if (ret !=0 ) +dev_warn (arizona->dev,"Failed to do magic: %d\n" , + ret); + + ret =regmap_update_bits (arizona->regmap,0x226 ,0x4000 , +0x4000 ); +if (ret !=0 ) +dev_warn (arizona->dev,"Failed to do magic: %d\n" , + ret); + } + +mutex_unlock (&arizona->dapm->card->dapm_mutex); ret = regmap_update_bits(arizona->regmap, ARIZONA_ACCESSORY_DETECT_MODE_1,
Signature · 1 line
1.7.10.4
PATCH 9/11 extcon: arizona: Clear _trig_sts bits after jack detection
In reply to Mark BrownFrom: Charles Keepax <[email protected]>
It is important to clear the wake trigger status bits otherwise DCVDD will be held high independent of the state of the LDOENA line.
--- drivers/extcon/extcon-arizona.c | 7 +++++++ include/linux/mfd/arizona/registers.h | 8 ++++++++ 2 files changed, 15 insertions(+)
drivers/extcon/extcon-arizona.c +7 -0
@@ -939,6 +939,13 @@ static irqreturn_t arizona_jackdet(int irq, void *data) ARIZONA_MICD_CLAMP_DB | ARIZONA_JD1_DB); } +/* Clear trig_sts to make sure DCVDD is not forced up */ +regmap_write (arizona->regmap,ARIZONA_AOD_WKUP_AND_TRIG , +ARIZONA_MICD_CLAMP_FALL_TRIG_STS | +ARIZONA_MICD_CLAMP_RISE_TRIG_STS | +ARIZONA_JD1_FALL_TRIG_STS | +ARIZONA_JD1_RISE_TRIG_STS ); +mutex_unlock (&info->lock);pm_runtime_mark_last_busy (info->dev);
include/linux/mfd/arizona/registers.h +8 -0
@@ -5267,6 +5267,14 @@/* * R3408 (0xD50) - AOD wkup and trig */ +#define ARIZONA_MICD_CLAMP_FALL_TRIG_STS 0x0080/* MICD_CLAMP_FALL_TRIG_STS */ +#define ARIZONA_MICD_CLAMP_FALL_TRIG_STS_MASK 0x0080/* MICD_CLAMP_FALL_TRIG_STS */ +#define ARIZONA_MICD_CLAMP_FALL_TRIG_STS_SHIFT 7/* MICD_CLAMP_FALL_TRIG_STS */ +#define ARIZONA_MICD_CLAMP_FALL_TRIG_STS_WIDTH 1/* MICD_CLAMP_FALL_TRIG_STS */ +#define ARIZONA_MICD_CLAMP_RISE_TRIG_STS 0x0040/* MICD_CLAMP_RISE_TRIG_STS */ +#define ARIZONA_MICD_CLAMP_RISE_TRIG_STS_MASK 0x0040/* MICD_CLAMP_RISE_TRIG_STS */ +#define ARIZONA_MICD_CLAMP_RISE_TRIG_STS_SHIFT 6/* MICD_CLAMP_RISE_TRIG_STS */ +#define ARIZONA_MICD_CLAMP_RISE_TRIG_STS_WIDTH 1/* MICD_CLAMP_RISE_TRIG_STS */ #define ARIZONA_GP5_FALL_TRIG_STS 0x0020/* GP5_FALL_TRIG_STS */ #define ARIZONA_GP5_FALL_TRIG_STS_MASK 0x0020/* GP5_FALL_TRIG_STS */ #define ARIZONA_GP5_FALL_TRIG_STS_SHIFT 5/* GP5_FALL_TRIG_STS */
Signature · 1 line
1.7.10.4
PATCH 10/11 extcon: arizona: Always take the first HPDET reading as the final one
In reply to Mark BrownThis should always be the most accurate reading for supported accessory configurations.
--- drivers/extcon/extcon-arizona.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
drivers/extcon/extcon-arizona.c +4 -3
@@ -451,6 +451,10 @@ static int arizona_hpdet_do_id(struct arizona_extcon_info *info, int *reading) info->hpdet_res[0 ], info->hpdet_res[1 ], info->hpdet_res[2]); + +/* Take the headphone impedance for the main report */ + *reading = info->hpdet_res[0 ]; +/* * Either the two grounds measure differently or we * measure the mic as high impedance.
@@ -466,9 +470,6 @@ static int arizona_hpdet_do_id(struct arizona_extcon_info *info, int *reading)dev_err (arizona->dev,"Failed to report mic: %d\n" , ret); } - -/* Take the headphone impedance for the main report */ - *reading = info->hpdet_res[1 ]; }else {dev_dbg (arizona->dev,"Detected headphone\n" ); }
Signature · 1 line
1.7.10.4
PATCH 11/11 extcon: arizona: Use MICDET for final microphone identification
In reply to Mark BrownWhen using HPDET to identify the accessory still run MICDET before we report a microphone in order to ensure that the accessory identified is compatible with the MICDET detection ranges after having confirmed that the device is not using a headphone.
--- drivers/extcon/extcon-arizona.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-)
drivers/extcon/extcon-arizona.c +8 -8
@@ -56,6 +56,7 @@ struct arizona_extcon_info {struct delayed_work hpdet_work;bool hpdet_active; +bool hpdet_done;int num_hpdet_res;unsigned int hpdet_res[3 ];
@@ -394,7 +395,6 @@ static int arizona_hpdet_do_id(struct arizona_extcon_info *info, int *reading) {struct arizona *arizona = info->arizona;int id_gpio = arizona->pdata.hpdet_id_gpio; -int ret;/* * If we're using HPDET for accessory identification we need
@@ -463,13 +463,7 @@ static int arizona_hpdet_do_id(struct arizona_extcon_info *info, int *reading) (id_gpio && info->hpdet_res[2] > 10)) { dev_dbg(arizona->dev, "Detected mic\n"); info->mic = true; - ret =extcon_set_cable_state_ (&info->edev, -ARIZONA_CABLE_MICROPHONE , - true); -if (ret !=0 ) { -dev_err (arizona->dev, -"Failed to report mic: %d\n" , ret); - } + info->detecting = true; } else {dev_dbg (arizona->dev,"Detected headphone\n" ); }
@@ -586,6 +580,8 @@ done: info->hpdet_active = false; } + info->hpdet_done = true; + out:mutex_unlock (&info->lock);
@@ -597,6 +593,9 @@ static void arizona_identify_headphone(struct arizona_extcon_info *info)struct arizona *arizona = info->arizona;int ret; +if (info->hpdet_done) +return ; +dev_dbg (arizona->dev,"Starting HPDET\n" );/* Make sure we keep the device enabled during the measurement */
@@ -923,6 +922,7 @@ static irqreturn_t arizona_jackdet(int irq, void *data)for (i =0 ; i <ARRAY_SIZE (info->hpdet_res); i++) info->hpdet_res[i] =0 ; info->mic = false; + info->hpdet_done = false;for (i =0 ; i <ARIZONA_NUM_BUTTONS ; i++) input_report_key(info->input,
Signature · 1 line
1.7.10.4
Quoted 7 lines · Mark Brown
The following changes since commit
689557d3c7045320958d5bc4141088f7b4dff7ba:mfd: wm5102: Add microphone clamp control registers (2013-01-15 15:42:18 +0900)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/broonie/misc.gittags/extcon-arizona-3.9
Pulled and pushed out, thanks.
greg k-h