Merge tag 'soundwire-5.4-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul...
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sat, 2 Nov 2019 17:15:46 +0000 (18:15 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sat, 2 Nov 2019 17:15:46 +0000 (18:15 +0100)
commit106901add52b6e79206c15563fcc0efe835f75bb
tree4400a4d18bf5b68d259931a6ba2fb389e32553f0
parent92fd9bf2c3260980c908c386e49a98b7b16da521
parent7b47ad3322d114736e08cc244a84fe7af9b861f6
Merge tag 'soundwire-5.4-rc6' of git://git./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