From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 22 Sep 2019 17:52:23 +0000 (-0700)
Subject: Merge tag 'soundwire-5.4-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul... 
X-Git-Tag: v5.4-rc1~77
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=8d7ead5c69dfa928322777c532fa0770af319202;p=platform%2Fkernel%2Flinux-rpi.git

Merge tag 'soundwire-5.4-rc1' of git://git./linux/kernel/git/vkoul/soundwire

Pull soundwire updates from Vinod Koul:
 "This includes DT support thanks to Srini and more work done by Intel
  (Pierre) on improving cadence and intel support.

  Summary:

   - Add DT bindings and DT support in core

   - Add debugfs support for soundwire properties

   - Improvements on streaming handling to core

   - Improved handling of Cadence module

   - More updates and improvements to Intel driver"

* tag 'soundwire-5.4-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/soundwire: (30 commits)
  soundwire: stream: make stream name a const pointer
  soundwire: Add compute_params callback
  soundwire: core: add device tree support for slave devices
  dt-bindings: soundwire: add slave bindings
  soundwire: bus: set initial value to port_status
  soundwire: intel: handle disabled links
  soundwire: intel: add debugfs register dump
  soundwire: cadence_master: add debugfs register dump
  soundwire: add debugfs support
  soundwire: intel: remove unused variables
  soundwire: intel: move shutdown() callback and don't export symbol
  soundwire: cadence_master: add kernel parameter to override interrupt mask
  soundwire: intel_init: add kernel module parameter to filter out links
  soundwire: cadence_master: fix divider setting in clock register
  soundwire: cadence_master: make use of mclk_freq property
  soundwire: intel: read mclk_freq property from firmware
  soundwire: add new mclk_freq field for properties
  soundwire: stream: remove unnecessary variable initializations
  soundwire: stream: fix disable sequence
  soundwire: include mod_devicetable.h to avoid compiling warnings
  ...
---

8d7ead5c69dfa928322777c532fa0770af319202
diff --cc drivers/soundwire/Makefile
index 45b7e50,34bbd36..563894e
--- a/drivers/soundwire/Makefile
+++ b/drivers/soundwire/Makefile
@@@ -5,8 -5,12 +5,12 @@@
  
  #Bus Objs
  soundwire-bus-objs := bus_type.o bus.o slave.o mipi_disco.o stream.o
 -obj-$(CONFIG_SOUNDWIRE_BUS) += soundwire-bus.o
 +obj-$(CONFIG_SOUNDWIRE) += soundwire-bus.o
  
+ ifdef CONFIG_DEBUG_FS
+ soundwire-bus-objs += debugfs.o
+ endif
+ 
  #Cadence Objs
  soundwire-cadence-objs := cadence_master.o
  obj-$(CONFIG_SOUNDWIRE_CADENCE) += soundwire-cadence.o