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

Commit 737a6b41 authored by Markus Pargmann's avatar Markus Pargmann Committed by Mark Brown
Browse files

ASoC: fsl-ssi: reorder and document fsl_ssi_private 



Reorder all variables in struct fsl_ssi_private to have groups that make
sense together. The patch also updates the struct documentation.

Signed-off-by: default avatarMarkus Pargmann <mpa@pengutronix.de>
Tested-By: default avatarMichael Grzeschik <mgr@pengutronix.de>
Signed-off-by: default avatarMark Brown <broonie@linaro.org>
parent d429d8e3

sound/soc/fsl/fsl_ssi.c

+43 −15
Original line number Diff line number Diff line
@@ -141,36 +141,64 @@ struct fsl_ssi_soc_data { 
/**

 * fsl_ssi_private: per-SSI private data

 *

 * @ssi: pointer to the SSI's registers

 * @ssi_phys: physical address of the SSI registers

 * @ssi: Pointer to the memory area

 * @irq: IRQ of this SSI

 * @playback: the number of playback streams opened

 * @capture: the number of capture streams opened

 * @cpu_dai: the CPU DAI for this device

 * @dev_attr: the sysfs device attribute structure

 * @stats: SSI statistics

 * @cpu_dai_drv: CPU DAI driver for this device

 *

 * @dai_fmt: DAI configuration this device is currently used with

 * @i2s_mode: i2s and network mode configuration of the device. Is used to

 * switch between normal and i2s/network mode

 * mode depending on the number of channels

 * @use_dma: DMA is used or FIQ with stream filter

 * @use_dual_fifo: DMA with support for both FIFOs used

 * @fifo_deph: Depth of the SSI FIFOs

 * @rxtx_reg_val: Specific register settings for receive/transmit configuration

 *

 * @clk: SSI clock

 * @baudclk: SSI baud clock for master mode

 * @baudclk_streams: Active streams that are using baudclk

 * @bitclk_freq: bitclock frequency set by .set_dai_sysclk

 *

 * @dma_params_tx: DMA transmit parameters

 * @dma_params_rx: DMA receive parameters

 * @ssi_phys: physical address of the SSI registers

 *

 * @fiq_params: FIQ stream filtering parameters

 *

 * @pdev: Pointer to pdev used for deprecated fsl-ssi sound card

 *

 * @dbg_stats: Debugging statistics

 *

 * @soc: SoC specifc data

 */

struct fsl_ssi_private {

	struct ccsr_ssi __iomem *ssi;

	dma_addr_t ssi_phys;

	unsigned int irq;

	unsigned int fifo_depth;

	struct snd_soc_dai_driver cpu_dai_drv;

	struct platform_device *pdev;

	unsigned int dai_fmt;



	unsigned int dai_fmt;

	u8 i2s_mode;

	bool use_dma;

	bool use_dual_fifo;

	u8 i2s_mode;

	struct clk *baudclk;

	unsigned int fifo_depth;

	struct fsl_ssi_rxtx_reg_val rxtx_reg_val;



	struct clk *clk;

	struct clk *baudclk;

	unsigned int baudclk_streams;

	unsigned int bitclk_freq;



	/* DMA params */

	struct snd_dmaengine_dai_dma_data dma_params_tx;

	struct snd_dmaengine_dai_dma_data dma_params_rx;

	dma_addr_t ssi_phys;



	/* params for non-dma FIQ stream filtered mode */

	struct imx_pcm_fiq_params fiq_params;

	/* Register values for rx/tx configuration */

	struct fsl_ssi_rxtx_reg_val rxtx_reg_val;



	/* Used when using fsl-ssi as sound-card. This is only used by ppc and

	 * should be replaced with simple-sound-card. */

	struct platform_device *pdev;



	struct fsl_ssi_dbg dbg_stats;