Skip to content

Commit

Permalink
soundwire: mipi-disco: add support for peripheral channelprepare timeout
Browse files Browse the repository at this point in the history
The DisCo for SoundWire 2.0 spec renamed the
'mipi-sdw-slave-channelprepare-timeout', add support for the new
definition in backwards-compatible ways.

Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
  • Loading branch information
plbossart authored and bardliao committed Aug 20, 2024
1 parent ad26caf commit c71bb1e
Showing 1 changed file with 6 additions and 2 deletions.
8 changes: 6 additions & 2 deletions drivers/soundwire/mipi_disco.c
Original file line number Diff line number Diff line change
Expand Up @@ -344,6 +344,7 @@ int sdw_slave_read_prop(struct sdw_slave *slave)
struct device *dev = &slave->dev;
struct fwnode_handle *port;
int nval;
int ret;

device_property_read_u32(dev, "mipi-sdw-sw-interface-revision",
&prop->mipi_revision);
Expand All @@ -366,8 +367,11 @@ int sdw_slave_read_prop(struct sdw_slave *slave)
device_property_read_u32(dev, "mipi-sdw-clockstopprepare-timeout",
&prop->clk_stop_timeout);

device_property_read_u32(dev, "mipi-sdw-slave-channelprepare-timeout",
&prop->ch_prep_timeout);
ret = device_property_read_u32(dev, "mipi-sdw-peripheral-channelprepare-timeout",
&prop->ch_prep_timeout);
if (ret < 0)
device_property_read_u32(dev, "mipi-sdw-slave-channelprepare-timeout",
&prop->ch_prep_timeout);

device_property_read_u32(dev,
"mipi-sdw-clockstopprepare-hard-reset-behavior",
Expand Down

0 comments on commit c71bb1e

Please sign in to comment.