]> git.proxmox.com Git - mirror_ubuntu-eoan-kernel.git/commitdiff
soundwire: mipi_disco: fix master/link error
authorPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Wed, 22 May 2019 19:47:18 +0000 (14:47 -0500)
committerVinod Koul <vkoul@kernel.org>
Mon, 27 May 2019 05:22:59 +0000 (10:52 +0530)
The MIPI DisCo specification for SoundWire defines the
"mipi-sdw-link-N-subproperties" for slaves and
"mipi-sdw-master-N-subproperties" for controllers. This is a mistake
that was not identified until now.

Existing Intel DSDT tables use 'link' everywhere, and the MIPI spec
will be updated to deprecate "mipi-sdw-master-N-subproperties"

Fix to parse firmware information on existing devices. If we ever see
a system with 'master-N-subproperties' I guess we'll have to try both.

Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Signed-off-by: Vinod Koul <vkoul@kernel.org>
drivers/soundwire/mipi_disco.c

index c1f51d6a23d22ba404e6ce83b0d424cd2682b9d4..6df68584c963e4d085d80ffa21245fd155f53d7b 100644 (file)
@@ -40,7 +40,7 @@ int sdw_master_read_prop(struct sdw_bus *bus)
 
        /* Find master handle */
        snprintf(name, sizeof(name),
-                "mipi-sdw-master-%d-subproperties", bus->link_id);
+                "mipi-sdw-link-%d-subproperties", bus->link_id);
 
        link = device_get_named_child_node(bus->dev, name);
        if (!link) {