ASoC: SOF: hda: manually register/unregister dmic device

The Intel machine drivers make use of the "dmic-codec", which isn't currently ACPI enumerated. While there is no control capability for the dmic, this dmic-codec allows for the use of parameters such as wake-up time. Rather than add conditional code in all machine drivers, add registration/unregistration for this platform device in the HDaudio support of SOF. This code would become conditional if there is ever an ACPI support added to the DMIC. Signed-off-by: Pierre-Louis Bossart <[email protected]>
thesofproject · Nov 1, 2018 · 5d7f074 · 5d7f074
1 parent 7e41d53
commit 5d7f074
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 0 deletions.
diff --git a/sound/soc/sof/intel/hda.c b/sound/soc/sof/intel/hda.c
@@ -507,6 +507,13 @@ int hda_dsp_probe(struct snd_sof_dev *sdev)
 	sdev->hda = hdev;
 	hdev->desc = chip;
 
+	hdev->dmic_dev = platform_device_register_data(&pci->dev, "dmic-codec",
+						       -1, NULL, 0);
+	if (IS_ERR(hdev->dmic_dev)) {
+		dev_err(&pci->dev, "Failed to create DMIC device\n");
+		return PTR_ERR(hdev->dmic_dev);
+	}
+
 	/*
 	 * use position update IPC if either it is forced
 	 * or we don't have other choice
@@ -681,6 +688,9 @@ int hda_dsp_remove(struct snd_sof_dev *sdev)
 	struct pci_dev *pci = sdev->pci;
 	const struct sof_intel_dsp_desc *chip = sdev->hda->desc;
 
+	if (sdev->hda && (!IS_ERR_OR_NULL(sdev->hda->dmic_dev)))
+		platform_device_unregister(sdev->hda->dmic_dev);
+
 	/* disable DSP IRQ */
 	snd_sof_dsp_update_bits(sdev, HDA_DSP_PP_BAR, SOF_HDA_REG_PP_PPCTL,
 				SOF_HDA_PPCTL_PIE, 0);

diff --git a/sound/soc/sof/intel/hda.h b/sound/soc/sof/intel/hda.h
@@ -363,6 +363,9 @@ struct sof_intel_hda_dev {
 	bool no_ipc_position;
 
 	int irq;
+
+	/* DMIC device */
+	struct platform_device *dmic_dev;
 };
 
 #define bus_to_sof_hda(bus) \