On Tue, 06 Jun 2017 22:51:33 +0200, Harsha Priya wrote:
Adds Kabylake rt5663_rt5514_max machine driver entry into machine table
Try to split this to two: one for a preparation patch to convert to C99 init style and another to add the new entry.
Takashi
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",-- 1.9.1