[PATCH 9/11] soundwire: amd: accept the legacy mipi-sdw-master-list property

[Corey Smith <corsmith@gmail.com>]

Rembrandt (ACP6x) firmware describes the controller links with the
legacy MIPI property name "mipi-sdw-master-list" instead of the current
"mipi-sdw-manager-list".  Fall back to the legacy name when the modern
one is not present.

Assisted-by: LLM
Signed-off-by: Corey Smith <corsmith@gmail.com>
---
 sound/soc/amd/acp/amd-sdw-acpi.c | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/sound/soc/amd/acp/amd-sdw-acpi.c b/sound/soc/amd/acp/amd-sdw-acpi.c
index 0160b0d..85dc1ba 100644
--- a/sound/soc/amd/acp/amd-sdw-acpi.c
+++ b/sound/soc/amd/acp/amd-sdw-acpi.c
@@ -36,9 +36,18 @@ int amd_sdw_scan_controller(struct sdw_amd_acpi_info *info)
 	ret = fwnode_property_read_u32_array(acpi_fwnode_handle(adev),
 					     "mipi-sdw-manager-list", &sdw_bitmap, 1);
 	if (ret) {
-		dev_err(&adev->dev,
-			"Failed to read mipi-sdw-manager-list: %d\n", ret);
-		return -EINVAL;
+		/*
+		 * Rembrandt (ACP6x) firmware uses the legacy MIPI property
+		 * name "mipi-sdw-master-list".
+		 */
+		ret = fwnode_property_read_u32_array(acpi_fwnode_handle(adev),
+						     "mipi-sdw-master-list",
+						     &sdw_bitmap, 1);
+		if (ret) {
+			dev_err(&adev->dev,
+				"Failed to read SoundWire manager list: %d\n", ret);
+			return -EINVAL;
+		}
 	}
 	count = hweight32(sdw_bitmap);
 	/* Check count is within bounds */