Commit d33ca7d2 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge tag 'soundwire-5.13-fixes' of... 

Merge tag 'soundwire-5.13-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/soundwire into char-misc-linus

soundwire fixes for v5.13

Fix in qcom driver for handling of qcom,ports-block-pack-mode property.
This fixes regression reported in DragonBoard DB845c and Lenovo Yoga
C630.

* tag 'soundwire-5.13-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/soundwire:
  soundwire: qcom: fix handling of qcom,ports-block-pack-mode
parents 50f09a3d da096fbc

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);