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

Commit e56a0a57 authored by Mark Brown's avatar Mark Brown
Browse files

extcon: arizona: Allow pull to be disabled on GPIO5 when used for JACKET 



In some designs an external pull won't be needed.

Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
parent 77ff4f95

drivers/extcon/extcon-arizona.c

+7 −2
Original line number Diff line number Diff line
@@ -986,6 +986,7 @@ static int arizona_extcon_probe(struct platform_device *pdev) 
	struct arizona *arizona = dev_get_drvdata(pdev->dev.parent);

	struct arizona_pdata *pdata;

	struct arizona_extcon_info *info;

	unsigned int val;

	int jack_irq_fall, jack_irq_rise;

	int ret, mode, i, j;
@@ -1172,9 +1173,13 @@ static int arizona_extcon_probe(struct platform_device *pdev) 
	 */

	if (info->micd_clamp) {

		if (arizona->pdata.jd_gpio5) {

			/* Put the GPIO into input mode */

			/* Put the GPIO into input mode with optional pull */

			val = 0xc101;

			if (arizona->pdata.jd_gpio5_nopull)

				val &= ~ARIZONA_GPN_PU;



			regmap_write(arizona->regmap, ARIZONA_GPIO5_CTRL,

				     0xc101);

				     val);



			regmap_update_bits(arizona->regmap,

					   ARIZONA_MICD_CLAMP_CONTROL,

include/linux/mfd/arizona/pdata.h

+3 −0
Original line number Diff line number Diff line
@@ -122,6 +122,9 @@ struct arizona_pdata { 
	/** GPIO5 is used for jack detection */

	bool jd_gpio5;



	/** Internal pull on GPIO5 is disabled when used for jack detection */

	bool jd_gpio5_nopull;



	/** Use the headphone detect circuit to identify the accessory */

	bool hpdet_acc_id;