diff options
| author |   Mark Brown <broonie@kernel.org> | 2019-07-06 12:25:24 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2019-07-06 12:25:24 +0100 |
| commit | 0dceaf7c798de953c74073cc77be40b7be49abbc (patch) | |
| tree | 8014fcd5783090ced8024d71d3d943676033af8e /sound/soc/codecs/nau8825.c | |
| parent | Linux 5.2-rc7 (diff) | |
| parent | ASoC: audio-graph-card: fix use-after-free in graph_for_each_link (diff) | |
| download | linux-dev-0dceaf7c798de953c74073cc77be40b7be49abbc.tar.xz linux-dev-0dceaf7c798de953c74073cc77be40b7be49abbc.zip | |
Merge branch 'asoc-5.2' into asoc-linus
Diffstat (limited to 'sound/soc/codecs/nau8825.c')
| -rw-r--r-- | sound/soc/codecs/nau8825.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/sound/soc/codecs/nau8825.c b/sound/soc/codecs/nau8825.c index e5dd05c94f62..9f5aee7de686 100644 --- a/sound/soc/codecs/nau8825.c +++ b/sound/soc/codecs/nau8825.c @@ -1880,6 +1880,10 @@ static void nau8825_init_regs(struct nau8825 *nau8825) NAU8825_JACK_EJECT_DEBOUNCE_MASK, nau8825->jack_eject_debounce << NAU8825_JACK_EJECT_DEBOUNCE_SFT); + /* Pull up IRQ pin */ + regmap_update_bits(regmap, NAU8825_REG_INTERRUPT_MASK, + NAU8825_IRQ_PIN_PULLUP | NAU8825_IRQ_PIN_PULL_EN, + NAU8825_IRQ_PIN_PULLUP | NAU8825_IRQ_PIN_PULL_EN); /* Mask unneeded IRQs: 1 - disable, 0 - enable */ regmap_update_bits(regmap, NAU8825_REG_INTERRUPT_MASK, 0x7ff, 0x7ff); |