Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 106901ad authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge tag 'soundwire-5.4-rc6' of... 

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
parents 92fd9bf2 7b47ad33

drivers/soundwire/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -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

drivers/soundwire/intel.c

+2 −2
Original line number Diff line number Diff line
@@ -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)

drivers/soundwire/slave.c

+2 −1
Original line number Diff line number Diff line
@@ -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;