ALSA: hda: intel-nhlt: handle NHLT VENDOR_DEFINED DMIC geometry

The NHLT spec defines a VENDOR_DEFINED geometry, which requires
reading additional information to figure out the number of
microphones.

Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>

diff --git a/include/sound/intel-nhlt.h b/include/sound/intel-nhlt.h
index 857922f039310a0ecda658729ffc8f2f303b9a38..f657fd8fc0add82ae21056ac37c19365187c8e17 100644 (file)
--- a/include/sound/intel-nhlt.h
+++ b/include/sound/intel-nhlt.h
@@ -96,16 +96,22 @@ struct nhlt_resource_desc  {
 #define MIC_ARRAY_2CH 2
 #define MIC_ARRAY_4CH 4
 
-struct nhlt_tdm_config {
+struct nhlt_device_specific_config {
        u8 virtual_slot;
        u8 config_type;
 } __packed;
 
 struct nhlt_dmic_array_config {
-       struct nhlt_tdm_config tdm_config;
+       struct nhlt_device_specific_config device_config;
        u8 array_type;
 } __packed;
 
+struct nhlt_vendor_dmic_array_config {
+       struct nhlt_dmic_array_config dmic_config;
+       u8 nb_mics;
+       /* TODO add vendor mic config */
+} __packed;
+
 enum {
        NHLT_MIC_ARRAY_2CH_SMALL = 0xa,
        NHLT_MIC_ARRAY_2CH_BIG = 0xb,

diff --git a/sound/hda/intel-nhlt.c b/sound/hda/intel-nhlt.c
index 7a62e03ba4073b851c71a617a57372d4f87be87c..daede96f28ee31dbd9debca853b9b301b0a89f02 100644 (file)
--- a/sound/hda/intel-nhlt.c
+++ b/sound/hda/intel-nhlt.c
@@ -63,6 +63,7 @@ int intel_nhlt_get_dmic_geo(struct device *dev, struct nhlt_acpi_table *nhlt)
 {
        struct nhlt_endpoint *epnt;
        struct nhlt_dmic_array_config *cfg;
+       struct nhlt_vendor_dmic_array_config *cfg_vendor;
        unsigned int dmic_geo = 0;
        u8 j;
 
@@ -86,7 +87,10 @@ int intel_nhlt_get_dmic_geo(struct device *dev, struct nhlt_acpi_table *nhlt)
                        case NHLT_MIC_ARRAY_4CH_2ND_GEOM:
                                dmic_geo = MIC_ARRAY_4CH;
                                break;
-
+                       case NHLT_MIC_ARRAY_VENDOR_DEFINED:
+                               cfg_vendor = (struct nhlt_vendor_dmic_array_config *)cfg;
+                               dmic_geo = cfg_vendor->nb_mics;
+                               break;
                        default:
                                dev_warn(dev, "undefined DMIC array_type 0x%0x\n",
                                         cfg->array_type);