Commit 3424305b authored by Pierre-Louis Bossart's avatar Pierre-Louis Bossart Committed by Vinod Koul
Browse files

soundwire: rename 'freq' fields 



Rename all fields with 'freq' as 'clk_freq' to follow the MIPI
specification and avoid confusion between bus clock and audio clocks.

No functionality change.

Signed-off-by: default avatarPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Signed-off-by: default avatarVinod Koul <vkoul@kernel.org>
parent 446701d1

drivers/soundwire/bus.c

+2 −2
Original line number Diff line number Diff line
@@ -87,7 +87,7 @@ int sdw_add_bus_master(struct sdw_bus *bus) 


	/*

	 * Initialize clock values based on Master properties. The max

	 * frequency is read from max_freq property. Current assumption

	 * frequency is read from max_clk_freq property. Current assumption

	 * is that the bus will start at highest clock frequency when

	 * powered on.

	 *
@@ -95,7 +95,7 @@ int sdw_add_bus_master(struct sdw_bus *bus) 
	 * to start with bank 0 (Table 40 of Spec)

	 */

	prop = &bus->prop;

	bus->params.max_dr_freq = prop->max_freq * SDW_DOUBLE_RATE_FACTOR;

	bus->params.max_dr_freq = prop->max_clk_freq * SDW_DOUBLE_RATE_FACTOR;

	bus->params.curr_dr_freq = bus->params.max_dr_freq;

	bus->params.curr_bank = SDW_BANK0;

	bus->params.next_bank = SDW_BANK1;

drivers/soundwire/intel.c

+6 −5
Original line number Diff line number Diff line
@@ -796,13 +796,14 @@ static int intel_prop_read(struct sdw_bus *bus) 
	sdw_master_read_prop(bus);



	/* BIOS is not giving some values correctly. So, lets override them */

	bus->prop.num_freq = 1;

	bus->prop.freq = devm_kcalloc(bus->dev, bus->prop.num_freq,

				      sizeof(*bus->prop.freq), GFP_KERNEL);

	if (!bus->prop.freq)

	bus->prop.num_clk_freq = 1;

	bus->prop.clk_freq = devm_kcalloc(bus->dev, bus->prop.num_clk_freq,

					  sizeof(*bus->prop.clk_freq),

					  GFP_KERNEL);

	if (!bus->prop.clk_freq)

		return -ENOMEM;



	bus->prop.freq[0] = bus->prop.max_freq;

	bus->prop.clk_freq[0] = bus->prop.max_clk_freq;

	bus->prop.err_threshold = 5;



	return 0;

drivers/soundwire/mipi_disco.c

+12 −11
Original line number Diff line number Diff line
@@ -58,31 +58,32 @@ int sdw_master_read_prop(struct sdw_bus *bus) 


	fwnode_property_read_u32(link,

				 "mipi-sdw-max-clock-frequency",

				 &prop->max_freq);

				 &prop->max_clk_freq);



	nval = fwnode_property_read_u32_array(link,

			"mipi-sdw-clock-frequencies-supported", NULL, 0);

	if (nval > 0) {

		prop->num_freq = nval;

		prop->freq = devm_kcalloc(bus->dev, prop->num_freq,

					  sizeof(*prop->freq), GFP_KERNEL);

		if (!prop->freq)

		prop->num_clk_freq = nval;

		prop->clk_freq = devm_kcalloc(bus->dev, prop->num_clk_freq,

					      sizeof(*prop->clk_freq),

					      GFP_KERNEL);

		if (!prop->clk_freq)

			return -ENOMEM;



		fwnode_property_read_u32_array(link,

				"mipi-sdw-clock-frequencies-supported",

				prop->freq, prop->num_freq);

				prop->clk_freq, prop->num_clk_freq);

	}



	/*

	 * Check the frequencies supported. If FW doesn't provide max

	 * freq, then populate here by checking values.

	 */

	if (!prop->max_freq && prop->freq) {

		prop->max_freq = prop->freq[0];

		for (i = 1; i < prop->num_freq; i++) {

			if (prop->freq[i] > prop->max_freq)

				prop->max_freq = prop->freq[i];

	if (!prop->max_clk_freq && prop->clk_freq) {

		prop->max_clk_freq = prop->clk_freq[0];

		for (i = 1; i < prop->num_clk_freq; i++) {

			if (prop->clk_freq[i] > prop->max_clk_freq)

				prop->max_clk_freq = prop->clk_freq[i];

		}

	}

drivers/soundwire/stream.c

+1 −1
Original line number Diff line number Diff line
@@ -1474,7 +1474,7 @@ static int _sdw_prepare_stream(struct sdw_stream_runtime *stream) 
		memcpy(&params, &bus->params, sizeof(params));



		/* TODO: Support Asynchronous mode */

		if ((prop->max_freq % stream->params.rate) != 0) {

		if ((prop->max_clk_freq % stream->params.rate) != 0) {

			dev_err(bus->dev, "Async mode not supported\n");

			return -EINVAL;

		}

include/linux/soundwire/sdw.h

+6 −6
Original line number Diff line number Diff line
@@ -365,11 +365,11 @@ struct sdw_slave_prop { 
 * struct sdw_master_prop - Master properties

 * @revision: MIPI spec version of the implementation

 * @clk_stop_mode: Bitmap for Clock Stop modes supported

 * @max_freq: Maximum Bus clock frequency, in Hz

 * @max_clk_freq: Maximum Bus clock frequency, in Hz

 * @num_clk_gears: Number of clock gears supported

 * @clk_gears: Clock gears supported

 * @num_freq: Number of clock frequencies supported, in Hz

 * @freq: Clock frequencies supported, in Hz

 * @num_clk_freq: Number of clock frequencies supported, in Hz

 * @clk_freq: Clock frequencies supported, in Hz

 * @default_frame_rate: Controller default Frame rate, in Hz

 * @default_row: Number of rows

 * @default_col: Number of columns
@@ -380,11 +380,11 @@ struct sdw_slave_prop { 
struct sdw_master_prop {

	u32 revision;

	enum sdw_clk_stop_mode clk_stop_mode;

	u32 max_freq;

	u32 max_clk_freq;

	u32 num_clk_gears;

	u32 *clk_gears;

	u32 num_freq;

	u32 *freq;

	u32 num_clk_freq;

	u32 *clk_freq;

	u32 default_frame_rate;

	u32 default_row;

	u32 default_col;

CRA Git | Maintained and supported by SUSTech CRA and CCSE