From: mpa@pengutronix.de (Markus Pargmann)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH v5 7/8] ASoC: fsl-ssi: reorder and document fsl_ssi_private
Date: Tue, 27 May 2014 10:24:24 +0200 [thread overview]
Message-ID: <1401179065-31195-8-git-send-email-mpa@pengutronix.de> (raw)
In-Reply-To: <1401179065-31195-1-git-send-email-mpa@pengutronix.de>
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: Markus Pargmann <mpa@pengutronix.de>
Tested-By: Michael Grzeschik <mgr@pengutronix.de>
---
sound/soc/fsl/fsl_ssi.c | 58 ++++++++++++++++++++++++++++++++++++-------------
1 file changed, 43 insertions(+), 15 deletions(-)
diff --git a/sound/soc/fsl/fsl_ssi.c b/sound/soc/fsl/fsl_ssi.c
index ac78660..9fe3a10 100644
--- a/sound/soc/fsl/fsl_ssi.c
+++ b/sound/soc/fsl/fsl_ssi.c
@@ -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;
--
2.0.0.rc2
next prev parent reply other threads:[~2014-05-27 8:24 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-05-27 8:24 [PATCH v5 0/8] ASoC: fsl-ssi: Driver cleanup Markus Pargmann
2014-05-27 8:24 ` [PATCH v5 1/8] ASoC: fsl-ssi: introduce SoC specific data Markus Pargmann
2014-05-27 8:24 ` [PATCH v5 2/8] ASoC: fsl-ssi: make fsl,mode property optional Markus Pargmann
2014-05-27 8:24 ` [PATCH v5 3/8] ASoC: fsl-ssi: set bitclock in master mode from hw_params Markus Pargmann
2014-05-27 8:24 ` [PATCH v5 4/8] ASoC: fsl-ssi: remove unnecessary spinlock Markus Pargmann
2014-05-27 8:24 ` [PATCH v5 5/8] ASoC: fsl-ssi: Set framerate divider correctly for i2s master mode Markus Pargmann
2014-05-27 8:24 ` [PATCH v5 6/8] ASoC: fsl-ssi: Fix baudclock handling Markus Pargmann
2014-05-27 8:24 ` Markus Pargmann [this message]
2014-05-27 8:24 ` [PATCH v5 8/8] ASoC: fsl-ssi: Use regmap Markus Pargmann
2014-06-01 10:55 ` [PATCH v5 0/8] ASoC: fsl-ssi: Driver cleanup Mark Brown
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1401179065-31195-8-git-send-email-mpa@pengutronix.de \
--to=mpa@pengutronix.de \
--cc=linux-arm-kernel@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).