aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/extcon
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2013-04-01 14:03:52 -0400
committerMark Brown <broonie@opensource.wolfsonmicro.com>2013-04-02 06:53:54 -0400
commite56a0a572be150c79cdbf62ff98f4a63419e1c0b (patch)
treec9d033b1f0e0adeed9252164b031a33b5a9b6200 /drivers/extcon
parent77ff4f95d77ddb14fe827e70d8b4be4a692790e9 (diff)
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: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'drivers/extcon')
-rw-r--r--drivers/extcon/extcon-arizona.c9
1 files changed, 7 insertions, 2 deletions
diff --git a/drivers/extcon/extcon-arizona.c b/drivers/extcon/extcon-arizona.c
index 95748d3cbc4e..132bc99fdc06 100644
--- a/drivers/extcon/extcon-arizona.c
+++ b/drivers/extcon/extcon-arizona.c
@@ -986,6 +986,7 @@ static int arizona_extcon_probe(struct platform_device *pdev)
986 struct arizona *arizona = dev_get_drvdata(pdev->dev.parent); 986 struct arizona *arizona = dev_get_drvdata(pdev->dev.parent);
987 struct arizona_pdata *pdata; 987 struct arizona_pdata *pdata;
988 struct arizona_extcon_info *info; 988 struct arizona_extcon_info *info;
989 unsigned int val;
989 int jack_irq_fall, jack_irq_rise; 990 int jack_irq_fall, jack_irq_rise;
990 int ret, mode, i, j; 991 int ret, mode, i, j;
991 992
@@ -1172,9 +1173,13 @@ static int arizona_extcon_probe(struct platform_device *pdev)
1172 */ 1173 */
1173 if (info->micd_clamp) { 1174 if (info->micd_clamp) {
1174 if (arizona->pdata.jd_gpio5) { 1175 if (arizona->pdata.jd_gpio5) {
1175 /* Put the GPIO into input mode */ 1176 /* Put the GPIO into input mode with optional pull */
1177 val = 0xc101;
1178 if (arizona->pdata.jd_gpio5_nopull)
1179 val &= ~ARIZONA_GPN_PU;
1180
1176 regmap_write(arizona->regmap, ARIZONA_GPIO5_CTRL, 1181 regmap_write(arizona->regmap, ARIZONA_GPIO5_CTRL,
1177 0xc101); 1182 val);
1178 1183
1179 regmap_update_bits(arizona->regmap, 1184 regmap_update_bits(arizona->regmap,
1180 ARIZONA_MICD_CLAMP_CONTROL, 1185 ARIZONA_MICD_CLAMP_CONTROL,