diff options
| author | Libin Yang <libin.yang@intel.com> | 2021-12-21 02:08:17 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2021-12-22 20:17:47 +0100 |
| commit | 78ea40efb48e978756db2ce45fcfa55bac056b91 (patch) | |
| tree | 61950e22ecad8a4a686e4560db91c48a7d86b6de | |
| parent | ALSA: hda: intel-sdw-acpi: harden detection of controller (diff) | |
| download | linux-78ea40efb48e978756db2ce45fcfa55bac056b91.tar.xz linux-78ea40efb48e978756db2ce45fcfa55bac056b91.zip | |
ALSA: hda: intel-sdw-acpi: go through HDAS ACPI at max depth of 2
In the HDAS ACPI scope, the SoundWire may not be the direct child of HDAS.
It needs to go through the ACPI table at max depth of 2 to find the
SoundWire device from HDAS.
Reviewed-by: Péter Ujfalusi <peter.ujfalusi@linux.intel.com>
Signed-off-by: Libin Yang <libin.yang@intel.com>
Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Signed-off-by: Bard Liao <yung-chuan.liao@linux.intel.com>
Link: https://lore.kernel.org/r/20211221010817.23636-3-yung-chuan.liao@linux.intel.com
Signed-off-by: Takashi Iwai <tiwai@suse.de>
| -rw-r--r-- | sound/hda/intel-sdw-acpi.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/sound/hda/intel-sdw-acpi.c b/sound/hda/intel-sdw-acpi.c index ba8a872a2901..b7758dbe2371 100644 --- a/sound/hda/intel-sdw-acpi.c +++ b/sound/hda/intel-sdw-acpi.c @@ -165,8 +165,14 @@ int sdw_intel_acpi_scan(acpi_handle *parent_handle, acpi_status status; info->handle = NULL; + /* + * In the HDAS ACPI scope, 'SNDW' may be either the child of + * 'HDAS' or the grandchild of 'HDAS'. So let's go through + * the ACPI from 'HDAS' at max depth of 2 to find the 'SNDW' + * device. + */ status = acpi_walk_namespace(ACPI_TYPE_DEVICE, - parent_handle, 1, + parent_handle, 2, sdw_intel_acpi_cb, NULL, info, NULL); if (ACPI_FAILURE(status) || info->handle == NULL) |