Unverified Commit ccab2c7d authored by Mark Brown's avatar Mark Brown
Browse files

Merge series "ASoC: Intel: machine driver updates for 5.7" from Pierre-Louis... 

Merge series "ASoC: Intel: machine driver updates for 5.7" from Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>:

Fix HDaudio/HDMI Kconfig dependencies, cleanup code, and add support
for 2 new configs (DA7219+Maxim 98360A and RT5692+RT1015)

Note that the last patch is the first case where we added the
Reviewed-by tags automagically from the list of GitHub
approvers. Feedback/comments welcome on the format, and thanks to
Ranjani for the nice script!

Changes since v1:
Change base to broonie/for-5.7
Rebase and fix for_each_codec_dais() macro in Patch 9.
Add new patch to remove GFP_ATOMIC

Guennadi Liakhovetski (3):
  ASoC: codecs: hdac_hdmi: (cosmetic) remove redundant variable
    initialisations
  ASoC: Intel: skylake: (cosmetic) remove redundant variable
    initialisations
  ASoC: Intel: (cosmetic) simplify structure member access

Kai Vehmanen (4):
  ASoC: Intel: boards: drop reverse deps for SND_HDA_CODEC_HDMI
  ASoC: Intel: sof_pcm512x: drop reverse deps for SND_HDA_CODEC_HDMI
  ASoC: Intel: sof_pcm512x: make HDMI optional for all platforms
  ASoC: SOF: Intel: hda: remove SND_SOC_SOF_HDA_COMMON_HDMI_CODEC

Pierre-Louis Bossart (1):
  ASoC: Intel: don't use GFP_ATOMIC for machine driver contexts

Yong Zhi (2):
  ASoC: Intel: sof_da7219_max98373: Add support for max98360a speaker
    amp
  ASoC: Intel: sof_rt5682: Add rt1015 speaker amp support

 sound/soc/codecs/hdac_hdmi.c                  |   6 +-
 sound/soc/intel/boards/Kconfig                |  20 ++--
 sound/soc/intel/boards/bdw-rt5650.c           |   2 +-
 sound/soc/intel/boards/bdw-rt5677.c           |   2 +-
 sound/soc/intel/boards/broadwell.c            |   2 +-
 sound/soc/intel/boards/bxt_da7219_max98357a.c |   2 +-
 sound/soc/intel/boards/bxt_rt298.c            |   2 +-
 sound/soc/intel/boards/bytcht_da7213.c        |   2 +-
 sound/soc/intel/boards/cht_bsw_max98090_ti.c  |   2 +-
 sound/soc/intel/boards/cht_bsw_nau8824.c      |   2 +-
 sound/soc/intel/boards/cht_bsw_rt5645.c       |   2 +-
 sound/soc/intel/boards/cml_rt1011_rt5682.c    |   4 +-
 sound/soc/intel/boards/glk_rt5682_max98357a.c |   2 +-
 sound/soc/intel/boards/haswell.c              |   2 +-
 sound/soc/intel/boards/kbl_rt5663_max98927.c  |   2 +-
 .../intel/boards/kbl_rt5663_rt5514_max98927.c |   2 +-
 sound/soc/intel/boards/skl_hda_dsp_generic.c  |   2 +-
 .../soc/intel/boards/skl_nau88l25_max98357a.c |   2 +-
 sound/soc/intel/boards/skl_nau88l25_ssm4567.c |   2 +-
 sound/soc/intel/boards/sof_da7219_max98373.c  |  78 +++++++++++--
 sound/soc/intel/boards/sof_pcm512x.c          |  38 ++++--
 sound/soc/intel/boards/sof_rt5682.c           | 110 +++++++++++++++++-
 .../intel/common/soc-acpi-intel-jsl-match.c   |  34 +++++-
 sound/soc/intel/skylake/skl.c                 |   4 +-
 sound/soc/sof/intel/Kconfig                   |  11 --
 sound/soc/sof/intel/hda.c                     |   3 +-
 26 files changed, 269 insertions(+), 71 deletions(-)

base-commit: 101247a3
--
2.20.1
parents a9bb153d 2e6529a5

sound/soc/codecs/hdac_hdmi.c

+3 −3
Original line number Diff line number Diff line
@@ -1998,11 +1998,11 @@ static struct hdac_hdmi_drv_data intel_drv_data = { 


static int hdac_hdmi_dev_probe(struct hdac_device *hdev)

{

	struct hdac_hdmi_priv *hdmi_priv = NULL;

	struct hdac_hdmi_priv *hdmi_priv;

	struct snd_soc_dai_driver *hdmi_dais = NULL;

	struct hdac_ext_link *hlink = NULL;

	struct hdac_ext_link *hlink;

	int num_dais = 0;

	int ret = 0;

	int ret;

	struct hdac_driver *hdrv = drv_to_hdac_driver(hdev->dev.driver);

	const struct hda_device_id *hdac_id = hdac_get_device_id(hdev, hdrv);

sound/soc/intel/boards/Kconfig

+11 −9
Original line number Diff line number Diff line
@@ -289,7 +289,6 @@ config SND_SOC_INTEL_DA7219_MAX98357A_GENERIC 
	select SND_SOC_DA7219

	select SND_SOC_MAX98357A

	select SND_SOC_DMIC

	select SND_HDA_CODEC_HDMI if SND_SOC_SOF_HDA_AUDIO_CODEC

	select SND_SOC_HDAC_HDMI



config SND_SOC_INTEL_BXT_DA7219_MAX98357A_COMMON
@@ -302,6 +301,7 @@ config SND_SOC_INTEL_BXT_DA7219_MAX98357A_MACH 
	tristate "Broxton with DA7219 and MAX98357A in I2S Mode"

	depends on I2C && ACPI

	depends on MFD_INTEL_LPSS || COMPILE_TEST

	depends on SND_HDA_CODEC_HDMI

	select SND_SOC_INTEL_BXT_DA7219_MAX98357A_COMMON

	help

	   This adds support for ASoC machine driver for Broxton-P platforms
@@ -402,6 +402,7 @@ config SND_SOC_INTEL_GLK_DA7219_MAX98357A_MACH 
	tristate "GLK with DA7219 and MAX98357A in I2S Mode"

	depends on I2C && ACPI

	depends on MFD_INTEL_LPSS || COMPILE_TEST

	depends on SND_HDA_CODEC_HDMI

	select SND_SOC_INTEL_BXT_DA7219_MAX98357A_COMMON

	help

	   This adds support for ASoC machine driver for Geminilake platforms
@@ -413,10 +414,10 @@ config SND_SOC_INTEL_GLK_RT5682_MAX98357A_MACH 
	tristate "GLK with RT5682 and MAX98357A in I2S Mode"

	depends on I2C && ACPI

	depends on MFD_INTEL_LPSS || COMPILE_TEST

	depends on SND_HDA_CODEC_HDMI

	select SND_SOC_RT5682

	select SND_SOC_MAX98357A

	select SND_SOC_DMIC

	select SND_HDA_CODEC_HDMI if SND_SOC_SOF_HDA_AUDIO_CODEC

	select SND_SOC_HDAC_HDMI

	help

	   This adds support for ASoC machine driver for Geminilake platforms
@@ -430,7 +431,7 @@ 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"

	select SND_HDA_CODEC_HDMI if SND_SOC_SOF_HDA_AUDIO_CODEC

	depends on SND_HDA_CODEC_HDMI

	select SND_SOC_HDAC_HDMI

	select SND_SOC_DMIC

	# SND_SOC_HDAC_HDA is already selected
@@ -448,9 +449,10 @@ config SND_SOC_INTEL_SOF_RT5682_MACH 
	depends on I2C && ACPI

	depends on (SND_SOC_SOF_HDA_LINK && (MFD_INTEL_LPSS || COMPILE_TEST)) ||\

		   (SND_SOC_SOF_BAYTRAIL && (X86_INTEL_LPSS || COMPILE_TEST))

	depends on SND_HDA_CODEC_HDMI

	select SND_SOC_RT1015

	select SND_SOC_RT5682

	select SND_SOC_DMIC

	select SND_HDA_CODEC_HDMI if SND_SOC_SOF_HDA_AUDIO_CODEC

	select SND_SOC_HDAC_HDMI

	help

	   This adds support for ASoC machine driver for SOF platforms
@@ -463,8 +465,8 @@ config SND_SOC_INTEL_SOF_PCM512x_MACH 
	depends on I2C && ACPI

	depends on (SND_SOC_SOF_HDA_AUDIO_CODEC && (MFD_INTEL_LPSS || COMPILE_TEST)) ||\

		   (SND_SOC_SOF_BAYTRAIL && (X86_INTEL_LPSS || COMPILE_TEST))

	depends on SND_HDA_CODEC_HDMI

	select SND_SOC_PCM512x_I2C

	select SND_HDA_CODEC_HDMI if SND_SOC_SOF_HDA_AUDIO_CODEC

	help

	  This adds support for ASoC machine driver for SOF platforms

	  with TI PCM512x I2S audio codec.
@@ -490,11 +492,11 @@ config SND_SOC_INTEL_SOF_CML_RT1011_RT5682_MACH 
	tristate "CML with RT1011 and RT5682 in I2S Mode"

	depends on I2C && ACPI

	depends on MFD_INTEL_LPSS || COMPILE_TEST

	depends on SND_HDA_CODEC_HDMI

	select SND_SOC_RT1011

	select SND_SOC_RT5682

	select SND_SOC_DMIC

	select SND_SOC_HDAC_HDMI

	select SND_HDA_CODEC_HDMI if SND_SOC_SOF_HDA_AUDIO_CODEC

	help

	  This adds support for ASoC machine driver for SOF platform with

	  RT1011 + RT5682 I2S codec.
@@ -506,16 +508,16 @@ endif ## SND_SOC_SOF_COMETLAKE_LP && SND_SOC_SOF_HDA_LINK 
if SND_SOC_SOF_JASPERLAKE



config SND_SOC_INTEL_SOF_DA7219_MAX98373_MACH

	tristate "SOF with DA7219 and MAX98373 in I2S Mode"

	tristate "SOF with DA7219 and MAX98373/MAX98360A in I2S Mode"

	depends on I2C && ACPI

	depends on MFD_INTEL_LPSS || COMPILE_TEST

	depends on SND_HDA_CODEC_HDMI

	select SND_SOC_DA7219

	select SND_SOC_MAX98373

	select SND_SOC_DMIC

	select SND_HDA_CODEC_HDMI if SND_SOC_SOF_HDA_AUDIO_CODEC

	help

	  This adds support for ASoC machine driver for SOF platforms

	  with DA7219 + MAX98373 I2S audio codec.

	  with DA7219 + MAX98373/MAX98360A I2S audio codec.

	  Say Y if you have such a device.

	  If unsure select "N".

sound/soc/intel/boards/bdw-rt5650.c

+1 −1
Original line number Diff line number Diff line
@@ -298,7 +298,7 @@ static int bdw_rt5650_probe(struct platform_device *pdev) 
		return -ENOMEM;



	/* override plaform name, if required */

	mach = (&pdev->dev)->platform_data;

	mach = pdev->dev.platform_data;

	ret = snd_soc_fixup_dai_links_platform_name(&bdw_rt5650_card,

						    mach->mach_params.platform);

sound/soc/intel/boards/bdw-rt5677.c

+1 −1
Original line number Diff line number Diff line
@@ -412,7 +412,7 @@ static int bdw_rt5677_probe(struct platform_device *pdev) 
	}



	/* override plaform name, if required */

	mach = (&pdev->dev)->platform_data;

	mach = pdev->dev.platform_data;

	ret = snd_soc_fixup_dai_links_platform_name(&bdw_rt5677_card,

						    mach->mach_params.platform);

	if (ret)

sound/soc/intel/boards/broadwell.c

+1 −1
Original line number Diff line number Diff line
@@ -283,7 +283,7 @@ static int broadwell_audio_probe(struct platform_device *pdev) 
	broadwell_rt286.dev = &pdev->dev;



	/* override plaform name, if required */

	mach = (&pdev->dev)->platform_data;

	mach = pdev->dev.platform_data;

	ret = snd_soc_fixup_dai_links_platform_name(&broadwell_rt286,

						    mach->mach_params.platform);

	if (ret)

CRA Git | Maintained and supported by SUSTech CRA and CCSE