Commit 8d7ead5c authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'soundwire-5.4-rc1' of git://git.kernel.org/pub/scm/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
  ...
parents e0703556 dfcff3f8

Documentation/devicetree/bindings/soundwire/soundwire-controller.yaml

0 → 100644
+82 −0
Original line number Diff line number Diff line 
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)

%YAML 1.2

---

$id: http://devicetree.org/schemas/soundwire/soundwire-controller.yaml#

$schema: http://devicetree.org/meta-schemas/core.yaml#



title: SoundWire Controller Generic Binding



maintainers:

  - Srinivas Kandagatla <srinivas.kandagatla@linaro.org>

  - Vinod Koul <vkoul@kernel.org>



description: |

  SoundWire busses can be described with a node for the SoundWire controller

  device and a set of child nodes for each SoundWire slave on the bus.



properties:

  $nodename:

    pattern: "^soundwire(@.*)?$"



  "#address-cells":

    const: 2



  "#size-cells":

    const: 0



patternProperties:

  "^.*@[0-9a-f],[0-9a-f]$":

    type: object



    properties:

      compatible:

        pattern: "^sdw[0-9a-f]{1}[0-9a-f]{4}[0-9a-f]{4}[0-9a-f]{2}$"

        description: Is the textual representation of SoundWire Enumeration

          address. compatible string should contain SoundWire Version ID,

          Manufacturer ID, Part ID and Class ID in order and shall be in

          lower-case hexadecimal with leading zeroes.

          Valid sizes of these fields are

          Version ID is 1 nibble, number '0x1' represents SoundWire 1.0

          and '0x2' represents SoundWire 1.1 and so on.

          MFD is 4 nibbles

          PID is 4 nibbles

          CID is 2 nibbles

          More Information on detail of encoding of these fields can be

          found in MIPI Alliance DisCo & SoundWire 1.0 Specifications.



      reg:

        maxItems: 1

        description:

          Link ID followed by Instance ID of SoundWire Device Address.



    required:

      - compatible

      - reg



required:

  - "#address-cells"

  - "#size-cells"



examples:

  - |

    soundwire@c2d0000 {

        #address-cells = <2>;

        #size-cells = <0>;

        reg = <0x0c2d0000 0x2000>;



        speaker@0,1 {

            compatible = "sdw10217201000";

            reg = <0 1>;

            powerdown-gpios = <&wcdpinctrl 2 0>;

            #thermal-sensor-cells = <0>;

        };



        speaker@0,2 {

            compatible = "sdw10217201000";

            reg = <0 2>;

            powerdown-gpios = <&wcdpinctrl 2 0>;

            #thermal-sensor-cells = <0>;

        };

    };



...

drivers/soundwire/Makefile

+4 −0
Original line number Diff line number Diff line
@@ -7,6 +7,10 @@ 
soundwire-bus-objs := bus_type.o bus.o slave.o mipi_disco.o stream.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

drivers/soundwire/bus.c

+18 −2
Original line number Diff line number Diff line
@@ -49,6 +49,8 @@ int sdw_add_bus_master(struct sdw_bus *bus) 
		}

	}



	sdw_bus_debugfs_init(bus);



	/*

	 * Device numbers in SoundWire are 0 through 15. Enumeration device

	 * number (0), Broadcast device number (15), Group numbers (12 and
@@ -77,6 +79,8 @@ int sdw_add_bus_master(struct sdw_bus *bus) 
	 */

	if (IS_ENABLED(CONFIG_ACPI) && ACPI_HANDLE(bus->dev))

		ret = sdw_acpi_find_slaves(bus);

	else if (IS_ENABLED(CONFIG_OF) && bus->dev->of_node)

		ret = sdw_of_find_slaves(bus);

	else

		ret = -ENOTSUPP; /* No ACPI/DT so error out */
@@ -109,6 +113,8 @@ static int sdw_delete_slave(struct device *dev, void *data) 
	struct sdw_slave *slave = dev_to_sdw_dev(dev);

	struct sdw_bus *bus = slave->bus;



	sdw_slave_debugfs_exit(slave);



	mutex_lock(&bus->bus_lock);



	if (slave->dev_num) /* clear dev_num if assigned */
@@ -130,6 +136,8 @@ static int sdw_delete_slave(struct device *dev, void *data) 
void sdw_delete_bus_master(struct sdw_bus *bus)

{

	device_for_each_child(bus->dev, NULL, sdw_delete_slave);



	sdw_bus_debugfs_exit(bus);

}

EXPORT_SYMBOL(sdw_delete_bus_master);
@@ -470,7 +478,8 @@ static int sdw_assign_device_num(struct sdw_slave *slave) 


	ret = sdw_write(slave, SDW_SCP_DEVNUMBER, dev_num);

	if (ret < 0) {

		dev_err(&slave->dev, "Program device_num failed: %d\n", ret);

		dev_err(&slave->dev, "Program device_num %d failed: %d\n",

			dev_num, ret);

		return ret;

	}
@@ -527,6 +536,7 @@ static int sdw_program_device_num(struct sdw_bus *bus) 
	do {

		ret = sdw_transfer(bus, &msg);

		if (ret == -ENODATA) { /* end of device id reads */

			dev_dbg(bus->dev, "No more devices to enumerate\n");

			ret = 0;

			break;

		}
@@ -803,7 +813,7 @@ static int sdw_handle_port_interrupt(struct sdw_slave *slave, 
static int sdw_handle_slave_alerts(struct sdw_slave *slave)

{

	struct sdw_slave_intr_status slave_intr;

	u8 clear = 0, bit, port_status[15];

	u8 clear = 0, bit, port_status[15] = {0};

	int port_num, stat, ret, count = 0;

	unsigned long port;

	bool slave_notify = false;
@@ -969,9 +979,15 @@ int sdw_handle_slave_status(struct sdw_bus *bus, 
	int i, ret = 0;



	if (status[0] == SDW_SLAVE_ATTACHED) {

		dev_dbg(bus->dev, "Slave attached, programming device number\n");

		ret = sdw_program_device_num(bus);

		if (ret)

			dev_err(bus->dev, "Slave attach failed: %d\n", ret);

		/*

		 * programming a device number will have side effects,

		 * so we deal with other devices at a later time

		 */

		return ret;

	}



	/* Continue to check other slave statuses */

drivers/soundwire/bus.h

+22 −2
Original line number Diff line number Diff line
@@ -15,9 +15,26 @@ static inline int sdw_acpi_find_slaves(struct sdw_bus *bus) 
}

#endif



int sdw_of_find_slaves(struct sdw_bus *bus);

void sdw_extract_slave_id(struct sdw_bus *bus,

			  u64 addr, struct sdw_slave_id *id);



#ifdef CONFIG_DEBUG_FS

void sdw_bus_debugfs_init(struct sdw_bus *bus);

void sdw_bus_debugfs_exit(struct sdw_bus *bus);

void sdw_slave_debugfs_init(struct sdw_slave *slave);

void sdw_slave_debugfs_exit(struct sdw_slave *slave);

void sdw_debugfs_init(void);

void sdw_debugfs_exit(void);

#else

static inline void sdw_bus_debugfs_init(struct sdw_bus *bus) {}

static inline void sdw_bus_debugfs_exit(struct sdw_bus *bus) {}

static inline void sdw_slave_debugfs_init(struct sdw_slave *slave) {}

static inline void sdw_slave_debugfs_exit(struct sdw_slave *slave) {}

static inline void sdw_debugfs_init(void) {}

static inline void sdw_debugfs_exit(void) {}

#endif



enum {

	SDW_MSG_FLAG_READ = 0,

	SDW_MSG_FLAG_WRITE,
@@ -49,8 +66,11 @@ struct sdw_msg { 


#define SDW_DOUBLE_RATE_FACTOR		2



extern int rows[SDW_FRAME_ROWS];

extern int cols[SDW_FRAME_COLS];

extern int sdw_rows[SDW_FRAME_ROWS];

extern int sdw_cols[SDW_FRAME_COLS];



int sdw_find_row_index(int row);

int sdw_find_col_index(int col);



/**

 * sdw_port_runtime: Runtime port parameters for Master or Slave

drivers/soundwire/bus_type.c

+3 −0
Original line number Diff line number Diff line
@@ -6,6 +6,7 @@ 
#include <linux/pm_domain.h>

#include <linux/soundwire/sdw.h>

#include <linux/soundwire/sdw_type.h>

#include "bus.h"



/**

 * sdw_get_device_id - find the matching SoundWire device id
@@ -177,11 +178,13 @@ EXPORT_SYMBOL_GPL(sdw_unregister_driver); 


static int __init sdw_bus_init(void)

{

	sdw_debugfs_init();

	return bus_register(&sdw_bus_type);

}



static void __exit sdw_bus_exit(void)

{

	sdw_debugfs_exit();

	bus_unregister(&sdw_bus_type);

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE