@@ -442,6 +442,26 @@ static struct skl_ssp_clk skl_ssp_clks[] = {
{.name = "ssp5_sclkfs"},
};
+static struct snd_soc_acpi_mach *skl_probe_hda_machine(
+ struct snd_soc_acpi_mach *machines)
+{
+
+ struct snd_soc_acpi_mach *mach;
+
+ /*
+ * FIXME:
+ * First check if there are any HDA codecs present on the system
+ * then search the match table.
+ * For now this function is not detecting the presence of any
+ * HDA codecs.
+ */
+ for (mach = machines; mach->id[0]; mach++) {
+ if (!strcmp(mach->id, "HDA_GEN"))
+ return mach;
+ }
+ return NULL;
+}
+
static int skl_machine_device_register(struct skl *skl, void *driver_data)
{
struct hdac_bus *bus = skl_to_bus(skl);
@@ -451,9 +471,14 @@ static int skl_machine_device_register(struct skl *skl, void *driver_data)
mach = snd_soc_acpi_find_machine(mach);
if (mach == NULL) {
- dev_err(bus->dev, "No matching machine driver found\n");
- return -ENODEV;
+ dev_dbg(bus->dev, "No matching I2S machine driver found\n");
+ mach = skl_probe_hda_machine(driver_data);
+ if (mach == NULL) {
+ dev_err(bus->dev, "No matching machine driver found\n");
+ return -ENODEV;
+ }
}
+
skl->fw_name = mach->fw_filename;
pdev = platform_device_alloc(mach->drv_name, -1);
@@ -1005,6 +1030,14 @@ static struct snd_soc_acpi_mach sst_skl_devdata[] = {
.quirk_data = &skl_codecs,
.pdata = &skl_dmic_data
},
+ {
+ .id = "HDA_GEN",
+ .drv_name = "skl_hda_generic",
+ .fw_filename = "intel/dsp_fw_release.bin",
+ .machine_quirk = NULL,
+ .quirk_data = NULL,
+ .pdata = &cnl_pdata,
+ },
{}
};
@@ -1067,7 +1100,14 @@ static struct snd_soc_acpi_mach sst_kbl_devdata[] = {
.drv_name = "kbl_rt5663",
.fw_filename = "intel/dsp_fw_kbl.bin",
},
-
+ {
+ .id = "HDA_GEN",
+ .drv_name = "skl_hda_generic",
+ .fw_filename = "intel/dsp_fw_kbl.bin",
+ .machine_quirk = NULL,
+ .quirk_data = NULL,
+ .pdata = &cnl_pdata,
+ },
{}
};
When no I2S based codecs are detected in the BIOS, check if there are any HDA codecs present. If yes, load the corresponding machine driver. TODO: support for detecting the presence of HDA codec is not implemented. it will be implemented in the next revision. Signed-off-by: Rakesh Ughreja <rakesh.a.ughreja@intel.com> --- sound/soc/intel/skylake/skl.c | 46 ++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 43 insertions(+), 3 deletions(-)