diff options
| author | Takashi Iwai <tiwai@suse.de> | 2021-08-06 17:00:51 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2021-08-06 17:00:51 +0200 |
| commit | 56e7a93160fe12a7ccce0c2191c64a6db9cb3ad9 (patch) | |
| tree | 3c1d838f353b6819efdc0f84770f2f07092a517c /sound/soc/codecs/cs42l42.h | |
| parent | 97367c97226aab8b298ada954ce12659ee3ad2a4 (diff) | |
| parent | e5ada3f6787a4d6234adc6f2f3ae35c6d5b71ba0 (diff) | |
| download | lwn-56e7a93160fe12a7ccce0c2191c64a6db9cb3ad9.tar.gz lwn-56e7a93160fe12a7ccce0c2191c64a6db9cb3ad9.zip | |
Merge tag 'asoc-fix-v5.14-rc4' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: Fixes for v5.14
Quite a lot of fixes here, the biggest set being for the cs42l42 driver
which is reasonably old but has seen a sudden uptick in activity.
There's also some fixes for correctly referencing PCM buffer addresses
and the removal of some driver-local bodges that had been done for the
lack of prefix handling in DAPM which were broken by the core handling
that as expected.
Diffstat (limited to 'sound/soc/codecs/cs42l42.h')
| -rw-r--r-- | sound/soc/codecs/cs42l42.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/sound/soc/codecs/cs42l42.h b/sound/soc/codecs/cs42l42.h index 206b3c81d3e0..8734f6828f3e 100644 --- a/sound/soc/codecs/cs42l42.h +++ b/sound/soc/codecs/cs42l42.h @@ -653,6 +653,8 @@ /* Page 0x25 Audio Port Registers */ #define CS42L42_SP_RX_CH_SEL (CS42L42_PAGE_25 + 0x01) +#define CS42L42_SP_RX_CHB_SEL_SHIFT 2 +#define CS42L42_SP_RX_CHB_SEL_MASK (3 << CS42L42_SP_RX_CHB_SEL_SHIFT) #define CS42L42_SP_RX_ISOC_CTL (CS42L42_PAGE_25 + 0x02) #define CS42L42_SP_RX_RSYNC_SHIFT 6 @@ -775,6 +777,7 @@ struct cs42l42_private { struct gpio_desc *reset_gpio; struct completion pdn_done; struct snd_soc_jack *jack; + int pll_config; int bclk; u32 sclk; u32 srate; |