diff mbox series

ASoC: Intel: boards: Add Cometlake Dialog Maxim machine driver

Message ID 1564646564-24990-1-git-send-email-mac.chiang@intel.com (mailing list archive)
State New, archived
Headers show
Series ASoC: Intel: boards: Add Cometlake Dialog Maxim machine driver | expand

Commit Message

Chiang, Mac Aug. 1, 2019, 8:02 a.m. UTC 
From: Mac Chiang <mac.chiang@intel.com>

enable Cometlake support with:
SSP0 for DA7219 headphone codec
SSP1 for MAX98357a speaker amp codec

Signed-off-by: Mac Chiang <mac.chiang@intel.com>
---
 sound/soc/intel/boards/Kconfig                    | 31 +++++++------
 sound/soc/intel/boards/kbl_da7219_max98357a.c     | 55 ++++++++++++++++++++---
 sound/soc/intel/common/soc-acpi-intel-cnl-match.c | 12 +++++
 3 files changed, 80 insertions(+), 18 deletions(-)

Comments

Pierre-Louis Bossart Aug. 1, 2019, 2:55 p.m. UTC | #1 
> -config SND_SOC_INTEL_KBL_DA7219_MAX98357A_MACH
> -	tristate "KBL with DA7219 and MAX98357A in I2S Mode"
> -	depends on I2C && ACPI
> -	depends on MFD_INTEL_LPSS || COMPILE_TEST
> -	select SND_SOC_DA7219
> -	select SND_SOC_MAX98357A
> -	select SND_SOC_DMIC
> -	select SND_SOC_HDAC_HDMI
> -	help
> -	  This adds support for ASoC Onboard Codec I2S machine driver. This will
> -	  create an alsa sound card for DA7219 + MAX98357A I2S audio codec.
> -	  Say Y if you have such a device.
> -
>   config SND_SOC_INTEL_KBL_DA7219_MAX98927_MACH
>   	tristate "KBL with DA7219 and MAX98927 in I2S Mode"
>   	depends on I2C && ACPI
> @@ -363,6 +350,24 @@ config SND_SOC_INTEL_KBL_RT5660_MACH
>   
>   endif ## SND_SOC_INTEL_KBL
>   
> +if SND_SOC_INTEL_KBL || SND_SOC_SOF_COMETLAKE_LP
> +
> +config SND_SOC_INTEL_KBL_DA7219_MAX98357A_MACH
> +	tristate "KBL with DA7219 and MAX98357A in I2S Mode"
> +	depends on I2C && ACPI
> +	depends on MFD_INTEL_LPSS || COMPILE_TEST
> +	select SND_SOC_DA7219
> +	select SND_SOC_MAX98357A
> +	select SND_SOC_DMIC
> +	select SND_SOC_HDAC_HDMI
> +	help
> +	  This adds support for ASoC Onboard Codec I2S machine driver. This will
> +	  create an alsa sound card for DA7219 + MAX98357A I2S audio codec for
> +	  Kabylake/Cometlake platforms.
> +	  Say Y if you have such a device.
> +
> +endif ## SND_SOC_INTEL_KBL || SND_SOC_SOF_COMETLAKE_LP

We should not mix generations and SST/SOF drivers like this, it's not 
going to be maintainable.

What you can do is have a common hidden option such as

config SND_SOC_INTEL_DA7219_MAX98357A_GENERIC
	tristate
	select SND_SOC_DA7219
	select SND_SOC_MAX98357A
	select SND_SOC_DMIC
	select SND_SOC_HDAC_HDMI

if SND_SOC_INTEL_KBL
config SND_SOC_INTEL_KBL_DA7219_MAX98357A_MACH
	tristate "KBL with DA7219 and MAX98357A in I2S Mode"
	depends on I2C && ACPI
	depends on MFD_INTEL_LPSS || COMPILE_TEST
	select SND_SOC_INTEL_DA7219_MAX98357A_GENERIC
endif


if SND_SOC_SOF_COMETLAKE_LP
config SND_SOC_INTEL_CML_LP_DA7219_MAX98357A_MACH
	tristate "CML_LP with DA7219 and MAX98357A in I2S Mode"
	depends on I2C && ACPI
	depends on MFD_INTEL_LPSS || COMPILE_TEST
	select SND_SOC_INTEL_DA7219_MAX98357A_GENERIC
endif

The other problem I have with this patch is that there are two existing 
machine drivers with almost the same configuration:
bxt_da7219_max98357a
kbl_da7219_max98357a

Why did you pick the latter?
The bxt_da7219_max98357a already supports BXT and GLK, and works with 
SOF, and it wouldn't be that difficult to extend further. And if you add 
CML_LP, then we could longer term make the KBL-specific machine driver 
go away.

We really need to stop all this incremental work and reuse machine 
drivers when the only differences are clock values (24/19.2) and SSP 
indices.

I stop here, not even looking at code differences until we have an 
agreed direction on code reuse.

> +
>   if SND_SOC_INTEL_GLK || (SND_SOC_SOF_GEMINILAKE  && SND_SOC_SOF_HDA_LINK)
>   
>   config SND_SOC_INTEL_GLK_RT5682_MAX98357A_MACH
> diff --git a/sound/soc/intel/boards/kbl_da7219_max98357a.c b/sound/soc/intel/boards/kbl_da7219_max98357a.c
> index 537a889..fe3ac70 100644
> --- a/sound/soc/intel/boards/kbl_da7219_max98357a.c
> +++ b/sound/soc/intel/boards/kbl_da7219_max98357a.c
> @@ -9,6 +9,7 @@
>    *   RT5663 codecs
>    */
>   
> +#include <asm/cpu_device_id.h>
>   #include <linux/input.h>
>   #include <linux/module.h>
>   #include <linux/platform_device.h>
> @@ -17,6 +18,7 @@
>   #include <sound/pcm.h>
>   #include <sound/pcm_params.h>
>   #include <sound/soc.h>
> +#include <sound/soc-acpi.h>
>   #include "../../codecs/da7219.h"
>   #include "../../codecs/hdac_hdmi.h"
>   #include "../../codecs/da7219-aad.h"
> @@ -210,7 +212,11 @@ static int kabylake_hdmi_init(struct snd_soc_pcm_runtime *rtd, int device)
>   	if (!pcm)
>   		return -ENOMEM;
>   
> +#if IS_ENABLED(CONFIG_SND_SOC_SOF_COMETLAKE_LP)
> +	pcm->device = dai->id;
> +#else
>   	pcm->device = device;
> +#endif
>   	pcm->codec_dai = dai;
>   
>   	list_add_tail(&pcm->head, &ctx->hdmi_pcm_list);
> @@ -587,9 +593,17 @@ static struct snd_soc_card kabylake_audio_card_da7219_m98357a = {
>   	.late_probe = kabylake_card_late_probe,
>   };
>   
> +static const struct x86_cpu_id cml_ids[] = {
> +	{ X86_VENDOR_INTEL, 6, 0x8E }, /* Cometlake CPU_ID */
> +	{}
> +};
> +
>   static int kabylake_audio_probe(struct platform_device *pdev)
>   {
>   	struct kbl_codec_private *ctx;
> +	struct snd_soc_acpi_mach *mach;
> +	const char *platform_name;
> +	int ret;
>   
>   	ctx = devm_kzalloc(&pdev->dev, sizeof(*ctx), GFP_KERNEL);
>   	if (!ctx)
> @@ -600,17 +614,46 @@ static int kabylake_audio_probe(struct platform_device *pdev)
>   	kabylake_audio_card =
>   		(struct snd_soc_card *)pdev->id_entry->driver_data;
>   
> +	kabylake_audio_card = &kabylake_audio_card_da7219_m98357a;
> +
>   	kabylake_audio_card->dev = &pdev->dev;
>   	snd_soc_card_set_drvdata(kabylake_audio_card, ctx);
> +
> +	if (x86_match_cpu(cml_ids)) {
> +		unsigned int i;
> +
> +		kabylake_audio_card->name = "cmlda7219max";
> +
> +		for (i = 0; i < ARRAY_SIZE(kabylake_dais); i++) {
> +			/* MAXIM_CODEC is connected to SSP1. */
> +			if (!strcmp(kabylake_dais[i].cpus->dai_name,
> +					KBL_MAXIM_CODEC_DAI)) {
> +				kabylake_dais[i].name = "SSP1-Codec";
> +				kabylake_dais[i].cpus->dai_name = "SSP1 Pin";
> +			}
> +			/* DIALOG_CODEC is connected to SSP0 */
> +			else if (!strcmp(kabylake_dais[i].cpus->dai_name,
> +					KBL_DIALOG_CODEC_DAI)) {
> +				kabylake_dais[i].name = "SSP0-Codec";
> +				kabylake_dais[i].cpus->dai_name = "SSP0 Pin";
> +			}
> +		}
> +	}
> +
> +	mach = (&pdev->dev)->platform_data;
> +	platform_name = mach->mach_params.platform;
> +
> +	ret = snd_soc_fixup_dai_links_platform_name(kabylake_audio_card,
> +							platform_name);
> +	if (ret)
> +		return ret;
> +
>   	return devm_snd_soc_register_card(&pdev->dev, kabylake_audio_card);
>   }
>   
>   static const struct platform_device_id kbl_board_ids[] = {
> -	{
> -		.name = "kbl_da7219_max98357a",
> -		.driver_data =
> -			(kernel_ulong_t)&kabylake_audio_card_da7219_m98357a,
> -	},
> +	{.name = "kbl_da7219_max98357a",},
> +	{.name = "cml_da7219_max98357a",},
>   	{ }
>   };
>   
> @@ -628,5 +671,7 @@ module_platform_driver(kabylake_audio)
>   /* Module information */
>   MODULE_DESCRIPTION("Audio Machine driver-DA7219 & MAX98357A in I2S mode");
>   MODULE_AUTHOR("Naveen Manohar <naveen.m@intel.com>");
> +MODULE_AUTHOR("Mac Chiang <mac.chiang@intel.com>");
>   MODULE_LICENSE("GPL v2");
>   MODULE_ALIAS("platform:kbl_da7219_max98357a");
> +MODULE_ALIAS("platform:cml_da7219_max98357a");
> diff --git a/sound/soc/intel/common/soc-acpi-intel-cnl-match.c b/sound/soc/intel/common/soc-acpi-intel-cnl-match.c
> index c36c0aa..4ea32b2 100644
> --- a/sound/soc/intel/common/soc-acpi-intel-cnl-match.c
> +++ b/sound/soc/intel/common/soc-acpi-intel-cnl-match.c
> @@ -19,6 +19,11 @@ static struct snd_soc_acpi_codecs cml_codecs = {
>   	.codecs = {"10EC5682"}
>   };
>   
> +static struct snd_soc_acpi_codecs cml_spk_codecs = {
> +	.num_codecs = 1,
> +	.codecs = {"MX98357A"}
> +};
> +
>   struct snd_soc_acpi_mach snd_soc_acpi_intel_cnl_machines[] = {
>   	{
>   		.id = "INT34C2",
> @@ -29,6 +34,13 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_cnl_machines[] = {
>   		.sof_tplg_filename = "sof-cnl-rt274.tplg",
>   	},
>   	{
> +		.id = "DLGS7219",
> +		.drv_name = "cml_da7219_max98357a",
> +		.quirk_data = &cml_spk_codecs,
> +		.sof_fw_filename = "sof-cnl.ri",
> +		.sof_tplg_filename = "sof-cml-da7219-max98357a.tplg",
> +	},
> +	{
>   		.id = "MX98357A",
>   		.drv_name = "sof_rt5682",
>   		.quirk_data = &cml_codecs,
>
Chiang, Mac Aug. 6, 2019, 9:11 a.m. UTC | #2 
> > -config SND_SOC_INTEL_KBL_DA7219_MAX98357A_MACH
> > -	tristate "KBL with DA7219 and MAX98357A in I2S Mode"
> > -	depends on I2C && ACPI
> > -	depends on MFD_INTEL_LPSS || COMPILE_TEST
> > -	select SND_SOC_DA7219
> > -	select SND_SOC_MAX98357A
> > -	select SND_SOC_DMIC
> > -	select SND_SOC_HDAC_HDMI
> > -	help
> > -	  This adds support for ASoC Onboard Codec I2S machine driver. This
> will
> > -	  create an alsa sound card for DA7219 + MAX98357A I2S audio codec.
> > -	  Say Y if you have such a device.
> > -
> >   config SND_SOC_INTEL_KBL_DA7219_MAX98927_MACH
> >   	tristate "KBL with DA7219 and MAX98927 in I2S Mode"
> >   	depends on I2C && ACPI
> > @@ -363,6 +350,24 @@ config SND_SOC_INTEL_KBL_RT5660_MACH
> >
> >   endif ## SND_SOC_INTEL_KBL
> >
> > +if SND_SOC_INTEL_KBL || SND_SOC_SOF_COMETLAKE_LP
> > +
> > +config SND_SOC_INTEL_KBL_DA7219_MAX98357A_MACH
> > +	tristate "KBL with DA7219 and MAX98357A in I2S Mode"
> > +	depends on I2C && ACPI
> > +	depends on MFD_INTEL_LPSS || COMPILE_TEST
> > +	select SND_SOC_DA7219
> > +	select SND_SOC_MAX98357A
> > +	select SND_SOC_DMIC
> > +	select SND_SOC_HDAC_HDMI
> > +	help
> > +	  This adds support for ASoC Onboard Codec I2S machine driver. This
> will
> > +	  create an alsa sound card for DA7219 + MAX98357A I2S audio codec
> for
> > +	  Kabylake/Cometlake platforms.
> > +	  Say Y if you have such a device.
> > +
> > +endif ## SND_SOC_INTEL_KBL || SND_SOC_SOF_COMETLAKE_LP
> 
> We should not mix generations and SST/SOF drivers like this, it's not going
> to be maintainable.
> 
> What you can do is have a common hidden option such as
> 
> config SND_SOC_INTEL_DA7219_MAX98357A_GENERIC
> 	tristate
> 	select SND_SOC_DA7219
> 	select SND_SOC_MAX98357A
> 	select SND_SOC_DMIC
> 	select SND_SOC_HDAC_HDMI
> 
> if SND_SOC_INTEL_KBL
> config SND_SOC_INTEL_KBL_DA7219_MAX98357A_MACH
> 	tristate "KBL with DA7219 and MAX98357A in I2S Mode"
> 	depends on I2C && ACPI
> 	depends on MFD_INTEL_LPSS || COMPILE_TEST
> 	select SND_SOC_INTEL_DA7219_MAX98357A_GENERIC
> endif
> 
> 
> if SND_SOC_SOF_COMETLAKE_LP
> config SND_SOC_INTEL_CML_LP_DA7219_MAX98357A_MACH
> 	tristate "CML_LP with DA7219 and MAX98357A in I2S Mode"
> 	depends on I2C && ACPI
> 	depends on MFD_INTEL_LPSS || COMPILE_TEST
> 	select SND_SOC_INTEL_DA7219_MAX98357A_GENERIC
> endif
> 
> The other problem I have with this patch is that there are two existing
> machine drivers with almost the same configuration:
> bxt_da7219_max98357a
> kbl_da7219_max98357a
> 
> Why did you pick the latter?
> The bxt_da7219_max98357a already supports BXT and GLK, and works with
> SOF, and it wouldn't be that difficult to extend further. And if you add
> CML_LP, then we could longer term make the KBL-specific machine driver go
> away.
> 
> We really need to stop all this incremental work and reuse machine drivers
> when the only differences are clock values (24/19.2) and SSP indices.
> 
> I stop here, not even looking at code differences until we have an agreed
> direction on code reuse.
> 
[Chiang, Mac] I agree and will submit the code changes in reusing of bxt_da7219_max98357a.
One question, when reusing bxt_da7219_max98357a, I found the CML cpu_id using "INTEL_FAM6_KABYLAKE_MOBILE 0x8E"?
Because we have diff SSP configurations, how to distinguish CML and KBL cpu_id?
> > +
> >   if SND_SOC_INTEL_GLK || (SND_SOC_SOF_GEMINILAKE  &&
> > SND_SOC_SOF_HDA_LINK)
> >
> >   config SND_SOC_INTEL_GLK_RT5682_MAX98357A_MACH
> > diff --git a/sound/soc/intel/boards/kbl_da7219_max98357a.c
> > b/sound/soc/intel/boards/kbl_da7219_max98357a.c
> > index 537a889..fe3ac70 100644
> > --- a/sound/soc/intel/boards/kbl_da7219_max98357a.c
> > +++ b/sound/soc/intel/boards/kbl_da7219_max98357a.c
> > @@ -9,6 +9,7 @@
> >    *   RT5663 codecs
> >    */
> >
> > +#include <asm/cpu_device_id.h>
> >   #include <linux/input.h>
> >   #include <linux/module.h>
> >   #include <linux/platform_device.h>
> > @@ -17,6 +18,7 @@
> >   #include <sound/pcm.h>
> >   #include <sound/pcm_params.h>
> >   #include <sound/soc.h>
> > +#include <sound/soc-acpi.h>
> >   #include "../../codecs/da7219.h"
> >   #include "../../codecs/hdac_hdmi.h"
> >   #include "../../codecs/da7219-aad.h"
> > @@ -210,7 +212,11 @@ static int kabylake_hdmi_init(struct
> snd_soc_pcm_runtime *rtd, int device)
> >   	if (!pcm)
> >   		return -ENOMEM;
> >
> > +#if IS_ENABLED(CONFIG_SND_SOC_SOF_COMETLAKE_LP)
> > +	pcm->device = dai->id;
> > +#else
> >   	pcm->device = device;
> > +#endif
> >   	pcm->codec_dai = dai;
> >
> >   	list_add_tail(&pcm->head, &ctx->hdmi_pcm_list); @@ -587,9
> +593,17
> > @@ static struct snd_soc_card kabylake_audio_card_da7219_m98357a = {
> >   	.late_probe = kabylake_card_late_probe,
> >   };
> >
> > +static const struct x86_cpu_id cml_ids[] = {
> > +	{ X86_VENDOR_INTEL, 6, 0x8E }, /* Cometlake CPU_ID */
> > +	{}
> > +};
> > +
> >   static int kabylake_audio_probe(struct platform_device *pdev)
> >   {
> >   	struct kbl_codec_private *ctx;
> > +	struct snd_soc_acpi_mach *mach;
> > +	const char *platform_name;
> > +	int ret;
> >
> >   	ctx = devm_kzalloc(&pdev->dev, sizeof(*ctx), GFP_KERNEL);
> >   	if (!ctx)
> > @@ -600,17 +614,46 @@ static int kabylake_audio_probe(struct
> platform_device *pdev)
> >   	kabylake_audio_card =
> >   		(struct snd_soc_card *)pdev->id_entry->driver_data;
> >
> > +	kabylake_audio_card = &kabylake_audio_card_da7219_m98357a;
> > +
> >   	kabylake_audio_card->dev = &pdev->dev;
> >   	snd_soc_card_set_drvdata(kabylake_audio_card, ctx);
> > +
> > +	if (x86_match_cpu(cml_ids)) {
> > +		unsigned int i;
> > +
> > +		kabylake_audio_card->name = "cmlda7219max";
> > +
> > +		for (i = 0; i < ARRAY_SIZE(kabylake_dais); i++) {
> > +			/* MAXIM_CODEC is connected to SSP1. */
> > +			if (!strcmp(kabylake_dais[i].cpus->dai_name,
> > +					KBL_MAXIM_CODEC_DAI)) {
> > +				kabylake_dais[i].name = "SSP1-Codec";
> > +				kabylake_dais[i].cpus->dai_name = "SSP1 Pin";
> > +			}
> > +			/* DIALOG_CODEC is connected to SSP0 */
> > +			else if (!strcmp(kabylake_dais[i].cpus->dai_name,
> > +					KBL_DIALOG_CODEC_DAI)) {
> > +				kabylake_dais[i].name = "SSP0-Codec";
> > +				kabylake_dais[i].cpus->dai_name = "SSP0 Pin";
> > +			}
> > +		}
> > +	}
> > +
> > +	mach = (&pdev->dev)->platform_data;
> > +	platform_name = mach->mach_params.platform;
> > +
> > +	ret = snd_soc_fixup_dai_links_platform_name(kabylake_audio_card,
> > +							platform_name);
> > +	if (ret)
> > +		return ret;
> > +
> >   	return devm_snd_soc_register_card(&pdev->dev,
> kabylake_audio_card);
> >   }
> >
> >   static const struct platform_device_id kbl_board_ids[] = {
> > -	{
> > -		.name = "kbl_da7219_max98357a",
> > -		.driver_data =
> > -			(kernel_ulong_t)&kabylake_audio_card_da7219_m98357a,
> > -	},
> > +	{.name = "kbl_da7219_max98357a",},
> > +	{.name = "cml_da7219_max98357a",},
> >   	{ }
> >   };
> >
> > @@ -628,5 +671,7 @@ module_platform_driver(kabylake_audio)
> >   /* Module information */
> >   MODULE_DESCRIPTION("Audio Machine driver-DA7219 & MAX98357A
> in I2S mode");
> >   MODULE_AUTHOR("Naveen Manohar <naveen.m@intel.com>");
> > +MODULE_AUTHOR("Mac Chiang <mac.chiang@intel.com>");
> >   MODULE_LICENSE("GPL v2");
> >   MODULE_ALIAS("platform:kbl_da7219_max98357a");
> > +MODULE_ALIAS("platform:cml_da7219_max98357a");
> > diff --git a/sound/soc/intel/common/soc-acpi-intel-cnl-match.c
> > b/sound/soc/intel/common/soc-acpi-intel-cnl-match.c
> > index c36c0aa..4ea32b2 100644
> > --- a/sound/soc/intel/common/soc-acpi-intel-cnl-match.c
> > +++ b/sound/soc/intel/common/soc-acpi-intel-cnl-match.c
> > @@ -19,6 +19,11 @@ static struct snd_soc_acpi_codecs cml_codecs = {
> >   	.codecs = {"10EC5682"}
> >   };
> >
> > +static struct snd_soc_acpi_codecs cml_spk_codecs = {
> > +	.num_codecs = 1,
> > +	.codecs = {"MX98357A"}
> > +};
> > +
> >   struct snd_soc_acpi_mach snd_soc_acpi_intel_cnl_machines[] = {
> >   	{
> >   		.id = "INT34C2",
> > @@ -29,6 +34,13 @@ struct snd_soc_acpi_mach
> snd_soc_acpi_intel_cnl_machines[] = {
> >   		.sof_tplg_filename = "sof-cnl-rt274.tplg",
> >   	},
> >   	{
> > +		.id = "DLGS7219",
> > +		.drv_name = "cml_da7219_max98357a",
> > +		.quirk_data = &cml_spk_codecs,
> > +		.sof_fw_filename = "sof-cnl.ri",
> > +		.sof_tplg_filename = "sof-cml-da7219-max98357a.tplg",
> > +	},
> > +	{
> >   		.id = "MX98357A",
> >   		.drv_name = "sof_rt5682",
> >   		.quirk_data = &cml_codecs,
> >
Pierre-Louis Bossart Aug. 6, 2019, 3:14 p.m. UTC | #3 
On 8/6/19 4:11 AM, Chiang, Mac wrote:
> 
>>> -config SND_SOC_INTEL_KBL_DA7219_MAX98357A_MACH
>>> -	tristate "KBL with DA7219 and MAX98357A in I2S Mode"
>>> -	depends on I2C && ACPI
>>> -	depends on MFD_INTEL_LPSS || COMPILE_TEST
>>> -	select SND_SOC_DA7219
>>> -	select SND_SOC_MAX98357A
>>> -	select SND_SOC_DMIC
>>> -	select SND_SOC_HDAC_HDMI
>>> -	help
>>> -	  This adds support for ASoC Onboard Codec I2S machine driver. This
>> will
>>> -	  create an alsa sound card for DA7219 + MAX98357A I2S audio codec.
>>> -	  Say Y if you have such a device.
>>> -
>>>    config SND_SOC_INTEL_KBL_DA7219_MAX98927_MACH
>>>    	tristate "KBL with DA7219 and MAX98927 in I2S Mode"
>>>    	depends on I2C && ACPI
>>> @@ -363,6 +350,24 @@ config SND_SOC_INTEL_KBL_RT5660_MACH
>>>
>>>    endif ## SND_SOC_INTEL_KBL
>>>
>>> +if SND_SOC_INTEL_KBL || SND_SOC_SOF_COMETLAKE_LP
>>> +
>>> +config SND_SOC_INTEL_KBL_DA7219_MAX98357A_MACH
>>> +	tristate "KBL with DA7219 and MAX98357A in I2S Mode"
>>> +	depends on I2C && ACPI
>>> +	depends on MFD_INTEL_LPSS || COMPILE_TEST
>>> +	select SND_SOC_DA7219
>>> +	select SND_SOC_MAX98357A
>>> +	select SND_SOC_DMIC
>>> +	select SND_SOC_HDAC_HDMI
>>> +	help
>>> +	  This adds support for ASoC Onboard Codec I2S machine driver. This
>> will
>>> +	  create an alsa sound card for DA7219 + MAX98357A I2S audio codec
>> for
>>> +	  Kabylake/Cometlake platforms.
>>> +	  Say Y if you have such a device.
>>> +
>>> +endif ## SND_SOC_INTEL_KBL || SND_SOC_SOF_COMETLAKE_LP
>>
>> We should not mix generations and SST/SOF drivers like this, it's not going
>> to be maintainable.
>>
>> What you can do is have a common hidden option such as
>>
>> config SND_SOC_INTEL_DA7219_MAX98357A_GENERIC
>> 	tristate
>> 	select SND_SOC_DA7219
>> 	select SND_SOC_MAX98357A
>> 	select SND_SOC_DMIC
>> 	select SND_SOC_HDAC_HDMI
>>
>> if SND_SOC_INTEL_KBL
>> config SND_SOC_INTEL_KBL_DA7219_MAX98357A_MACH
>> 	tristate "KBL with DA7219 and MAX98357A in I2S Mode"
>> 	depends on I2C && ACPI
>> 	depends on MFD_INTEL_LPSS || COMPILE_TEST
>> 	select SND_SOC_INTEL_DA7219_MAX98357A_GENERIC
>> endif
>>
>>
>> if SND_SOC_SOF_COMETLAKE_LP
>> config SND_SOC_INTEL_CML_LP_DA7219_MAX98357A_MACH
>> 	tristate "CML_LP with DA7219 and MAX98357A in I2S Mode"
>> 	depends on I2C && ACPI
>> 	depends on MFD_INTEL_LPSS || COMPILE_TEST
>> 	select SND_SOC_INTEL_DA7219_MAX98357A_GENERIC
>> endif
>>
>> The other problem I have with this patch is that there are two existing
>> machine drivers with almost the same configuration:
>> bxt_da7219_max98357a
>> kbl_da7219_max98357a
>>
>> Why did you pick the latter?
>> The bxt_da7219_max98357a already supports BXT and GLK, and works with
>> SOF, and it wouldn't be that difficult to extend further. And if you add
>> CML_LP, then we could longer term make the KBL-specific machine driver go
>> away.
>>
>> We really need to stop all this incremental work and reuse machine drivers
>> when the only differences are clock values (24/19.2) and SSP indices.
>>
>> I stop here, not even looking at code differences until we have an agreed
>> direction on code reuse.
>>
> [Chiang, Mac] I agree and will submit the code changes in reusing of bxt_da7219_max98357a.
> One question, when reusing bxt_da7219_max98357a, I found the CML cpu_id using "INTEL_FAM6_KABYLAKE_MOBILE 0x8E"?
> Because we have diff SSP configurations, how to distinguish CML and KBL cpu_id?

Ah, this is interesting. Indeed there are mixed/matched combination of 
CPU and chipset. If the cpu_id does not give the information, we may 
have to use the PCI ID which will be different. I am not sure though 
that this information is passed to the machine driver, so some plumbing 
may be required.

Let's do this is steps, first add CML to the bxt_da7219_max9837a and 
then worry about KBL later. Which Chromebook model uses that 
kbl_da7219_max9837a combination anyways, we'd need to retest that.

>>> +
>>>    if SND_SOC_INTEL_GLK || (SND_SOC_SOF_GEMINILAKE  &&
>>> SND_SOC_SOF_HDA_LINK)
>>>
>>>    config SND_SOC_INTEL_GLK_RT5682_MAX98357A_MACH
>>> diff --git a/sound/soc/intel/boards/kbl_da7219_max98357a.c
>>> b/sound/soc/intel/boards/kbl_da7219_max98357a.c
>>> index 537a889..fe3ac70 100644
>>> --- a/sound/soc/intel/boards/kbl_da7219_max98357a.c
>>> +++ b/sound/soc/intel/boards/kbl_da7219_max98357a.c
>>> @@ -9,6 +9,7 @@
>>>     *   RT5663 codecs
>>>     */
>>>
>>> +#include <asm/cpu_device_id.h>
>>>    #include <linux/input.h>
>>>    #include <linux/module.h>
>>>    #include <linux/platform_device.h>
>>> @@ -17,6 +18,7 @@
>>>    #include <sound/pcm.h>
>>>    #include <sound/pcm_params.h>
>>>    #include <sound/soc.h>
>>> +#include <sound/soc-acpi.h>
>>>    #include "../../codecs/da7219.h"
>>>    #include "../../codecs/hdac_hdmi.h"
>>>    #include "../../codecs/da7219-aad.h"
>>> @@ -210,7 +212,11 @@ static int kabylake_hdmi_init(struct
>> snd_soc_pcm_runtime *rtd, int device)
>>>    	if (!pcm)
>>>    		return -ENOMEM;
>>>
>>> +#if IS_ENABLED(CONFIG_SND_SOC_SOF_COMETLAKE_LP)
>>> +	pcm->device = dai->id;
>>> +#else
>>>    	pcm->device = device;
>>> +#endif
>>>    	pcm->codec_dai = dai;
>>>
>>>    	list_add_tail(&pcm->head, &ctx->hdmi_pcm_list); @@ -587,9
>> +593,17
>>> @@ static struct snd_soc_card kabylake_audio_card_da7219_m98357a = {
>>>    	.late_probe = kabylake_card_late_probe,
>>>    };
>>>
>>> +static const struct x86_cpu_id cml_ids[] = {
>>> +	{ X86_VENDOR_INTEL, 6, 0x8E }, /* Cometlake CPU_ID */
>>> +	{}
>>> +};
>>> +
>>>    static int kabylake_audio_probe(struct platform_device *pdev)
>>>    {
>>>    	struct kbl_codec_private *ctx;
>>> +	struct snd_soc_acpi_mach *mach;
>>> +	const char *platform_name;
>>> +	int ret;
>>>
>>>    	ctx = devm_kzalloc(&pdev->dev, sizeof(*ctx), GFP_KERNEL);
>>>    	if (!ctx)
>>> @@ -600,17 +614,46 @@ static int kabylake_audio_probe(struct
>> platform_device *pdev)
>>>    	kabylake_audio_card =
>>>    		(struct snd_soc_card *)pdev->id_entry->driver_data;
>>>
>>> +	kabylake_audio_card = &kabylake_audio_card_da7219_m98357a;
>>> +
>>>    	kabylake_audio_card->dev = &pdev->dev;
>>>    	snd_soc_card_set_drvdata(kabylake_audio_card, ctx);
>>> +
>>> +	if (x86_match_cpu(cml_ids)) {
>>> +		unsigned int i;
>>> +
>>> +		kabylake_audio_card->name = "cmlda7219max";
>>> +
>>> +		for (i = 0; i < ARRAY_SIZE(kabylake_dais); i++) {
>>> +			/* MAXIM_CODEC is connected to SSP1. */
>>> +			if (!strcmp(kabylake_dais[i].cpus->dai_name,
>>> +					KBL_MAXIM_CODEC_DAI)) {
>>> +				kabylake_dais[i].name = "SSP1-Codec";
>>> +				kabylake_dais[i].cpus->dai_name = "SSP1 Pin";
>>> +			}
>>> +			/* DIALOG_CODEC is connected to SSP0 */
>>> +			else if (!strcmp(kabylake_dais[i].cpus->dai_name,
>>> +					KBL_DIALOG_CODEC_DAI)) {
>>> +				kabylake_dais[i].name = "SSP0-Codec";
>>> +				kabylake_dais[i].cpus->dai_name = "SSP0 Pin";
>>> +			}
>>> +		}
>>> +	}
>>> +
>>> +	mach = (&pdev->dev)->platform_data;
>>> +	platform_name = mach->mach_params.platform;
>>> +
>>> +	ret = snd_soc_fixup_dai_links_platform_name(kabylake_audio_card,
>>> +							platform_name);
>>> +	if (ret)
>>> +		return ret;
>>> +
>>>    	return devm_snd_soc_register_card(&pdev->dev,
>> kabylake_audio_card);
>>>    }
>>>
>>>    static const struct platform_device_id kbl_board_ids[] = {
>>> -	{
>>> -		.name = "kbl_da7219_max98357a",
>>> -		.driver_data =
>>> -			(kernel_ulong_t)&kabylake_audio_card_da7219_m98357a,
>>> -	},
>>> +	{.name = "kbl_da7219_max98357a",},
>>> +	{.name = "cml_da7219_max98357a",},
>>>    	{ }
>>>    };
>>>
>>> @@ -628,5 +671,7 @@ module_platform_driver(kabylake_audio)
>>>    /* Module information */
>>>    MODULE_DESCRIPTION("Audio Machine driver-DA7219 & MAX98357A
>> in I2S mode");
>>>    MODULE_AUTHOR("Naveen Manohar <naveen.m@intel.com>");
>>> +MODULE_AUTHOR("Mac Chiang <mac.chiang@intel.com>");
>>>    MODULE_LICENSE("GPL v2");
>>>    MODULE_ALIAS("platform:kbl_da7219_max98357a");
>>> +MODULE_ALIAS("platform:cml_da7219_max98357a");
>>> diff --git a/sound/soc/intel/common/soc-acpi-intel-cnl-match.c
>>> b/sound/soc/intel/common/soc-acpi-intel-cnl-match.c
>>> index c36c0aa..4ea32b2 100644
>>> --- a/sound/soc/intel/common/soc-acpi-intel-cnl-match.c
>>> +++ b/sound/soc/intel/common/soc-acpi-intel-cnl-match.c
>>> @@ -19,6 +19,11 @@ static struct snd_soc_acpi_codecs cml_codecs = {
>>>    	.codecs = {"10EC5682"}
>>>    };
>>>
>>> +static struct snd_soc_acpi_codecs cml_spk_codecs = {
>>> +	.num_codecs = 1,
>>> +	.codecs = {"MX98357A"}
>>> +};
>>> +
>>>    struct snd_soc_acpi_mach snd_soc_acpi_intel_cnl_machines[] = {
>>>    	{
>>>    		.id = "INT34C2",
>>> @@ -29,6 +34,13 @@ struct snd_soc_acpi_mach
>> snd_soc_acpi_intel_cnl_machines[] = {
>>>    		.sof_tplg_filename = "sof-cnl-rt274.tplg",
>>>    	},
>>>    	{
>>> +		.id = "DLGS7219",
>>> +		.drv_name = "cml_da7219_max98357a",
>>> +		.quirk_data = &cml_spk_codecs,
>>> +		.sof_fw_filename = "sof-cnl.ri",
>>> +		.sof_tplg_filename = "sof-cml-da7219-max98357a.tplg",
>>> +	},
>>> +	{
>>>    		.id = "MX98357A",
>>>    		.drv_name = "sof_rt5682",
>>>    		.quirk_data = &cml_codecs,
>>>
>
diff mbox series

Patch

diff --git a/sound/soc/intel/boards/Kconfig b/sound/soc/intel/boards/Kconfig
index 50bf149..545aef8 100644
--- a/sound/soc/intel/boards/Kconfig
+++ b/sound/soc/intel/boards/Kconfig
@@ -322,19 +322,6 @@  config SND_SOC_INTEL_KBL_RT5663_RT5514_MAX98927_MACH
           Say Y or m if you have such a device. This is a recommended option.
           If unsure select "N".
 
-config SND_SOC_INTEL_KBL_DA7219_MAX98357A_MACH
-	tristate "KBL with DA7219 and MAX98357A in I2S Mode"
-	depends on I2C && ACPI
-	depends on MFD_INTEL_LPSS || COMPILE_TEST
-	select SND_SOC_DA7219
-	select SND_SOC_MAX98357A
-	select SND_SOC_DMIC
-	select SND_SOC_HDAC_HDMI
-	help
-	  This adds support for ASoC Onboard Codec I2S machine driver. This will
-	  create an alsa sound card for DA7219 + MAX98357A I2S audio codec.
-	  Say Y if you have such a device.
-
 config SND_SOC_INTEL_KBL_DA7219_MAX98927_MACH
 	tristate "KBL with DA7219 and MAX98927 in I2S Mode"
 	depends on I2C && ACPI
@@ -363,6 +350,24 @@  config SND_SOC_INTEL_KBL_RT5660_MACH
 
 endif ## SND_SOC_INTEL_KBL
 
+if SND_SOC_INTEL_KBL || SND_SOC_SOF_COMETLAKE_LP
+
+config SND_SOC_INTEL_KBL_DA7219_MAX98357A_MACH
+	tristate "KBL with DA7219 and MAX98357A in I2S Mode"
+	depends on I2C && ACPI
+	depends on MFD_INTEL_LPSS || COMPILE_TEST
+	select SND_SOC_DA7219
+	select SND_SOC_MAX98357A
+	select SND_SOC_DMIC
+	select SND_SOC_HDAC_HDMI
+	help
+	  This adds support for ASoC Onboard Codec I2S machine driver. This will
+	  create an alsa sound card for DA7219 + MAX98357A I2S audio codec for
+	  Kabylake/Cometlake platforms.
+	  Say Y if you have such a device.
+
+endif ## SND_SOC_INTEL_KBL || SND_SOC_SOF_COMETLAKE_LP
+
 if SND_SOC_INTEL_GLK || (SND_SOC_SOF_GEMINILAKE  && SND_SOC_SOF_HDA_LINK)
 
 config SND_SOC_INTEL_GLK_RT5682_MAX98357A_MACH
diff --git a/sound/soc/intel/boards/kbl_da7219_max98357a.c b/sound/soc/intel/boards/kbl_da7219_max98357a.c
index 537a889..fe3ac70 100644
--- a/sound/soc/intel/boards/kbl_da7219_max98357a.c
+++ b/sound/soc/intel/boards/kbl_da7219_max98357a.c
@@ -9,6 +9,7 @@ 
  *   RT5663 codecs
  */
 
+#include <asm/cpu_device_id.h>
 #include <linux/input.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
@@ -17,6 +18,7 @@ 
 #include <sound/pcm.h>
 #include <sound/pcm_params.h>
 #include <sound/soc.h>
+#include <sound/soc-acpi.h>
 #include "../../codecs/da7219.h"
 #include "../../codecs/hdac_hdmi.h"
 #include "../../codecs/da7219-aad.h"
@@ -210,7 +212,11 @@  static int kabylake_hdmi_init(struct snd_soc_pcm_runtime *rtd, int device)
 	if (!pcm)
 		return -ENOMEM;
 
+#if IS_ENABLED(CONFIG_SND_SOC_SOF_COMETLAKE_LP)
+	pcm->device = dai->id;
+#else
 	pcm->device = device;
+#endif
 	pcm->codec_dai = dai;
 
 	list_add_tail(&pcm->head, &ctx->hdmi_pcm_list);
@@ -587,9 +593,17 @@  static struct snd_soc_card kabylake_audio_card_da7219_m98357a = {
 	.late_probe = kabylake_card_late_probe,
 };
 
+static const struct x86_cpu_id cml_ids[] = {
+	{ X86_VENDOR_INTEL, 6, 0x8E }, /* Cometlake CPU_ID */
+	{}
+};
+
 static int kabylake_audio_probe(struct platform_device *pdev)
 {
 	struct kbl_codec_private *ctx;
+	struct snd_soc_acpi_mach *mach;
+	const char *platform_name;
+	int ret;
 
 	ctx = devm_kzalloc(&pdev->dev, sizeof(*ctx), GFP_KERNEL);
 	if (!ctx)
@@ -600,17 +614,46 @@  static int kabylake_audio_probe(struct platform_device *pdev)
 	kabylake_audio_card =
 		(struct snd_soc_card *)pdev->id_entry->driver_data;
 
+	kabylake_audio_card = &kabylake_audio_card_da7219_m98357a;
+
 	kabylake_audio_card->dev = &pdev->dev;
 	snd_soc_card_set_drvdata(kabylake_audio_card, ctx);
+
+	if (x86_match_cpu(cml_ids)) {
+		unsigned int i;
+
+		kabylake_audio_card->name = "cmlda7219max";
+
+		for (i = 0; i < ARRAY_SIZE(kabylake_dais); i++) {
+			/* MAXIM_CODEC is connected to SSP1. */
+			if (!strcmp(kabylake_dais[i].cpus->dai_name,
+					KBL_MAXIM_CODEC_DAI)) {
+				kabylake_dais[i].name = "SSP1-Codec";
+				kabylake_dais[i].cpus->dai_name = "SSP1 Pin";
+			}
+			/* DIALOG_CODEC is connected to SSP0 */
+			else if (!strcmp(kabylake_dais[i].cpus->dai_name,
+					KBL_DIALOG_CODEC_DAI)) {
+				kabylake_dais[i].name = "SSP0-Codec";
+				kabylake_dais[i].cpus->dai_name = "SSP0 Pin";
+			}
+		}
+	}
+
+	mach = (&pdev->dev)->platform_data;
+	platform_name = mach->mach_params.platform;
+
+	ret = snd_soc_fixup_dai_links_platform_name(kabylake_audio_card,
+							platform_name);
+	if (ret)
+		return ret;
+
 	return devm_snd_soc_register_card(&pdev->dev, kabylake_audio_card);
 }
 
 static const struct platform_device_id kbl_board_ids[] = {
-	{
-		.name = "kbl_da7219_max98357a",
-		.driver_data =
-			(kernel_ulong_t)&kabylake_audio_card_da7219_m98357a,
-	},
+	{.name = "kbl_da7219_max98357a",},
+	{.name = "cml_da7219_max98357a",},
 	{ }
 };
 
@@ -628,5 +671,7 @@  module_platform_driver(kabylake_audio)
 /* Module information */
 MODULE_DESCRIPTION("Audio Machine driver-DA7219 & MAX98357A in I2S mode");
 MODULE_AUTHOR("Naveen Manohar <naveen.m@intel.com>");
+MODULE_AUTHOR("Mac Chiang <mac.chiang@intel.com>");
 MODULE_LICENSE("GPL v2");
 MODULE_ALIAS("platform:kbl_da7219_max98357a");
+MODULE_ALIAS("platform:cml_da7219_max98357a");
diff --git a/sound/soc/intel/common/soc-acpi-intel-cnl-match.c b/sound/soc/intel/common/soc-acpi-intel-cnl-match.c
index c36c0aa..4ea32b2 100644
--- a/sound/soc/intel/common/soc-acpi-intel-cnl-match.c
+++ b/sound/soc/intel/common/soc-acpi-intel-cnl-match.c
@@ -19,6 +19,11 @@  static struct snd_soc_acpi_codecs cml_codecs = {
 	.codecs = {"10EC5682"}
 };
 
+static struct snd_soc_acpi_codecs cml_spk_codecs = {
+	.num_codecs = 1,
+	.codecs = {"MX98357A"}
+};
+
 struct snd_soc_acpi_mach snd_soc_acpi_intel_cnl_machines[] = {
 	{
 		.id = "INT34C2",
@@ -29,6 +34,13 @@  struct snd_soc_acpi_mach snd_soc_acpi_intel_cnl_machines[] = {
 		.sof_tplg_filename = "sof-cnl-rt274.tplg",
 	},
 	{
+		.id = "DLGS7219",
+		.drv_name = "cml_da7219_max98357a",
+		.quirk_data = &cml_spk_codecs,
+		.sof_fw_filename = "sof-cnl.ri",
+		.sof_tplg_filename = "sof-cml-da7219-max98357a.tplg",
+	},
+	{
 		.id = "MX98357A",
 		.drv_name = "sof_rt5682",
 		.quirk_data = &cml_codecs,