kybaaz/linux-xiaomi-chiron
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

soundwire fixes for v5.13

Browse source 
Fix in qcom driver for handling of qcom,ports-block-pack-mode property.
 This fixes regression reported in DragonBoard DB845c and Lenovo Yoga
 C630.
 -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCAAdFiEE+vs47OPLdNbVcHzyfBQHDyUjg0cFAmCmEpgACgkQfBQHDyUj
 g0c+2w/+MsNEQWByTVx6x+DGzui2iAf3Ev1jPmGEOfDYm0NsQEGM/9McDsbFVDkz
 tuPHXr1M3vwDLq6biXHWmDpTkA4sQfNNWMr3hNuOD3Rce1iiwwQGZ/sI3ePsgySF
 t8HmDAmD2asS/6L2DftwAJzQjglG3xsLSRxyTZ6veXPYk7hPonYXK9h71uILIp2J
 8V5A2fCHOB24fPtVsm3y7V1ZfgP7w3g9Ylr4S/9uyY50I72a8BuNjhgpTFaOXU1t
 snbv7z5klq5FDQ4DSx+poYfS4mt5sKIHp8vaNsUXGGYk/YcpKd4Ha1rTgz7xLYMv
 2neaFUGgh/pkfM/4+B5cUHafhaIpMLAfnVNl6WnAmnA6PgHOp3Z1w7FAF6g+Nv6s
 WRSjn+9u1Jtd6fBn7Erh2LXGo4ytHQlrudOEb3VQyTHtTfpMotcFdZo60ZVwPmIF
 RVTUXBUBIbbVfYbHDx6iLPPfrTDhbi7qsFu+rZA2O1W2EZOXtEL30Qpl6saHhuBr
 5+z2LW2ssRAsvl20yJcqgaitnImItaL7xbK7jE0n/6ylVRIDlldILj+KgJSVuyB1
 oNaGkmvHkWLmr5LoZoTUINr/lBfTS4U2XmVQlYsSFmjqECqvrba0szsRmFRy4WI+
 Tr2EbbvDpOH5FzdQoHh1JWj7rkUYKzhCl49aqkZEF5ezRwhKx3A=
 =qUPO
 -----END PGP SIGNATURE-----

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
This commit is contained in:
Greg Kroah-Hartman 2021-05-21 12:55:39 +02:00
commit d33ca7d2e8
1 changed files with 10 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

12
drivers/soundwire/qcom.c
View file

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