Skip to content

Commit 1ae4aa5

Browse files
plbossartvinodkoul
authored andcommitted
soundwire: mipi-disco: remove DPn audio-modes
The concept of DPn audio-modes was never used by anyone, and was removed from the DisCo for SoundWire 2.0 specification. Remove the definitions and TODO. Signed-off-by: Pierre-Louis Bossart <[email protected]> Signed-off-by: Bard Liao <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Vinod Koul <[email protected]>
1 parent 9942f90 commit 1ae4aa5

File tree

2 files changed

+0
-36
lines changed

2 files changed

+0
-36
lines changed

drivers/soundwire/mipi_disco.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -304,8 +304,6 @@ static int sdw_slave_read_dpn(struct sdw_slave *slave,
304304
fwnode_property_read_u32(node, "mipi-sdw-port-encoding-type",
305305
&dpn[i].port_encoding);
306306

307-
/* TODO: Read audio mode */
308-
309307
fwnode_handle_put(node);
310308

311309
i++;

include/linux/soundwire/sdw.h

Lines changed: 0 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -254,41 +254,8 @@ struct sdw_dp0_prop {
254254
bool imp_def_interrupts;
255255
};
256256

257-
/**
258-
* struct sdw_dpn_audio_mode - Audio mode properties for DPn
259-
* @bus_min_freq: Minimum bus frequency, in Hz
260-
* @bus_max_freq: Maximum bus frequency, in Hz
261-
* @bus_num_freq: Number of discrete frequencies supported
262-
* @bus_freq: Discrete bus frequencies, in Hz
263-
* @min_freq: Minimum sampling frequency, in Hz
264-
* @max_freq: Maximum sampling bus frequency, in Hz
265-
* @num_freq: Number of discrete sampling frequency supported
266-
* @freq: Discrete sampling frequencies, in Hz
267-
* @prep_ch_behave: Specifies the dependencies between Channel Prepare
268-
* sequence and bus clock configuration
269-
* If 0, Channel Prepare can happen at any Bus clock rate
270-
* If 1, Channel Prepare sequence shall happen only after Bus clock is
271-
* changed to a frequency supported by this mode or compatible modes
272-
* described by the next field
273-
* @glitchless: Bitmap describing possible glitchless transitions from this
274-
* Audio Mode to other Audio Modes
275-
*/
276-
struct sdw_dpn_audio_mode {
277-
u32 bus_min_freq;
278-
u32 bus_max_freq;
279-
u32 bus_num_freq;
280-
u32 *bus_freq;
281-
u32 max_freq;
282-
u32 min_freq;
283-
u32 num_freq;
284-
u32 *freq;
285-
u32 prep_ch_behave;
286-
u32 glitchless;
287-
};
288-
289257
/**
290258
* struct sdw_dpn_prop - Data Port DPn properties
291-
* @audio_modes: Audio modes supported
292259
* @num: port number
293260
* @max_word: Maximum number of bits in a Payload Channel Sample, 1 to 64
294261
* (inclusive)
@@ -318,7 +285,6 @@ struct sdw_dpn_audio_mode {
318285
* machine
319286
*/
320287
struct sdw_dpn_prop {
321-
struct sdw_dpn_audio_mode *audio_modes;
322288
u32 num;
323289
u32 max_word;
324290
u32 min_word;

0 commit comments

Comments
 (0)