Commit da096fbc authored by Srinivas Kandagatla's avatar Srinivas Kandagatla Committed by Vinod Koul
Browse files

soundwire: qcom: fix handling of qcom,ports-block-pack-mode 



Support to "qcom,ports-block-pack-mode" was added at later stages
to support a variant of Qualcomm SoundWire controllers available
on Apps processor. However the older versions of the SoundWire
controller which are embedded in WCD Codecs do not need this property.

So returning on error for those cases will break boards like DragonBoard
DB845c and Lenovo Yoga C630.

This patch fixes error handling on this property considering older usecases.

Fixes: a5943e4f ("soundwire: qcom: check of_property_read status")
Reported-by: default avatarAmit Pundir <amit.pundir@linaro.org>
Signed-off-by: default avatarSrinivas Kandagatla <srinivas.kandagatla@linaro.org>
Tested-by: default avatarAmit Pundir <amit.pundir@linaro.org>
Link: https://lore.kernel.org/r/20210504125909.16108-1-srinivas.kandagatla@linaro.org


Signed-off-by: default avatarVinod Koul <vkoul@kernel.org>
parent 6efb943b

drivers/soundwire/qcom.c

+10 −2
Original line number Diff line number Diff line
@@ -1150,8 +1150,16 @@ static int qcom_swrm_get_port_config(struct qcom_swrm_ctrl *ctrl) 


	ret = of_property_read_u8_array(np, "qcom,ports-block-pack-mode",

					bp_mode, nports);

	if (ret)

	if (ret) {

		u32 version;



		ctrl->reg_read(ctrl, SWRM_COMP_HW_VERSION, &version);



		if (version <= 0x01030000)

			memset(bp_mode, SWR_INVALID_PARAM, QCOM_SDW_MAX_PORTS);

		else

			return ret;

	}



	memset(hstart, SWR_INVALID_PARAM, QCOM_SDW_MAX_PORTS);

	of_property_read_u8_array(np, "qcom,ports-hstart", hstart, nports);