Alsa-Devel Archive on lore.kernel.org
 help / color / mirror / Atom feed
From: Harsha Priya <harshapriya.n@intel.com>
To: vinod.koul@intel.com, broonie@kernel.org, patch@alsa-project.org,
	alsa-devel@alsa-project.org
Cc: Harsha Priya <harshapriya.n@intel.com>
Subject: [PATCH 2/2] ASoC: Intel: Add Kabylake RT5663+RT5514+MAX98927 machine driver entry
Date: Tue,  6 Jun 2017 13:51:33 -0700	[thread overview]
Message-ID: <1496782293-15658-3-git-send-email-harshapriya.n@intel.com> (raw)
In-Reply-To: <1496782293-15658-1-git-send-email-harshapriya.n@intel.com>

Adds Kabylake rt5663_rt5514_max machine driver entry into machine table

Signed-off-by: Harsha Priya <harshapriya.n@intel.com>
---
 sound/soc/intel/skylake/skl.c | 37 +++++++++++++++++++++++++++++++++----
 1 file changed, 33 insertions(+), 4 deletions(-)

diff --git a/sound/soc/intel/skylake/skl.c b/sound/soc/intel/skylake/skl.c
index 4ebae85..e761550 100644
--- a/sound/soc/intel/skylake/skl.c
+++ b/sound/soc/intel/skylake/skl.c
@@ -876,10 +876,31 @@ static void skl_remove(struct pci_dev *pci)
 	dev_set_drvdata(&pci->dev, NULL);
 }
 
-static struct sst_codecs skl_codecs = { 1, {"NAU88L25"} };
-static struct sst_codecs kbl_codecs = { 1, {"NAU88L25"} };
-static struct sst_codecs bxt_codecs = { 1, {"MX98357A"} };
-static struct sst_codecs kbl_poppy_codecs = { 1, {"10EC5663"} };
+static struct sst_codecs skl_codecs = {
+	.num_codecs = 1,
+	.codecs = {"NAU88L25"}
+};
+
+static struct sst_codecs kbl_codecs = {
+	.num_codecs = 1,
+	.codecs = {"NAU88L25"}
+};
+
+static struct sst_codecs bxt_codecs = {
+	.num_codecs = 1,
+	.codecs = {"MX98357A"}
+};
+
+static struct sst_codecs kbl_poppy_codecs = {
+	.num_codecs = 1,
+	.codecs = {"10EC5663"}
+};
+
+static struct sst_codecs kbl_5663_5514_codecs = {
+	.num_codecs = 2,
+	.codecs = {"10EC5663", "10EC5514"}
+};
+
 
 static struct sst_acpi_mach sst_skl_devdata[] = {
 	{
@@ -945,6 +966,14 @@ static void skl_remove(struct pci_dev *pci)
 	},
 	{
 		.id = "MX98927",
+		.drv_name = "kbl_r5514_5663_max",
+		.fw_filename = "intel/dsp_fw_kbl.bin",
+		.machine_quirk = sst_acpi_codec_list,
+		.quirk_data = &kbl_5663_5514_codecs,
+		.pdata = &skl_dmic_data
+	},
+	{
+		.id = "MX98927",
 		.drv_name = "kbl_rt5663_m98927",
 		.fw_filename = "intel/dsp_fw_kbl.bin",
 		.machine_quirk = sst_acpi_codec_list,
-- 
1.9.1

  parent reply	other threads:[~2017-06-06 20:51 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-06-06 20:51 [PATCH 0/2] ASoC: Intel: Add Kabylake machine driver for RT5663+RT5514+MAX98927 Harsha Priya
2017-06-06 20:51 ` [PATCH 1/2] ASoC: Intel: Add Kabylake machine driver for RT5514, RT5663 and MAX98927 Harsha Priya
2017-06-07  6:50   ` Takashi Iwai
2017-06-06 20:51 ` Harsha Priya [this message]
2017-06-07  6:10   ` [PATCH 2/2] ASoC: Intel: Add Kabylake RT5663+RT5514+MAX98927 machine driver entry Takashi Iwai

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1496782293-15658-3-git-send-email-harshapriya.n@intel.com \
    --to=harshapriya.n@intel.com \
    --cc=alsa-devel@alsa-project.org \
    --cc=broonie@kernel.org \
    --cc=patch@alsa-project.org \
    --cc=vinod.koul@intel.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox