From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 27 Nov 2024 21:38:09 +0000 (-0800)
Subject: Merge tag 'soundwire-6.13-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul... 
X-Git-Tag: microblaze-v6.16~514
X-Git-Url: http://git.monstr.eu/?a=commitdiff_plain;h=9ad55a67a788c0806b0fe23be36fae6dbfbc3fc5;p=linux-2.6-microblaze.git

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

Pull soundwire updates from Vinod Koul:

 - structure optimization of few bus structures and header updates

 - support for 2.0 disco spec

 - amd driver updates for acp revision, refactoring code and support for
   acp6.3

 - soft reset support for cadence driver

* tag 'soundwire-6.13-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/soundwire: (24 commits)
  soundwire: Minor formatting fixups in sdw.h header
  soundwire: Update the includes on the sdw.h header
  soundwire: cadence: clear MCP BLOCK_WAKEUP in init
  soundwire: cadence: add soft-reset on startup
  soundwire: intel_auxdevice: add kernel parameter for mclk divider
  soundwire: mipi-disco: add support for DP0/DPn 'lane-list' property
  soundwire: mipi-disco: add new properties from 2.0 spec
  soundwire: mipi-disco: add comment on DP0-supported property
  soundwire: mipi-disco: add support for peripheral channelprepare timeout
  soundwire: mipi_disco: add support for clock-scales property
  soundwire: mipi-disco: add error handling for property array read
  soundwire: mipi-disco: remove DPn audio-modes
  soundwire: optimize sdw_dpn_prop
  soundwire: optimize sdw_dp0_prop
  soundwire: optimize sdw_slave_prop
  soundwire: optimize sdw_bus structure
  soundwire: optimize sdw_master_prop
  soundwire: optimize sdw_stream_runtime memory layout
  soundwire: mipi_disco: add MIPI-specific property_read_bool() helpers
  soundwire: Correct some typos in comments
  ...
---

9ad55a67a788c0806b0fe23be36fae6dbfbc3fc5
diff --cc include/linux/soundwire/sdw.h
index 49d690f3d29a,784656f740f6..bd9836690da6
--- a/include/linux/soundwire/sdw.h
+++ b/include/linux/soundwire/sdw.h
@@@ -4,14 -4,20 +4,21 @@@
  #ifndef __SOUNDWIRE_H
  #define __SOUNDWIRE_H
  
+ #include <linux/bitfield.h>
  #include <linux/bug.h>
- #include <linux/lockdep_types.h>
+ #include <linux/completion.h>
+ #include <linux/device.h>
  #include <linux/irq.h>
  #include <linux/irqdomain.h>
+ #include <linux/lockdep_types.h>
  #include <linux/mod_devicetable.h>
- #include <linux/bitfield.h>
+ #include <linux/mutex.h>
+ #include <linux/types.h>
 +#include <sound/sdca.h>
  
+ struct dentry;
+ struct fwnode_handle;
+ 
  struct sdw_bus;
  struct sdw_slave;