Commit 4d5d604c authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'soundwire-6.8-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/soundwire 

Pull soundwire updates from Vinod Koul:

 - Core: add concept of controller_id to deal with clear Controller /
   Manager hierarchy

 - bunch of qcom driver refactoring for qcom_swrm_stream_alloc_ports(),
   qcom_swrm_stream_alloc_ports() and setting controller id to hw master
   id

* tag 'soundwire-6.8-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/soundwire:
  soundwire: amd: drop bus freq calculation and set 'max_clk_freq'
  soundwire: generic_bandwidth_allocation use bus->params.max_dr_freq
  soundwire: qcom: set controller id to hw master id
  soundwire: fix initializing sysfs for same devices on different buses
  soundwire: bus: introduce controller_id
  soundwire: stream: constify sdw_port_config when adding devices
  soundwire: qcom: move sconfig in qcom_swrm_stream_alloc_ports() out of critical section
  soundwire: qcom: drop unneeded qcom_swrm_stream_alloc_ports() cleanup
parents 34551358 becfce52

drivers/soundwire/amd_manager.c

+10 −2
Original line number Diff line number Diff line
@@ -927,6 +927,14 @@ static int amd_sdw_manager_probe(struct platform_device *pdev) 
	amd_manager->bus.clk_stop_timeout = 200;

	amd_manager->bus.link_id = amd_manager->instance;



	/*

	 * Due to BIOS compatibility, the two links are exposed within

	 * the scope of a single controller. If this changes, the

	 * controller_id will have to be updated with drv_data

	 * information.

	 */

	amd_manager->bus.controller_id = 0;



	switch (amd_manager->instance) {

	case ACP_SDW0:

		amd_manager->num_dout_ports = AMD_SDW0_MAX_TX_PORTS;
@@ -942,13 +950,13 @@ static int amd_sdw_manager_probe(struct platform_device *pdev) 


	amd_manager->reg_mask = &sdw_manager_reg_mask_array[amd_manager->instance];

	params = &amd_manager->bus.params;

	params->max_dr_freq = AMD_SDW_DEFAULT_CLK_FREQ * 2;

	params->curr_dr_freq = AMD_SDW_DEFAULT_CLK_FREQ * 2;



	params->col = AMD_SDW_DEFAULT_COLUMNS;

	params->row = AMD_SDW_DEFAULT_ROWS;

	prop = &amd_manager->bus.prop;

	prop->clk_freq = &amd_sdw_freq_tbl[0];

	prop->mclk_freq = AMD_SDW_BUS_BASE_FREQ;

	prop->max_clk_freq = AMD_SDW_DEFAULT_CLK_FREQ;



	ret = sdw_bus_master_add(&amd_manager->bus, dev, dev->fwnode);

	if (ret) {

drivers/soundwire/bus.c

+4 −0
Original line number Diff line number Diff line
@@ -22,6 +22,10 @@ static int sdw_get_id(struct sdw_bus *bus) 
		return rc;



	bus->id = rc;



	if (bus->controller_id == -1)

		bus->controller_id = rc;



	return 0;

}

drivers/soundwire/debugfs.c

+1 −1
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ void sdw_bus_debugfs_init(struct sdw_bus *bus) 
		return;



	/* create the debugfs master-N */

	snprintf(name, sizeof(name), "master-%d-%d", bus->id, bus->link_id);

	snprintf(name, sizeof(name), "master-%d-%d", bus->controller_id, bus->link_id);

	bus->debugfs = debugfs_create_dir(name, sdw_debugfs_root);

}

drivers/soundwire/generic_bandwidth_allocation.c

+3 −5
Original line number Diff line number Diff line
@@ -333,7 +333,7 @@ static int sdw_select_row_col(struct sdw_bus *bus, int clk_freq) 
 */

static int sdw_compute_bus_params(struct sdw_bus *bus)

{

	unsigned int max_dr_freq, curr_dr_freq = 0;

	unsigned int curr_dr_freq = 0;

	struct sdw_master_prop *mstr_prop = &bus->prop;

	int i, clk_values, ret;

	bool is_gear = false;
@@ -351,14 +351,12 @@ static int sdw_compute_bus_params(struct sdw_bus *bus) 
		clk_buf = NULL;

	}



	max_dr_freq = mstr_prop->max_clk_freq * SDW_DOUBLE_RATE_FACTOR;



	for (i = 0; i < clk_values; i++) {

		if (!clk_buf)

			curr_dr_freq = max_dr_freq;

			curr_dr_freq = bus->params.max_dr_freq;

		else

			curr_dr_freq = (is_gear) ?

				(max_dr_freq >>  clk_buf[i]) :

				(bus->params.max_dr_freq >>  clk_buf[i]) :

				clk_buf[i] * SDW_DOUBLE_RATE_FACTOR;



		if (curr_dr_freq <= bus->params.bandwidth)

drivers/soundwire/intel_auxdevice.c

+3 −0
Original line number Diff line number Diff line
@@ -234,6 +234,9 @@ static int intel_link_probe(struct auxiliary_device *auxdev, 
	cdns->instance = sdw->instance;

	cdns->msg_count = 0;



	/* single controller for all SoundWire links */

	bus->controller_id = 0;



	bus->link_id = auxdev->id;

	bus->clk_stop_timeout = 1;