diff options
| author | Takashi Iwai <tiwai@suse.de> | 2017-03-30 20:03:25 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2017-03-30 20:03:25 +0200 |
| commit | 9dfcce42b09cde01b2b1f5527ed91112a04a8ab0 (patch) | |
| tree | f9519c7144c13e7e038615a2697b81abe12384c1 /sound/soc/codecs/rt5665.h | |
| parent | 2d7d54002e396c180db0c800c1046f0a3c471597 (diff) | |
| parent | 2ddaa6762696db4bb35726063b421782a9e0436f (diff) | |
| download | op-kernel-dev-9dfcce42b09cde01b2b1f5527ed91112a04a8ab0.zip op-kernel-dev-9dfcce42b09cde01b2b1f5527ed91112a04a8ab0.tar.gz | |
Merge tag 'asoc-fix-v4.11-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: Fixes for v4.11
A relatively large pile of fixes for mainline, the first since the merge
window. The biggest block of changes here by volume is the sun8i-codec
set, the driver was newly added in the merge window but it was realized
that renaming some of the user visible controls was required so these
are being pushed for v4.11 to avoid the original code appearing in a
release. Otherwise it's all fairly standard bugfix stuff.
Diffstat (limited to 'sound/soc/codecs/rt5665.h')
| -rw-r--r-- | sound/soc/codecs/rt5665.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/codecs/rt5665.h b/sound/soc/codecs/rt5665.h index 12f7080..a30f5e6 100644 --- a/sound/soc/codecs/rt5665.h +++ b/sound/soc/codecs/rt5665.h @@ -1106,7 +1106,7 @@ #define RT5665_HP_DRIVER_MASK (0x3 << 2) #define RT5665_HP_DRIVER_1X (0x0 << 2) #define RT5665_HP_DRIVER_3X (0x1 << 2) -#define RT5665_HP_DRIVER_5X (0x2 << 2) +#define RT5665_HP_DRIVER_5X (0x3 << 2) #define RT5665_LDO1_DVO_MASK (0x3) #define RT5665_LDO1_DVO_09 (0x0) #define RT5665_LDO1_DVO_10 (0x1) |
