diff options
| author | Takashi Iwai | 2019-02-28 13:30:55 +0100 |
|---|---|---|
| committer | Takashi Iwai | 2019-02-28 13:30:55 +0100 |
| commit | 70395a96bd882d8dba669f99b5cec0008690accd (patch) | |
| tree | 37f3a4c2cf35828f153f3ce59c3daa4f39241c32 /sound/soc/codecs/adau1977.c | |
| parent | ALSA: firewire-motu: fix construction of PCM frame for capture direction (diff) | |
| parent | Merge branch 'asoc-5.1' into asoc-next (diff) | |
| download | kernel-qcow2-linux-70395a96bd882d8dba669f99b5cec0008690accd.tar.gz kernel-qcow2-linux-70395a96bd882d8dba669f99b5cec0008690accd.tar.xz kernel-qcow2-linux-70395a96bd882d8dba669f99b5cec0008690accd.zip | |
Merge tag 'asoc-v5.1-2' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-next
ASoC: More changes for v5.1
Another batch of changes for ASoC, no big core changes - it's mainly
small fixes and improvements for individual drivers.
- A big refresh and cleanup of the Samsung drivers, fixing a number of
issues which allow the driver to be used with a wider range of
userspaces.
- Fixes for the Intel drivers to make them more standard so less likely
to get bitten by core issues.
- New driver for Cirrus Logic CS35L26.
Diffstat (limited to 'sound/soc/codecs/adau1977.c')
| -rw-r--r-- | sound/soc/codecs/adau1977.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/sound/soc/codecs/adau1977.c b/sound/soc/codecs/adau1977.c index 116af6a9ce3b..11c53bcb71dd 100644 --- a/sound/soc/codecs/adau1977.c +++ b/sound/soc/codecs/adau1977.c @@ -885,13 +885,15 @@ static int adau1977_setup_micbias(struct adau1977 *adau1977) struct adau1977_platform_data *pdata = adau1977->dev->platform_data; unsigned int micbias; - if (pdata) { + if (pdata) micbias = pdata->micbias; - if (micbias > ADAU1977_MICBIAS_9V0) - return -EINVAL; - - } else { + else if (device_property_read_u32(adau1977->dev, "adi,micbias", + &micbias)) micbias = ADAU1977_MICBIAS_8V5; + + if (micbias > ADAU1977_MICBIAS_9V0) { + dev_err(adau1977->dev, "Invalid value for 'adi,micbias'\n"); + return -EINVAL; } return regmap_update_bits(adau1977->regmap, ADAU1977_REG_MICBIAS, |