Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit dab63eb2 authored by Mark Brown's avatar Mark Brown Committed by Chanwoo Choi
Browse files

extcon: arizona: Use microphone clamp function if available 



Newer Arizona devices include a microphone clamp function which is tied to
jack detect. Activate this feature when present in order to ensure best
performance of the subsystem.

Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: default avatarChanwoo Choi <cw00.choi@samsung.com>
Signed-off-by: default avatarMyungjoo Ham <myungjoo.ham@samsung.com>
parent b17e5462

drivers/extcon/extcon-arizona.c

+19 −0
Original line number Diff line number Diff line
@@ -45,6 +45,7 @@ struct arizona_extcon_info { 
	int micd_num_modes;



	bool micd_reva;

	bool micd_clamp;



	bool mic;

	bool detecting;
@@ -375,6 +376,7 @@ static int arizona_extcon_probe(struct platform_device *pdev) 
			info->micd_reva = true;

			break;

		default:

			info->micd_clamp = true;

			break;

		}

		break;
@@ -423,6 +425,19 @@ static int arizona_extcon_probe(struct platform_device *pdev) 
				   arizona->pdata.micd_bias_start_time

				   << ARIZONA_MICD_BIAS_STARTTIME_SHIFT);



	/*

	 * If we have a clamp use it.

	 */

	if (info->micd_clamp) {

		regmap_update_bits(arizona->regmap,

				   ARIZONA_MICD_CLAMP_CONTROL,

				   ARIZONA_MICD_CLAMP_MODE_MASK, 4);

		regmap_update_bits(arizona->regmap,

				   ARIZONA_JACK_DETECT_DEBOUNCE,

				   ARIZONA_MICD_CLAMP_DB,

				   ARIZONA_MICD_CLAMP_DB);

	}



	arizona_extcon_set_mode(info, 0);



	info->input = devm_input_allocate_device(&pdev->dev);
@@ -529,6 +544,10 @@ static int arizona_extcon_remove(struct platform_device *pdev) 


	pm_runtime_disable(&pdev->dev);



	regmap_update_bits(arizona->regmap,

			   ARIZONA_MICD_CLAMP_CONTROL,

			   ARIZONA_MICD_CLAMP_MODE_MASK, 0);



	arizona_set_irq_wake(arizona, ARIZONA_IRQ_JD_RISE, 0);

	arizona_set_irq_wake(arizona, ARIZONA_IRQ_JD_FALL, 0);

	arizona_free_irq(arizona, ARIZONA_IRQ_MICDET, info);

include/linux/mfd/arizona/core.h

+3 −1
Original line number Diff line number Diff line
@@ -75,8 +75,10 @@ enum arizona_type { 
#define ARIZONA_IRQ_DCS_HP_DONE           47

#define ARIZONA_IRQ_FLL2_CLOCK_OK         48

#define ARIZONA_IRQ_FLL1_CLOCK_OK         49

#define ARIZONA_IRQ_MICD_CLAMP_RISE	  50

#define ARIZONA_IRQ_MICD_CLAMP_FALL	  51



#define ARIZONA_NUM_IRQ                   50

#define ARIZONA_NUM_IRQ                   52



struct snd_soc_dapm_context;

include/linux/mfd/arizona/registers.h

+28 −0
Original line number Diff line number Diff line
@@ -119,6 +119,7 @@ 
#define ARIZONA_ACCESSORY_DETECT_MODE_1          0x293

#define ARIZONA_HEADPHONE_DETECT_1               0x29B

#define ARIZONA_HEADPHONE_DETECT_2               0x29C

#define ARIZONA_MICD_CLAMP_CONTROL               0x2A2

#define ARIZONA_MIC_DETECT_1                     0x2A3

#define ARIZONA_MIC_DETECT_2                     0x2A4

#define ARIZONA_MIC_DETECT_3                     0x2A5
@@ -2069,6 +2070,13 @@ 
#define ARIZONA_HP_LVL_SHIFT                          0  /* HP_LVL - [6:0] */

#define ARIZONA_HP_LVL_WIDTH                          7  /* HP_LVL - [6:0] */



/*

 * R674 (0x2A2) - MICD clamp control

 */

#define ARIZONA_MICD_CLAMP_MODE_MASK             0x000F  /* MICD_CLAMP_MODE - [3:0] */

#define ARIZONA_MICD_CLAMP_MODE_SHIFT                 0  /* MICD_CLAMP_MODE - [3:0] */

#define ARIZONA_MICD_CLAMP_MODE_WIDTH                 4  /* MICD_CLAMP_MODE - [3:0] */



/*

 * R675 (0x2A3) - Mic Detect 1

 */
@@ -5267,6 +5275,12 @@ 
/*

 * R3409 (0xD51) - AOD IRQ1

 */

#define ARIZONA_MICD_CLAMP_FALL_EINT1            0x0080  /* MICD_CLAMP_FALL_EINT1 */

#define ARIZONA_MICD_CLAMP_FALL_EINT1_MASK       0x0080  /* MICD_CLAMP_FALL_EINT1 */

#define ARIZONA_MICD_CLAMP_FALL_EINT1_SHIFT           7  /* MICD_CLAMP_FALL_EINT1 */

#define ARIZONA_MICD_CLAMP_RISE_EINT1            0x0040  /* MICD_CLAMP_RISE_EINT1 */

#define ARIZONA_MICD_CLAMP_RISE_EINT1_MASK       0x0040  /* MICD_CLAMP_RISE_EINT1 */

#define ARIZONA_MICD_CLAMP_RISE_EINT1_SHIFT           6  /* MICD_CLAMP_RISE_EINT1 */

#define ARIZONA_GP5_FALL_EINT1                   0x0020  /* GP5_FALL_EINT1 */

#define ARIZONA_GP5_FALL_EINT1_MASK              0x0020  /* GP5_FALL_EINT1 */

#define ARIZONA_GP5_FALL_EINT1_SHIFT                  5  /* GP5_FALL_EINT1 */
@@ -5295,6 +5309,12 @@ 
/*

 * R3410 (0xD52) - AOD IRQ2

 */

#define ARIZONA_MICD_CLAMP_FALL_EINT2            0x0080  /* MICD_CLAMP_FALL_EINT2 */

#define ARIZONA_MICD_CLAMP_FALL_EINT2_MASK       0x0080  /* MICD_CLAMP_FALL_EINT2 */

#define ARIZONA_MICD_CLAMP_FALL_EINT2_SHIFT           7  /* MICD_CLAMP_FALL_EINT2 */

#define ARIZONA_MICD_CLAMP_RISE_EINT2            0x0040  /* MICD_CLAMP_RISE_EINT2 */

#define ARIZONA_MICD_CLAMP_RISE_EINT2_MASK       0x0040  /* MICD_CLAMP_RISE_EINT2 */

#define ARIZONA_MICD_CLAMP_RISE_EINT2_SHIFT           6  /* MICD_CLAMP_RISE_EINT2 */

#define ARIZONA_GP5_FALL_EINT2                   0x0020  /* GP5_FALL_EINT2 */

#define ARIZONA_GP5_FALL_EINT2_MASK              0x0020  /* GP5_FALL_EINT2 */

#define ARIZONA_GP5_FALL_EINT2_SHIFT                  5  /* GP5_FALL_EINT2 */
@@ -5379,6 +5399,10 @@ 
/*

 * R3413 (0xD55) - AOD IRQ Raw Status

 */

#define ARIZONA_MICD_CLAMP_STS                   0x0008  /* MICD_CLAMP_STS */

#define ARIZONA_MICD_CLAMP_STS_MASK              0x0008  /* MICD_CLAMP_STS */

#define ARIZONA_MICD_CLAMP_STS_SHIFT                  3  /* MICD_CLAMP_STS */

#define ARIZONA_MICD_CLAMP_STS_WIDTH                  1  /* MICD_CLAMP_STS */

#define ARIZONA_GP5_STS                          0x0004  /* GP5_STS */

#define ARIZONA_GP5_STS_MASK                     0x0004  /* GP5_STS */

#define ARIZONA_GP5_STS_SHIFT                         2  /* GP5_STS */
@@ -5395,6 +5419,10 @@ 
/*

 * R3414 (0xD56) - Jack detect debounce

 */

#define ARIZONA_MICD_CLAMP_DB                    0x0008  /* MICD_CLAMP_DB */

#define ARIZONA_MICD_CLAMP_DB_MASK               0x0008  /* MICD_CLAMP_DB */

#define ARIZONA_MICD_CLAMP_DB_SHIFT                   3  /* MICD_CLAMP_DB */

#define ARIZONA_MICD_CLAMP_DB_WIDTH                   1  /* MICD_CLAMP_DB */

#define ARIZONA_JD2_DB                           0x0002  /* JD2_DB */

#define ARIZONA_JD2_DB_MASK                      0x0002  /* JD2_DB */

#define ARIZONA_JD2_DB_SHIFT                          1  /* JD2_DB */