ASOC: Intel: refine hda machine driver to make it work with SOF

Signed-off-by: Rander Wang <rander.wang@linux.intel.com>
Signed-off-by: Mengdong Lin <mengdong.lin@linux.intel.com>

Author: RanderWang

sound/soc/intel/boards/Kconfig

@@ -326,6 +326,10 @@ config SND_SOC_INTEL_KBL_DA7219_MAX98357A_MACH
 	  create an alsa sound card for DA7219 + MAX98357A I2S audio codec.
 	  Say Y if you have such a device.
 
+endif ## SND_SOC_INTEL_SKYLAKE
+
+if SND_SOC_INTEL_SKYLAKE || SND_SOC_SOF_HDA
+
 config SND_SOC_INTEL_SKL_HDA_DSP_GENERIC_MACH
 	tristate "SKL/KBL/BXT/APL with HDA Codecs"
 	select SND_SOC_HDAC_HDMI
@@ -335,8 +339,7 @@ config SND_SOC_INTEL_SKL_HDA_DSP_GENERIC_MACH
 	  SKL/KBL/BXT/APL with iDisp, HDA audio codecs.
           Say Y or m if you have such a device. This is a recommended option.
 	  If unsure select "N".
-
-endif ## SND_SOC_INTEL_SKYLAKE
+endif ## SND_SOC_INTEL_SKYLAKE || SND_SOC_SOF_HDA
 
 if SND_SOC_INTEL_SKYLAKE || SND_SOC_SOF_CANNONLAKE
 

sound/soc/intel/boards/skl_hda_dsp_generic.c

@@ -12,6 +12,7 @@
 #include <sound/pcm.h>
 #include <sound/pcm_params.h>
 #include <sound/soc.h>
+#include <sound/sof.h>
 #include "../../codecs/hdac_hdmi.h"
 #include "../skylake/skl.h"
 #include "skl_hda_dsp_common.h"
@@ -101,16 +102,16 @@ static struct snd_soc_card hda_soc_card = {
 #define IDISP_ROUTE_COUNT	(IDISP_DAI_COUNT * 2)
 #define IDISP_CODEC_MASK	0x4
 
-static int skl_hda_fill_card_info(struct skl_machine_pdata *pdata)
+static int skl_hda_fill_card_info(const char *platform,
+				  unsigned long codec_mask)
 {
 	struct snd_soc_card *card = &hda_soc_card;
-	u32 codec_count, codec_mask;
+	u32 codec_count;
 	int i, num_links, num_route;
 
-	codec_mask = pdata->codec_mask;
 	codec_count = hweight_long(codec_mask);
 
-	if (codec_count == 1 && pdata->codec_mask & IDISP_CODEC_MASK) {
+	if (codec_count == 1 && codec_mask & IDISP_CODEC_MASK) {
 		num_links = IDISP_DAI_COUNT;
 		num_route = IDISP_ROUTE_COUNT;
 	} else if (codec_count == 2 && codec_mask & IDISP_CODEC_MASK) {
@@ -126,17 +127,22 @@ static int skl_hda_fill_card_info(struct skl_machine_pdata *pdata)
 	card->num_dapm_routes = num_route;
 
 	for (i = 0; i < num_links; i++)
-		skl_hda_be_dai_links[i].platform_name = pdata->platform;
+		skl_hda_be_dai_links[i].platform_name = platform;
 
 	return 0;
 }
 
 static int skl_hda_audio_probe(struct platform_device *pdev)
 {
-	struct skl_machine_pdata *pdata;
 	struct skl_hda_private *ctx;
 	int ret;
 
+#if IS_ENABLED(CONFIG_SND_SOC_SOF_INTEL)
+	struct snd_sof_pdata *pdata = dev_get_platdata(&pdev->dev);
+#else
+	struct skl_machine_pdata *pdata = dev_get_drvdata(&pdev->dev);
+#endif
+
 	dev_dbg(&pdev->dev, "%s: entry\n", __func__);
 
 	ctx = devm_kzalloc(&pdev->dev, sizeof(*ctx), GFP_ATOMIC);
@@ -145,11 +151,10 @@ static int skl_hda_audio_probe(struct platform_device *pdev)
 
 	INIT_LIST_HEAD(&ctx->hdmi_pcm_list);
 
-	pdata = dev_get_drvdata(&pdev->dev);
 	if (!pdata)
 		return -EINVAL;
 
-	ret = skl_hda_fill_card_info(pdata);
+	ret = skl_hda_fill_card_info(pdata->platform, pdata->codec_mask);
 	if (ret < 0) {
 		dev_err(&pdev->dev, "Unsupported HDAudio/iDisp configuration found\n");
 		return ret;