From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 24 Jan 2025 15:54:34 +0000 (-0800)
Subject: Merge tag 'sound-6.14-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai... 
X-Git-Tag: v6.14-rc1~111
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=2c8d2a510c15c003749e43ac2b8e1bc79a7a00d6;p=linux-block.git

Merge tag 'sound-6.14-rc1' of git://git./linux/kernel/git/tiwai/sound

Pull sound updates from Takashi Iwai:
 "This was a relatively calm cycle, and most of changes are rather small
  device-specific fixes. Here are highlights:

  Core:
   - Further enhancements of ALSA rawmidi and sequencer APIs for MIDI
     2.0
   - compress-offload API extensions for ASRC support

  ASoC:
   - Allow clocking on each DAI in an audio graph card to be configured
     separately
   - Improved power management for Renesas RZ-SSI
   - KUnit testing for the Cirrus DSP framework
   - Memory to meory operation support for Freescale/NXP platforms
   - Support for pause operations in SOF
   - Support for Allwinner suinv F1C100s, Awinc AW88083, Realtek
     ALC5682I-VE

  HD- and USB-audio:
   - Add support for Focusrite Scarlett 4th Gen 16i16, 18i16, and 18i20
     interfaces via new FCP driver
   - TAS2781 SPI HD-audio sub-codec support
   - Various device-specific quirks as usual"

* tag 'sound-6.14-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound: (235 commits)
  ALSA: hda: tas2781-spi: Fix bogus error handling in tas2781_hda_spi_probe()
  ALSA: hda: tas2781-spi: Fix error code in tas2781_read_acpi()
  ALSA: hda: tas2781-spi: Delete some dead code
  ALSA: usb: fcp: Fix return code from poll ops
  ALSA: usb: fcp: Fix incorrect resp->opcode retrieval
  ALSA: usb: fcp: Fix meter_levels type to __le32
  ALSA: hda/realtek: Enable Mute LED on HP Laptop 14s-fq1xxx
  ALSA: hda: tas2781-spi: Fix -Wsometimes-uninitialized in tasdevice_spi_switch_book()
  ALSA: ctxfi: Simplify dao_clear_{left,right}_input() functions
  ALSA: hda: tas2781-spi: select CRC32 instead of CRC32_SARWATE
  ALSA: usb: fcp: Fix hwdep read ops types
  ALSA: scarlett2: Add device_setup option to use FCP driver
  ALSA: FCP: Add Focusrite Control Protocol driver
  ALSA: hda/tas2781: Add tas2781 hda SPI driver
  ALSA: hda/realtek - Fixed headphone distorted sound on Acer Aspire A115-31 laptop
  ASoC: xilinx: xlnx_spdif: Simpify using devm_clk_get_enabled()
  ALSA: hda: Support for Ideapad hotkey mute LEDs
  ASoC: Intel: sof_sdw: Fix DMI match for Lenovo 83JX, 83MC and 83NM
  ASoC: Intel: sof_sdw: Fix DMI match for Lenovo 83LC
  ASoC: dapm: add support for preparing streams
  ...
---

2c8d2a510c15c003749e43ac2b8e1bc79a7a00d6
diff --cc include/sound/sdca_function.h
index 9dc5bfec07e5,89e42db6d591..c051c17903e8
--- a/include/sound/sdca_function.h
+++ b/include/sound/sdca_function.h
@@@ -40,33 -42,17 +42,34 @@@ enum sdca_function_type 
  #define	SDCA_FUNCTION_TYPE_RJ_NAME		"RJ"
  #define	SDCA_FUNCTION_TYPE_SIMPLE_NAME		"SimpleJack"
  #define	SDCA_FUNCTION_TYPE_HID_NAME		"HID"
+ #define	SDCA_FUNCTION_TYPE_IMP_DEF_NAME		"ImplementationDefined"
  
  enum sdca_entity0_controls {
 -	SDCA_CONTROL_ENTITY_0_COMMIT_GROUP_MASK		= 0x01,
 -	SDCA_CONTROL_ENTITY_0_INTSTAT_CLEAR		= 0x02,
 -	SDCA_CONTROL_ENTITY_0_INT_ENABLE		= 0x03,
 -	SDCA_CONTROL_ENTITY_0_FUNCTION_SDCA_VERSION	= 0x04,
 -	SDCA_CONTROL_ENTITY_0_FUNCTION_TOPOLOGY		= 0x05,
 -	SDCA_CONTROL_ENTITY_0_FUNCTION_MANUFACTURER_ID	= 0x06,
 -	SDCA_CONTROL_ENTITY_0_FUNCTION_ID		= 0x07,
 -	SDCA_CONTROL_ENTITY_0_FUNCTION_VERSION		= 0x08
 +	SDCA_CTL_ENTITY_0_COMMIT_GROUP_MASK		= 0x01,
 +	SDCA_CTL_ENTITY_0_FUNCTION_SDCA_VERSION		= 0x04,
 +	SDCA_CTL_ENTITY_0_FUNCTION_TYPE			= 0x05,
 +	SDCA_CTL_ENTITY_0_FUNCTION_MANUFACTURER_ID	= 0x06,
 +	SDCA_CTL_ENTITY_0_FUNCTION_ID			= 0x07,
 +	SDCA_CTL_ENTITY_0_FUNCTION_VERSION		= 0x08,
 +	SDCA_CTL_ENTITY_0_FUNCTION_EXTENSION_ID		= 0x09,
 +	SDCA_CTL_ENTITY_0_FUNCTION_EXTENSION_VERSION	= 0x0A,
 +	SDCA_CTL_ENTITY_0_FUNCTION_STATUS		= 0x10,
 +	SDCA_CTL_ENTITY_0_FUNCTION_ACTION		= 0x11,
 +	SDCA_CTL_ENTITY_0_MATCHING_GUID			= 0x12,
 +	SDCA_CTL_ENTITY_0_DEVICE_MANUFACTURER_ID	= 0x2C,
 +	SDCA_CTL_ENTITY_0_DEVICE_PART_ID		= 0x2D,
 +	SDCA_CTL_ENTITY_0_DEVICE_VERSION		= 0x2E,
 +	SDCA_CTL_ENTITY_0_DEVICE_SDCA_VERSION		= 0x2F,
 +
 +	/* Function Status Bits */
 +	SDCA_CTL_ENTITY_0_DEVICE_NEWLY_ATTACHED		= BIT(0),
 +	SDCA_CTL_ENTITY_0_INTS_DISABLED_ABNORMALLY	= BIT(1),
 +	SDCA_CTL_ENTITY_0_STREAMING_STOPPED_ABNORMALLY	= BIT(2),
 +	SDCA_CTL_ENTITY_0_FUNCTION_FAULT		= BIT(3),
 +	SDCA_CTL_ENTITY_0_UMP_SEQUENCE_FAULT		= BIT(4),
 +	SDCA_CTL_ENTITY_0_FUNCTION_NEEDS_INITIALIZATION	= BIT(5),
 +	SDCA_CTL_ENTITY_0_FUNCTION_HAS_BEEN_RESET	= BIT(6),
 +	SDCA_CTL_ENTITY_0_FUNCTION_BUSY			= BIT(7),
  };
  
  #endif