Unverified Commit 4f451bc9 authored by Mark Brown's avatar Mark Brown
Browse files

ASoC: Intel: boards: updates for 6.12 

Merge series from Bard Liao <yung-chuan.liao@linux.intel.com>:

Some simplifications from Brent Lu for Chromebooks, a new SoundWire codec
support from Bard Liao, new cs42l43 match entries support from
Charles Keepax, Add quirks from some new Dell laptops from Maciej
Strozek, some ACPI match entries from Balamurugan C, and few bug
fixes from Pierre-Louis Bossart.

v2:
 - Add "ASoC: SOF: Intel: hda: support BT link mask in mach_params"
   commit to fix the build issue in v1.

Balamurugan C (2):
  ASoC: Intel: soc-acpi: Add entry for sof_es8336 in ARL match table.
  ASoC: Intel: soc-acpi: Add entry for HDMI_In capture support in ARL
    match table

Bard Liao (4):
  ASoC: Intel: sof_sdw: add rt1320 amp support
  ASoC: SOF: Intel: hda: refactoring topology name fixup for HDA mach
  ASoC: Intel: sof_sdw: move ignore_internal_dmic check earlier
  ASoC: Intel: sof_sdw: overwrite mach_params->dmic_num

Brent Lu (5):
  ASoC: SOF: Intel: hda: refactoring topology name fixup for SDW mach
  ASoC: SOF: Intel: hda: support BT link mask in mach_params
  ASoC: Intel: skl_hda_dsp_generic: support BT audio offload
  ASoC: Intel: skl_hda_dsp_generic: remove hdac-hdmi support
  ASoC: Intel: skl_hda_dsp_generic: use sof_hdmi_private to init HDMI

Charles Keepax (3):
  ASoC: Intel: soc-acpi: arl: Add match entries for new cs42l43 laptops
  ASoC: Intel: soc-acpi: adl: Add match entries for new cs42l43 laptops
  ASoC: Intel: soc-acpi: lnl: Add match entries for new cs42l43 laptops

Maciej Strozek (1):
  ASoC: Intel: sof_sdw: Add quirks from some new Dell laptops

Pierre-Louis Bossart (2):
  ASoC: Intel: sof_sdw: make sof_sdw_quirk static
  ASoC: Intel: boards: always check the result of
    acpi_dev_get_first_match_dev()

 include/sound/soc-acpi.h                      |   2 +
 sound/soc/intel/boards/Kconfig                |   2 +-
 sound/soc/intel/boards/bytcht_cx2072x.c       |   4 +
 sound/soc/intel/boards/bytcht_da7213.c        |   4 +
 sound/soc/intel/boards/bytcht_es8316.c        |   2 +-
 sound/soc/intel/boards/bytcr_rt5640.c         |   2 +-
 sound/soc/intel/boards/bytcr_rt5651.c         |   2 +-
 sound/soc/intel/boards/cht_bsw_rt5645.c       |   4 +
 sound/soc/intel/boards/cht_bsw_rt5672.c       |   4 +
 sound/soc/intel/boards/skl_hda_dsp_common.c   |  56 ++--
 sound/soc/intel/boards/skl_hda_dsp_common.h   |  39 +--
 sound/soc/intel/boards/skl_hda_dsp_generic.c  |  58 ++--
 sound/soc/intel/boards/sof_es8336.c           |  12 +-
 sound/soc/intel/boards/sof_sdw.c              |  85 +++++-
 sound/soc/intel/boards/sof_sdw_common.h       |   2 -
 sound/soc/intel/boards/sof_wm8804.c           |   4 +
 .../intel/common/soc-acpi-intel-adl-match.c   | 105 +++++++
 .../intel/common/soc-acpi-intel-arl-match.c   | 244 +++++++++++++++
 .../intel/common/soc-acpi-intel-hda-match.c   |  12 +-
 .../intel/common/soc-acpi-intel-lnl-match.c   | 104 +++++++
 sound/soc/sdw_utils/soc_sdw_rt_amp.c          |  11 +-
 sound/soc/sdw_utils/soc_sdw_utils.c           |  19 ++
 sound/soc/sof/intel/hda.c                     | 281 ++++++++----------
 23 files changed, 780 insertions(+), 278 deletions(-)

--
2.43.0
parents a1a94016 9307694f

include/sound/soc-acpi.h

+2 −0
Original line number Diff line number Diff line
@@ -73,6 +73,7 @@ static inline struct snd_soc_acpi_mach *snd_soc_acpi_codec_list(void *arg) 
 * @subsystem_rev: optional PCI SSID revision value

 * @subsystem_id_set: true if a value has been written to

 *		      subsystem_vendor and subsystem_device.

 * @bt_link_mask: BT offload link enabled on the board

 */

struct snd_soc_acpi_mach_params {

	u32 acpi_ipc_irq_index;
@@ -89,6 +90,7 @@ struct snd_soc_acpi_mach_params { 
	unsigned short subsystem_device;

	unsigned short subsystem_rev;

	bool subsystem_id_set;

	u32 bt_link_mask;

};



/**

sound/soc/intel/boards/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -305,7 +305,6 @@ if SND_SOC_SOF_HDA_AUDIO_CODEC 
config SND_SOC_INTEL_SKL_HDA_DSP_GENERIC_MACH

	tristate "Skylake+ with HDA Codecs"

	depends on SND_HDA_CODEC_HDMI

	select SND_SOC_HDAC_HDMI

	select SND_SOC_INTEL_HDA_DSP_COMMON

	select SND_SOC_DMIC

	# SND_SOC_HDAC_HDA is already selected
@@ -524,6 +523,7 @@ config SND_SOC_INTEL_SOUNDWIRE_SOF_MACH 
	select SND_SOC_RT1308

	select SND_SOC_RT1316_SDW

	select SND_SOC_RT1318_SDW

	select SND_SOC_RT1320_SDW

	select SND_SOC_RT5682_SDW

	select SND_SOC_CS42L42_SDW

	select SND_SOC_CS42L43

sound/soc/intel/boards/bytcht_cx2072x.c

+4 −0
Original line number Diff line number Diff line
@@ -255,7 +255,11 @@ static int snd_byt_cht_cx2072x_probe(struct platform_device *pdev) 
		snprintf(codec_name, sizeof(codec_name), "i2c-%s",

			 acpi_dev_name(adev));

		byt_cht_cx2072x_dais[dai_index].codecs->name = codec_name;

	} else {

		dev_err(&pdev->dev, "Error cannot find '%s' dev\n", mach->id);

		return -ENOENT;

	}



	acpi_dev_put(adev);



	/* override platform name, if required */

sound/soc/intel/boards/bytcht_da7213.c

+4 −0
Original line number Diff line number Diff line
@@ -258,7 +258,11 @@ static int bytcht_da7213_probe(struct platform_device *pdev) 
		snprintf(codec_name, sizeof(codec_name),

			 "i2c-%s", acpi_dev_name(adev));

		dailink[dai_index].codecs->name = codec_name;

	} else {

		dev_err(&pdev->dev, "Error cannot find '%s' dev\n", mach->id);

		return -ENOENT;

	}



	acpi_dev_put(adev);



	/* override platform name, if required */

sound/soc/intel/boards/bytcht_es8316.c

+1 −1
Original line number Diff line number Diff line
@@ -562,7 +562,7 @@ static int snd_byt_cht_es8316_mc_probe(struct platform_device *pdev) 
		byt_cht_es8316_dais[dai_index].codecs->name = codec_name;

	} else {

		dev_err(dev, "Error cannot find '%s' dev\n", mach->id);

		return -ENXIO;

		return -ENOENT;

	}



	codec_dev = acpi_get_first_physical_node(adev);