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

Commit e76e397a authored by Charles Keepax's avatar Charles Keepax Committed by Chanwoo Choi
Browse files

mfd: arizona: Add registers for ADC microphone detection 



The newer devices support using a software comparison to determine
whether a 3/4 pole jack is present. Add the registers necessary for
this.

Signed-off-by: default avatarCharles Keepax <ckeepax@opensource.wolfsonmicro.com>
Acked-by: default avatarLee Jones <lee.jones@linaro.org>
Signed-off-by: default avatarChanwoo Choi <cw00.choi@samsung.com>
parent 1f93e4a9

drivers/mfd/wm5110-tables.c

+2 −0
Original line number Diff line number Diff line
@@ -1811,6 +1811,7 @@ static bool wm5110_readable_register(struct device *dev, unsigned int reg) 
	case ARIZONA_MIC_DETECT_1:

	case ARIZONA_MIC_DETECT_2:

	case ARIZONA_MIC_DETECT_3:

	case ARIZONA_MIC_DETECT_4:

	case ARIZONA_MIC_DETECT_LEVEL_1:

	case ARIZONA_MIC_DETECT_LEVEL_2:

	case ARIZONA_MIC_DETECT_LEVEL_3:
@@ -2847,6 +2848,7 @@ static bool wm5110_volatile_register(struct device *dev, unsigned int reg) 
	case ARIZONA_ASYNC_SAMPLE_RATE_1_STATUS:

	case ARIZONA_ASYNC_SAMPLE_RATE_2_STATUS:

	case ARIZONA_MIC_DETECT_3:

	case ARIZONA_MIC_DETECT_4:

	case ARIZONA_HP_CTRL_1L:

	case ARIZONA_HP_CTRL_1R:

	case ARIZONA_HEADPHONE_DETECT_2:

include/dt-bindings/mfd/arizona.h

+2 −0
Original line number Diff line number Diff line
@@ -107,5 +107,7 @@ 
#define ARIZONA_ACCDET_MODE_MIC 0

#define ARIZONA_ACCDET_MODE_HPL 1

#define ARIZONA_ACCDET_MODE_HPR 2

#define ARIZONA_ACCDET_MODE_HPM 4

#define ARIZONA_ACCDET_MODE_ADC 7



#endif

include/linux/mfd/arizona/pdata.h

+3 −0
Original line number Diff line number Diff line
@@ -124,6 +124,9 @@ struct arizona_pdata { 
	/** Channel to use for headphone detection */

	unsigned int hpdet_channel;



	/** Use software comparison to determine mic presence */

	bool micd_software_compare;



	/** Extra debounce timeout used during initial mic detection (ms) */

	unsigned int micd_detect_debounce;

include/linux/mfd/arizona/registers.h

+3 −3
Original line number Diff line number Diff line
@@ -2359,9 +2359,9 @@ 
#define ARIZONA_ACCDET_SRC_MASK                  0x2000  /* ACCDET_SRC */

#define ARIZONA_ACCDET_SRC_SHIFT                     13  /* ACCDET_SRC */

#define ARIZONA_ACCDET_SRC_WIDTH                      1  /* ACCDET_SRC */

#define ARIZONA_ACCDET_MODE_MASK                 0x0003  /* ACCDET_MODE - [1:0] */

#define ARIZONA_ACCDET_MODE_SHIFT                     0  /* ACCDET_MODE - [1:0] */

#define ARIZONA_ACCDET_MODE_WIDTH                     2  /* ACCDET_MODE - [1:0] */

#define ARIZONA_ACCDET_MODE_MASK                 0x0007  /* ACCDET_MODE - [2:0] */

#define ARIZONA_ACCDET_MODE_SHIFT                     0  /* ACCDET_MODE - [2:0] */

#define ARIZONA_ACCDET_MODE_WIDTH                     3  /* ACCDET_MODE - [2:0] */



/*

 * R667 (0x29B) - Headphone Detect 1