iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

soundwire: qcom: set controller id to hw master id

Browse Source 
Qualcomm Soundwire Controllers IP version after 1.3 have a dedicated
master id register which will provide a unique id value for each
controller instance. Use this value instead of artificially generated
value from idr. Versions 1.3 and below only have one instance of
soundwire controller which does no have this register, so let them use
value from idr.

Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
Reviewed-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Tested-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Link: https://lore.kernel.org/r/20231123105332.102167-1-srinivas.kandagatla@linaro.org
Signed-off-by: Vinod Koul <vkoul@kernel.org>
This commit is contained in:
Srinivas Kandagatla 2023-11-23 10:53:32 +00:00 committed by Vinod Koul
parent 8a8a9ac8a4
commit a7ae05ef35
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/soundwire/qcom.c
View File

@ -1620,9 +1620,13 @@ static int qcom_swrm_probe(struct platform_device *pdev)
}
}
/* FIXME: is there a DT-defined value to use ? */
ctrl->bus.controller_id = -1;
if (ctrl->version > SWRM_VERSION_1_3_0) {
ctrl->reg_read(ctrl, SWRM_COMP_MASTER_ID, &val);
ctrl->bus.controller_id = val;
}
ret = sdw_bus_master_add(&ctrl->bus, dev, dev->fwnode);
if (ret) {
dev_err(dev, "Failed to register Soundwire controller (%d)\n",