From: Bard Liao <yung-chuan.liao@linux.intel.com>
To: linux-sound@vger.kernel.org, vkoul@kernel.org
Cc: vinod.koul@linaro.org, linux-kernel@vger.kernel.org,
pierre-louis.bossart@linux.intel.com, bard.liao@intel.com
Subject: [PATCH v2 10/14] soundwire: mipi_disco: add support for clock-scales property
Date: Wed, 11 Sep 2024 19:58:23 +0800 [thread overview]
Message-ID: <20240911115827.233171-11-yung-chuan.liao@linux.intel.com> (raw)
In-Reply-To: <20240911115827.233171-1-yung-chuan.liao@linux.intel.com>
From: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
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 <pierre-louis.bossart@linux.intel.com>
Signed-off-by: Bard Liao <yung-chuan.liao@linux.intel.com>
---
drivers/soundwire/mipi_disco.c | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/drivers/soundwire/mipi_disco.c b/drivers/soundwire/mipi_disco.c
index 99253f4c9a38..5f42d23bbc85 100644
--- a/drivers/soundwire/mipi_disco.c
+++ b/drivers/soundwire/mipi_disco.c
@@ -51,6 +51,7 @@ int sdw_master_read_prop(struct sdw_bus *bus)
{
struct sdw_master_prop *prop = &bus->prop;
struct fwnode_handle *link;
+ const char *scales_prop;
char name[32];
int nval;
int ret;
@@ -112,7 +113,12 @@ int sdw_master_read_prop(struct sdw_bus *bus)
}
}
- nval = fwnode_property_count_u32(link, "mipi-sdw-supported-clock-gears");
+ scales_prop = "mipi-sdw-supported-clock-scales";
+ nval = fwnode_property_count_u32(link, scales_prop);
+ if (nval == 0) {
+ scales_prop = "mipi-sdw-supported-clock-gears";
+ nval = fwnode_property_count_u32(link, scales_prop);
+ }
if (nval > 0) {
prop->num_clk_gears = nval;
prop->clk_gears = devm_kcalloc(bus->dev, prop->num_clk_gears,
@@ -124,7 +130,7 @@ int sdw_master_read_prop(struct sdw_bus *bus)
}
ret = fwnode_property_read_u32_array(link,
- "mipi-sdw-supported-clock-gears",
+ scales_prop,
prop->clk_gears,
prop->num_clk_gears);
if (ret < 0)
--
2.43.0
next prev parent reply other threads:[~2024-09-11 11:59 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-09-11 11:58 [PATCH v2 00/14] soundwire: mipi-disco: add partial SoundWire Disco 2.1 Bard Liao
2024-09-11 11:58 ` [PATCH v2 01/14] soundwire: mipi_disco: add MIPI-specific property_read_bool() helpers Bard Liao
2024-09-11 11:58 ` [PATCH v2 02/14] soundwire: optimize sdw_stream_runtime memory layout Bard Liao
2024-09-11 11:58 ` [PATCH v2 03/14] soundwire: optimize sdw_master_prop Bard Liao
2024-09-11 11:58 ` [PATCH v2 04/14] soundwire: optimize sdw_bus structure Bard Liao
2024-09-11 11:58 ` [PATCH v2 05/14] soundwire: optimize sdw_slave_prop Bard Liao
2024-09-11 11:58 ` [PATCH v2 06/14] soundwire: optimize sdw_dp0_prop Bard Liao
2024-09-11 11:58 ` [PATCH v2 07/14] soundwire: optimize sdw_dpn_prop Bard Liao
2024-09-11 11:58 ` [PATCH v2 08/14] soundwire: mipi-disco: remove DPn audio-modes Bard Liao
2024-09-11 11:58 ` [PATCH v2 09/14] soundwire: mipi-disco: add error handling for property array read Bard Liao
2024-09-11 11:58 ` Bard Liao [this message]
2024-09-11 11:58 ` [PATCH v2 11/14] soundwire: mipi-disco: add support for peripheral channelprepare timeout Bard Liao
2024-09-11 11:58 ` [PATCH v2 12/14] soundwire: mipi-disco: add comment on DP0-supported property Bard Liao
2024-09-11 11:58 ` [PATCH v2 13/14] soundwire: mipi-disco: add new properties from 2.0 spec Bard Liao
2024-09-11 11:58 ` [PATCH v2 14/14] soundwire: mipi-disco: add support for DP0/DPn 'lane-list' property Bard Liao
2024-09-12 14:41 ` [PATCH v2 00/14] soundwire: mipi-disco: add partial SoundWire Disco 2.1 Charles Keepax
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240911115827.233171-11-yung-chuan.liao@linux.intel.com \
--to=yung-chuan.liao@linux.intel.com \
--cc=bard.liao@intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-sound@vger.kernel.org \
--cc=pierre-louis.bossart@linux.intel.com \
--cc=vinod.koul@linaro.org \
--cc=vkoul@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox