diff options
author | Takashi Iwai <tiwai@suse.de> | 2018-12-07 13:40:00 +0300 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2018-12-07 13:40:04 +0300 |
commit | 2bff7e97ebbb1119e9f22936706294f4e85d4db6 (patch) | |
tree | a2afac81b24649749d546feb6af966f813eb7dd2 /sound/soc/codecs/pcm186x.h | |
parent | 157ab88ef64a2edccd722f120464109ceba9bac1 (diff) | |
parent | bde1a7459623a66c2abec4d0a841e4b06cc88d9a (diff) | |
download | linux-2bff7e97ebbb1119e9f22936706294f4e85d4db6.tar.xz |
Merge branch 'for-linus' into for-next
Back-merge for applying the more HD-audio quirks on top of the latest
code.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/soc/codecs/pcm186x.h')
-rw-r--r-- | sound/soc/codecs/pcm186x.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/codecs/pcm186x.h b/sound/soc/codecs/pcm186x.h index 2c6ba55bf394..bb3f0c42a1cd 100644 --- a/sound/soc/codecs/pcm186x.h +++ b/sound/soc/codecs/pcm186x.h @@ -139,7 +139,7 @@ enum pcm186x_type { #define PCM186X_MAX_REGISTER PCM186X_CURR_TRIM_CTRL /* PCM186X_PAGE */ -#define PCM186X_RESET 0xff +#define PCM186X_RESET 0xfe /* PCM186X_ADCX_INPUT_SEL_X */ #define PCM186X_ADC_INPUT_SEL_POL BIT(7) |