diff options
author | Mark Brown <broonie@kernel.org> | 2021-06-22 15:48:07 +0100 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2021-06-22 15:48:07 +0100 |
commit | 657e473e8813f62c536f74650188d078f9fff345 (patch) | |
tree | ab3800b675ef8159721b2da7f1982ce670a544cc /sound/soc/intel/boards/Kconfig | |
parent | 4b1d51715d1cf78a1527fe426fc0278dcfea1959 (diff) | |
parent | bf35a1eeaca618341409f94c90271bb14d1c484a (diff) | |
download | linux-657e473e8813f62c536f74650188d078f9fff345.tar.bz2 |
Merge series "ASoC: Intel: machine driver corrections" from Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>:
Some of these patches dealing with Sparse warnings were submitted
earlier but not merged. I grouped them with a couple of fixes from
Kai.
v2:
added Mark Brown in CC, was missed in v1
added Richard Fitzgerald Tested-by
Kai Vehmanen (3):
ASoC: Intel: sof_sdw: use mach data for ADL RVP DMIC count
ASoC: Intel: sof_sdw: remove hdac-hdmi support
ASoC: Intel: skl_hda_dsp_generic: Update Kconfig documentation
Pierre-Louis Bossart (7):
ASoC: Intel: sof_rt5682: shrink platform_id names below 20 characters
ASoC: Intel: glk_rt5682_max98357a: shrink platform_id below 20
characters
ASoC: Intel: kbl_da7219_max98357a: shrink platform_id below 20
characters
ASoC: Intel: sof_da7219_max98373: shrink platform_id below 20
characters
ASoC: Intel: sof_sdw: fix signed/unsigned warning
ASoC: Intel: soc-acpi: add ull suffix for SoundWire _ADR values
ASoC: Intel: use MODULE_DEVICE_TABLE with platform_device_id tables
sound/soc/intel/boards/Kconfig | 7 ++--
sound/soc/intel/boards/bxt_da7219_max98357a.c | 4 +-
sound/soc/intel/boards/bxt_rt298.c | 3 +-
sound/soc/intel/boards/ehl_rt5660.c | 2 +-
sound/soc/intel/boards/glk_rt5682_max98357a.c | 4 +-
sound/soc/intel/boards/kbl_da7219_max98357a.c | 4 +-
sound/soc/intel/boards/kbl_da7219_max98927.c | 5 +--
sound/soc/intel/boards/kbl_rt5660.c | 2 +-
sound/soc/intel/boards/kbl_rt5663_max98927.c | 3 +-
.../intel/boards/kbl_rt5663_rt5514_max98927.c | 2 +-
.../soc/intel/boards/skl_nau88l25_max98357a.c | 3 +-
sound/soc/intel/boards/skl_nau88l25_ssm4567.c | 3 +-
sound/soc/intel/boards/skl_rt286.c | 3 +-
sound/soc/intel/boards/sof_cs42l42.c | 3 +-
sound/soc/intel/boards/sof_da7219_max98373.c | 6 +--
sound/soc/intel/boards/sof_rt5682.c | 20 +++-------
sound/soc/intel/boards/sof_sdw.c | 5 +--
sound/soc/intel/boards/sof_sdw_common.h | 1 -
sound/soc/intel/boards/sof_sdw_hdmi.c | 37 +-----------------
.../intel/common/soc-acpi-intel-adl-match.c | 28 +++++++-------
.../intel/common/soc-acpi-intel-cml-match.c | 20 +++++-----
.../intel/common/soc-acpi-intel-cnl-match.c | 2 +-
.../intel/common/soc-acpi-intel-glk-match.c | 2 +-
.../intel/common/soc-acpi-intel-icl-match.c | 12 +++---
.../intel/common/soc-acpi-intel-jsl-match.c | 6 +--
.../intel/common/soc-acpi-intel-kbl-match.c | 2 +-
.../intel/common/soc-acpi-intel-tgl-match.c | 38 +++++++++----------
27 files changed, 83 insertions(+), 144 deletions(-)
--
2.25.1
Diffstat (limited to 'sound/soc/intel/boards/Kconfig')
-rw-r--r-- | sound/soc/intel/boards/Kconfig | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/sound/soc/intel/boards/Kconfig b/sound/soc/intel/boards/Kconfig index eef5f4ac87c5..7e29b0d911e2 100644 --- a/sound/soc/intel/boards/Kconfig +++ b/sound/soc/intel/boards/Kconfig @@ -442,7 +442,7 @@ endif ## SND_SOC_SOF_GEMINILAKE if SND_SOC_INTEL_SKYLAKE_HDAUDIO_CODEC || SND_SOC_SOF_HDA_AUDIO_CODEC config SND_SOC_INTEL_SKL_HDA_DSP_GENERIC_MACH - tristate "SKL/KBL/BXT/APL with HDA Codecs" + tristate "Skylake+ with HDA Codecs" depends on SND_HDA_CODEC_HDMI depends on GPIOLIB select SND_SOC_HDAC_HDMI @@ -450,8 +450,9 @@ config SND_SOC_INTEL_SKL_HDA_DSP_GENERIC_MACH select SND_SOC_DMIC # SND_SOC_HDAC_HDA is already selected help - This adds support for ASoC machine driver for Intel platforms - SKL/KBL/BXT/APL with iDisp, HDA audio codecs. + This adds support for ASoC machine driver for Intel Skylake+ + platforms with display (HDMI/DP) and HDA audio codecs, and + Smart Sound Technology (SST) integrated audio DSP. Say Y or m if you have such a device. This is a recommended option. If unsure select "N". |