Skip to content

Commit 89e95be

Browse files
plbossartvinodkoul
authored andcommitted
soundwire: mipi_disco: add support for clock-scales property
The DisCo for SoundWire 2.0 spec adds support for the 'mipi-sdw-supported-clock-scales' property, which is just a rename. Add in a backwards-compatible manner. Signed-off-by: Pierre-Louis Bossart <[email protected]> Signed-off-by: Bard Liao <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Vinod Koul <[email protected]>
1 parent a489afc commit 89e95be

File tree

1 file changed

+8
-2
lines changed

1 file changed

+8
-2
lines changed

drivers/soundwire/mipi_disco.c

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@ int sdw_master_read_prop(struct sdw_bus *bus)
5151
{
5252
struct sdw_master_prop *prop = &bus->prop;
5353
struct fwnode_handle *link;
54+
const char *scales_prop;
5455
char name[32];
5556
int nval;
5657
int ret;
@@ -112,7 +113,12 @@ int sdw_master_read_prop(struct sdw_bus *bus)
112113
}
113114
}
114115

115-
nval = fwnode_property_count_u32(link, "mipi-sdw-supported-clock-gears");
116+
scales_prop = "mipi-sdw-supported-clock-scales";
117+
nval = fwnode_property_count_u32(link, scales_prop);
118+
if (nval == 0) {
119+
scales_prop = "mipi-sdw-supported-clock-gears";
120+
nval = fwnode_property_count_u32(link, scales_prop);
121+
}
116122
if (nval > 0) {
117123
prop->num_clk_gears = nval;
118124
prop->clk_gears = devm_kcalloc(bus->dev, prop->num_clk_gears,
@@ -124,7 +130,7 @@ int sdw_master_read_prop(struct sdw_bus *bus)
124130
}
125131

126132
ret = fwnode_property_read_u32_array(link,
127-
"mipi-sdw-supported-clock-gears",
133+
scales_prop,
128134
prop->clk_gears,
129135
prop->num_clk_gears);
130136
if (ret < 0)

0 commit comments

Comments
 (0)