Unverified Commit 657e473e authored by Mark Brown's avatar Mark Brown
Browse files

Merge series "ASoC: Intel: machine driver corrections" from Pierre-Louis... 

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
parents 4b1d5171 bf35a1ee

sound/soc/intel/boards/Kconfig

+4 −3
Original line number Diff line number Diff line
@@ -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".

sound/soc/intel/boards/bxt_da7219_max98357a.c

+1 −3
Original line number Diff line number Diff line
@@ -845,6 +845,7 @@ static const struct platform_device_id bxt_board_ids[] = { 
	{ .name = "cml_da7219_mx98357a" },

	{ }

};

MODULE_DEVICE_TABLE(platform, bxt_board_ids);



static struct platform_driver broxton_audio = {

	.probe = broxton_audio_probe,
@@ -866,7 +867,4 @@ MODULE_AUTHOR("Naveen Manohar <naveen.m@intel.com>"); 
MODULE_AUTHOR("Mac Chiang <mac.chiang@intel.com>");

MODULE_AUTHOR("Brent Lu <brent.lu@intel.com>");

MODULE_LICENSE("GPL v2");

MODULE_ALIAS("platform:bxt_da7219_mx98357a");

MODULE_ALIAS("platform:glk_da7219_mx98357a");

MODULE_ALIAS("platform:cml_da7219_mx98357a");

MODULE_IMPORT_NS(SND_SOC_INTEL_HDA_DSP_COMMON);

sound/soc/intel/boards/bxt_rt298.c

+1 −2
Original line number Diff line number Diff line
@@ -649,6 +649,7 @@ static const struct platform_device_id bxt_board_ids[] = { 
				(unsigned long)&geminilake_rt298 },

	{}

};

MODULE_DEVICE_TABLE(platform, bxt_board_ids);



static struct platform_driver broxton_audio = {

	.probe = broxton_audio_probe,
@@ -665,6 +666,4 @@ MODULE_AUTHOR("Ramesh Babu <Ramesh.Babu@intel.com>"); 
MODULE_AUTHOR("Senthilnathan Veppur <senthilnathanx.veppur@intel.com>");

MODULE_DESCRIPTION("Intel SST Audio for Broxton");

MODULE_LICENSE("GPL v2");

MODULE_ALIAS("platform:bxt_alc298s_i2s");

MODULE_ALIAS("platform:glk_alc298s_i2s");

MODULE_IMPORT_NS(SND_SOC_INTEL_HDA_DSP_COMMON);

sound/soc/intel/boards/ehl_rt5660.c

+1 −1
Original line number Diff line number Diff line
@@ -304,6 +304,7 @@ static const struct platform_device_id ehl_board_ids[] = { 
	{ .name = "ehl_rt5660" },

	{ }

};

MODULE_DEVICE_TABLE(platform, ehl_board_ids);



static struct platform_driver snd_ehl_rt5660_driver = {

	.driver = {
@@ -319,5 +320,4 @@ module_platform_driver(snd_ehl_rt5660_driver); 
MODULE_DESCRIPTION("ASoC Intel(R) Elkhartlake + rt5660 Machine driver");

MODULE_AUTHOR("libin.yang@intel.com");

MODULE_LICENSE("GPL v2");

MODULE_ALIAS("platform:ehl_rt5660");

MODULE_IMPORT_NS(SND_SOC_INTEL_HDA_DSP_COMMON);

sound/soc/intel/boards/glk_rt5682_max98357a.c

+2 −2
Original line number Diff line number Diff line
@@ -619,12 +619,13 @@ static int geminilake_audio_probe(struct platform_device *pdev) 


static const struct platform_device_id glk_board_ids[] = {

	{

		.name = "glk_rt5682_max98357a",

		.name = "glk_rt5682_mx98357a",

		.driver_data =

			(kernel_ulong_t)&glk_audio_card_rt5682_m98357a,

	},

	{ }

};

MODULE_DEVICE_TABLE(platform, glk_board_ids);



static struct platform_driver geminilake_audio = {

	.probe = geminilake_audio_probe,
@@ -641,5 +642,4 @@ MODULE_DESCRIPTION("Geminilake Audio Machine driver-RT5682 & MAX98357A in I2S mo 
MODULE_AUTHOR("Naveen Manohar <naveen.m@intel.com>");

MODULE_AUTHOR("Harsha Priya <harshapriya.n@intel.com>");

MODULE_LICENSE("GPL v2");

MODULE_ALIAS("platform:glk_rt5682_max98357a");

MODULE_IMPORT_NS(SND_SOC_INTEL_HDA_DSP_COMMON);