aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/mfd
diff options
context:
space:
mode:
authorCharles Keepax <ckeepax@opensource.wolfsonmicro.com>2013-10-26 10:27:04 -0400
committerLee Jones <lee.jones@linaro.org>2013-11-11 06:22:13 -0500
commit24f76f37aab7cfd97e17976b41182817e887f0e1 (patch)
tree8e49908ad8029e06212db58831f189250b924ce5 /drivers/mfd
parent6bfd1e63de34a278d67db32e3644340838308252 (diff)
mfd: wm5110: Enable micd clamp functionality
Add missing registers and interrupts required for the microphone detection clamping. Signed-off-by: Charles Keepax <ckeepax@opensource.wolfsonmicro.com> Signed-off-by: Lee Jones <lee.jones@linaro.org>
Diffstat (limited to 'drivers/mfd')
-rw-r--r--drivers/mfd/wm5110-tables.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/drivers/mfd/wm5110-tables.c b/drivers/mfd/wm5110-tables.c
index c5c116a7b5ff..bf8b3b5ad1fe 100644
--- a/drivers/mfd/wm5110-tables.c
+++ b/drivers/mfd/wm5110-tables.c
@@ -243,6 +243,12 @@ int wm5110_patch(struct arizona *arizona)
243EXPORT_SYMBOL_GPL(wm5110_patch); 243EXPORT_SYMBOL_GPL(wm5110_patch);
244 244
245static const struct regmap_irq wm5110_aod_irqs[ARIZONA_NUM_IRQ] = { 245static const struct regmap_irq wm5110_aod_irqs[ARIZONA_NUM_IRQ] = {
246 [ARIZONA_IRQ_MICD_CLAMP_FALL] = {
247 .mask = ARIZONA_MICD_CLAMP_FALL_EINT1
248 },
249 [ARIZONA_IRQ_MICD_CLAMP_RISE] = {
250 .mask = ARIZONA_MICD_CLAMP_RISE_EINT1
251 },
246 [ARIZONA_IRQ_GP5_FALL] = { .mask = ARIZONA_GP5_FALL_EINT1 }, 252 [ARIZONA_IRQ_GP5_FALL] = { .mask = ARIZONA_GP5_FALL_EINT1 },
247 [ARIZONA_IRQ_GP5_RISE] = { .mask = ARIZONA_GP5_RISE_EINT1 }, 253 [ARIZONA_IRQ_GP5_RISE] = { .mask = ARIZONA_GP5_RISE_EINT1 },
248 [ARIZONA_IRQ_JD_FALL] = { .mask = ARIZONA_JD1_FALL_EINT1 }, 254 [ARIZONA_IRQ_JD_FALL] = { .mask = ARIZONA_JD1_FALL_EINT1 },
@@ -505,6 +511,7 @@ static const struct reg_default wm5110_reg_default[] = {
505 { 0x00000293, 0x0000 }, /* R659 - Accessory Detect Mode 1 */ 511 { 0x00000293, 0x0000 }, /* R659 - Accessory Detect Mode 1 */
506 { 0x0000029B, 0x0020 }, /* R667 - Headphone Detect 1 */ 512 { 0x0000029B, 0x0020 }, /* R667 - Headphone Detect 1 */
507 { 0x0000029C, 0x0000 }, /* R668 - Headphone Detect 2 */ 513 { 0x0000029C, 0x0000 }, /* R668 - Headphone Detect 2 */
514 { 0x000002A2, 0x0000 }, /* R674 - Micd clamp control */
508 { 0x000002A3, 0x1102 }, /* R675 - Mic Detect 1 */ 515 { 0x000002A3, 0x1102 }, /* R675 - Mic Detect 1 */
509 { 0x000002A4, 0x009F }, /* R676 - Mic Detect 2 */ 516 { 0x000002A4, 0x009F }, /* R676 - Mic Detect 2 */
510 { 0x000002A5, 0x0000 }, /* R677 - Mic Detect 3 */ 517 { 0x000002A5, 0x0000 }, /* R677 - Mic Detect 3 */
@@ -1439,6 +1446,7 @@ static bool wm5110_readable_register(struct device *dev, unsigned int reg)
1439 case ARIZONA_ACCESSORY_DETECT_MODE_1: 1446 case ARIZONA_ACCESSORY_DETECT_MODE_1:
1440 case ARIZONA_HEADPHONE_DETECT_1: 1447 case ARIZONA_HEADPHONE_DETECT_1:
1441 case ARIZONA_HEADPHONE_DETECT_2: 1448 case ARIZONA_HEADPHONE_DETECT_2:
1449 case ARIZONA_MICD_CLAMP_CONTROL:
1442 case ARIZONA_MIC_DETECT_1: 1450 case ARIZONA_MIC_DETECT_1:
1443 case ARIZONA_MIC_DETECT_2: 1451 case ARIZONA_MIC_DETECT_2:
1444 case ARIZONA_MIC_DETECT_3: 1452 case ARIZONA_MIC_DETECT_3: