Pull sound updates from Takashi Iwai: "Lots of changes (slightly more code increase than usual) at this time, while most of code changes are ASoC driver-specific. Here are some highlights: Core: - The new auxiliary bus implementation for Intel DSP, which will be used by other drivers as well - Lots of ASoC core cleanups and refactoring - UBSAN and KCSAN fixes in rawmidi, sequencer and a few others - Compress-offload API enhancement for the pause during draining HD- and USB-audio: - Enhancements of the USB-audio implicit feedback support, including better full-duplex operations - Continued CA0132 improvements and fixes - A few new quirk entries, HDMI audio fixes ASoC: - Support for boot time selection of Intel DSP firmware, which should help distros/users testing new stuff more easily; the kconfig was moved to boot time option, too - Some basic DPCM support in audio graph card - Removal of old pre-DT Freescale drivers - Support for Allwinner H6 I2S, Analog Devices ADAU1372, Intel Alderlake-S, GMediatek MT8192, NXP i.MX HDMI and XCVR, Realtek RT715, Qualcomm SM8250 and simple GPIO based muxes" * tag 'sound-5.11-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound: (445 commits) ALSA: pcm: oss: Fix potential out-of-bounds shift ALSA: usb-audio: Fix potential out-of-bounds shift ALSA: hda/ca0132 - Add ZxR surround DAC setup. ALSA: hda/ca0132 - Add 8051 PLL write helper functions. ALSA: hda/hdmi: packet buffer index must be set before reading value ASoC: SOF: imx: update kernel-doc description ASoC: mediatek: mt8183: delete some unreachable code ASoC: mediatek: mt8183: add PM ops to machine drivers ASoC: topology: Fix wrong size check ASoC: topology: Add missing size check ASoC: SOF: Intel: hda: fix the condition passed to sof_dev_dbg_or_err ASoC: SOF: modify the SOF_DBG flags ASoC: SOF: Intel: hda: remove duplicated status dump ASoC: rt1015p: delay 300ms after SDB pulling high for calibration ASoC: rt1015p: move SDB control from trigger to DAPM ASoC: wm_adsp: remove "ctl" from list on error in wm_adsp_create_control() ALSA: usb-audio: Fix control 'access overflow' errors from chmap ALSA: hda/hdmi: always print pin NIDs as hexadecimal ALSA: hda/realtek - Add supported for more Lenovo ALC285 Headset Button ALSA: hda/ca0132 - Remove now unnecessary DSP setup functions. ...
Showing the changes to include/uapi (2 of 378 files). Show all
Unified · Split
| @@ -170,16 +170,22 @@ · 169 unmodified lines | ||
| 170 | 170 | #define SND_SOC_TPLG_LNK_FLGBIT_VOICE_WAKEUP (1 << 3) |
| 171 | 171 | |
| 172 | 172 | /* DAI topology BCLK parameter |
| 173 | − * For the backwards capability, by default codec is bclk master | |
| 173 | + * For the backwards capability, by default codec is bclk provider | |
| 174 | 174 | */ |
| 175 | −#define SND_SOC_TPLG_BCLK_CM 0 /* codec is bclk master */ | |
| 176 | −#define SND_SOC_TPLG_BCLK_CS 1 /* codec is bclk slave */ | |
| 175 | +#define SND_SOC_TPLG_BCLK_CP 0 /* codec is bclk provider */ | |
| 176 | +#define SND_SOC_TPLG_BCLK_CC 1 /* codec is bclk consumer */ | |
| 177 | +/* keep previous definitions for compatibility */ | |
| 178 | +#define SND_SOC_TPLG_BCLK_CM SND_SOC_TPLG_BCLK_CP | |
| 179 | +#define SND_SOC_TPLG_BCLK_CS SND_SOC_TPLG_BCLK_CC | |
| 177 | 180 | |
| 178 | 181 | /* DAI topology FSYNC parameter |
| 179 | − * For the backwards capability, by default codec is fsync master | |
| 182 | + * For the backwards capability, by default codec is fsync provider | |
| 180 | 183 | */ |
| 181 | −#define SND_SOC_TPLG_FSYNC_CM 0 /* codec is fsync master */ | |
| 182 | −#define SND_SOC_TPLG_FSYNC_CS 1 /* codec is fsync slave */ | |
| 184 | +#define SND_SOC_TPLG_FSYNC_CP 0 /* codec is fsync provider */ | |
| 185 | +#define SND_SOC_TPLG_FSYNC_CC 1 /* codec is fsync consumer */ | |
| 186 | +/* keep previous definitions for compatibility */ | |
| 187 | +#define SND_SOC_TPLG_FSYNC_CM SND_SOC_TPLG_FSYNC_CP | |
| 188 | +#define SND_SOC_TPLG_FSYNC_CS SND_SOC_TPLG_FSYNC_CC | |
| 183 | 189 | |
| 184 | 190 | /* |
| 185 | 191 | * Block Header. |
| @@ -336,8 +342,8 @@ struct snd_soc_tplg_hw_config { · 150 unmodified lines | ||
| 336 | 342 | __u8 clock_gated; /* SND_SOC_TPLG_DAI_CLK_GATE_ value */ |
| 337 | 343 | __u8 invert_bclk; /* 1 for inverted BCLK, 0 for normal */ |
| 338 | 344 | __u8 invert_fsync; /* 1 for inverted frame clock, 0 for normal */ |
| 339 | − __u8 bclk_master; /* SND_SOC_TPLG_BCLK_ value */ | |
| 340 | − __u8 fsync_master; /* SND_SOC_TPLG_FSYNC_ value */ | |
| 345 | + __u8 bclk_provider; /* SND_SOC_TPLG_BCLK_ value */ | |
| 346 | + __u8 fsync_provider; /* SND_SOC_TPLG_FSYNC_ value */ | |
| 341 | 347 | __u8 mclk_direction; /* SND_SOC_TPLG_MCLK_ value */ |
| 342 | 348 | __le16 reserved; /* for 32bit alignment */ |
| 343 | 349 | __le32 mclk_rate; /* MCLK or SYSCLK freqency in Hz */ |
| @@ -26,7 +26,7 @@ · 25 unmodified lines | ||
| 26 | 26 | |
| 27 | 27 | /* SOF ABI version major, minor and patch numbers */ |
| 28 | 28 | #define SOF_ABI_MAJOR 3 |
| 29 | −#define SOF_ABI_MINOR 17 | |
| 29 | +#define SOF_ABI_MINOR 18 | |
| 30 | 30 | #define SOF_ABI_PATCH 0 |
| 31 | 31 | |
| 32 | 32 | /* SOF ABI version number. Format within 32bit word is MMmmmppp */ |