ASOC: SOF: add info for hda machine driver

(1)Hda codec status and platform name are used by
   machine driver to create dai links, so it need
   to be set in sof core

(2)Try HDA codec if no I2S codec is found

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

Author: RanderWang

include/sound/sof.h

@@ -47,6 +47,7 @@ struct snd_sof_pdata {
 	const struct firmware *fw;
 	const char *drv_name;
 	const char *name;
+	const char *platform;
 
 	/* parent device */
 	struct device *dev;
@@ -59,6 +60,9 @@ struct snd_sof_pdata {
 	unsigned int gpio;
 	unsigned int active;
 
+	/* hda codec */
+	unsigned long codec_mask;
+
 	/* machine */
 	struct platform_device *pdev_mach;
 	union {

sound/soc/sof/intel/hda.c

@@ -415,6 +415,9 @@ static int hda_init_caps(struct snd_sof_dev *sdev)
 	if (!bus->codec_mask)
 		dev_info(bus->dev, "no hda codecs found!\n");
 
+	/* used by hda machine driver to create dai links */
+	sdev->pdata->codec_mask = bus->codec_mask;
+
 	/* create codec instances */
 	hda_codec_probe_bus(sdev);
 

sound/soc/sof/sof-acpi-dev.c

@@ -232,8 +232,9 @@ static int sof_acpi_probe(struct platform_device *pdev)
 		if (ret < 0)
 			return ret;
 #else
-		dev_err(dev, "No matching ASoC machine driver found - aborting probe\n");
-		return -ENODEV;
+		dev_warn(dev, "No matching ASoC machine driver found - falling back to HDA codec\n");
+		mach = snd_soc_acpi_intel_hda_machines;
+		mach->sof_fw_filename = desc->nocodec_fw_filename;
 #endif
 	}
 #endif
@@ -251,6 +252,7 @@ static int sof_acpi_probe(struct platform_device *pdev)
 	priv->sof_pdata = sof_pdata;
 	sof_pdata->dev = &pdev->dev;
 	sof_pdata->type = SOF_DEVICE_APCI;
+	sof_pdata->platform = "sof-audio";
 	dev_set_drvdata(&pdev->dev, priv);
 
 	/* do we need to generate any machine plat data ? */

sound/soc/sof/sof-pci-dev.c

@@ -229,9 +229,9 @@ static int sof_pci_probe(struct pci_dev *pci,
 		if (ret < 0)
 			goto release_regions;
 #else
-		dev_err(dev, "No matching ASoC machine driver found - aborting probe\n");
-		ret = -ENODEV;
-		goto release_regions;
+		dev_warn(dev, "No matching ASoC machine driver found - falling back to HDA codec\n");
+		mach = snd_soc_acpi_intel_hda_machines;
+		mach->sof_fw_filename = desc->nocodec_fw_filename;
 #endif
 	}
 #endif
@@ -245,6 +245,7 @@ static int sof_pci_probe(struct pci_dev *pci,
 	priv->sof_pdata = sof_pdata;
 	sof_pdata->dev = &pci->dev;
 	sof_pdata->type = SOF_DEVICE_PCI;
+	sof_pdata->platform = "sof-audio";
 
 	/* register sof-audio platform driver */
 	ret = sof_create_platform_device(priv);

sound/soc/sof/sof-spi-dev.c

@@ -130,20 +130,9 @@ static int sof_spi_probe(struct spi_device *spi)
 	sof_pdata->dev = dev;
 	sof_pdata->type = SOF_DEVICE_SPI;
 
-	/* register machine driver */
-	sof_pdata->pdev_mach =
-		platform_device_register_data(dev, mach->drv_name, -1,
-					      sof_pdata, sizeof(*sof_pdata));
-	if (IS_ERR(sof_pdata->pdev_mach))
-		return PTR_ERR(sof_pdata->pdev_mach);
-
-	dev_dbg(dev, "created machine %s\n",
-		dev_name(&sof_pdata->pdev_mach->dev));
-
 	/* register sof-audio platform driver */
 	ret = sof_create_platform_device(priv);
 	if (ret) {
-		platform_device_unregister(sof_pdata->pdev_mach);
 		dev_err(dev, "error: failed to create platform device!\n");
 		return ret;
 	}