diff options
| author | Takashi Iwai <tiwai@suse.de> | 2024-01-16 17:37:17 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2024-01-16 17:37:17 +0100 |
| commit | e06964205920b5a45b13d4f3eebb69e39ea49ab1 (patch) | |
| tree | 19e1748146e144a8faafb7eca16820ba583db3c2 /include/sound | |
| parent | b018cee7369896c7a15bfdbe88f168f3dbd8ba27 (diff) | |
| parent | ab09fb9c629ed3aaea6a82467f08595dbc549726 (diff) | |
Merge tag 'asoc-fix-v6.8-merge-window' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: Fixes for v6.8
A bunch of small fixes that come in during the merge window, mainly
fixing issues from some core refactoring around dummy components that
weren't detected until things reached mainline.
The TAS driver changes are a little larger than normal for a device ID
addition due to some shuffling around of where things are registered and
DT updates but aren't really any more substantial than normal.
Diffstat (limited to 'include/sound')
| -rw-r--r-- | include/sound/tas2781.h | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/include/sound/tas2781.h b/include/sound/tas2781.h index 0a86ab8d47b9..b00d65417c31 100644 --- a/include/sound/tas2781.h +++ b/include/sound/tas2781.h @@ -1,13 +1,13 @@ /* SPDX-License-Identifier: GPL-2.0 */ // -// ALSA SoC Texas Instruments TAS2781 Audio Smart Amplifier +// ALSA SoC Texas Instruments TAS2563/TAS2781 Audio Smart Amplifier // // Copyright (C) 2022 - 2023 Texas Instruments Incorporated // https://www.ti.com // -// The TAS2781 driver implements a flexible and configurable +// The TAS2563/TAS2781 driver implements a flexible and configurable // algo coefficient setting for one, two, or even multiple -// TAS2781 chips. +// TAS2563/TAS2781 chips. // // Author: Shenghao Ding <shenghao-ding@ti.com> // Author: Kevin Lu <kevin-lu@ti.com> @@ -60,7 +60,8 @@ #define TASDEVICE_CMD_FIELD_W 0x4 enum audio_device { - TAS2781 = 0, + TAS2563, + TAS2781, }; enum device_catlog_id { |