[PATCH v2 0/6] ASoC: Intel: kabylake: Adds rt5663+max98927 machine driver

[PATCH v2 0/6] ASoC: Intel: kabylake: Adds rt5663+max98927 machine driver

[Naveen M]

Convert all machine data to C99 style initialization.
Add support for multiple codecs in acpi matching of sst library using
machine quirk for robust mach driver selection.
Add kabylake machine driver & corresponding driver entry in machine table
for following codecs:
 1. rt5663 for headset configured to ssp1.
 2. max98927 for speakers configured to ssp0.
Changes in V2: Convert all machine data to C99 style. 

Naveen M (6):
  ASoC: Intel: Convert all machine data to C99 style
  ASoC: Intel: Create a helper to search for matching machine
  ASoC: Move quirk to identify correct machine driver
  ASoC: Improve machine driver selection based on quirk data
  ASoC: Intel: Add Kabylake Realtek Maxim machine driver
  ASoC: Intel: Add Kabylake RT5663+MAX98927 machine driver entry

 sound/soc/intel/Kconfig                      |  15 +
 sound/soc/intel/atom/sst/sst_acpi.c          | 211 ++++++--
 sound/soc/intel/boards/Makefile              |   2 +
 sound/soc/intel/boards/kbl_rt5663_max98927.c | 687 +++++++++++++++++++++++++++
 sound/soc/intel/common/sst-acpi.h            |  23 +
 sound/soc/intel/common/sst-match-acpi.c      |  47 +-
 sound/soc/intel/skylake/skl.c                |  84 +++-
 7 files changed, 1003 insertions(+), 66 deletions(-)
 create mode 100644 sound/soc/intel/boards/kbl_rt5663_max98927.c

-- 
1.9.1

[PATCH v2 1/6] ASoC: Intel: Convert all machine data to C99 style

[Naveen M]

C99 style struct initialization helps in readability as well as
initialization of variables not specified as NULL.

Signed-off-by: Naveen M <naveen.m@intel.com>
Signed-off-by: Vinod Koul <vinod.koul@intel.com>
---
 sound/soc/intel/atom/sst/sst_acpi.c | 209 ++++++++++++++++++++++++++++--------
 sound/soc/intel/skylake/skl.c       |  60 +++++++++--
 2 files changed, 211 insertions(+), 58 deletions(-)

diff --git a/sound/soc/intel/atom/sst/sst_acpi.c b/sound/soc/intel/atom/sst/sst_acpi.c
index dd250b8..193c4d7 100644
--- a/sound/soc/intel/atom/sst/sst_acpi.c
+++ b/sound/soc/intel/atom/sst/sst_acpi.c
@@ -453,12 +453,20 @@ static int byt_thinkpad10_quirk_cb(const struct dmi_system_id *id)
 
 
 static struct sst_acpi_mach cht_surface_mach = {
-	"10EC5640", "cht-bsw-rt5645", "intel/fw_sst_22a8.bin", "cht-bsw", NULL,
-								&chv_platform_data };
+	.id = "10EC5640",
+	.drv_name = "cht-bsw-rt5645",
+	.fw_filename = "intel/fw_sst_22a8.bin",
+	.board = "cht-bsw",
+	.pdata = &chv_platform_data,
+};
 
 static struct sst_acpi_mach byt_thinkpad_10 = {
-	"10EC5640", "cht-bsw-rt5672", "intel/fw_sst_0f28.bin", "cht-bsw", NULL,
-	                                                        &byt_rvp_platform_data };
+	.id = "10EC5640",
+	.drv_name = "cht-bsw-rt5672",
+	.fw_filename = "intel/fw_sst_0f28.bin",
+	.board = "cht-bsw",
+	.pdata = &byt_rvp_platform_data,
+};
 
 static struct sst_acpi_mach *cht_quirk(void *arg)
 {
@@ -486,68 +494,175 @@ static struct sst_acpi_mach *byt_quirk(void *arg)
 
 
 static struct sst_acpi_mach sst_acpi_bytcr[] = {
-	{"10EC5640", "bytcr_rt5640", "intel/fw_sst_0f28.bin", "bytcr_rt5640", byt_quirk,
-						&byt_rvp_platform_data },
-	{"10EC5642", "bytcr_rt5640", "intel/fw_sst_0f28.bin", "bytcr_rt5640", NULL,
-						&byt_rvp_platform_data },
-	{"INTCCFFD", "bytcr_rt5640", "intel/fw_sst_0f28.bin", "bytcr_rt5640", NULL,
-						&byt_rvp_platform_data },
-	{"10EC5651", "bytcr_rt5651", "intel/fw_sst_0f28.bin", "bytcr_rt5651", NULL,
-						&byt_rvp_platform_data },
-	{"DLGS7212", "bytcht_da7213", "intel/fw_sst_0f28.bin", "bytcht_da7213", NULL,
-						&byt_rvp_platform_data },
-	{"DLGS7213", "bytcht_da7213", "intel/fw_sst_0f28.bin", "bytcht_da7213", NULL,
-						&byt_rvp_platform_data },
+	{
+		.id = "10EC5640",
+		.drv_name = "bytcr_rt5640",
+		.fw_filename = "intel/fw_sst_0f28.bin",
+		.board = "bytcr_rt5640",
+		.machine_quirk = byt_quirk,
+		.pdata = &byt_rvp_platform_data,
+	},
+	{
+		.id = "10EC5642",
+		.drv_name = "bytcr_rt5640",
+		.fw_filename = "intel/fw_sst_0f28.bin",
+		.board = "bytcr_rt5640",
+		.pdata = &byt_rvp_platform_data
+	},
+	{
+		.id = "INTCCFFD",
+		.drv_name = "bytcr_rt5640",
+		.fw_filename = "intel/fw_sst_0f28.bin",
+		.board = "bytcr_rt5640",
+		.pdata = &byt_rvp_platform_data
+	},
+	{
+		.id = "10EC5651",
+		.drv_name = "bytcr_rt5651",
+		.fw_filename = "intel/fw_sst_0f28.bin",
+		.board = "bytcr_rt5651",
+		.pdata = &byt_rvp_platform_data
+	},
+	{
+		.id = "DLGS7212",
+		.drv_name = "bytcht_da7213",
+		.fw_filename = "intel/fw_sst_0f28.bin",
+		.board = "bytcht_da7213",
+		.pdata = &byt_rvp_platform_data
+	},
+	{
+		.id = "DLGS7213",
+		.drv_name = "bytcht_da7213",
+		.fw_filename = "intel/fw_sst_0f28.bin",
+		.board = "bytcht_da7213",
+		.pdata = &byt_rvp_platform_data
+	},
 	/* some Baytrail platforms rely on RT5645, use CHT machine driver */
-	{"10EC5645", "cht-bsw-rt5645", "intel/fw_sst_0f28.bin", "cht-bsw", NULL,
-						&byt_rvp_platform_data },
-	{"10EC5648", "cht-bsw-rt5645", "intel/fw_sst_0f28.bin", "cht-bsw", NULL,
-						&byt_rvp_platform_data },
+	{
+		.id = "10EC5645",
+		.drv_name = "cht-bsw-rt5645",
+		.fw_filename = "intel/fw_sst_0f28.bin",
+		.board = "cht-bsw",
+		.pdata = &byt_rvp_platform_data
+	},
+	{
+		.id = "10EC5648",
+		.drv_name = "cht-bsw-rt5645",
+		.fw_filename = "intel/fw_sst_0f28.bin",
+		.board = "cht-bsw",
+		.pdata = &byt_rvp_platform_data
+	},
 #if IS_ENABLED(CONFIG_SND_SOC_INTEL_BYT_CHT_NOCODEC_MACH)
 	/*
 	 * This is always last in the table so that it is selected only when
 	 * enabled explicitly and there is no codec-related information in SSDT
 	 */
-	{"80860F28", "bytcht_nocodec", "intel/fw_sst_0f28.bin", "bytcht_nocodec", NULL,
-						&byt_rvp_platform_data },
+	{
+		.id = "80860F28",
+		.drv_name = "bytcht_nocodec",
+		.fw_filename = "intel/fw_sst_0f28.bin",
+		.board = "bytcht_nocodec",
+		.pdata = &byt_rvp_platform_data
+	},
 #endif
 	{},
 };
 
 /* Cherryview-based platforms: CherryTrail and Braswell */
 static struct sst_acpi_mach sst_acpi_chv[] = {
-	{"10EC5670", "cht-bsw-rt5672", "intel/fw_sst_22a8.bin", "cht-bsw", NULL,
-						&chv_platform_data },
-	{"10EC5672", "cht-bsw-rt5672", "intel/fw_sst_22a8.bin", "cht-bsw", NULL,
-						&chv_platform_data },
-	{"10EC5645", "cht-bsw-rt5645", "intel/fw_sst_22a8.bin", "cht-bsw", NULL,
-						&chv_platform_data },
-	{"10EC5650", "cht-bsw-rt5645", "intel/fw_sst_22a8.bin", "cht-bsw", NULL,
-						&chv_platform_data },
-	{"10EC3270", "cht-bsw-rt5645", "intel/fw_sst_22a8.bin", "cht-bsw", NULL,
-						&chv_platform_data },
-
-	{"193C9890", "cht-bsw-max98090", "intel/fw_sst_22a8.bin", "cht-bsw", NULL,
-						&chv_platform_data },
-	{"DLGS7212", "bytcht_da7213", "intel/fw_sst_22a8.bin", "bytcht_da7213", NULL,
-						&chv_platform_data },
-	{"DLGS7213", "bytcht_da7213", "intel/fw_sst_22a8.bin", "bytcht_da7213", NULL,
-						&chv_platform_data },
+	{
+		.id = "10EC5670",
+		.drv_name = "cht-bsw-rt5672",
+		.fw_filename = "intel/fw_sst_22a8.bin",
+		.board = "cht-bsw",
+		.pdata = &chv_platform_data
+	},
+	{
+		.id = "10EC5672",
+		.drv_name = "cht-bsw-rt5672",
+		.fw_filename = "intel/fw_sst_22a8.bin",
+		.board = "cht-bsw",
+		.pdata = &chv_platform_data
+	},
+	{
+		.id = "10EC5645",
+		.drv_name = "cht-bsw-rt5645",
+		.fw_filename = "intel/fw_sst_22a8.bin",
+		.board = "cht-bsw",
+		.pdata = &chv_platform_data
+	},
+	{
+		.id = "10EC5650",
+		.drv_name = "cht-bsw-rt5645",
+		.fw_filename = "intel/fw_sst_22a8.bin",
+		.board = "cht-bsw",
+		.pdata = &chv_platform_data
+	},
+	{
+		.id = "10EC3270",
+		.drv_name = "cht-bsw-rt5645",
+		.fw_filename = "intel/fw_sst_22a8.bin",
+		.board = "cht-bsw",
+		.pdata = &chv_platform_data
+	},
+
+	{
+		.id = "193C9890",
+		.drv_name = "cht-bsw-max98090",
+		.fw_filename = "intel/fw_sst_22a8.bin",
+		.board = "cht-bsw",
+		.pdata = &chv_platform_data
+	},
+	{
+		.id = "DLGS7212",
+		.drv_name = "bytcht_da7213",
+		.fw_filename = "intel/fw_sst_22a8.bin",
+		.board = "bytcht_da7213",
+		.pdata = &chv_platform_data
+	},
+	{
+		.id = "DLGS7213",
+		.drv_name = "bytcht_da7213",
+		.fw_filename = "intel/fw_sst_22a8.bin",
+		.board = "bytcht_da7213",
+		.pdata = &chv_platform_data
+	},
 	/* some CHT-T platforms rely on RT5640, use Baytrail machine driver */
-	{"10EC5640", "bytcr_rt5640", "intel/fw_sst_22a8.bin", "bytcr_rt5640", cht_quirk,
-						&chv_platform_data },
-	{"10EC3276", "bytcr_rt5640", "intel/fw_sst_22a8.bin", "bytcr_rt5640", NULL,
-						&chv_platform_data },
+	{
+		.id = "10EC5640",
+		.drv_name = "bytcr_rt5640",
+		.fw_filename = "intel/fw_sst_22a8.bin",
+		.board = "bytcr_rt5640",
+		.machine_quirk = cht_quirk,
+		.pdata = &chv_platform_data
+	},
+	{
+		.id = "10EC3276",
+		.drv_name = "bytcr_rt5640",
+		.fw_filename = "intel/fw_sst_22a8.bin",
+		.board = "bytcr_rt5640",
+		.pdata = &chv_platform_data
+	},
 	/* some CHT-T platforms rely on RT5651, use Baytrail machine driver */
-	{"10EC5651", "bytcr_rt5651", "intel/fw_sst_22a8.bin", "bytcr_rt5651", NULL,
-						&chv_platform_data },
+	{
+		.id = "10EC5651",
+		.drv_name = "bytcr_rt5651",
+		.fw_filename = "intel/fw_sst_22a8.bin",
+		.board = "bytcr_rt5651",
+		.pdata = &chv_platform_data
+	},
 #if IS_ENABLED(CONFIG_SND_SOC_INTEL_BYT_CHT_NOCODEC_MACH)
 	/*
 	 * This is always last in the table so that it is selected only when
 	 * enabled explicitly and there is no codec-related information in SSDT
 	 */
-	{"808622A8", "bytcht_nocodec", "intel/fw_sst_22a8.bin", "bytcht_nocodec", NULL,
-						&chv_platform_data },
+	{
+		.id = "808622A8",
+		.drv_name = "bytcht_nocodec",
+		.fw_filename = "intel/fw_sst_22a8.bin",
+		.board = "bytcht_nocodec",
+		.pdata = &chv_platform_data
+	},
 #endif
 	{},
 };
diff --git a/sound/soc/intel/skylake/skl.c b/sound/soc/intel/skylake/skl.c
index 6df3b31..22a7e39 100644
--- a/sound/soc/intel/skylake/skl.c
+++ b/sound/soc/intel/skylake/skl.c
@@ -863,28 +863,66 @@ static void skl_remove(struct pci_dev *pci)
 }
 
 static struct sst_acpi_mach sst_skl_devdata[] = {
-	{ "INT343A", "skl_alc286s_i2s", "intel/dsp_fw_release.bin", NULL, NULL, NULL },
-	{ "INT343B", "skl_n88l25_s4567", "intel/dsp_fw_release.bin",
-				NULL, NULL, &skl_dmic_data },
-	{ "MX98357A", "skl_n88l25_m98357a", "intel/dsp_fw_release.bin",
-				NULL, NULL, &skl_dmic_data },
+	{
+		.id = "INT343A",
+		.drv_name = "skl_alc286s_i2s",
+		.fw_filename = "intel/dsp_fw_release.bin",
+	},
+	{
+		.id = "INT343B",
+		.drv_name = "skl_n88l25_s4567",
+		.fw_filename = "intel/dsp_fw_release.bin",
+		.pdata = &skl_dmic_data
+	},
+	{
+		.id = "MX98357A",
+		.drv_name = "skl_n88l25_m98357a",
+		.fw_filename = "intel/dsp_fw_release.bin",
+		.pdata = &skl_dmic_data
+	},
 	{}
 };
 
 static struct sst_acpi_mach sst_bxtp_devdata[] = {
-	{ "INT343A", "bxt_alc298s_i2s", "intel/dsp_fw_bxtn.bin", NULL, NULL, NULL },
-	{ "DLGS7219", "bxt_da7219_max98357a_i2s", "intel/dsp_fw_bxtn.bin", NULL, NULL, NULL },
+	{
+		.id = "INT343A",
+		.drv_name = "bxt_alc298s_i2s",
+		.fw_filename = "intel/dsp_fw_bxtn.bin",
+	},
+	{
+		.id = "DLGS7219",
+		.drv_name = "bxt_da7219_max98357a_i2s",
+		.fw_filename = "intel/dsp_fw_bxtn.bin",
+	},
 };
 
 static struct sst_acpi_mach sst_kbl_devdata[] = {
-	{ "INT343A", "kbl_alc286s_i2s", "intel/dsp_fw_kbl.bin", NULL, NULL, NULL },
-	{ "INT343B", "kbl_n88l25_s4567", "intel/dsp_fw_kbl.bin", NULL, NULL, &skl_dmic_data },
-	{ "MX98357A", "kbl_n88l25_m98357a", "intel/dsp_fw_kbl.bin", NULL, NULL, &skl_dmic_data },
+	{
+		.id = "INT343A",
+		.drv_name = "kbl_alc286s_i2s",
+		.fw_filename = "intel/dsp_fw_kbl.bin",
+	},
+	{
+		.id = "INT343B",
+		.drv_name = "kbl_n88l25_s4567",
+		.fw_filename = "intel/dsp_fw_kbl.bin",
+		.pdata = &skl_dmic_data
+	},
+	{
+		.id = "MX98357A",
+		.drv_name = "kbl_n88l25_m98357a",
+		.fw_filename = "intel/dsp_fw_kbl.bin",
+		.pdata = &skl_dmic_data
+	},
 	{}
 };
 
 static struct sst_acpi_mach sst_glk_devdata[] = {
-	{ "INT343A", "glk_alc298s_i2s", "intel/dsp_fw_glk.bin", NULL, NULL, NULL },
+	{
+		.id = "INT343A",
+		.drv_name = "glk_alc298s_i2s",
+		.fw_filename = "intel/dsp_fw_glk.bin",
+	},
 };
 
 /* PCI IDs */
-- 
1.9.1

Re: [PATCH v2 1/6] ASoC: Intel: Convert all machine data to C99 style

[Vinod Koul]

On Thu, May 11, 2017 at 06:02:19PM +0530, Naveen M wrote:
> C99 style struct initialization helps in readability as well as
> initialization of variables not specified as NULL.
> 
> Signed-off-by: Naveen M <naveen.m@intel.com>
> Signed-off-by: Vinod Koul <vinod.koul@intel.com>

this needs:

Suggested-by: Takashi Iwai <tiwai@suse.de>

> ---
>  sound/soc/intel/atom/sst/sst_acpi.c | 209 ++++++++++++++++++++++++++++--------
>  sound/soc/intel/skylake/skl.c       |  60 +++++++++--

Series looks good to me, but I feel we should split these two to separate
patches as they touch two different drivers.

>  2 files changed, 211 insertions(+), 58 deletions(-)
> 
> diff --git a/sound/soc/intel/atom/sst/sst_acpi.c b/sound/soc/intel/atom/sst/sst_acpi.c
> index dd250b8..193c4d7 100644
> --- a/sound/soc/intel/atom/sst/sst_acpi.c
> +++ b/sound/soc/intel/atom/sst/sst_acpi.c
> @@ -453,12 +453,20 @@ static int byt_thinkpad10_quirk_cb(const struct dmi_system_id *id)
>  
>  
>  static struct sst_acpi_mach cht_surface_mach = {
> -	"10EC5640", "cht-bsw-rt5645", "intel/fw_sst_22a8.bin", "cht-bsw", NULL,
> -								&chv_platform_data };
> +	.id = "10EC5640",
> +	.drv_name = "cht-bsw-rt5645",
> +	.fw_filename = "intel/fw_sst_22a8.bin",
> +	.board = "cht-bsw",
> +	.pdata = &chv_platform_data,
> +};
>  
>  static struct sst_acpi_mach byt_thinkpad_10 = {
> -	"10EC5640", "cht-bsw-rt5672", "intel/fw_sst_0f28.bin", "cht-bsw", NULL,
> -	                                                        &byt_rvp_platform_data };
> +	.id = "10EC5640",
> +	.drv_name = "cht-bsw-rt5672",
> +	.fw_filename = "intel/fw_sst_0f28.bin",
> +	.board = "cht-bsw",
> +	.pdata = &byt_rvp_platform_data,
> +};
>  
>  static struct sst_acpi_mach *cht_quirk(void *arg)
>  {
> @@ -486,68 +494,175 @@ static struct sst_acpi_mach *byt_quirk(void *arg)
>  
>  
>  static struct sst_acpi_mach sst_acpi_bytcr[] = {
> -	{"10EC5640", "bytcr_rt5640", "intel/fw_sst_0f28.bin", "bytcr_rt5640", byt_quirk,
> -						&byt_rvp_platform_data },
> -	{"10EC5642", "bytcr_rt5640", "intel/fw_sst_0f28.bin", "bytcr_rt5640", NULL,
> -						&byt_rvp_platform_data },
> -	{"INTCCFFD", "bytcr_rt5640", "intel/fw_sst_0f28.bin", "bytcr_rt5640", NULL,
> -						&byt_rvp_platform_data },
> -	{"10EC5651", "bytcr_rt5651", "intel/fw_sst_0f28.bin", "bytcr_rt5651", NULL,
> -						&byt_rvp_platform_data },
> -	{"DLGS7212", "bytcht_da7213", "intel/fw_sst_0f28.bin", "bytcht_da7213", NULL,
> -						&byt_rvp_platform_data },
> -	{"DLGS7213", "bytcht_da7213", "intel/fw_sst_0f28.bin", "bytcht_da7213", NULL,
> -						&byt_rvp_platform_data },
> +	{
> +		.id = "10EC5640",
> +		.drv_name = "bytcr_rt5640",
> +		.fw_filename = "intel/fw_sst_0f28.bin",
> +		.board = "bytcr_rt5640",
> +		.machine_quirk = byt_quirk,
> +		.pdata = &byt_rvp_platform_data,
> +	},
> +	{
> +		.id = "10EC5642",
> +		.drv_name = "bytcr_rt5640",
> +		.fw_filename = "intel/fw_sst_0f28.bin",
> +		.board = "bytcr_rt5640",
> +		.pdata = &byt_rvp_platform_data
> +	},
> +	{
> +		.id = "INTCCFFD",
> +		.drv_name = "bytcr_rt5640",
> +		.fw_filename = "intel/fw_sst_0f28.bin",
> +		.board = "bytcr_rt5640",
> +		.pdata = &byt_rvp_platform_data
> +	},
> +	{
> +		.id = "10EC5651",
> +		.drv_name = "bytcr_rt5651",
> +		.fw_filename = "intel/fw_sst_0f28.bin",
> +		.board = "bytcr_rt5651",
> +		.pdata = &byt_rvp_platform_data
> +	},
> +	{
> +		.id = "DLGS7212",
> +		.drv_name = "bytcht_da7213",
> +		.fw_filename = "intel/fw_sst_0f28.bin",
> +		.board = "bytcht_da7213",
> +		.pdata = &byt_rvp_platform_data
> +	},
> +	{
> +		.id = "DLGS7213",
> +		.drv_name = "bytcht_da7213",
> +		.fw_filename = "intel/fw_sst_0f28.bin",
> +		.board = "bytcht_da7213",
> +		.pdata = &byt_rvp_platform_data
> +	},
>  	/* some Baytrail platforms rely on RT5645, use CHT machine driver */
> -	{"10EC5645", "cht-bsw-rt5645", "intel/fw_sst_0f28.bin", "cht-bsw", NULL,
> -						&byt_rvp_platform_data },
> -	{"10EC5648", "cht-bsw-rt5645", "intel/fw_sst_0f28.bin", "cht-bsw", NULL,
> -						&byt_rvp_platform_data },
> +	{
> +		.id = "10EC5645",
> +		.drv_name = "cht-bsw-rt5645",
> +		.fw_filename = "intel/fw_sst_0f28.bin",
> +		.board = "cht-bsw",
> +		.pdata = &byt_rvp_platform_data
> +	},
> +	{
> +		.id = "10EC5648",
> +		.drv_name = "cht-bsw-rt5645",
> +		.fw_filename = "intel/fw_sst_0f28.bin",
> +		.board = "cht-bsw",
> +		.pdata = &byt_rvp_platform_data
> +	},
>  #if IS_ENABLED(CONFIG_SND_SOC_INTEL_BYT_CHT_NOCODEC_MACH)
>  	/*
>  	 * This is always last in the table so that it is selected only when
>  	 * enabled explicitly and there is no codec-related information in SSDT
>  	 */
> -	{"80860F28", "bytcht_nocodec", "intel/fw_sst_0f28.bin", "bytcht_nocodec", NULL,
> -						&byt_rvp_platform_data },
> +	{
> +		.id = "80860F28",
> +		.drv_name = "bytcht_nocodec",
> +		.fw_filename = "intel/fw_sst_0f28.bin",
> +		.board = "bytcht_nocodec",
> +		.pdata = &byt_rvp_platform_data
> +	},
>  #endif
>  	{},
>  };
>  
>  /* Cherryview-based platforms: CherryTrail and Braswell */
>  static struct sst_acpi_mach sst_acpi_chv[] = {
> -	{"10EC5670", "cht-bsw-rt5672", "intel/fw_sst_22a8.bin", "cht-bsw", NULL,
> -						&chv_platform_data },
> -	{"10EC5672", "cht-bsw-rt5672", "intel/fw_sst_22a8.bin", "cht-bsw", NULL,
> -						&chv_platform_data },
> -	{"10EC5645", "cht-bsw-rt5645", "intel/fw_sst_22a8.bin", "cht-bsw", NULL,
> -						&chv_platform_data },
> -	{"10EC5650", "cht-bsw-rt5645", "intel/fw_sst_22a8.bin", "cht-bsw", NULL,
> -						&chv_platform_data },
> -	{"10EC3270", "cht-bsw-rt5645", "intel/fw_sst_22a8.bin", "cht-bsw", NULL,
> -						&chv_platform_data },
> -
> -	{"193C9890", "cht-bsw-max98090", "intel/fw_sst_22a8.bin", "cht-bsw", NULL,
> -						&chv_platform_data },
> -	{"DLGS7212", "bytcht_da7213", "intel/fw_sst_22a8.bin", "bytcht_da7213", NULL,
> -						&chv_platform_data },
> -	{"DLGS7213", "bytcht_da7213", "intel/fw_sst_22a8.bin", "bytcht_da7213", NULL,
> -						&chv_platform_data },
> +	{
> +		.id = "10EC5670",
> +		.drv_name = "cht-bsw-rt5672",
> +		.fw_filename = "intel/fw_sst_22a8.bin",
> +		.board = "cht-bsw",
> +		.pdata = &chv_platform_data
> +	},
> +	{
> +		.id = "10EC5672",
> +		.drv_name = "cht-bsw-rt5672",
> +		.fw_filename = "intel/fw_sst_22a8.bin",
> +		.board = "cht-bsw",
> +		.pdata = &chv_platform_data
> +	},
> +	{
> +		.id = "10EC5645",
> +		.drv_name = "cht-bsw-rt5645",
> +		.fw_filename = "intel/fw_sst_22a8.bin",
> +		.board = "cht-bsw",
> +		.pdata = &chv_platform_data
> +	},
> +	{
> +		.id = "10EC5650",
> +		.drv_name = "cht-bsw-rt5645",
> +		.fw_filename = "intel/fw_sst_22a8.bin",
> +		.board = "cht-bsw",
> +		.pdata = &chv_platform_data
> +	},
> +	{
> +		.id = "10EC3270",
> +		.drv_name = "cht-bsw-rt5645",
> +		.fw_filename = "intel/fw_sst_22a8.bin",
> +		.board = "cht-bsw",
> +		.pdata = &chv_platform_data
> +	},
> +
> +	{
> +		.id = "193C9890",
> +		.drv_name = "cht-bsw-max98090",
> +		.fw_filename = "intel/fw_sst_22a8.bin",
> +		.board = "cht-bsw",
> +		.pdata = &chv_platform_data
> +	},
> +	{
> +		.id = "DLGS7212",
> +		.drv_name = "bytcht_da7213",
> +		.fw_filename = "intel/fw_sst_22a8.bin",
> +		.board = "bytcht_da7213",
> +		.pdata = &chv_platform_data
> +	},
> +	{
> +		.id = "DLGS7213",
> +		.drv_name = "bytcht_da7213",
> +		.fw_filename = "intel/fw_sst_22a8.bin",
> +		.board = "bytcht_da7213",
> +		.pdata = &chv_platform_data
> +	},
>  	/* some CHT-T platforms rely on RT5640, use Baytrail machine driver */
> -	{"10EC5640", "bytcr_rt5640", "intel/fw_sst_22a8.bin", "bytcr_rt5640", cht_quirk,
> -						&chv_platform_data },
> -	{"10EC3276", "bytcr_rt5640", "intel/fw_sst_22a8.bin", "bytcr_rt5640", NULL,
> -						&chv_platform_data },
> +	{
> +		.id = "10EC5640",
> +		.drv_name = "bytcr_rt5640",
> +		.fw_filename = "intel/fw_sst_22a8.bin",
> +		.board = "bytcr_rt5640",
> +		.machine_quirk = cht_quirk,
> +		.pdata = &chv_platform_data
> +	},
> +	{
> +		.id = "10EC3276",
> +		.drv_name = "bytcr_rt5640",
> +		.fw_filename = "intel/fw_sst_22a8.bin",
> +		.board = "bytcr_rt5640",
> +		.pdata = &chv_platform_data
> +	},
>  	/* some CHT-T platforms rely on RT5651, use Baytrail machine driver */
> -	{"10EC5651", "bytcr_rt5651", "intel/fw_sst_22a8.bin", "bytcr_rt5651", NULL,
> -						&chv_platform_data },
> +	{
> +		.id = "10EC5651",
> +		.drv_name = "bytcr_rt5651",
> +		.fw_filename = "intel/fw_sst_22a8.bin",
> +		.board = "bytcr_rt5651",
> +		.pdata = &chv_platform_data
> +	},
>  #if IS_ENABLED(CONFIG_SND_SOC_INTEL_BYT_CHT_NOCODEC_MACH)
>  	/*
>  	 * This is always last in the table so that it is selected only when
>  	 * enabled explicitly and there is no codec-related information in SSDT
>  	 */
> -	{"808622A8", "bytcht_nocodec", "intel/fw_sst_22a8.bin", "bytcht_nocodec", NULL,
> -						&chv_platform_data },
> +	{
> +		.id = "808622A8",
> +		.drv_name = "bytcht_nocodec",
> +		.fw_filename = "intel/fw_sst_22a8.bin",
> +		.board = "bytcht_nocodec",
> +		.pdata = &chv_platform_data
> +	},
>  #endif
>  	{},
>  };
> diff --git a/sound/soc/intel/skylake/skl.c b/sound/soc/intel/skylake/skl.c
> index 6df3b31..22a7e39 100644
> --- a/sound/soc/intel/skylake/skl.c
> +++ b/sound/soc/intel/skylake/skl.c
> @@ -863,28 +863,66 @@ static void skl_remove(struct pci_dev *pci)
>  }
>  
>  static struct sst_acpi_mach sst_skl_devdata[] = {
> -	{ "INT343A", "skl_alc286s_i2s", "intel/dsp_fw_release.bin", NULL, NULL, NULL },
> -	{ "INT343B", "skl_n88l25_s4567", "intel/dsp_fw_release.bin",
> -				NULL, NULL, &skl_dmic_data },
> -	{ "MX98357A", "skl_n88l25_m98357a", "intel/dsp_fw_release.bin",
> -				NULL, NULL, &skl_dmic_data },
> +	{
> +		.id = "INT343A",
> +		.drv_name = "skl_alc286s_i2s",
> +		.fw_filename = "intel/dsp_fw_release.bin",
> +	},
> +	{
> +		.id = "INT343B",
> +		.drv_name = "skl_n88l25_s4567",
> +		.fw_filename = "intel/dsp_fw_release.bin",
> +		.pdata = &skl_dmic_data
> +	},
> +	{
> +		.id = "MX98357A",
> +		.drv_name = "skl_n88l25_m98357a",
> +		.fw_filename = "intel/dsp_fw_release.bin",
> +		.pdata = &skl_dmic_data
> +	},
>  	{}
>  };
>  
>  static struct sst_acpi_mach sst_bxtp_devdata[] = {
> -	{ "INT343A", "bxt_alc298s_i2s", "intel/dsp_fw_bxtn.bin", NULL, NULL, NULL },
> -	{ "DLGS7219", "bxt_da7219_max98357a_i2s", "intel/dsp_fw_bxtn.bin", NULL, NULL, NULL },
> +	{
> +		.id = "INT343A",
> +		.drv_name = "bxt_alc298s_i2s",
> +		.fw_filename = "intel/dsp_fw_bxtn.bin",
> +	},
> +	{
> +		.id = "DLGS7219",
> +		.drv_name = "bxt_da7219_max98357a_i2s",
> +		.fw_filename = "intel/dsp_fw_bxtn.bin",
> +	},
>  };
>  
>  static struct sst_acpi_mach sst_kbl_devdata[] = {
> -	{ "INT343A", "kbl_alc286s_i2s", "intel/dsp_fw_kbl.bin", NULL, NULL, NULL },
> -	{ "INT343B", "kbl_n88l25_s4567", "intel/dsp_fw_kbl.bin", NULL, NULL, &skl_dmic_data },
> -	{ "MX98357A", "kbl_n88l25_m98357a", "intel/dsp_fw_kbl.bin", NULL, NULL, &skl_dmic_data },
> +	{
> +		.id = "INT343A",
> +		.drv_name = "kbl_alc286s_i2s",
> +		.fw_filename = "intel/dsp_fw_kbl.bin",
> +	},
> +	{
> +		.id = "INT343B",
> +		.drv_name = "kbl_n88l25_s4567",
> +		.fw_filename = "intel/dsp_fw_kbl.bin",
> +		.pdata = &skl_dmic_data
> +	},
> +	{
> +		.id = "MX98357A",
> +		.drv_name = "kbl_n88l25_m98357a",
> +		.fw_filename = "intel/dsp_fw_kbl.bin",
> +		.pdata = &skl_dmic_data
> +	},
>  	{}
>  };
>  
>  static struct sst_acpi_mach sst_glk_devdata[] = {
> -	{ "INT343A", "glk_alc298s_i2s", "intel/dsp_fw_glk.bin", NULL, NULL, NULL },
> +	{
> +		.id = "INT343A",
> +		.drv_name = "glk_alc298s_i2s",
> +		.fw_filename = "intel/dsp_fw_glk.bin",
> +	},
>  };
>  
>  /* PCI IDs */
> -- 
> 1.9.1
> 

-- 
~Vinod

Re: [alsa-devel] [PATCH v2 1/6] ASoC: Intel: Convert all machine data to C99 style

[Naveen M]

On Mon, May 15, 2017 at 10:50:23AM +0530, Vinod Koul wrote:
> On Thu, May 11, 2017 at 06:02:19PM +0530, Naveen M wrote:
> > C99 style struct initialization helps in readability as well as
> > initialization of variables not specified as NULL.
> > 
> > Signed-off-by: Naveen M <naveen.m@intel.com>
> > Signed-off-by: Vinod Koul <vinod.koul@intel.com>
> 
> this needs:
> 
> Suggested-by: Takashi Iwai <tiwai@suse.de>
Will be added in V3. Thanks for pointing this out.
> 
> > ---
> >  sound/soc/intel/atom/sst/sst_acpi.c | 209 ++++++++++++++++++++++++++++--------
> >  sound/soc/intel/skylake/skl.c       |  60 +++++++++--
> 
> Series looks good to me, but I feel we should split these two to separate
> patches as they touch two different drivers.
> 
Sure, will be fixed with V3.
> >  2 files changed, 211 insertions(+), 58 deletions(-)
> > 
> > diff --git a/sound/soc/intel/atom/sst/sst_acpi.c b/sound/soc/intel/atom/sst/sst_acpi.c
> > index dd250b8..193c4d7 100644
> > --- a/sound/soc/intel/atom/sst/sst_acpi.c
> > +++ b/sound/soc/intel/atom/sst/sst_acpi.c
> > @@ -453,12 +453,20 @@ static int byt_thinkpad10_quirk_cb(const struct dmi_system_id *id)
> >  
> >  
> >  static struct sst_acpi_mach cht_surface_mach = {
> > -	"10EC5640", "cht-bsw-rt5645", "intel/fw_sst_22a8.bin", "cht-bsw", NULL,
> > -								&chv_platform_data };
> > +	.id = "10EC5640",
> > +	.drv_name = "cht-bsw-rt5645",
> > +	.fw_filename = "intel/fw_sst_22a8.bin",
> > +	.board = "cht-bsw",
> > +	.pdata = &chv_platform_data,
> > +};
> >  
> >  static struct sst_acpi_mach byt_thinkpad_10 = {
> > -	"10EC5640", "cht-bsw-rt5672", "intel/fw_sst_0f28.bin", "cht-bsw", NULL,
> > -	                                                        &byt_rvp_platform_data };
> > +	.id = "10EC5640",
> > +	.drv_name = "cht-bsw-rt5672",
> > +	.fw_filename = "intel/fw_sst_0f28.bin",
> > +	.board = "cht-bsw",
> > +	.pdata = &byt_rvp_platform_data,
> > +};
> >  
> >  static struct sst_acpi_mach *cht_quirk(void *arg)
> >  {
> > @@ -486,68 +494,175 @@ static struct sst_acpi_mach *byt_quirk(void *arg)
> >  
> >  
> >  static struct sst_acpi_mach sst_acpi_bytcr[] = {
> > -	{"10EC5640", "bytcr_rt5640", "intel/fw_sst_0f28.bin", "bytcr_rt5640", byt_quirk,
> > -						&byt_rvp_platform_data },
> > -	{"10EC5642", "bytcr_rt5640", "intel/fw_sst_0f28.bin", "bytcr_rt5640", NULL,
> > -						&byt_rvp_platform_data },
> > -	{"INTCCFFD", "bytcr_rt5640", "intel/fw_sst_0f28.bin", "bytcr_rt5640", NULL,
> > -						&byt_rvp_platform_data },
> > -	{"10EC5651", "bytcr_rt5651", "intel/fw_sst_0f28.bin", "bytcr_rt5651", NULL,
> > -						&byt_rvp_platform_data },
> > -	{"DLGS7212", "bytcht_da7213", "intel/fw_sst_0f28.bin", "bytcht_da7213", NULL,
> > -						&byt_rvp_platform_data },
> > -	{"DLGS7213", "bytcht_da7213", "intel/fw_sst_0f28.bin", "bytcht_da7213", NULL,
> > -						&byt_rvp_platform_data },
> > +	{
> > +		.id = "10EC5640",
> > +		.drv_name = "bytcr_rt5640",
> > +		.fw_filename = "intel/fw_sst_0f28.bin",
> > +		.board = "bytcr_rt5640",
> > +		.machine_quirk = byt_quirk,
> > +		.pdata = &byt_rvp_platform_data,
> > +	},
> > +	{
> > +		.id = "10EC5642",
> > +		.drv_name = "bytcr_rt5640",
> > +		.fw_filename = "intel/fw_sst_0f28.bin",
> > +		.board = "bytcr_rt5640",
> > +		.pdata = &byt_rvp_platform_data
> > +	},
> > +	{
> > +		.id = "INTCCFFD",
> > +		.drv_name = "bytcr_rt5640",
> > +		.fw_filename = "intel/fw_sst_0f28.bin",
> > +		.board = "bytcr_rt5640",
> > +		.pdata = &byt_rvp_platform_data
> > +	},
> > +	{
> > +		.id = "10EC5651",
> > +		.drv_name = "bytcr_rt5651",
> > +		.fw_filename = "intel/fw_sst_0f28.bin",
> > +		.board = "bytcr_rt5651",
> > +		.pdata = &byt_rvp_platform_data
> > +	},
> > +	{
> > +		.id = "DLGS7212",
> > +		.drv_name = "bytcht_da7213",
> > +		.fw_filename = "intel/fw_sst_0f28.bin",
> > +		.board = "bytcht_da7213",
> > +		.pdata = &byt_rvp_platform_data
> > +	},
> > +	{
> > +		.id = "DLGS7213",
> > +		.drv_name = "bytcht_da7213",
> > +		.fw_filename = "intel/fw_sst_0f28.bin",
> > +		.board = "bytcht_da7213",
> > +		.pdata = &byt_rvp_platform_data
> > +	},
> >  	/* some Baytrail platforms rely on RT5645, use CHT machine driver */
> > -	{"10EC5645", "cht-bsw-rt5645", "intel/fw_sst_0f28.bin", "cht-bsw", NULL,
> > -						&byt_rvp_platform_data },
> > -	{"10EC5648", "cht-bsw-rt5645", "intel/fw_sst_0f28.bin", "cht-bsw", NULL,
> > -						&byt_rvp_platform_data },
> > +	{
> > +		.id = "10EC5645",
> > +		.drv_name = "cht-bsw-rt5645",
> > +		.fw_filename = "intel/fw_sst_0f28.bin",
> > +		.board = "cht-bsw",
> > +		.pdata = &byt_rvp_platform_data
> > +	},
> > +	{
> > +		.id = "10EC5648",
> > +		.drv_name = "cht-bsw-rt5645",
> > +		.fw_filename = "intel/fw_sst_0f28.bin",
> > +		.board = "cht-bsw",
> > +		.pdata = &byt_rvp_platform_data
> > +	},
> >  #if IS_ENABLED(CONFIG_SND_SOC_INTEL_BYT_CHT_NOCODEC_MACH)
> >  	/*
> >  	 * This is always last in the table so that it is selected only when
> >  	 * enabled explicitly and there is no codec-related information in SSDT
> >  	 */
> > -	{"80860F28", "bytcht_nocodec", "intel/fw_sst_0f28.bin", "bytcht_nocodec", NULL,
> > -						&byt_rvp_platform_data },
> > +	{
> > +		.id = "80860F28",
> > +		.drv_name = "bytcht_nocodec",
> > +		.fw_filename = "intel/fw_sst_0f28.bin",
> > +		.board = "bytcht_nocodec",
> > +		.pdata = &byt_rvp_platform_data
> > +	},
> >  #endif
> >  	{},
> >  };
> >  
> >  /* Cherryview-based platforms: CherryTrail and Braswell */
> >  static struct sst_acpi_mach sst_acpi_chv[] = {
> > -	{"10EC5670", "cht-bsw-rt5672", "intel/fw_sst_22a8.bin", "cht-bsw", NULL,
> > -						&chv_platform_data },
> > -	{"10EC5672", "cht-bsw-rt5672", "intel/fw_sst_22a8.bin", "cht-bsw", NULL,
> > -						&chv_platform_data },
> > -	{"10EC5645", "cht-bsw-rt5645", "intel/fw_sst_22a8.bin", "cht-bsw", NULL,
> > -						&chv_platform_data },
> > -	{"10EC5650", "cht-bsw-rt5645", "intel/fw_sst_22a8.bin", "cht-bsw", NULL,
> > -						&chv_platform_data },
> > -	{"10EC3270", "cht-bsw-rt5645", "intel/fw_sst_22a8.bin", "cht-bsw", NULL,
> > -						&chv_platform_data },
> > -
> > -	{"193C9890", "cht-bsw-max98090", "intel/fw_sst_22a8.bin", "cht-bsw", NULL,
> > -						&chv_platform_data },
> > -	{"DLGS7212", "bytcht_da7213", "intel/fw_sst_22a8.bin", "bytcht_da7213", NULL,
> > -						&chv_platform_data },
> > -	{"DLGS7213", "bytcht_da7213", "intel/fw_sst_22a8.bin", "bytcht_da7213", NULL,
> > -						&chv_platform_data },
> > +	{
> > +		.id = "10EC5670",
> > +		.drv_name = "cht-bsw-rt5672",
> > +		.fw_filename = "intel/fw_sst_22a8.bin",
> > +		.board = "cht-bsw",
> > +		.pdata = &chv_platform_data
> > +	},
> > +	{
> > +		.id = "10EC5672",
> > +		.drv_name = "cht-bsw-rt5672",
> > +		.fw_filename = "intel/fw_sst_22a8.bin",
> > +		.board = "cht-bsw",
> > +		.pdata = &chv_platform_data
> > +	},
> > +	{
> > +		.id = "10EC5645",
> > +		.drv_name = "cht-bsw-rt5645",
> > +		.fw_filename = "intel/fw_sst_22a8.bin",
> > +		.board = "cht-bsw",
> > +		.pdata = &chv_platform_data
> > +	},
> > +	{
> > +		.id = "10EC5650",
> > +		.drv_name = "cht-bsw-rt5645",
> > +		.fw_filename = "intel/fw_sst_22a8.bin",
> > +		.board = "cht-bsw",
> > +		.pdata = &chv_platform_data
> > +	},
> > +	{
> > +		.id = "10EC3270",
> > +		.drv_name = "cht-bsw-rt5645",
> > +		.fw_filename = "intel/fw_sst_22a8.bin",
> > +		.board = "cht-bsw",
> > +		.pdata = &chv_platform_data
> > +	},
> > +
> > +	{
> > +		.id = "193C9890",
> > +		.drv_name = "cht-bsw-max98090",
> > +		.fw_filename = "intel/fw_sst_22a8.bin",
> > +		.board = "cht-bsw",
> > +		.pdata = &chv_platform_data
> > +	},
> > +	{
> > +		.id = "DLGS7212",
> > +		.drv_name = "bytcht_da7213",
> > +		.fw_filename = "intel/fw_sst_22a8.bin",
> > +		.board = "bytcht_da7213",
> > +		.pdata = &chv_platform_data
> > +	},
> > +	{
> > +		.id = "DLGS7213",
> > +		.drv_name = "bytcht_da7213",
> > +		.fw_filename = "intel/fw_sst_22a8.bin",
> > +		.board = "bytcht_da7213",
> > +		.pdata = &chv_platform_data
> > +	},
> >  	/* some CHT-T platforms rely on RT5640, use Baytrail machine driver */
> > -	{"10EC5640", "bytcr_rt5640", "intel/fw_sst_22a8.bin", "bytcr_rt5640", cht_quirk,
> > -						&chv_platform_data },
> > -	{"10EC3276", "bytcr_rt5640", "intel/fw_sst_22a8.bin", "bytcr_rt5640", NULL,
> > -						&chv_platform_data },
> > +	{
> > +		.id = "10EC5640",
> > +		.drv_name = "bytcr_rt5640",
> > +		.fw_filename = "intel/fw_sst_22a8.bin",
> > +		.board = "bytcr_rt5640",
> > +		.machine_quirk = cht_quirk,
> > +		.pdata = &chv_platform_data
> > +	},
> > +	{
> > +		.id = "10EC3276",
> > +		.drv_name = "bytcr_rt5640",
> > +		.fw_filename = "intel/fw_sst_22a8.bin",
> > +		.board = "bytcr_rt5640",
> > +		.pdata = &chv_platform_data
> > +	},
> >  	/* some CHT-T platforms rely on RT5651, use Baytrail machine driver */
> > -	{"10EC5651", "bytcr_rt5651", "intel/fw_sst_22a8.bin", "bytcr_rt5651", NULL,
> > -						&chv_platform_data },
> > +	{
> > +		.id = "10EC5651",
> > +		.drv_name = "bytcr_rt5651",
> > +		.fw_filename = "intel/fw_sst_22a8.bin",
> > +		.board = "bytcr_rt5651",
> > +		.pdata = &chv_platform_data
> > +	},
> >  #if IS_ENABLED(CONFIG_SND_SOC_INTEL_BYT_CHT_NOCODEC_MACH)
> >  	/*
> >  	 * This is always last in the table so that it is selected only when
> >  	 * enabled explicitly and there is no codec-related information in SSDT
> >  	 */
> > -	{"808622A8", "bytcht_nocodec", "intel/fw_sst_22a8.bin", "bytcht_nocodec", NULL,
> > -						&chv_platform_data },
> > +	{
> > +		.id = "808622A8",
> > +		.drv_name = "bytcht_nocodec",
> > +		.fw_filename = "intel/fw_sst_22a8.bin",
> > +		.board = "bytcht_nocodec",
> > +		.pdata = &chv_platform_data
> > +	},
> >  #endif
> >  	{},
> >  };
> > diff --git a/sound/soc/intel/skylake/skl.c b/sound/soc/intel/skylake/skl.c
> > index 6df3b31..22a7e39 100644
> > --- a/sound/soc/intel/skylake/skl.c
> > +++ b/sound/soc/intel/skylake/skl.c
> > @@ -863,28 +863,66 @@ static void skl_remove(struct pci_dev *pci)
> >  }
> >  
> >  static struct sst_acpi_mach sst_skl_devdata[] = {
> > -	{ "INT343A", "skl_alc286s_i2s", "intel/dsp_fw_release.bin", NULL, NULL, NULL },
> > -	{ "INT343B", "skl_n88l25_s4567", "intel/dsp_fw_release.bin",
> > -				NULL, NULL, &skl_dmic_data },
> > -	{ "MX98357A", "skl_n88l25_m98357a", "intel/dsp_fw_release.bin",
> > -				NULL, NULL, &skl_dmic_data },
> > +	{
> > +		.id = "INT343A",
> > +		.drv_name = "skl_alc286s_i2s",
> > +		.fw_filename = "intel/dsp_fw_release.bin",
> > +	},
> > +	{
> > +		.id = "INT343B",
> > +		.drv_name = "skl_n88l25_s4567",
> > +		.fw_filename = "intel/dsp_fw_release.bin",
> > +		.pdata = &skl_dmic_data
> > +	},
> > +	{
> > +		.id = "MX98357A",
> > +		.drv_name = "skl_n88l25_m98357a",
> > +		.fw_filename = "intel/dsp_fw_release.bin",
> > +		.pdata = &skl_dmic_data
> > +	},
> >  	{}
> >  };
> >  
> >  static struct sst_acpi_mach sst_bxtp_devdata[] = {
> > -	{ "INT343A", "bxt_alc298s_i2s", "intel/dsp_fw_bxtn.bin", NULL, NULL, NULL },
> > -	{ "DLGS7219", "bxt_da7219_max98357a_i2s", "intel/dsp_fw_bxtn.bin", NULL, NULL, NULL },
> > +	{
> > +		.id = "INT343A",
> > +		.drv_name = "bxt_alc298s_i2s",
> > +		.fw_filename = "intel/dsp_fw_bxtn.bin",
> > +	},
> > +	{
> > +		.id = "DLGS7219",
> > +		.drv_name = "bxt_da7219_max98357a_i2s",
> > +		.fw_filename = "intel/dsp_fw_bxtn.bin",
> > +	},
> >  };
> >  
> >  static struct sst_acpi_mach sst_kbl_devdata[] = {
> > -	{ "INT343A", "kbl_alc286s_i2s", "intel/dsp_fw_kbl.bin", NULL, NULL, NULL },
> > -	{ "INT343B", "kbl_n88l25_s4567", "intel/dsp_fw_kbl.bin", NULL, NULL, &skl_dmic_data },
> > -	{ "MX98357A", "kbl_n88l25_m98357a", "intel/dsp_fw_kbl.bin", NULL, NULL, &skl_dmic_data },
> > +	{
> > +		.id = "INT343A",
> > +		.drv_name = "kbl_alc286s_i2s",
> > +		.fw_filename = "intel/dsp_fw_kbl.bin",
> > +	},
> > +	{
> > +		.id = "INT343B",
> > +		.drv_name = "kbl_n88l25_s4567",
> > +		.fw_filename = "intel/dsp_fw_kbl.bin",
> > +		.pdata = &skl_dmic_data
> > +	},
> > +	{
> > +		.id = "MX98357A",
> > +		.drv_name = "kbl_n88l25_m98357a",
> > +		.fw_filename = "intel/dsp_fw_kbl.bin",
> > +		.pdata = &skl_dmic_data
> > +	},
> >  	{}
> >  };
> >  
> >  static struct sst_acpi_mach sst_glk_devdata[] = {
> > -	{ "INT343A", "glk_alc298s_i2s", "intel/dsp_fw_glk.bin", NULL, NULL, NULL },
> > +	{
> > +		.id = "INT343A",
> > +		.drv_name = "glk_alc298s_i2s",
> > +		.fw_filename = "intel/dsp_fw_glk.bin",
> > +	},
> >  };
> >  
> >  /* PCI IDs */
> > -- 
> > 1.9.1
> > 
> 
> -- 
> ~Vinod

-- 
_______________________________________________
Alsa-devel mailing list
Alsa-devel@alsa-project.org
http://mailman.alsa-project.org/mailman/listinfo/alsa-devel

Re: [PATCH v2 1/6] ASoC: Intel: Convert all machine data to C99 style

[Naveen M]

On Mon, May 15, 2017 at 10:50:23AM +0530, Vinod Koul wrote:
> On Thu, May 11, 2017 at 06:02:19PM +0530, Naveen M wrote:
> > C99 style struct initialization helps in readability as well as
> > initialization of variables not specified as NULL.
> > 
> > Signed-off-by: Naveen M <naveen.m@intel.com>
> > Signed-off-by: Vinod Koul <vinod.koul@intel.com>
> 
> this needs:
> 
> Suggested-by: Takashi Iwai <tiwai@suse.de>
Will be added in V3. Thanks for pointing this out.
> 
> > ---
> >  sound/soc/intel/atom/sst/sst_acpi.c | 209 ++++++++++++++++++++++++++++--------
> >  sound/soc/intel/skylake/skl.c       |  60 +++++++++--
> 
> Series looks good to me, but I feel we should split these two to separate
> patches as they touch two different drivers.
> 
Sure, will be fixed with V3.
> >  2 files changed, 211 insertions(+), 58 deletions(-)
> > 
> > diff --git a/sound/soc/intel/atom/sst/sst_acpi.c b/sound/soc/intel/atom/sst/sst_acpi.c
> > index dd250b8..193c4d7 100644
> > --- a/sound/soc/intel/atom/sst/sst_acpi.c
> > +++ b/sound/soc/intel/atom/sst/sst_acpi.c
> > @@ -453,12 +453,20 @@ static int byt_thinkpad10_quirk_cb(const struct dmi_system_id *id)
> >  
> >  
> >  static struct sst_acpi_mach cht_surface_mach = {
> > -	"10EC5640", "cht-bsw-rt5645", "intel/fw_sst_22a8.bin", "cht-bsw", NULL,
> > -								&chv_platform_data };
> > +	.id = "10EC5640",
> > +	.drv_name = "cht-bsw-rt5645",
> > +	.fw_filename = "intel/fw_sst_22a8.bin",
> > +	.board = "cht-bsw",
> > +	.pdata = &chv_platform_data,
> > +};
> >  
> >  static struct sst_acpi_mach byt_thinkpad_10 = {
> > -	"10EC5640", "cht-bsw-rt5672", "intel/fw_sst_0f28.bin", "cht-bsw", NULL,
> > -	                                                        &byt_rvp_platform_data };
> > +	.id = "10EC5640",
> > +	.drv_name = "cht-bsw-rt5672",
> > +	.fw_filename = "intel/fw_sst_0f28.bin",
> > +	.board = "cht-bsw",
> > +	.pdata = &byt_rvp_platform_data,
> > +};
> >  
> >  static struct sst_acpi_mach *cht_quirk(void *arg)
> >  {
> > @@ -486,68 +494,175 @@ static struct sst_acpi_mach *byt_quirk(void *arg)
> >  
> >  
> >  static struct sst_acpi_mach sst_acpi_bytcr[] = {
> > -	{"10EC5640", "bytcr_rt5640", "intel/fw_sst_0f28.bin", "bytcr_rt5640", byt_quirk,
> > -						&byt_rvp_platform_data },
> > -	{"10EC5642", "bytcr_rt5640", "intel/fw_sst_0f28.bin", "bytcr_rt5640", NULL,
> > -						&byt_rvp_platform_data },
> > -	{"INTCCFFD", "bytcr_rt5640", "intel/fw_sst_0f28.bin", "bytcr_rt5640", NULL,
> > -						&byt_rvp_platform_data },
> > -	{"10EC5651", "bytcr_rt5651", "intel/fw_sst_0f28.bin", "bytcr_rt5651", NULL,
> > -						&byt_rvp_platform_data },
> > -	{"DLGS7212", "bytcht_da7213", "intel/fw_sst_0f28.bin", "bytcht_da7213", NULL,
> > -						&byt_rvp_platform_data },
> > -	{"DLGS7213", "bytcht_da7213", "intel/fw_sst_0f28.bin", "bytcht_da7213", NULL,
> > -						&byt_rvp_platform_data },
> > +	{
> > +		.id = "10EC5640",
> > +		.drv_name = "bytcr_rt5640",
> > +		.fw_filename = "intel/fw_sst_0f28.bin",
> > +		.board = "bytcr_rt5640",
> > +		.machine_quirk = byt_quirk,
> > +		.pdata = &byt_rvp_platform_data,
> > +	},
> > +	{
> > +		.id = "10EC5642",
> > +		.drv_name = "bytcr_rt5640",
> > +		.fw_filename = "intel/fw_sst_0f28.bin",
> > +		.board = "bytcr_rt5640",
> > +		.pdata = &byt_rvp_platform_data
> > +	},
> > +	{
> > +		.id = "INTCCFFD",
> > +		.drv_name = "bytcr_rt5640",
> > +		.fw_filename = "intel/fw_sst_0f28.bin",
> > +		.board = "bytcr_rt5640",
> > +		.pdata = &byt_rvp_platform_data
> > +	},
> > +	{
> > +		.id = "10EC5651",
> > +		.drv_name = "bytcr_rt5651",
> > +		.fw_filename = "intel/fw_sst_0f28.bin",
> > +		.board = "bytcr_rt5651",
> > +		.pdata = &byt_rvp_platform_data
> > +	},
> > +	{
> > +		.id = "DLGS7212",
> > +		.drv_name = "bytcht_da7213",
> > +		.fw_filename = "intel/fw_sst_0f28.bin",
> > +		.board = "bytcht_da7213",
> > +		.pdata = &byt_rvp_platform_data
> > +	},
> > +	{
> > +		.id = "DLGS7213",
> > +		.drv_name = "bytcht_da7213",
> > +		.fw_filename = "intel/fw_sst_0f28.bin",
> > +		.board = "bytcht_da7213",
> > +		.pdata = &byt_rvp_platform_data
> > +	},
> >  	/* some Baytrail platforms rely on RT5645, use CHT machine driver */
> > -	{"10EC5645", "cht-bsw-rt5645", "intel/fw_sst_0f28.bin", "cht-bsw", NULL,
> > -						&byt_rvp_platform_data },
> > -	{"10EC5648", "cht-bsw-rt5645", "intel/fw_sst_0f28.bin", "cht-bsw", NULL,
> > -						&byt_rvp_platform_data },
> > +	{
> > +		.id = "10EC5645",
> > +		.drv_name = "cht-bsw-rt5645",
> > +		.fw_filename = "intel/fw_sst_0f28.bin",
> > +		.board = "cht-bsw",
> > +		.pdata = &byt_rvp_platform_data
> > +	},
> > +	{
> > +		.id = "10EC5648",
> > +		.drv_name = "cht-bsw-rt5645",
> > +		.fw_filename = "intel/fw_sst_0f28.bin",
> > +		.board = "cht-bsw",
> > +		.pdata = &byt_rvp_platform_data
> > +	},
> >  #if IS_ENABLED(CONFIG_SND_SOC_INTEL_BYT_CHT_NOCODEC_MACH)
> >  	/*
> >  	 * This is always last in the table so that it is selected only when
> >  	 * enabled explicitly and there is no codec-related information in SSDT
> >  	 */
> > -	{"80860F28", "bytcht_nocodec", "intel/fw_sst_0f28.bin", "bytcht_nocodec", NULL,
> > -						&byt_rvp_platform_data },
> > +	{
> > +		.id = "80860F28",
> > +		.drv_name = "bytcht_nocodec",
> > +		.fw_filename = "intel/fw_sst_0f28.bin",
> > +		.board = "bytcht_nocodec",
> > +		.pdata = &byt_rvp_platform_data
> > +	},
> >  #endif
> >  	{},
> >  };
> >  
> >  /* Cherryview-based platforms: CherryTrail and Braswell */
> >  static struct sst_acpi_mach sst_acpi_chv[] = {
> > -	{"10EC5670", "cht-bsw-rt5672", "intel/fw_sst_22a8.bin", "cht-bsw", NULL,
> > -						&chv_platform_data },
> > -	{"10EC5672", "cht-bsw-rt5672", "intel/fw_sst_22a8.bin", "cht-bsw", NULL,
> > -						&chv_platform_data },
> > -	{"10EC5645", "cht-bsw-rt5645", "intel/fw_sst_22a8.bin", "cht-bsw", NULL,
> > -						&chv_platform_data },
> > -	{"10EC5650", "cht-bsw-rt5645", "intel/fw_sst_22a8.bin", "cht-bsw", NULL,
> > -						&chv_platform_data },
> > -	{"10EC3270", "cht-bsw-rt5645", "intel/fw_sst_22a8.bin", "cht-bsw", NULL,
> > -						&chv_platform_data },
> > -
> > -	{"193C9890", "cht-bsw-max98090", "intel/fw_sst_22a8.bin", "cht-bsw", NULL,
> > -						&chv_platform_data },
> > -	{"DLGS7212", "bytcht_da7213", "intel/fw_sst_22a8.bin", "bytcht_da7213", NULL,
> > -						&chv_platform_data },
> > -	{"DLGS7213", "bytcht_da7213", "intel/fw_sst_22a8.bin", "bytcht_da7213", NULL,
> > -						&chv_platform_data },
> > +	{
> > +		.id = "10EC5670",
> > +		.drv_name = "cht-bsw-rt5672",
> > +		.fw_filename = "intel/fw_sst_22a8.bin",
> > +		.board = "cht-bsw",
> > +		.pdata = &chv_platform_data
> > +	},
> > +	{
> > +		.id = "10EC5672",
> > +		.drv_name = "cht-bsw-rt5672",
> > +		.fw_filename = "intel/fw_sst_22a8.bin",
> > +		.board = "cht-bsw",
> > +		.pdata = &chv_platform_data
> > +	},
> > +	{
> > +		.id = "10EC5645",
> > +		.drv_name = "cht-bsw-rt5645",
> > +		.fw_filename = "intel/fw_sst_22a8.bin",
> > +		.board = "cht-bsw",
> > +		.pdata = &chv_platform_data
> > +	},
> > +	{
> > +		.id = "10EC5650",
> > +		.drv_name = "cht-bsw-rt5645",
> > +		.fw_filename = "intel/fw_sst_22a8.bin",
> > +		.board = "cht-bsw",
> > +		.pdata = &chv_platform_data
> > +	},
> > +	{
> > +		.id = "10EC3270",
> > +		.drv_name = "cht-bsw-rt5645",
> > +		.fw_filename = "intel/fw_sst_22a8.bin",
> > +		.board = "cht-bsw",
> > +		.pdata = &chv_platform_data
> > +	},
> > +
> > +	{
> > +		.id = "193C9890",
> > +		.drv_name = "cht-bsw-max98090",
> > +		.fw_filename = "intel/fw_sst_22a8.bin",
> > +		.board = "cht-bsw",
> > +		.pdata = &chv_platform_data
> > +	},
> > +	{
> > +		.id = "DLGS7212",
> > +		.drv_name = "bytcht_da7213",
> > +		.fw_filename = "intel/fw_sst_22a8.bin",
> > +		.board = "bytcht_da7213",
> > +		.pdata = &chv_platform_data
> > +	},
> > +	{
> > +		.id = "DLGS7213",
> > +		.drv_name = "bytcht_da7213",
> > +		.fw_filename = "intel/fw_sst_22a8.bin",
> > +		.board = "bytcht_da7213",
> > +		.pdata = &chv_platform_data
> > +	},
> >  	/* some CHT-T platforms rely on RT5640, use Baytrail machine driver */
> > -	{"10EC5640", "bytcr_rt5640", "intel/fw_sst_22a8.bin", "bytcr_rt5640", cht_quirk,
> > -						&chv_platform_data },
> > -	{"10EC3276", "bytcr_rt5640", "intel/fw_sst_22a8.bin", "bytcr_rt5640", NULL,
> > -						&chv_platform_data },
> > +	{
> > +		.id = "10EC5640",
> > +		.drv_name = "bytcr_rt5640",
> > +		.fw_filename = "intel/fw_sst_22a8.bin",
> > +		.board = "bytcr_rt5640",
> > +		.machine_quirk = cht_quirk,
> > +		.pdata = &chv_platform_data
> > +	},
> > +	{
> > +		.id = "10EC3276",
> > +		.drv_name = "bytcr_rt5640",
> > +		.fw_filename = "intel/fw_sst_22a8.bin",
> > +		.board = "bytcr_rt5640",
> > +		.pdata = &chv_platform_data
> > +	},
> >  	/* some CHT-T platforms rely on RT5651, use Baytrail machine driver */
> > -	{"10EC5651", "bytcr_rt5651", "intel/fw_sst_22a8.bin", "bytcr_rt5651", NULL,
> > -						&chv_platform_data },
> > +	{
> > +		.id = "10EC5651",
> > +		.drv_name = "bytcr_rt5651",
> > +		.fw_filename = "intel/fw_sst_22a8.bin",
> > +		.board = "bytcr_rt5651",
> > +		.pdata = &chv_platform_data
> > +	},
> >  #if IS_ENABLED(CONFIG_SND_SOC_INTEL_BYT_CHT_NOCODEC_MACH)
> >  	/*
> >  	 * This is always last in the table so that it is selected only when
> >  	 * enabled explicitly and there is no codec-related information in SSDT
> >  	 */
> > -	{"808622A8", "bytcht_nocodec", "intel/fw_sst_22a8.bin", "bytcht_nocodec", NULL,
> > -						&chv_platform_data },
> > +	{
> > +		.id = "808622A8",
> > +		.drv_name = "bytcht_nocodec",
> > +		.fw_filename = "intel/fw_sst_22a8.bin",
> > +		.board = "bytcht_nocodec",
> > +		.pdata = &chv_platform_data
> > +	},
> >  #endif
> >  	{},
> >  };
> > diff --git a/sound/soc/intel/skylake/skl.c b/sound/soc/intel/skylake/skl.c
> > index 6df3b31..22a7e39 100644
> > --- a/sound/soc/intel/skylake/skl.c
> > +++ b/sound/soc/intel/skylake/skl.c
> > @@ -863,28 +863,66 @@ static void skl_remove(struct pci_dev *pci)
> >  }
> >  
> >  static struct sst_acpi_mach sst_skl_devdata[] = {
> > -	{ "INT343A", "skl_alc286s_i2s", "intel/dsp_fw_release.bin", NULL, NULL, NULL },
> > -	{ "INT343B", "skl_n88l25_s4567", "intel/dsp_fw_release.bin",
> > -				NULL, NULL, &skl_dmic_data },
> > -	{ "MX98357A", "skl_n88l25_m98357a", "intel/dsp_fw_release.bin",
> > -				NULL, NULL, &skl_dmic_data },
> > +	{
> > +		.id = "INT343A",
> > +		.drv_name = "skl_alc286s_i2s",
> > +		.fw_filename = "intel/dsp_fw_release.bin",
> > +	},
> > +	{
> > +		.id = "INT343B",
> > +		.drv_name = "skl_n88l25_s4567",
> > +		.fw_filename = "intel/dsp_fw_release.bin",
> > +		.pdata = &skl_dmic_data
> > +	},
> > +	{
> > +		.id = "MX98357A",
> > +		.drv_name = "skl_n88l25_m98357a",
> > +		.fw_filename = "intel/dsp_fw_release.bin",
> > +		.pdata = &skl_dmic_data
> > +	},
> >  	{}
> >  };
> >  
> >  static struct sst_acpi_mach sst_bxtp_devdata[] = {
> > -	{ "INT343A", "bxt_alc298s_i2s", "intel/dsp_fw_bxtn.bin", NULL, NULL, NULL },
> > -	{ "DLGS7219", "bxt_da7219_max98357a_i2s", "intel/dsp_fw_bxtn.bin", NULL, NULL, NULL },
> > +	{
> > +		.id = "INT343A",
> > +		.drv_name = "bxt_alc298s_i2s",
> > +		.fw_filename = "intel/dsp_fw_bxtn.bin",
> > +	},
> > +	{
> > +		.id = "DLGS7219",
> > +		.drv_name = "bxt_da7219_max98357a_i2s",
> > +		.fw_filename = "intel/dsp_fw_bxtn.bin",
> > +	},
> >  };
> >  
> >  static struct sst_acpi_mach sst_kbl_devdata[] = {
> > -	{ "INT343A", "kbl_alc286s_i2s", "intel/dsp_fw_kbl.bin", NULL, NULL, NULL },
> > -	{ "INT343B", "kbl_n88l25_s4567", "intel/dsp_fw_kbl.bin", NULL, NULL, &skl_dmic_data },
> > -	{ "MX98357A", "kbl_n88l25_m98357a", "intel/dsp_fw_kbl.bin", NULL, NULL, &skl_dmic_data },
> > +	{
> > +		.id = "INT343A",
> > +		.drv_name = "kbl_alc286s_i2s",
> > +		.fw_filename = "intel/dsp_fw_kbl.bin",
> > +	},
> > +	{
> > +		.id = "INT343B",
> > +		.drv_name = "kbl_n88l25_s4567",
> > +		.fw_filename = "intel/dsp_fw_kbl.bin",
> > +		.pdata = &skl_dmic_data
> > +	},
> > +	{
> > +		.id = "MX98357A",
> > +		.drv_name = "kbl_n88l25_m98357a",
> > +		.fw_filename = "intel/dsp_fw_kbl.bin",
> > +		.pdata = &skl_dmic_data
> > +	},
> >  	{}
> >  };
> >  
> >  static struct sst_acpi_mach sst_glk_devdata[] = {
> > -	{ "INT343A", "glk_alc298s_i2s", "intel/dsp_fw_glk.bin", NULL, NULL, NULL },
> > +	{
> > +		.id = "INT343A",
> > +		.drv_name = "glk_alc298s_i2s",
> > +		.fw_filename = "intel/dsp_fw_glk.bin",
> > +	},
> >  };
> >  
> >  /* PCI IDs */
> > -- 
> > 1.9.1
> > 
> 
> -- 
> ~Vinod

-- 

[PATCH v2 2/6] ASoC: Intel: Create a helper to search for matching machine

[Naveen M]

Create a helper function to search for a matching machine
based on HID. No functional change

Signed-off-by: Naveen M <naveen.m@intel.com>
Signed-off-by: Harsha Priya <harshapriya.n@intel.com>
---
 sound/soc/intel/common/sst-acpi.h       |  3 +++
 sound/soc/intel/common/sst-match-acpi.c | 19 +++++++++++++++----
 2 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/sound/soc/intel/common/sst-acpi.h b/sound/soc/intel/common/sst-acpi.h
index 214e000..3649d3b 100644
--- a/sound/soc/intel/common/sst-acpi.h
+++ b/sound/soc/intel/common/sst-acpi.h
@@ -43,6 +43,9 @@ static inline bool sst_acpi_find_package_from_hid(const u8 hid[ACPI_ID_LEN],
 /* acpi match */
 struct sst_acpi_mach *sst_acpi_find_machine(struct sst_acpi_mach *machines);
 
+/* acpi check hid */
+bool sst_acpi_check_hid(const u8 hid[ACPI_ID_LEN]);
+
 /* Descriptor for SST ASoC machine driver */
 struct sst_acpi_mach {
 	/* ACPI ID for the matching machine driver. Audio codec for instance */
diff --git a/sound/soc/intel/common/sst-match-acpi.c b/sound/soc/intel/common/sst-match-acpi.c
index 1070f3a..f4af3d1 100644
--- a/sound/soc/intel/common/sst-match-acpi.c
+++ b/sound/soc/intel/common/sst-match-acpi.c
@@ -63,15 +63,26 @@ static acpi_status sst_acpi_mach_match(acpi_handle handle, u32 level,
 	return AE_OK;
 }
 
+bool sst_acpi_check_hid(const u8 hid[ACPI_ID_LEN])
+{
+	acpi_status status;
+	bool found = false;
+
+	status = acpi_get_devices(hid, sst_acpi_mach_match, &found, NULL);
+
+	if (ACPI_FAILURE(status))
+		return false;
+
+	return found;
+}
+EXPORT_SYMBOL_GPL(sst_acpi_check_hid);
+
 struct sst_acpi_mach *sst_acpi_find_machine(struct sst_acpi_mach *machines)
 {
 	struct sst_acpi_mach *mach;
-	bool found = false;
 
 	for (mach = machines; mach->id[0]; mach++)
-		if (ACPI_SUCCESS(acpi_get_devices(mach->id,
-						  sst_acpi_mach_match,
-						  &found, NULL)) && found)
+		if (sst_acpi_check_hid(mach->id) == true)
 			return mach;
 	return NULL;
 }
-- 
1.9.1

[PATCH v2 3/6] ASoC: Move quirk to identify correct machine driver

[Naveen M]

sst_acpi_mach has a quirk field to handle board specific quirks.
Patch moves quirk call to sst_acpi_find_machine() instead of calling
it in respective driver

Signed-off-by: Naveen M <naveen.m@intel.com>
Signed-off-by: Subhransu S. Prusty <subhransu.s.prusty@intel.com>
---
 sound/soc/intel/atom/sst/sst_acpi.c     |  2 --
 sound/soc/intel/common/sst-match-acpi.c | 12 +++++++++---
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/sound/soc/intel/atom/sst/sst_acpi.c b/sound/soc/intel/atom/sst/sst_acpi.c
index 193c4d7..592f6af 100644
--- a/sound/soc/intel/atom/sst/sst_acpi.c
+++ b/sound/soc/intel/atom/sst/sst_acpi.c
@@ -303,8 +303,6 @@ static int sst_acpi_probe(struct platform_device *pdev)
 		dev_err(dev, "No matching machine driver found\n");
 		return -ENODEV;
 	}
-	if (mach->machine_quirk)
-		mach = mach->machine_quirk(mach);
 
 	pdata = mach->pdata;
 
diff --git a/sound/soc/intel/common/sst-match-acpi.c b/sound/soc/intel/common/sst-match-acpi.c
index f4af3d1..88e4977 100644
--- a/sound/soc/intel/common/sst-match-acpi.c
+++ b/sound/soc/intel/common/sst-match-acpi.c
@@ -81,9 +81,15 @@ struct sst_acpi_mach *sst_acpi_find_machine(struct sst_acpi_mach *machines)
 {
 	struct sst_acpi_mach *mach;
 
-	for (mach = machines; mach->id[0]; mach++)
-		if (sst_acpi_check_hid(mach->id) == true)
-			return mach;
+	for (mach = machines; mach->id[0]; mach++) {
+		if (sst_acpi_check_hid(mach->id) == true) {
+			if (mach->machine_quirk == NULL)
+				return mach;
+
+			if (mach->machine_quirk(mach) != NULL)
+				return mach;
+		}
+	}
 	return NULL;
 }
 EXPORT_SYMBOL_GPL(sst_acpi_find_machine);
-- 
1.9.1

[PATCH v2 4/6] ASoC: Improve machine driver selection based on quirk data

[Naveen M]

Use quirk function to select the correct machine driver
by checking all codecs instead of only one based on quirk data.

Signed-off-by: Naveen M <naveen.m@intel.com>
Signed-off-by: Harsha Priya <harshapriya.n@intel.com>
---
 sound/soc/intel/common/sst-acpi.h       | 20 ++++++++++++++++++++
 sound/soc/intel/common/sst-match-acpi.c | 18 ++++++++++++++++++
 sound/soc/intel/skylake/skl.c           | 14 ++++++++++++++
 3 files changed, 52 insertions(+)

diff --git a/sound/soc/intel/common/sst-acpi.h b/sound/soc/intel/common/sst-acpi.h
index 3649d3b..afe9b87 100644
--- a/sound/soc/intel/common/sst-acpi.h
+++ b/sound/soc/intel/common/sst-acpi.h
@@ -58,5 +58,25 @@ struct sst_acpi_mach {
 	/* board name */
 	const char *board;
 	struct sst_acpi_mach * (*machine_quirk)(void *arg);
+	const void *quirk_data;
 	void *pdata;
 };
+
+#define SST_ACPI_MAX_CODECS 3
+
+/**
+ * struct sst_codecs: Structure to hold secondary codec information apart from
+ * the matched one, this data will be passed to the quirk function to match
+ * with the ACPI detected devices
+ *
+ * @num_codecs: number of secondary codecs used in the platform
+ * @codecs: holds the codec IDs
+ *
+ */
+struct sst_codecs {
+	int num_codecs;
+	u8 codecs[SST_ACPI_MAX_CODECS][ACPI_ID_LEN];
+};
+
+/* check all codecs */
+struct sst_acpi_mach *sst_acpi_codec_list(void *arg);
diff --git a/sound/soc/intel/common/sst-match-acpi.c b/sound/soc/intel/common/sst-match-acpi.c
index 88e4977..56d26f3 100644
--- a/sound/soc/intel/common/sst-match-acpi.c
+++ b/sound/soc/intel/common/sst-match-acpi.c
@@ -151,5 +151,23 @@ bool sst_acpi_find_package_from_hid(const u8 hid[ACPI_ID_LEN],
 }
 EXPORT_SYMBOL_GPL(sst_acpi_find_package_from_hid);
 
+struct sst_acpi_mach *sst_acpi_codec_list(void *arg)
+{
+	struct sst_acpi_mach *mach = arg;
+	struct sst_codecs *codec_list = (struct sst_codecs *) mach->quirk_data;
+	int i;
+
+	if (mach->quirk_data == NULL)
+		return mach;
+
+	for (i = 0; i < codec_list->num_codecs; i++) {
+		if (sst_acpi_check_hid(codec_list->codecs[i]) != true)
+			return NULL;
+	}
+
+	return mach;
+}
+EXPORT_SYMBOL_GPL(sst_acpi_codec_list);
+
 MODULE_LICENSE("GPL v2");
 MODULE_DESCRIPTION("Intel Common ACPI Match module");
diff --git a/sound/soc/intel/skylake/skl.c b/sound/soc/intel/skylake/skl.c
index 22a7e39..fd1dae1 100644
--- a/sound/soc/intel/skylake/skl.c
+++ b/sound/soc/intel/skylake/skl.c
@@ -862,6 +862,10 @@ 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_acpi_mach sst_skl_devdata[] = {
 	{
 		.id = "INT343A",
@@ -872,12 +876,16 @@ static void skl_remove(struct pci_dev *pci)
 		.id = "INT343B",
 		.drv_name = "skl_n88l25_s4567",
 		.fw_filename = "intel/dsp_fw_release.bin",
+		.machine_quirk = sst_acpi_codec_list,
+		.quirk_data = &skl_codecs,
 		.pdata = &skl_dmic_data
 	},
 	{
 		.id = "MX98357A",
 		.drv_name = "skl_n88l25_m98357a",
 		.fw_filename = "intel/dsp_fw_release.bin",
+		.machine_quirk = sst_acpi_codec_list,
+		.quirk_data = &skl_codecs,
 		.pdata = &skl_dmic_data
 	},
 	{}
@@ -893,6 +901,8 @@ static void skl_remove(struct pci_dev *pci)
 		.id = "DLGS7219",
 		.drv_name = "bxt_da7219_max98357a_i2s",
 		.fw_filename = "intel/dsp_fw_bxtn.bin",
+		.machine_quirk = sst_acpi_codec_list,
+		.quirk_data = &bxt_codecs,
 	},
 };
 
@@ -906,12 +916,16 @@ static void skl_remove(struct pci_dev *pci)
 		.id = "INT343B",
 		.drv_name = "kbl_n88l25_s4567",
 		.fw_filename = "intel/dsp_fw_kbl.bin",
+		.machine_quirk = sst_acpi_codec_list,
+		.quirk_data = &kbl_codecs,
 		.pdata = &skl_dmic_data
 	},
 	{
 		.id = "MX98357A",
 		.drv_name = "kbl_n88l25_m98357a",
 		.fw_filename = "intel/dsp_fw_kbl.bin",
+		.machine_quirk = sst_acpi_codec_list,
+		.quirk_data = &kbl_codecs,
 		.pdata = &skl_dmic_data
 	},
 	{}
-- 
1.9.1

Applied "ASoC: Improve machine driver selection based on quirk data" to the asoc tree

[Mark Brown]

The patch

   ASoC: Improve machine driver selection based on quirk data

has been applied to the asoc tree at

   git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git 

All being well this means that it will be integrated into the linux-next
tree (usually sometime in the next 24 hours) and sent to Linus during
the next merge window (or sooner if it is a bug fix), however if
problems are discovered then the patch may be dropped or reverted.  

You may get further e-mails resulting from automated or manual testing
and review of the tree, please engage with people reporting problems and
send followup patches addressing any issues that are reported if needed.

If any updates are required or you are submitting further changes they
should be sent as incremental updates against current git, existing
patches will not be replaced.

Please add any relevant lists and maintainers to the CCs when replying
to this mail.

Thanks,
Mark

>From 54746dabf770eb268d302f2f770d6dacea24f08a Mon Sep 17 00:00:00 2001
From: Naveen M <naveen.m@intel.com>
Date: Mon, 15 May 2017 13:42:15 +0530
Subject: [PATCH] ASoC: Improve machine driver selection based on quirk data

Use quirk function to select the correct machine driver
by checking all codecs instead of only one based on quirk data.

Signed-off-by: Naveen M <naveen.m@intel.com>
Signed-off-by: Harsha Priya <harshapriya.n@intel.com>
Acked-by: Vinod Koul <vinod.koul@intel.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
---
 sound/soc/intel/common/sst-acpi.h       | 20 ++++++++++++++++++++
 sound/soc/intel/common/sst-match-acpi.c | 18 ++++++++++++++++++
 sound/soc/intel/skylake/skl.c           | 14 ++++++++++++++
 3 files changed, 52 insertions(+)

diff --git a/sound/soc/intel/common/sst-acpi.h b/sound/soc/intel/common/sst-acpi.h
index 3649d3b08c9e..afe9b87b8bd5 100644
--- a/sound/soc/intel/common/sst-acpi.h
+++ b/sound/soc/intel/common/sst-acpi.h
@@ -58,5 +58,25 @@ struct sst_acpi_mach {
 	/* board name */
 	const char *board;
 	struct sst_acpi_mach * (*machine_quirk)(void *arg);
+	const void *quirk_data;
 	void *pdata;
 };
+
+#define SST_ACPI_MAX_CODECS 3
+
+/**
+ * struct sst_codecs: Structure to hold secondary codec information apart from
+ * the matched one, this data will be passed to the quirk function to match
+ * with the ACPI detected devices
+ *
+ * @num_codecs: number of secondary codecs used in the platform
+ * @codecs: holds the codec IDs
+ *
+ */
+struct sst_codecs {
+	int num_codecs;
+	u8 codecs[SST_ACPI_MAX_CODECS][ACPI_ID_LEN];
+};
+
+/* check all codecs */
+struct sst_acpi_mach *sst_acpi_codec_list(void *arg);
diff --git a/sound/soc/intel/common/sst-match-acpi.c b/sound/soc/intel/common/sst-match-acpi.c
index 88e4977578b5..56d26f36a3cb 100644
--- a/sound/soc/intel/common/sst-match-acpi.c
+++ b/sound/soc/intel/common/sst-match-acpi.c
@@ -151,5 +151,23 @@ bool sst_acpi_find_package_from_hid(const u8 hid[ACPI_ID_LEN],
 }
 EXPORT_SYMBOL_GPL(sst_acpi_find_package_from_hid);
 
+struct sst_acpi_mach *sst_acpi_codec_list(void *arg)
+{
+	struct sst_acpi_mach *mach = arg;
+	struct sst_codecs *codec_list = (struct sst_codecs *) mach->quirk_data;
+	int i;
+
+	if (mach->quirk_data == NULL)
+		return mach;
+
+	for (i = 0; i < codec_list->num_codecs; i++) {
+		if (sst_acpi_check_hid(codec_list->codecs[i]) != true)
+			return NULL;
+	}
+
+	return mach;
+}
+EXPORT_SYMBOL_GPL(sst_acpi_codec_list);
+
 MODULE_LICENSE("GPL v2");
 MODULE_DESCRIPTION("Intel Common ACPI Match module");
diff --git a/sound/soc/intel/skylake/skl.c b/sound/soc/intel/skylake/skl.c
index a4d1121595b6..ceb7734d74ed 100644
--- a/sound/soc/intel/skylake/skl.c
+++ b/sound/soc/intel/skylake/skl.c
@@ -876,6 +876,10 @@ 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_acpi_mach sst_skl_devdata[] = {
 	{
 		.id = "INT343A",
@@ -886,12 +890,16 @@ static struct sst_acpi_mach sst_skl_devdata[] = {
 		.id = "INT343B",
 		.drv_name = "skl_n88l25_s4567",
 		.fw_filename = "intel/dsp_fw_release.bin",
+		.machine_quirk = sst_acpi_codec_list,
+		.quirk_data = &skl_codecs,
 		.pdata = &skl_dmic_data
 	},
 	{
 		.id = "MX98357A",
 		.drv_name = "skl_n88l25_m98357a",
 		.fw_filename = "intel/dsp_fw_release.bin",
+		.machine_quirk = sst_acpi_codec_list,
+		.quirk_data = &skl_codecs,
 		.pdata = &skl_dmic_data
 	},
 	{}
@@ -907,6 +915,8 @@ static struct sst_acpi_mach sst_bxtp_devdata[] = {
 		.id = "DLGS7219",
 		.drv_name = "bxt_da7219_max98357a_i2s",
 		.fw_filename = "intel/dsp_fw_bxtn.bin",
+		.machine_quirk = sst_acpi_codec_list,
+		.quirk_data = &bxt_codecs,
 	},
 };
 
@@ -920,12 +930,16 @@ static struct sst_acpi_mach sst_kbl_devdata[] = {
 		.id = "INT343B",
 		.drv_name = "kbl_n88l25_s4567",
 		.fw_filename = "intel/dsp_fw_kbl.bin",
+		.machine_quirk = sst_acpi_codec_list,
+		.quirk_data = &kbl_codecs,
 		.pdata = &skl_dmic_data
 	},
 	{
 		.id = "MX98357A",
 		.drv_name = "kbl_n88l25_m98357a",
 		.fw_filename = "intel/dsp_fw_kbl.bin",
+		.machine_quirk = sst_acpi_codec_list,
+		.quirk_data = &kbl_codecs,
 		.pdata = &skl_dmic_data
 	},
 	{}
-- 
2.11.0

[PATCH v2 5/6] ASoC: Intel: Add Kabylake Realtek Maxim machine driver

[Naveen M]

This patch adds Kabylake I2S machine driver which uses codecs
MAX98927 as speakers and RT5663 as headset, configured to ssp0
& ssp1 respectively.

Signed-off-by: Naveen M <naveen.m@intel.com>
Signed-off-by: Harsha Priya <harshapriya.n@intel.com>
---
 sound/soc/intel/Kconfig                      |  15 +
 sound/soc/intel/boards/Makefile              |   2 +
 sound/soc/intel/boards/kbl_rt5663_max98927.c | 687 +++++++++++++++++++++++++++
 3 files changed, 704 insertions(+)
 create mode 100644 sound/soc/intel/boards/kbl_rt5663_max98927.c

diff --git a/sound/soc/intel/Kconfig b/sound/soc/intel/Kconfig
index 67968ef..a9c50d0 100644
--- a/sound/soc/intel/Kconfig
+++ b/sound/soc/intel/Kconfig
@@ -226,6 +226,21 @@ config SND_SOC_INTEL_BYT_CHT_NOCODEC_MACH
 	  connector
 	  If unsure select "N".
 
+config SND_SOC_INTEL_KBL_RT5663_MAX98927_MACH
+	tristate "ASoC Audio driver for KBL with RT5663 and MAX98927 in I2S Mode"
+	depends on X86_INTEL_LPSS && I2C
+	select SND_SOC_INTEL_SST
+	select SND_SOC_INTEL_SKYLAKE
+	select SND_SOC_RT5663
+	select SND_SOC_MAX98927
+	select SND_SOC_DMIC
+	select SND_SOC_HDAC_HDMI
+	help
+	  This adds support for ASoC Onboard Codec I2S machine driver. This will
+	  create an alsa sound card for RT5663 + MAX98927.
+	  Say Y if you have such a device.
+	  If unsure select "N".
+
 config SND_SOC_INTEL_SKYLAKE
 	tristate
 	select SND_HDA_EXT_CORE
diff --git a/sound/soc/intel/boards/Makefile b/sound/soc/intel/boards/Makefile
index 56896e0..c92ebca 100644
--- a/sound/soc/intel/boards/Makefile
+++ b/sound/soc/intel/boards/Makefile
@@ -12,6 +12,7 @@ snd-soc-sst-cht-bsw-rt5645-objs := cht_bsw_rt5645.o
 snd-soc-sst-cht-bsw-max98090_ti-objs := cht_bsw_max98090_ti.o
 snd-soc-sst-byt-cht-da7213-objs := bytcht_da7213.o
 snd-soc-sst-byt-cht-nocodec-objs := bytcht_nocodec.o
+snd-soc-kbl_rt5663_max98927-objs := kbl_rt5663_max98927.o
 snd-soc-skl_rt286-objs := skl_rt286.o
 snd-skl_nau88l25_max98357a-objs := skl_nau88l25_max98357a.o
 snd-soc-skl_nau88l25_ssm4567-objs := skl_nau88l25_ssm4567.o
@@ -30,6 +31,7 @@ obj-$(CONFIG_SND_SOC_INTEL_CHT_BSW_RT5645_MACH) += snd-soc-sst-cht-bsw-rt5645.o
 obj-$(CONFIG_SND_SOC_INTEL_CHT_BSW_MAX98090_TI_MACH) += snd-soc-sst-cht-bsw-max98090_ti.o
 obj-$(CONFIG_SND_SOC_INTEL_BYT_CHT_DA7213_MACH) += snd-soc-sst-byt-cht-da7213.o
 obj-$(CONFIG_SND_SOC_INTEL_BYT_CHT_NOCODEC_MACH) += snd-soc-sst-byt-cht-nocodec.o
+obj-$(CONFIG_SND_SOC_INTEL_KBL_RT5663_MAX98927_MACH) += snd-soc-kbl_rt5663_max98927.o
 obj-$(CONFIG_SND_SOC_INTEL_SKL_RT286_MACH) += snd-soc-skl_rt286.o
 obj-$(CONFIG_SND_SOC_INTEL_SKL_NAU88L25_MAX98357A_MACH) += snd-skl_nau88l25_max98357a.o
 obj-$(CONFIG_SND_SOC_INTEL_SKL_NAU88L25_SSM4567_MACH) += snd-soc-skl_nau88l25_ssm4567.o
diff --git a/sound/soc/intel/boards/kbl_rt5663_max98927.c b/sound/soc/intel/boards/kbl_rt5663_max98927.c
new file mode 100644
index 0000000..f9ba977
--- /dev/null
+++ b/sound/soc/intel/boards/kbl_rt5663_max98927.c
@@ -0,0 +1,687 @@
+/*
+ * Intel Kabylake I2S Machine Driver with MAXIM98927
+ * and RT5663 Codecs
+ *
+ * Copyright (C) 2017, Intel Corporation. All rights reserved.
+ *
+ * Modified from:
+ *   Intel Skylake I2S Machine driver
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License version
+ * 2 as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ */
+
+#include <linux/module.h>
+#include <linux/platform_device.h>
+#include <sound/core.h>
+#include <sound/jack.h>
+#include <sound/pcm.h>
+#include <sound/pcm_params.h>
+#include <sound/soc.h>
+#include "../../codecs/rt5663.h"
+#include "../../codecs/hdac_hdmi.h"
+#include "../skylake/skl.h"
+
+#define KBL_REALTEK_CODEC_DAI "rt5663-aif"
+#define KBL_MAXIM_CODEC_DAI "max98927-aif1"
+#define DMIC_CH(p) p->list[p->count-1]
+#define MAXIM_DEV0_NAME "i2c-MX98927:00"
+#define MAXIM_DEV1_NAME "i2c-MX98927:01"
+
+static struct snd_soc_card kabylake_audio_card;
+static const struct snd_pcm_hw_constraint_list *dmic_constraints;
+static struct snd_soc_jack skylake_hdmi[3];
+
+struct kbl_hdmi_pcm {
+	struct list_head head;
+	struct snd_soc_dai *codec_dai;
+	int device;
+};
+
+struct kbl_rt5663_private {
+	struct snd_soc_jack kabylake_headset;
+	struct list_head hdmi_pcm_list;
+};
+
+enum {
+	KBL_DPCM_AUDIO_PB = 0,
+	KBL_DPCM_AUDIO_CP,
+	KBL_DPCM_AUDIO_REF_CP,
+	KBL_DPCM_AUDIO_DMIC_CP,
+	KBL_DPCM_AUDIO_HDMI1_PB,
+	KBL_DPCM_AUDIO_HDMI2_PB,
+	KBL_DPCM_AUDIO_HDMI3_PB,
+};
+
+static const struct snd_kcontrol_new kabylake_controls[] = {
+	SOC_DAPM_PIN_SWITCH("Headphone Jack"),
+	SOC_DAPM_PIN_SWITCH("Headset Mic"),
+	SOC_DAPM_PIN_SWITCH("Left Spk"),
+	SOC_DAPM_PIN_SWITCH("Right Spk"),
+};
+
+static const struct snd_soc_dapm_widget kabylake_widgets[] = {
+	SND_SOC_DAPM_HP("Headphone Jack", NULL),
+	SND_SOC_DAPM_MIC("Headset Mic", NULL),
+	SND_SOC_DAPM_SPK("Left Spk", NULL),
+	SND_SOC_DAPM_SPK("Right Spk", NULL),
+	SND_SOC_DAPM_MIC("SoC DMIC", NULL),
+	SND_SOC_DAPM_SPK("DP", NULL),
+	SND_SOC_DAPM_SPK("HDMI", NULL),
+
+};
+
+static const struct snd_soc_dapm_route kabylake_map[] = {
+	/* HP jack connectors - unknown if we have jack detection */
+	{ "Headphone Jack", NULL, "HPOL" },
+	{ "Headphone Jack", NULL, "HPOR" },
+
+	/* speaker */
+	{ "Left Spk", NULL, "Left BE_OUT" },
+	{ "Right Spk", NULL, "Right BE_OUT" },
+
+	/* other jacks */
+	{ "IN1P", NULL, "Headset Mic" },
+	{ "IN1N", NULL, "Headset Mic" },
+	{ "DMic", NULL, "SoC DMIC" },
+
+	{ "HDMI", NULL, "hif5 Output" },
+	{ "DP", NULL, "hif6 Output" },
+
+	/* CODEC BE connections */
+	{ "Left HiFi Playback", NULL, "ssp0 Tx" },
+	{ "Right HiFi Playback", NULL, "ssp0 Tx" },
+	{ "ssp0 Tx", NULL, "codec0_out" },
+
+	{ "AIF Playback", NULL, "ssp1 Tx" },
+	{ "ssp1 Tx", NULL, "codec1_out" },
+
+	{ "codec0_in", NULL, "ssp1 Rx" },
+	{ "ssp1 Rx", NULL, "AIF Capture" },
+
+	/* DMIC */
+	{ "dmic01_hifi", NULL, "DMIC01 Rx" },
+	{ "DMIC01 Rx", NULL, "DMIC AIF" },
+
+	{ "hifi3", NULL, "iDisp3 Tx"},
+	{ "iDisp3 Tx", NULL, "iDisp3_out"},
+	{ "hifi2", NULL, "iDisp2 Tx"},
+	{ "iDisp2 Tx", NULL, "iDisp2_out"},
+	{ "hifi1", NULL, "iDisp1 Tx"},
+	{ "iDisp1 Tx", NULL, "iDisp1_out"},
+};
+
+static struct snd_soc_codec_conf max98927_codec_conf[] = {
+	{
+		.dev_name = MAXIM_DEV0_NAME,
+		.name_prefix = "Right",
+	},
+	{
+		.dev_name = MAXIM_DEV1_NAME,
+		.name_prefix = "Left",
+	},
+};
+
+static struct snd_soc_dai_link_component max98927_codec_components[] = {
+	{ /* Left */
+		.name = MAXIM_DEV0_NAME,
+		.dai_name = KBL_MAXIM_CODEC_DAI,
+	},
+	{ /* Right */
+		.name = MAXIM_DEV1_NAME,
+		.dai_name = KBL_MAXIM_CODEC_DAI,
+	},
+};
+
+static int kabylake_rt5663_fe_init(struct snd_soc_pcm_runtime *rtd)
+{
+	int ret;
+	struct snd_soc_dapm_context *dapm;
+	struct snd_soc_component *component = rtd->cpu_dai->component;
+
+	dapm = snd_soc_component_get_dapm(component);
+	ret = snd_soc_dapm_ignore_suspend(dapm, "Reference Capture");
+	if (ret) {
+		dev_err(rtd->dev, "Ref Cap ignore suspend failed %d\n", ret);
+		return ret;
+	}
+
+	return ret;
+}
+
+static int kabylake_rt5663_codec_init(struct snd_soc_pcm_runtime *rtd)
+{
+	int ret;
+	struct kbl_rt5663_private *ctx = snd_soc_card_get_drvdata(rtd->card);
+	struct snd_soc_codec *codec = rtd->codec;
+
+	/*
+	 * Headset buttons map to the google Reference headset.
+	 * These can be configured by userspace.
+	 */
+	ret = snd_soc_card_jack_new(&kabylake_audio_card, "Headset Jack",
+			SND_JACK_HEADSET | SND_JACK_BTN_0 | SND_JACK_BTN_1 |
+			SND_JACK_BTN_2 | SND_JACK_BTN_3, &ctx->kabylake_headset,
+			NULL, 0);
+	if (ret) {
+		dev_err(rtd->dev, "Headset Jack creation failed %d\n", ret);
+		return ret;
+	}
+
+	rt5663_set_jack_detect(codec, &ctx->kabylake_headset);
+	ret = snd_soc_dapm_ignore_suspend(&rtd->card->dapm, "SoC DMIC");
+	if (ret) {
+		dev_err(rtd->dev, "SoC DMIC ignore suspend failed %d\n", ret);
+		return ret;
+	}
+
+	return ret;
+}
+
+static int kabylake_hdmi1_init(struct snd_soc_pcm_runtime *rtd)
+{
+	struct kbl_rt5663_private *ctx = snd_soc_card_get_drvdata(rtd->card);
+	struct snd_soc_dai *dai = rtd->codec_dai;
+	struct kbl_hdmi_pcm *pcm;
+
+	pcm = devm_kzalloc(rtd->card->dev, sizeof(*pcm), GFP_KERNEL);
+	if (!pcm)
+		return -ENOMEM;
+
+	pcm->device = KBL_DPCM_AUDIO_HDMI1_PB;
+	pcm->codec_dai = dai;
+
+	list_add_tail(&pcm->head, &ctx->hdmi_pcm_list);
+
+	return 0;
+}
+
+static int kabylake_hdmi2_init(struct snd_soc_pcm_runtime *rtd)
+{
+	struct kbl_rt5663_private *ctx = snd_soc_card_get_drvdata(rtd->card);
+	struct snd_soc_dai *dai = rtd->codec_dai;
+	struct kbl_hdmi_pcm *pcm;
+
+	pcm = devm_kzalloc(rtd->card->dev, sizeof(*pcm), GFP_KERNEL);
+	if (!pcm)
+		return -ENOMEM;
+
+	pcm->device = KBL_DPCM_AUDIO_HDMI2_PB;
+	pcm->codec_dai = dai;
+
+	list_add_tail(&pcm->head, &ctx->hdmi_pcm_list);
+
+	return 0;
+}
+
+static int kabylake_hdmi3_init(struct snd_soc_pcm_runtime *rtd)
+{
+	struct kbl_rt5663_private *ctx = snd_soc_card_get_drvdata(rtd->card);
+	struct snd_soc_dai *dai = rtd->codec_dai;
+	struct kbl_hdmi_pcm *pcm;
+
+	pcm = devm_kzalloc(rtd->card->dev, sizeof(*pcm), GFP_KERNEL);
+	if (!pcm)
+		return -ENOMEM;
+
+	pcm->device = KBL_DPCM_AUDIO_HDMI3_PB;
+	pcm->codec_dai = dai;
+
+	list_add_tail(&pcm->head, &ctx->hdmi_pcm_list);
+
+	return 0;
+}
+
+static unsigned int rates[] = {
+	48000,
+};
+
+static struct snd_pcm_hw_constraint_list constraints_rates = {
+	.count = ARRAY_SIZE(rates),
+	.list  = rates,
+	.mask = 0,
+};
+
+static unsigned int channels[] = {
+	2,
+};
+
+static struct snd_pcm_hw_constraint_list constraints_channels = {
+	.count = ARRAY_SIZE(channels),
+	.list = channels,
+	.mask = 0,
+};
+
+static int kbl_fe_startup(struct snd_pcm_substream *substream)
+{
+	struct snd_pcm_runtime *runtime = substream->runtime;
+
+	/*
+	 * On this platform for PCM device we support,
+	 * 48Khz
+	 * stereo
+	 * 16 bit audio
+	 */
+
+	runtime->hw.channels_max = 2;
+	snd_pcm_hw_constraint_list(runtime, 0, SNDRV_PCM_HW_PARAM_CHANNELS,
+					   &constraints_channels);
+
+	runtime->hw.formats = SNDRV_PCM_FMTBIT_S16_LE;
+	snd_pcm_hw_constraint_msbits(runtime, 0, 16, 16);
+
+	snd_pcm_hw_constraint_list(runtime, 0,
+				SNDRV_PCM_HW_PARAM_RATE, &constraints_rates);
+
+	return 0;
+}
+
+static const struct snd_soc_ops kabylake_rt5663_fe_ops = {
+	.startup = kbl_fe_startup,
+};
+
+static int kabylake_ssp_fixup(struct snd_soc_pcm_runtime *rtd,
+	struct snd_pcm_hw_params *params)
+{
+	struct snd_interval *rate = hw_param_interval(params,
+			SNDRV_PCM_HW_PARAM_RATE);
+	struct snd_interval *channels = hw_param_interval(params,
+			SNDRV_PCM_HW_PARAM_CHANNELS);
+	struct snd_mask *fmt = hw_param_mask(params, SNDRV_PCM_HW_PARAM_FORMAT);
+
+	/* The ADSP will convert the FE rate to 48k, stereo */
+	rate->min = rate->max = 48000;
+	channels->min = channels->max = 2;
+	/* set SSP1 to 24 bit */
+	snd_mask_none(fmt);
+	snd_mask_set(fmt, SNDRV_PCM_FORMAT_S24_LE);
+
+	return 0;
+}
+
+static int kabylake_rt5663_hw_params(struct snd_pcm_substream *substream,
+	struct snd_pcm_hw_params *params)
+{
+	struct snd_soc_pcm_runtime *rtd = substream->private_data;
+	struct snd_soc_dai *codec_dai = rtd->codec_dai;
+	int ret;
+
+	ret = snd_soc_dai_set_sysclk(codec_dai,
+			RT5663_SCLK_S_MCLK, 24576000, SND_SOC_CLOCK_IN);
+	/* use ASRC for internal clocks, as PLL rate isn't multiple of BCLK */
+	rt5663_sel_asrc_clk_src(codec_dai->codec, RT5663_DA_STEREO_FILTER, 1);
+
+	if (ret < 0)
+		dev_err(rtd->dev, "snd_soc_dai_set_sysclk err = %d\n", ret);
+
+	return ret;
+}
+
+static struct snd_soc_ops kabylake_rt5663_ops = {
+	.hw_params = kabylake_rt5663_hw_params,
+};
+
+static int kabylake_dmic_fixup(struct snd_soc_pcm_runtime *rtd,
+		struct snd_pcm_hw_params *params)
+{
+	struct snd_interval *channels = hw_param_interval(params,
+				SNDRV_PCM_HW_PARAM_CHANNELS);
+
+	if (params_channels(params) == 2 || DMIC_CH(dmic_constraints) == 2)
+		channels->min = channels->max = 2;
+	else
+		channels->min = channels->max = 4;
+
+	return 0;
+}
+
+static unsigned int channels_dmic[] = {
+	2, 4,
+};
+
+static struct snd_pcm_hw_constraint_list constraints_dmic_channels = {
+	.count = ARRAY_SIZE(channels_dmic),
+	.list = channels_dmic,
+	.mask = 0,
+};
+
+static const unsigned int dmic_2ch[] = {
+	2,
+};
+
+static const struct snd_pcm_hw_constraint_list constraints_dmic_2ch = {
+	.count = ARRAY_SIZE(dmic_2ch),
+	.list = dmic_2ch,
+	.mask = 0,
+};
+
+static int kabylake_dmic_startup(struct snd_pcm_substream *substream)
+{
+	struct snd_pcm_runtime *runtime = substream->runtime;
+
+	runtime->hw.channels_max = DMIC_CH(dmic_constraints);
+	snd_pcm_hw_constraint_list(runtime, 0, SNDRV_PCM_HW_PARAM_CHANNELS,
+			dmic_constraints);
+
+	return snd_pcm_hw_constraint_list(substream->runtime, 0,
+			SNDRV_PCM_HW_PARAM_RATE, &constraints_rates);
+}
+
+static struct snd_soc_ops kabylake_dmic_ops = {
+	.startup = kabylake_dmic_startup,
+};
+
+static unsigned int rates_16000[] = {
+	16000,
+};
+
+static struct snd_pcm_hw_constraint_list constraints_16000 = {
+	.count = ARRAY_SIZE(rates_16000),
+	.list  = rates_16000,
+};
+
+static const unsigned int ch_mono[] = {
+	1,
+};
+
+static const struct snd_pcm_hw_constraint_list constraints_refcap = {
+	.count = ARRAY_SIZE(ch_mono),
+	.list  = ch_mono,
+};
+
+static int kabylake_refcap_startup(struct snd_pcm_substream *substream)
+{
+	substream->runtime->hw.channels_max = 1;
+	snd_pcm_hw_constraint_list(substream->runtime, 0,
+					SNDRV_PCM_HW_PARAM_CHANNELS,
+					&constraints_refcap);
+
+	return snd_pcm_hw_constraint_list(substream->runtime, 0,
+				SNDRV_PCM_HW_PARAM_RATE,
+				&constraints_16000);
+}
+
+static struct snd_soc_ops skylaye_refcap_ops = {
+	.startup = kabylake_refcap_startup,
+};
+
+/* kabylake digital audio interface glue - connects codec <--> CPU */
+static struct snd_soc_dai_link kabylake_dais[] = {
+	/* Front End DAI links */
+	[KBL_DPCM_AUDIO_PB] = {
+		.name = "Kbl Audio Port",
+		.stream_name = "Audio",
+		.cpu_dai_name = "System Pin",
+		.platform_name = "0000:00:1f.3",
+		.dynamic = 1,
+		.codec_name = "snd-soc-dummy",
+		.codec_dai_name = "snd-soc-dummy-dai",
+		.nonatomic = 1,
+		.init = kabylake_rt5663_fe_init,
+		.trigger = {
+			SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST},
+		.dpcm_playback = 1,
+		.ops = &kabylake_rt5663_fe_ops,
+	},
+	[KBL_DPCM_AUDIO_CP] = {
+		.name = "Kbl Audio Capture Port",
+		.stream_name = "Audio Record",
+		.cpu_dai_name = "System Pin",
+		.platform_name = "0000:00:1f.3",
+		.dynamic = 1,
+		.codec_name = "snd-soc-dummy",
+		.codec_dai_name = "snd-soc-dummy-dai",
+		.nonatomic = 1,
+		.trigger = {
+			SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST},
+		.dpcm_capture = 1,
+		.ops = &kabylake_rt5663_fe_ops,
+	},
+	[KBL_DPCM_AUDIO_REF_CP] = {
+		.name = "Kbl Audio Reference cap",
+		.stream_name = "Wake on Voice",
+		.cpu_dai_name = "Reference Pin",
+		.codec_name = "snd-soc-dummy",
+		.codec_dai_name = "snd-soc-dummy-dai",
+		.platform_name = "0000:00:1f.3",
+		.init = NULL,
+		.dpcm_capture = 1,
+		.nonatomic = 1,
+		.dynamic = 1,
+		.ops = &skylaye_refcap_ops,
+	},
+	[KBL_DPCM_AUDIO_DMIC_CP] = {
+		.name = "Kbl Audio DMIC cap",
+		.stream_name = "dmiccap",
+		.cpu_dai_name = "DMIC Pin",
+		.codec_name = "snd-soc-dummy",
+		.codec_dai_name = "snd-soc-dummy-dai",
+		.platform_name = "0000:00:1f.3",
+		.init = NULL,
+		.dpcm_capture = 1,
+		.nonatomic = 1,
+		.dynamic = 1,
+		.ops = &kabylake_dmic_ops,
+	},
+	[KBL_DPCM_AUDIO_HDMI1_PB] = {
+		.name = "Kbl HDMI Port1",
+		.stream_name = "Hdmi1",
+		.cpu_dai_name = "HDMI1 Pin",
+		.codec_name = "snd-soc-dummy",
+		.codec_dai_name = "snd-soc-dummy-dai",
+		.platform_name = "0000:00:1f.3",
+		.dpcm_playback = 1,
+		.init = NULL,
+		.trigger = {
+			SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST},
+		.nonatomic = 1,
+		.dynamic = 1,
+	},
+	[KBL_DPCM_AUDIO_HDMI2_PB] = {
+		.name = "Kbl HDMI Port2",
+		.stream_name = "Hdmi2",
+		.cpu_dai_name = "HDMI2 Pin",
+		.codec_name = "snd-soc-dummy",
+		.codec_dai_name = "snd-soc-dummy-dai",
+		.platform_name = "0000:00:1f.3",
+		.dpcm_playback = 1,
+		.init = NULL,
+		.trigger = {
+			SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST},
+		.nonatomic = 1,
+		.dynamic = 1,
+	},
+	[KBL_DPCM_AUDIO_HDMI3_PB] = {
+		.name = "Kbl HDMI Port3",
+		.stream_name = "Hdmi3",
+		.cpu_dai_name = "HDMI3 Pin",
+		.codec_name = "snd-soc-dummy",
+		.codec_dai_name = "snd-soc-dummy-dai",
+		.platform_name = "0000:00:1f.3",
+		.trigger = {
+			SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST},
+		.dpcm_playback = 1,
+		.init = NULL,
+		.nonatomic = 1,
+		.dynamic = 1,
+	},
+
+	/* Back End DAI links */
+	{
+		/* SSP0 - Codec */
+		.name = "SSP0-Codec",
+		.id = 0,
+		.cpu_dai_name = "SSP0 Pin",
+		.platform_name = "0000:00:1f.3",
+		.no_pcm = 1,
+		.codecs = max98927_codec_components,
+		.num_codecs = ARRAY_SIZE(max98927_codec_components),
+		.dai_fmt = SND_SOC_DAIFMT_I2S |
+			SND_SOC_DAIFMT_NB_NF |
+			SND_SOC_DAIFMT_CBS_CFS,
+		.ignore_pmdown_time = 1,
+		.be_hw_params_fixup = kabylake_ssp_fixup,
+		.dpcm_playback = 1,
+	},
+	{
+		/* SSP1 - Codec */
+		.name = "SSP1-Codec",
+		.id = 1,
+		.cpu_dai_name = "SSP1 Pin",
+		.platform_name = "0000:00:1f.3",
+		.no_pcm = 1,
+		.codec_name = "i2c-10EC5663:00",
+		.codec_dai_name = KBL_REALTEK_CODEC_DAI,
+		.init = kabylake_rt5663_codec_init,
+		.dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF |
+			SND_SOC_DAIFMT_CBS_CFS,
+		.ignore_pmdown_time = 1,
+		.be_hw_params_fixup = kabylake_ssp_fixup,
+		.ops = &kabylake_rt5663_ops,
+		.dpcm_playback = 1,
+		.dpcm_capture = 1,
+	},
+	{
+		.name = "dmic01",
+		.id = 2,
+		.cpu_dai_name = "DMIC01 Pin",
+		.codec_name = "dmic-codec",
+		.codec_dai_name = "dmic-hifi",
+		.platform_name = "0000:00:1f.3",
+		.be_hw_params_fixup = kabylake_dmic_fixup,
+		.ignore_suspend = 1,
+		.dpcm_capture = 1,
+		.no_pcm = 1,
+	},
+	{
+		.name = "iDisp1",
+		.id = 3,
+		.cpu_dai_name = "iDisp1 Pin",
+		.codec_name = "ehdaudio0D2",
+		.codec_dai_name = "intel-hdmi-hifi1",
+		.platform_name = "0000:00:1f.3",
+		.dpcm_playback = 1,
+		.init = kabylake_hdmi1_init,
+		.no_pcm = 1,
+	},
+	{
+		.name = "iDisp2",
+		.id = 4,
+		.cpu_dai_name = "iDisp2 Pin",
+		.codec_name = "ehdaudio0D2",
+		.codec_dai_name = "intel-hdmi-hifi2",
+		.platform_name = "0000:00:1f.3",
+		.init = kabylake_hdmi2_init,
+		.dpcm_playback = 1,
+		.no_pcm = 1,
+	},
+	{
+		.name = "iDisp3",
+		.id = 5,
+		.cpu_dai_name = "iDisp3 Pin",
+		.codec_name = "ehdaudio0D2",
+		.codec_dai_name = "intel-hdmi-hifi3",
+		.platform_name = "0000:00:1f.3",
+		.init = kabylake_hdmi3_init,
+		.dpcm_playback = 1,
+		.no_pcm = 1,
+	},
+};
+
+#define NAME_SIZE	32
+static int kabylake_card_late_probe(struct snd_soc_card *card)
+{
+	struct kbl_rt5663_private *ctx = snd_soc_card_get_drvdata(card);
+	struct kbl_hdmi_pcm *pcm;
+	int err, i = 0;
+	char jack_name[NAME_SIZE];
+
+	list_for_each_entry(pcm, &ctx->hdmi_pcm_list, head) {
+		snprintf(jack_name, sizeof(jack_name),
+			"HDMI/DP, pcm=%d Jack", pcm->device);
+		err = snd_soc_card_jack_new(card, jack_name,
+					SND_JACK_AVOUT, &skylake_hdmi[i],
+					NULL, 0);
+
+		if (err)
+			return err;
+
+		err = hdac_hdmi_jack_init(pcm->codec_dai, pcm->device,
+						&skylake_hdmi[i]);
+		if (err < 0)
+			return err;
+
+		i++;
+	}
+
+	return 0;
+}
+
+/* kabylake audio machine driver for SPT + RT5663 */
+static struct snd_soc_card kabylake_audio_card = {
+	.name = "kblrt5663max",
+	.owner = THIS_MODULE,
+	.dai_link = kabylake_dais,
+	.num_links = ARRAY_SIZE(kabylake_dais),
+	.controls = kabylake_controls,
+	.num_controls = ARRAY_SIZE(kabylake_controls),
+	.dapm_widgets = kabylake_widgets,
+	.num_dapm_widgets = ARRAY_SIZE(kabylake_widgets),
+	.dapm_routes = kabylake_map,
+	.num_dapm_routes = ARRAY_SIZE(kabylake_map),
+	.codec_conf = max98927_codec_conf,
+	.num_configs = ARRAY_SIZE(max98927_codec_conf),
+	.fully_routed = true,
+	.late_probe = kabylake_card_late_probe,
+};
+
+static int kabylake_audio_probe(struct platform_device *pdev)
+{
+	struct kbl_rt5663_private *ctx;
+	struct skl_machine_pdata *pdata;
+
+	ctx = devm_kzalloc(&pdev->dev, sizeof(*ctx), GFP_ATOMIC);
+	if (!ctx)
+		return -ENOMEM;
+
+	INIT_LIST_HEAD(&ctx->hdmi_pcm_list);
+
+	kabylake_audio_card.dev = &pdev->dev;
+	snd_soc_card_set_drvdata(&kabylake_audio_card, ctx);
+
+	pdata = dev_get_drvdata(&pdev->dev);
+	if (pdata)
+		dmic_constraints = pdata->dmic_num == 2 ?
+			&constraints_dmic_2ch : &constraints_dmic_channels;
+
+	return devm_snd_soc_register_card(&pdev->dev, &kabylake_audio_card);
+}
+
+static const struct platform_device_id kbl_board_ids[] = {
+	{ .name = "kbl_rt5663_m98927" },
+	{ }
+};
+
+static struct platform_driver kabylake_audio = {
+	.probe = kabylake_audio_probe,
+	.driver = {
+		.name = "kbl_rt5663_m98927",
+		.pm = &snd_soc_pm_ops,
+	},
+	.id_table = kbl_board_ids,
+};
+
+module_platform_driver(kabylake_audio)
+
+/* Module information */
+MODULE_DESCRIPTION("Audio Machine driver-RT5663 & MAX98927 in I2S mode");
+MODULE_AUTHOR("Naveen M <naveen.m@intel.com>");
+MODULE_AUTHOR("Harsha Priya <harshapriya.n@intel.com>");
+MODULE_LICENSE("GPL v2");
+MODULE_ALIAS("platform:kbl_rt5663_m98927");
-- 
1.9.1

[PATCH v2 6/6] ASoC: Intel: Add Kabylake RT5663+MAX98927 machine driver entry

[Naveen M]

Adds kbl_rt5663_max98927_i2s machine driver entry into machine table

Signed-off-by: Naveen M <naveen.m@intel.com>
---
 sound/soc/intel/skylake/skl.c | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/sound/soc/intel/skylake/skl.c b/sound/soc/intel/skylake/skl.c
index fd1dae1..9e22723 100644
--- a/sound/soc/intel/skylake/skl.c
+++ b/sound/soc/intel/skylake/skl.c
@@ -865,6 +865,7 @@ static void skl_remove(struct pci_dev *pci)
 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_acpi_mach sst_skl_devdata[] = {
 	{
@@ -928,6 +929,15 @@ static void skl_remove(struct pci_dev *pci)
 		.quirk_data = &kbl_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,
+		.quirk_data = &kbl_poppy_codecs,
+		.pdata = &skl_dmic_data
+	},
+
 	{}
 };
 
-- 
1.9.1

Applied "ASoC: Intel: Add Kabylake RT5663+MAX98927 machine driver entry" to the asoc tree

[Mark Brown]

The patch

   ASoC: Intel: Add Kabylake RT5663+MAX98927 machine driver entry

has been applied to the asoc tree at

   git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git 

All being well this means that it will be integrated into the linux-next
tree (usually sometime in the next 24 hours) and sent to Linus during
the next merge window (or sooner if it is a bug fix), however if
problems are discovered then the patch may be dropped or reverted.  

You may get further e-mails resulting from automated or manual testing
and review of the tree, please engage with people reporting problems and
send followup patches addressing any issues that are reported if needed.

If any updates are required or you are submitting further changes they
should be sent as incremental updates against current git, existing
patches will not be replaced.

Please add any relevant lists and maintainers to the CCs when replying
to this mail.

Thanks,
Mark

>From 0809d9871d1066634f8abae9ecfbdfadecb8cd35 Mon Sep 17 00:00:00 2001
From: Naveen M <naveen.m@intel.com>
Date: Mon, 15 May 2017 13:42:17 +0530
Subject: [PATCH] ASoC: Intel: Add Kabylake RT5663+MAX98927 machine driver
 entry

Adds kbl_rt5663_max98927_i2s machine driver entry into machine table

Signed-off-by: Naveen M <naveen.m@intel.com>
Acked-by: Vinod Koul <vinod.koul@intel.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
---
 sound/soc/intel/skylake/skl.c | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/sound/soc/intel/skylake/skl.c b/sound/soc/intel/skylake/skl.c
index ceb7734d74ed..4ebae850c559 100644
--- a/sound/soc/intel/skylake/skl.c
+++ b/sound/soc/intel/skylake/skl.c
@@ -879,6 +879,7 @@ static void skl_remove(struct pci_dev *pci)
 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_acpi_mach sst_skl_devdata[] = {
 	{
@@ -942,6 +943,15 @@ static struct sst_acpi_mach sst_kbl_devdata[] = {
 		.quirk_data = &kbl_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,
+		.quirk_data = &kbl_poppy_codecs,
+		.pdata = &skl_dmic_data
+	},
+
 	{}
 };
 
-- 
2.11.0