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

Commit 5d9ab708 authored by Charles Keepax's avatar Charles Keepax Committed by Mark Brown
Browse files

extcon: arizona: Clear _trig_sts bits after jack detection 



It is important to clear the wake trigger status bits otherwise DCVDD
will be held high independent of the state of the LDOENA line.

Signed-off-by: default avatarCharles Keepax <ckeepax@opensource.wolfsonmicro.com>
Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
parent 903aa56f

drivers/extcon/extcon-arizona.c

+7 −0
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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 */