UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

soundwire fixes for v5.4-rc6 

- Kconfig fixes to ensure soundwire is built only for ACPI and DT
   platform
 - fix for intel PDI offsets and numbers
 - slave scanf format fix
 -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCAAdFiEE+vs47OPLdNbVcHzyfBQHDyUjg0cFAl26rXkACgkQfBQHDyUj
 g0dfnQ/+MCoSOMnPjY9qupDWpmxQiDjUW4YS903B2ftXXaM1k9+nxIN1q/MXKmsQ
 zz7ceQTgBZ0+DTZpC0q8V77HqLGglNe6F9WAYCy0pndfHspLhLAtm5pBA8KIki1G
 7awaIqigZHWNEmuz/qI6BbyRyeXtOsppbj1HLAxKIG+acc0052I2zmnl9XHSbvjK
 aOFApTXhSlZsdDpO/RN8NGlFzN34FrfkVguWQo9MR7nfH0cMWXW72JKuJM8OMoTQ
 GRPhD+C2fhBLpqSBwv9rl/Vk+PBDdeOxvHCn5TG8ETf2g8UwM3RtuVESi/Ix3y78
 veZ96Z/OaQhA24N/VlYhGoXuwq6uHcwiepyE6k+nRbNtkUzDItZR7TunaP2qpLFV
 KBwvRFux2RzShKmxdf62nq04iYBQvyUh6sRS8JIOPpp+LoSn6f0iEkn6GFkMMvLc
 4mt79G7AsWEYrIY42L4ip63RrRu6TL+6cQpu4z0rieiy/OIsvZjlICqyBuwfJto+
 v11ABulZm+t4yt5qXYDnqekgWB1/U/WG4jZ6yaMmmeiW8rnHLZndGou9FrHxlHgN
 /ifOFttXVUH1GTSxON0q+RfevycRcQWOBb6mkxz7rRzyD1TWkTLs/QxlT6WJ1P6D
 erKUXRnuIks2Wj2yqCxyhhjGv3tuZLlEBRZUdkruMNebA3q3piU=
 =hypa
 -----END PGP SIGNATURE-----

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

Vinod writes:

soundwire fixes for v5.4-rc6

- Kconfig fixes to ensure soundwire is built only for ACPI and DT
  platform
- fix for intel PDI offsets and numbers
- slave scanf format fix

* tag 'soundwire-5.4-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/soundwire:
  soundwire: slave: fix scanf format
  soundwire: intel: fix intel_register_dai PDI offsets and numbers
  soundwire: depend on ACPI || OF
  soundwire: depend on ACPI
This commit is contained in:
Greg Kroah-Hartman 2019-11-02 18:15:46 +01:00
parent 92fd9bf2c3 7b47ad3322
commit 106901add5
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
drivers/soundwire/Kconfig
View File

@ -5,6 +5,7 @@
menuconfig SOUNDWIRE
tristate "SoundWire support"
depends on ACPI || OF
help
SoundWire is a 2-Pin interface with data and clock line ratified
by the MIPI Alliance. SoundWire is used for transporting data

4
drivers/soundwire/intel.c
View File

@ -900,7 +900,7 @@ static int intel_register_dai(struct sdw_intel *sdw)
/* Create PCM DAIs */
stream = &cdns->pcm;
ret = intel_create_dai(cdns, dais, INTEL_PDI_IN, stream->num_in,
ret = intel_create_dai(cdns, dais, INTEL_PDI_IN, cdns->pcm.num_in,
off, stream->num_ch_in, true);
if (ret)
return ret;
@ -931,7 +931,7 @@ static int intel_register_dai(struct sdw_intel *sdw)
if (ret)
return ret;
off += cdns->pdm.num_bd;
off += cdns->pdm.num_out;
ret = intel_create_dai(cdns, dais, INTEL_PDI_BD, cdns->pdm.num_bd,
off, stream->num_ch_bd, false);
if (ret)

3
drivers/soundwire/slave.c
View File

@ -128,7 +128,8 @@ int sdw_of_find_slaves(struct sdw_bus *bus)
struct device_node *node;
for_each_child_of_node(bus->dev->of_node, node) {
int link_id, sdw_version, ret, len;
int link_id, ret, len;
unsigned int sdw_version;
const char *compat = NULL;
struct sdw_slave_id id;
const __be32 *addr;