* [PATCH 1/5] ASoC: fsi: Add fsi_get_frame_width function
2010-10-12 2:38 [PATCH 0/5] ASoC: fsi: clean up patches Kuninori Morimoto
@ 2010-10-12 2:39 ` Kuninori Morimoto, Kuninori Morimoto
2010-10-12 2:39 ` [PATCH 2/5] ASoC: fsi: remove un-necessary variable from fsi_dai_startup Kuninori Morimoto, Kuninori Morimoto
` (5 subsequent siblings)
6 siblings, 0 replies; 10+ messages in thread
From: Kuninori Morimoto, Kuninori Morimoto @ 2010-10-12 2:39 UTC (permalink / raw)
To: Mark Brown; +Cc: Linux-ALSA, Liam Girdwood
It is not so important for now.
But will be used in future.
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
---
sound/soc/sh/fsi.c | 10 +++++++++-
1 files changed, 9 insertions(+), 1 deletions(-)
diff --git a/sound/soc/sh/fsi.c b/sound/soc/sh/fsi.c
index dd99633..aa2cbb1 100644
--- a/sound/soc/sh/fsi.c
+++ b/sound/soc/sh/fsi.c
@@ -368,6 +368,14 @@ static int fsi_num2len(int num, int width)
return num * width;
}
+static int fsi_get_frame_width(struct fsi_priv *fsi)
+{
+ struct snd_pcm_substream *substream = fsi->substream;
+ struct snd_pcm_runtime *runtime = substream->runtime;
+
+ return frames_to_bytes(runtime, 1) / fsi->chan_num;
+}
+
/*
* dma function
*/
@@ -596,7 +604,7 @@ static int fsi_fifo_data_ctrl(struct fsi_priv *fsi, int startup, int is_play)
}
/* get 1 channel data width */
- ch_width = frames_to_bytes(runtime, 1) / fsi->chan_num;
+ ch_width = fsi_get_frame_width(fsi);
/* get residue data number of alsa */
data_residue_num = fsi_len2num(fsi->buff_len - fsi->buff_offset,
--
1.7.0.4
^ permalink raw reply related [flat|nested] 10+ messages in thread* [PATCH 2/5] ASoC: fsi: remove un-necessary variable from fsi_dai_startup
2010-10-12 2:38 [PATCH 0/5] ASoC: fsi: clean up patches Kuninori Morimoto
2010-10-12 2:39 ` [PATCH 1/5] ASoC: fsi: Add fsi_get_frame_width function Kuninori Morimoto, Kuninori Morimoto
@ 2010-10-12 2:39 ` Kuninori Morimoto, Kuninori Morimoto
2010-10-12 2:40 ` [PATCH 3/5] ASoC: fsi: avoid un-necessary status read Kuninori Morimoto, Kuninori Morimoto
` (4 subsequent siblings)
6 siblings, 0 replies; 10+ messages in thread
From: Kuninori Morimoto, Kuninori Morimoto @ 2010-10-12 2:39 UTC (permalink / raw)
To: Mark Brown; +Cc: Linux-ALSA, Liam Girdwood
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
---
sound/soc/sh/fsi.c | 3 +--
1 files changed, 1 insertions(+), 2 deletions(-)
diff --git a/sound/soc/sh/fsi.c b/sound/soc/sh/fsi.c
index aa2cbb1..d68dcbb 100644
--- a/sound/soc/sh/fsi.c
+++ b/sound/soc/sh/fsi.c
@@ -730,7 +730,6 @@ static int fsi_dai_startup(struct snd_pcm_substream *substream,
u32 data;
int is_play = (substream->stream == SNDRV_PCM_STREAM_PLAYBACK);
int is_master;
- int ret = 0;
pm_runtime_get_sync(dai->dev);
@@ -809,7 +808,7 @@ static int fsi_dai_startup(struct snd_pcm_substream *substream,
/* fifo init */
fsi_fifo_init(fsi, is_play, dai);
- return ret;
+ return 0;
}
static void fsi_dai_shutdown(struct snd_pcm_substream *substream,
--
1.7.0.4
^ permalink raw reply related [flat|nested] 10+ messages in thread* [PATCH 3/5] ASoC: fsi: avoid un-necessary status read
2010-10-12 2:38 [PATCH 0/5] ASoC: fsi: clean up patches Kuninori Morimoto
2010-10-12 2:39 ` [PATCH 1/5] ASoC: fsi: Add fsi_get_frame_width function Kuninori Morimoto, Kuninori Morimoto
2010-10-12 2:39 ` [PATCH 2/5] ASoC: fsi: remove un-necessary variable from fsi_dai_startup Kuninori Morimoto, Kuninori Morimoto
@ 2010-10-12 2:40 ` Kuninori Morimoto, Kuninori Morimoto
2010-10-12 2:40 ` [PATCH 4/5] ASoC: fsi: Add fsi_is_play function Kuninori Morimoto, Kuninori Morimoto
` (3 subsequent siblings)
6 siblings, 0 replies; 10+ messages in thread
From: Kuninori Morimoto, Kuninori Morimoto @ 2010-10-12 2:40 UTC (permalink / raw)
To: Mark Brown; +Cc: Linux-ALSA, Liam Girdwood
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
---
sound/soc/sh/fsi.c | 3 +--
1 files changed, 1 insertions(+), 2 deletions(-)
diff --git a/sound/soc/sh/fsi.c b/sound/soc/sh/fsi.c
index d68dcbb..2b3a50d 100644
--- a/sound/soc/sh/fsi.c
+++ b/sound/soc/sh/fsi.c
@@ -572,7 +572,6 @@ static int fsi_fifo_data_ctrl(struct fsi_priv *fsi, int startup, int is_play)
{
struct snd_pcm_runtime *runtime;
struct snd_pcm_substream *substream = NULL;
- u32 status;
u32 status_reg = is_play ? DOFF_ST : DIFF_ST;
int data_residue_num;
int data_num;
@@ -662,9 +661,9 @@ static int fsi_fifo_data_ctrl(struct fsi_priv *fsi, int startup, int is_play)
fsi->buff_offset += fsi_num2offset(data_num, ch_width);
/* check fifo status */
- status = fsi_reg_read(fsi, status_reg);
if (!startup) {
struct snd_soc_dai *dai = fsi_get_dai(substream);
+ u32 status = fsi_reg_read(fsi, status_reg);
if (status & ERR_OVER)
dev_err(dai->dev, "over run\n");
--
1.7.0.4
^ permalink raw reply related [flat|nested] 10+ messages in thread* [PATCH 4/5] ASoC: fsi: Add fsi_is_play function
2010-10-12 2:38 [PATCH 0/5] ASoC: fsi: clean up patches Kuninori Morimoto
` (2 preceding siblings ...)
2010-10-12 2:40 ` [PATCH 3/5] ASoC: fsi: avoid un-necessary status read Kuninori Morimoto, Kuninori Morimoto
@ 2010-10-12 2:40 ` Kuninori Morimoto, Kuninori Morimoto
2010-10-12 9:16 ` Liam Girdwood
2010-10-12 2:40 ` [PATCH 5/5] ASoC: fsi: Add new macro and shift for PortA/B In/Out Kuninori Morimoto, Kuninori Morimoto
` (2 subsequent siblings)
6 siblings, 1 reply; 10+ messages in thread
From: Kuninori Morimoto, Kuninori Morimoto @ 2010-10-12 2:40 UTC (permalink / raw)
To: Mark Brown; +Cc: Linux-ALSA, Liam Girdwood
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
---
sound/soc/sh/fsi.c | 13 +++++++++----
1 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/sound/soc/sh/fsi.c b/sound/soc/sh/fsi.c
index 2b3a50d..09a2df2 100644
--- a/sound/soc/sh/fsi.c
+++ b/sound/soc/sh/fsi.c
@@ -295,6 +295,11 @@ static u32 fsi_get_info_flags(struct fsi_priv *fsi)
master->info->portb_flags;
}
+static int fsi_is_play(struct snd_pcm_substream *substream)
+{
+ return substream->stream == SNDRV_PCM_STREAM_PLAYBACK;
+}
+
static int fsi_is_master_mode(struct fsi_priv *fsi, int is_play)
{
u32 mode;
@@ -727,7 +732,7 @@ static int fsi_dai_startup(struct snd_pcm_substream *substream,
u32 fmt;
u32 reg;
u32 data;
- int is_play = (substream->stream == SNDRV_PCM_STREAM_PLAYBACK);
+ int is_play = fsi_is_play(substream);
int is_master;
pm_runtime_get_sync(dai->dev);
@@ -814,7 +819,7 @@ static void fsi_dai_shutdown(struct snd_pcm_substream *substream,
struct snd_soc_dai *dai)
{
struct fsi_priv *fsi = fsi_get_priv(substream);
- int is_play = substream->stream == SNDRV_PCM_STREAM_PLAYBACK;
+ int is_play = fsi_is_play(substream);
fsi_irq_disable(fsi, is_play);
fsi_clk_ctrl(fsi, 0);
@@ -827,7 +832,7 @@ static int fsi_dai_trigger(struct snd_pcm_substream *substream, int cmd,
{
struct fsi_priv *fsi = fsi_get_priv(substream);
struct snd_pcm_runtime *runtime = substream->runtime;
- int is_play = substream->stream == SNDRV_PCM_STREAM_PLAYBACK;
+ int is_play = fsi_is_play(substream);
int ret = 0;
switch (cmd) {
@@ -854,7 +859,7 @@ static int fsi_dai_hw_params(struct snd_pcm_substream *substream,
struct fsi_master *master = fsi_get_master(fsi);
int (*set_rate)(int is_porta, int rate) = master->info->set_rate;
int fsi_ver = master->core->ver;
- int is_play = (substream->stream == SNDRV_PCM_STREAM_PLAYBACK);
+ int is_play = fsi_is_play(substream);
int ret;
/* if slave mode, set_rate is not needed */
--
1.7.0.4
^ permalink raw reply related [flat|nested] 10+ messages in thread* Re: [PATCH 4/5] ASoC: fsi: Add fsi_is_play function
2010-10-12 2:40 ` [PATCH 4/5] ASoC: fsi: Add fsi_is_play function Kuninori Morimoto, Kuninori Morimoto
@ 2010-10-12 9:16 ` Liam Girdwood
2010-10-12 9:30 ` [PATCH 4/5 v2] ASoC: " Kuninori Morimoto
0 siblings, 1 reply; 10+ messages in thread
From: Liam Girdwood @ 2010-10-12 9:16 UTC (permalink / raw)
To: Kuninori Morimoto; +Cc: Linux-ALSA, Mark Brown
On Tue, 2010-10-12 at 11:40 +0900, Kuninori Morimoto wrote:
> Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
> ---
> sound/soc/sh/fsi.c | 13 +++++++++----
> 1 files changed, 9 insertions(+), 4 deletions(-)
>
> diff --git a/sound/soc/sh/fsi.c b/sound/soc/sh/fsi.c
> index 2b3a50d..09a2df2 100644
> --- a/sound/soc/sh/fsi.c
> +++ b/sound/soc/sh/fsi.c
> @@ -295,6 +295,11 @@ static u32 fsi_get_info_flags(struct fsi_priv *fsi)
> master->info->portb_flags;
> }
>
> +static int fsi_is_play(struct snd_pcm_substream *substream)
> +{
> + return substream->stream == SNDRV_PCM_STREAM_PLAYBACK;
> +}
> +
It may be better to make this inline since it's very small.
--
Freelance Developer, SlimLogic Ltd
ASoC and Voltage Regulator Maintainer.
http://www.slimlogic.co.uk
^ permalink raw reply [flat|nested] 10+ messages in thread* [PATCH 4/5 v2] ASoC: Add fsi_is_play function
2010-10-12 9:16 ` Liam Girdwood
@ 2010-10-12 9:30 ` Kuninori Morimoto
0 siblings, 0 replies; 10+ messages in thread
From: Kuninori Morimoto @ 2010-10-12 9:30 UTC (permalink / raw)
To: Mark Brown; +Cc: Linux-ALSA, Liam Girdwood
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
---
v1 -> v2
o fsi_is_play become inline
sound/soc/sh/fsi.c | 13 +++++++++----
1 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/sound/soc/sh/fsi.c b/sound/soc/sh/fsi.c
index 2b3a50d..f9e59ab 100644
--- a/sound/soc/sh/fsi.c
+++ b/sound/soc/sh/fsi.c
@@ -295,6 +295,11 @@ static u32 fsi_get_info_flags(struct fsi_priv *fsi)
master->info->portb_flags;
}
+static inline int fsi_is_play(struct snd_pcm_substream *substream)
+{
+ return substream->stream == SNDRV_PCM_STREAM_PLAYBACK;
+}
+
static int fsi_is_master_mode(struct fsi_priv *fsi, int is_play)
{
u32 mode;
@@ -727,7 +732,7 @@ static int fsi_dai_startup(struct snd_pcm_substream *substream,
u32 fmt;
u32 reg;
u32 data;
- int is_play = (substream->stream == SNDRV_PCM_STREAM_PLAYBACK);
+ int is_play = fsi_is_play(substream);
int is_master;
pm_runtime_get_sync(dai->dev);
@@ -814,7 +819,7 @@ static void fsi_dai_shutdown(struct snd_pcm_substream *substream,
struct snd_soc_dai *dai)
{
struct fsi_priv *fsi = fsi_get_priv(substream);
- int is_play = substream->stream == SNDRV_PCM_STREAM_PLAYBACK;
+ int is_play = fsi_is_play(substream);
fsi_irq_disable(fsi, is_play);
fsi_clk_ctrl(fsi, 0);
@@ -827,7 +832,7 @@ static int fsi_dai_trigger(struct snd_pcm_substream *substream, int cmd,
{
struct fsi_priv *fsi = fsi_get_priv(substream);
struct snd_pcm_runtime *runtime = substream->runtime;
- int is_play = substream->stream == SNDRV_PCM_STREAM_PLAYBACK;
+ int is_play = fsi_is_play(substream);
int ret = 0;
switch (cmd) {
@@ -854,7 +859,7 @@ static int fsi_dai_hw_params(struct snd_pcm_substream *substream,
struct fsi_master *master = fsi_get_master(fsi);
int (*set_rate)(int is_porta, int rate) = master->info->set_rate;
int fsi_ver = master->core->ver;
- int is_play = (substream->stream == SNDRV_PCM_STREAM_PLAYBACK);
+ int is_play = fsi_is_play(substream);
int ret;
/* if slave mode, set_rate is not needed */
--
1.7.0.4
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [PATCH 5/5] ASoC: fsi: Add new macro and shift for PortA/B In/Out
2010-10-12 2:38 [PATCH 0/5] ASoC: fsi: clean up patches Kuninori Morimoto
` (3 preceding siblings ...)
2010-10-12 2:40 ` [PATCH 4/5] ASoC: fsi: Add fsi_is_play function Kuninori Morimoto, Kuninori Morimoto
@ 2010-10-12 2:40 ` Kuninori Morimoto, Kuninori Morimoto
2010-10-12 9:16 ` [PATCH 0/5] ASoC: fsi: clean up patches Liam Girdwood
2010-10-12 10:04 ` Mark Brown
6 siblings, 0 replies; 10+ messages in thread
From: Kuninori Morimoto, Kuninori Morimoto @ 2010-10-12 2:40 UTC (permalink / raw)
To: Mark Brown; +Cc: Linux-ALSA, Liam Girdwood
Some FSI register have similar bit array for PortA/B and In/Out.
This patch add new macro and shift for it
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
---
sound/soc/sh/fsi.c | 45 ++++++++++++++++++++++-----------------------
1 files changed, 22 insertions(+), 23 deletions(-)
diff --git a/sound/soc/sh/fsi.c b/sound/soc/sh/fsi.c
index 09a2df2..895ce75 100644
--- a/sound/soc/sh/fsi.c
+++ b/sound/soc/sh/fsi.c
@@ -80,11 +80,12 @@
#define B_CLK 0x00000010
#define A_CLK 0x00000001
-/* INT_ST */
-#define INT_B_IN (1 << 12)
-#define INT_B_OUT (1 << 8)
-#define INT_A_IN (1 << 4)
-#define INT_A_OUT (1 << 0)
+/* IO SHIFT / MACRO */
+#define BI_SHIFT 12
+#define BO_SHIFT 8
+#define AI_SHIFT 4
+#define AO_SHIFT 0
+#define AB_IO(param, shift) (param << shift)
/* SOFT_RST */
#define PBSR (1 << 12) /* Port B Software Reset */
@@ -93,9 +94,7 @@
#define FSISR (1 << 0) /* Software Reset */
/* FIFO_SZ */
-#define OUT_SZ_MASK 0x7
-#define BO_SZ_SHIFT 8
-#define AO_SZ_SHIFT 0
+#define FIFO_SZ_MASK 0x7
#define FSI_RATES SNDRV_PCM_RATE_8000_96000
@@ -315,17 +314,17 @@ static int fsi_is_master_mode(struct fsi_priv *fsi, int is_play)
return (mode & flags) != mode;
}
-static u32 fsi_port_ab_io_bit(struct fsi_priv *fsi, int is_play)
+static u32 fsi_get_port_shift(struct fsi_priv *fsi, int is_play)
{
int is_porta = fsi_is_port_a(fsi);
- u32 data;
+ u32 shift;
if (is_porta)
- data = is_play ? (1 << 0) : (1 << 4);
+ shift = is_play ? AO_SHIFT : AI_SHIFT;
else
- data = is_play ? (1 << 8) : (1 << 12);
+ shift = is_play ? BO_SHIFT : BI_SHIFT;
- return data;
+ return shift;
}
static void fsi_stream_push(struct fsi_priv *fsi,
@@ -440,7 +439,7 @@ static void fsi_dma_soft_pop32(struct fsi_priv *fsi, int num)
static void fsi_irq_enable(struct fsi_priv *fsi, int is_play)
{
- u32 data = fsi_port_ab_io_bit(fsi, is_play);
+ u32 data = AB_IO(1, fsi_get_port_shift(fsi, is_play));
struct fsi_master *master = fsi_get_master(fsi);
fsi_master_mask_set(master, master->core->imsk, data, data);
@@ -449,7 +448,7 @@ static void fsi_irq_enable(struct fsi_priv *fsi, int is_play)
static void fsi_irq_disable(struct fsi_priv *fsi, int is_play)
{
- u32 data = fsi_port_ab_io_bit(fsi, is_play);
+ u32 data = AB_IO(1, fsi_get_port_shift(fsi, is_play));
struct fsi_master *master = fsi_get_master(fsi);
fsi_master_mask_set(master, master->core->imsk, data, 0);
@@ -471,8 +470,8 @@ static void fsi_irq_clear_status(struct fsi_priv *fsi)
u32 data = 0;
struct fsi_master *master = fsi_get_master(fsi);
- data |= fsi_port_ab_io_bit(fsi, 0);
- data |= fsi_port_ab_io_bit(fsi, 1);
+ data |= AB_IO(1, fsi_get_port_shift(fsi, 0));
+ data |= AB_IO(1, fsi_get_port_shift(fsi, 1));
/* clear interrupt factor */
fsi_master_mask_set(master, master->core->int_st, data, 0);
@@ -523,8 +522,8 @@ static void fsi_fifo_init(struct fsi_priv *fsi,
/* get on-chip RAM capacity */
shift = fsi_master_read(master, FIFO_SZ);
- shift >>= fsi_is_port_a(fsi) ? AO_SZ_SHIFT : BO_SZ_SHIFT;
- shift &= OUT_SZ_MASK;
+ shift >>= fsi_get_port_shift(fsi, is_play);
+ shift &= FIFO_SZ_MASK;
fsi->fifo_max_num = 256 << shift;
dev_dbg(dai->dev, "fifo = %d words\n", fsi->fifo_max_num);
@@ -705,13 +704,13 @@ static irqreturn_t fsi_interrupt(int irq, void *data)
fsi_master_mask_set(master, SOFT_RST, IR, 0);
fsi_master_mask_set(master, SOFT_RST, IR, IR);
- if (int_st & INT_A_OUT)
+ if (int_st & AB_IO(1, AO_SHIFT))
fsi_data_push(&master->fsia, 0);
- if (int_st & INT_B_OUT)
+ if (int_st & AB_IO(1, BO_SHIFT))
fsi_data_push(&master->fsib, 0);
- if (int_st & INT_A_IN)
+ if (int_st & AB_IO(1, AI_SHIFT))
fsi_data_pop(&master->fsia, 0);
- if (int_st & INT_B_IN)
+ if (int_st & AB_IO(1, BI_SHIFT))
fsi_data_pop(&master->fsib, 0);
fsi_irq_clear_all_status(master);
--
1.7.0.4
^ permalink raw reply related [flat|nested] 10+ messages in thread* Re: [PATCH 0/5] ASoC: fsi: clean up patches
2010-10-12 2:38 [PATCH 0/5] ASoC: fsi: clean up patches Kuninori Morimoto
` (4 preceding siblings ...)
2010-10-12 2:40 ` [PATCH 5/5] ASoC: fsi: Add new macro and shift for PortA/B In/Out Kuninori Morimoto, Kuninori Morimoto
@ 2010-10-12 9:16 ` Liam Girdwood
2010-10-12 10:04 ` Mark Brown
6 siblings, 0 replies; 10+ messages in thread
From: Liam Girdwood @ 2010-10-12 9:16 UTC (permalink / raw)
To: Kuninori Morimoto; +Cc: Linux-ALSA, Mark Brown
On Tue, 2010-10-12 at 11:38 +0900, Kuninori Morimoto wrote:
> Dear Mark, Liam
>
> These patches are clean up for fsi driver
>
> Kuninori Morimoto (5):
> ASoC: fsi: Add fsi_get_frame_width function
> ASoC: fsi: remove un-necessary variable from fsi_dai_startup
> ASoC: fsi: avoid un-necessary status read
> ASoC: fsi: Add fsi_is_play function
> ASoC: fsi: Add new macro and shift for PortA/B In/Out
>
> Best regards
> --
> Kuninori Morimoto
>
All
Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
One comment in 4/5 that can be fixed incrementally.
Thanks
Liam
--
Freelance Developer, SlimLogic Ltd
ASoC and Voltage Regulator Maintainer.
http://www.slimlogic.co.uk
^ permalink raw reply [flat|nested] 10+ messages in thread* Re: [PATCH 0/5] ASoC: fsi: clean up patches
2010-10-12 2:38 [PATCH 0/5] ASoC: fsi: clean up patches Kuninori Morimoto
` (5 preceding siblings ...)
2010-10-12 9:16 ` [PATCH 0/5] ASoC: fsi: clean up patches Liam Girdwood
@ 2010-10-12 10:04 ` Mark Brown
6 siblings, 0 replies; 10+ messages in thread
From: Mark Brown @ 2010-10-12 10:04 UTC (permalink / raw)
To: Kuninori Morimoto; +Cc: Linux-ALSA, Liam Girdwood
On Tue, Oct 12, 2010 at 11:38:33AM +0900, Kuninori Morimoto wrote:
> Kuninori Morimoto (5):
> ASoC: fsi: Add fsi_get_frame_width function
> ASoC: fsi: remove un-necessary variable from fsi_dai_startup
> ASoC: fsi: avoid un-necessary status read
> ASoC: fsi: Add fsi_is_play function
> ASoC: fsi: Add new macro and shift for PortA/B In/Out
All applied, thanks.
^ permalink raw reply [flat|nested] 10+ messages in thread