@@ -21,6 +21,7 @@
#include "../../codecs/hdac_hdmi.h"
#include "../skylake/skl.h"
#include "../../codecs/da7219-aad.h"
+#include "hdac_hdmi_common.h"
#define KBL_DIALOG_CODEC_DAI "da7219-hifi"
#define KBL_MAXIM_CODEC_DAI "HiFi"
@@ -40,6 +41,7 @@ struct kbl_hdmi_pcm {
struct kbl_codec_private {
struct snd_soc_jack kabylake_headset;
struct list_head hdmi_pcm_list;
+ struct device_link *link;
};
enum {
@@ -216,7 +218,8 @@ static int kabylake_hdmi_init(struct snd_soc_pcm_runtime *rtd, int device)
list_add_tail(&pcm->head, &ctx->hdmi_pcm_list);
- return 0;
+ /* Setup a device_link between machine device and HDMI codec device. */
+ return hdac_hdmi_add_device_link(rtd->card->dev, dai->dev, &ctx->link);
}
static int kabylake_hdmi1_init(struct snd_soc_pcm_runtime *rtd)
@@ -597,8 +600,17 @@ static const struct platform_device_id kbl_board_ids[] = {
{ }
};
+static int kabylake_audio_remove(struct platform_device *pdev)
+{
+ struct snd_soc_card *card = platform_get_drvdata(pdev);
+ struct kbl_codec_private *ctx = snd_soc_card_get_drvdata(card);
+
+ return hdac_hdmi_del_device_link(&ctx->link);
+}
+
static struct platform_driver kabylake_audio = {
.probe = kabylake_audio_probe,
+ .remove = kabylake_audio_remove,
.driver = {
.name = "kbl_da7219_max98357a",
.pm = &snd_soc_pm_ops,