All of lore.kernel.org
 help / color / mirror / Atom feed
From: Markus Pargmann <mpa@pengutronix.de>
To: Mark Brown <broonie@kernel.org>
Cc: Fabio Estevam <fabio.estevam@freescale.com>,
	alsa-devel@alsa-project.org, Alexander Shiyan <shc_work@mail.ru>,
	Timur Tabi <timur@tabi.org>,
	"Li.Xiubo@freescale.com" <Li.Xiubo@freescale.com>,
	kernel@pengutronix.de, Nicolin Chen <Guangyu.Chen@freescale.com>,
	Markus Pargmann <mpa@pengutronix.de>,
	linux-arm-kernel@lists.infradead.org
Subject: [PATCH v4 16/17] ASoC: fsl-ssi: reorder and document fsl_ssi_private
Date: Mon, 28 Apr 2014 12:54:57 +0200	[thread overview]
Message-ID: <1398682498-24357-17-git-send-email-mpa@pengutronix.de> (raw)
In-Reply-To: <1398682498-24357-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>
---
 sound/soc/fsl/fsl_ssi.c | 57 ++++++++++++++++++++++++++++++++++++-------------
 1 file changed, 42 insertions(+), 15 deletions(-)

diff --git a/sound/soc/fsl/fsl_ssi.c b/sound/soc/fsl/fsl_ssi.c
index 755e3ef..81809a7 100644
--- a/sound/soc/fsl/fsl_ssi.c
+++ b/sound/soc/fsl/fsl_ssi.c
@@ -141,35 +141,62 @@ 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
+ *
+ * @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;
+
+	/* 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;
 
-- 
1.9.1

WARNING: multiple messages have this Message-ID (diff)
From: mpa@pengutronix.de (Markus Pargmann)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH v4 16/17] ASoC: fsl-ssi: reorder and document fsl_ssi_private
Date: Mon, 28 Apr 2014 12:54:57 +0200	[thread overview]
Message-ID: <1398682498-24357-17-git-send-email-mpa@pengutronix.de> (raw)
In-Reply-To: <1398682498-24357-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>
---
 sound/soc/fsl/fsl_ssi.c | 57 ++++++++++++++++++++++++++++++++++++-------------
 1 file changed, 42 insertions(+), 15 deletions(-)

diff --git a/sound/soc/fsl/fsl_ssi.c b/sound/soc/fsl/fsl_ssi.c
index 755e3ef..81809a7 100644
--- a/sound/soc/fsl/fsl_ssi.c
+++ b/sound/soc/fsl/fsl_ssi.c
@@ -141,35 +141,62 @@ 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
+ *
+ * @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;
+
+	/* 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;
 
-- 
1.9.1

  parent reply	other threads:[~2014-04-28 10:54 UTC|newest]

Thread overview: 52+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-04-28 10:54 [PATCH v4 00/17] ASoC: fsl-ssi: Driver cleanup Markus Pargmann
2014-04-28 10:54 ` Markus Pargmann
2014-04-28 10:54 ` [PATCH v4 01/17] ASoC: fsl-ssi: Fix register values when disabling Markus Pargmann
2014-04-28 10:54   ` Markus Pargmann
2014-04-28 10:54 ` [PATCH v4 02/17] ASoC: fsl-ssi: Move debugging to seperate file Markus Pargmann
2014-04-28 10:54   ` Markus Pargmann
2014-04-28 10:54 ` [PATCH v4 03/17] ASoC: fsl-ssi: Use dev_name for DAI driver struct Markus Pargmann
2014-04-28 10:54   ` Markus Pargmann
2014-04-28 10:54 ` [PATCH v4 04/17] ASoC: fsl-ssi: Move imx-specific probe to seperate function Markus Pargmann
2014-04-28 10:54   ` Markus Pargmann
2014-04-28 10:54 ` [PATCH v4 05/17] ASoC: fsl-ssi: Remove useless DMA code Markus Pargmann
2014-04-28 10:54   ` Markus Pargmann
2014-04-28 10:54 ` [PATCH v4 06/17] ASoC: fsl-ssi: Cleanup probe function Markus Pargmann
2014-04-28 10:54   ` Markus Pargmann
2014-04-28 10:54 ` [PATCH v4 07/17] ASoC: fsl-ssi: Remove unnecessary variables from ssi_private Markus Pargmann
2014-04-28 10:54   ` Markus Pargmann
2014-04-28 10:54 ` [PATCH v4 08/17] ASoC: fsl-ssi: introduce SoC specific data Markus Pargmann
2014-04-28 10:54   ` Markus Pargmann
2014-05-20 22:02   ` Mark Brown
2014-05-20 22:02     ` Mark Brown
2014-05-27  6:21     ` Markus Pargmann
2014-05-27  6:21       ` Markus Pargmann
2014-04-28 10:54 ` [PATCH v4 09/17] ASoC: fsl-ssi: make fsl, mode property optional Markus Pargmann
2014-04-28 10:54   ` [PATCH v4 09/17] ASoC: fsl-ssi: make fsl,mode " Markus Pargmann
2014-04-28 10:54 ` [PATCH v4 10/17] ASoC: fsl-ssi: Transmit enable synchronization Markus Pargmann
2014-04-28 10:54   ` Markus Pargmann
2014-05-20 22:04   ` Mark Brown
2014-05-20 22:04     ` Mark Brown
2014-04-28 10:54 ` [PATCH v4 11/17] ASoC: fsl-ssi: Move fsl_ssi_set_dai_sysclk above fsl_ssi_hw_params Markus Pargmann
2014-04-28 10:54   ` Markus Pargmann
2014-05-20 22:05   ` Mark Brown
2014-05-20 22:05     ` Mark Brown
2014-04-28 10:54 ` [PATCH v4 12/17] ASoC: fsl-ssi: set bitclock in master mode from hw_params Markus Pargmann
2014-04-28 10:54   ` Markus Pargmann
2014-05-20 22:08   ` Mark Brown
2014-05-20 22:08     ` Mark Brown
2014-05-27  7:05     ` Markus Pargmann
2014-05-27  7:05       ` Markus Pargmann
2014-04-28 10:54 ` [PATCH v4 13/17] ASoC: fsl-ssi: remove unnecessary spinlock Markus Pargmann
2014-04-28 10:54   ` Markus Pargmann
2014-04-28 10:54 ` [PATCH v4 14/17] ASoC: fsl-ssi: Set framerate divider correctly for i2s master mode Markus Pargmann
2014-04-28 10:54   ` Markus Pargmann
2014-04-28 10:54 ` [PATCH v4 15/17] ASoC: fsl-ssi: Fix baudclock handling Markus Pargmann
2014-04-28 10:54   ` Markus Pargmann
2014-04-28 10:54 ` Markus Pargmann [this message]
2014-04-28 10:54   ` [PATCH v4 16/17] ASoC: fsl-ssi: reorder and document fsl_ssi_private Markus Pargmann
2014-04-28 10:54 ` [PATCH v4 17/17] ASoC: fsl-ssi: Use regmap Markus Pargmann
2014-04-28 10:54   ` Markus Pargmann
2014-04-28 21:43 ` [PATCH v4 00/17] ASoC: fsl-ssi: Driver cleanup Michael Grzeschik
2014-04-28 21:43   ` Michael Grzeschik
2014-05-20 22:10 ` Mark Brown
2014-05-20 22:10   ` 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=1398682498-24357-17-git-send-email-mpa@pengutronix.de \
    --to=mpa@pengutronix.de \
    --cc=Guangyu.Chen@freescale.com \
    --cc=Li.Xiubo@freescale.com \
    --cc=alsa-devel@alsa-project.org \
    --cc=broonie@kernel.org \
    --cc=fabio.estevam@freescale.com \
    --cc=kernel@pengutronix.de \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=shc_work@mail.ru \
    --cc=timur@tabi.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.