* [PATCH 0/2] ASoC: sh: fsi: Add module/port control
@ 2011-04-19 6:54 Kuninori Morimoto
2011-04-19 6:54 ` [PATCH 1/2] ASoC: sh: fsi: add fsi_is_clk_master function Kuninori Morimoto
` (2 more replies)
0 siblings, 3 replies; 6+ messages in thread
From: Kuninori Morimoto @ 2011-04-19 6:54 UTC (permalink / raw)
To: Mark Brown; +Cc: yoshii, Linux-ALSA, Simon, Magnus, Liam Girdwood
Dear Mark, Liam
Cc Magnus, Simon, yoshii-san
These patches control FSI module/port power.
Kuninori Morimoto:
ASoC: sh: fsi: add fsi_is_clk_master function
ASoC: sh: fsi: Add module/port control function
The FIFO of each port were always working even though
it was not used in current FSI driver.
2nd patch add module/port control functions.
>> Mark
these patches are depend on my
[PATCH] ASoC: fsi: add dev_pm_ops :: suspend/resume
Best regards
--
Kuninori Morimoto
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH 1/2] ASoC: sh: fsi: add fsi_is_clk_master function
2011-04-19 6:54 [PATCH 0/2] ASoC: sh: fsi: Add module/port control Kuninori Morimoto
@ 2011-04-19 6:54 ` Kuninori Morimoto
2011-04-19 23:34 ` Simon Horman
2011-04-20 13:00 ` Mark Brown
2011-04-19 6:54 ` [PATCH 2/2] ASoC: sh: fsi: Add module/port control function Kuninori Morimoto
2011-04-20 11:11 ` [PATCH 0/2] ASoC: sh: fsi: Add module/port control Liam Girdwood
2 siblings, 2 replies; 6+ messages in thread
From: Kuninori Morimoto @ 2011-04-19 6:54 UTC (permalink / raw)
To: Mark Brown; +Cc: yoshii, Linux-ALSA, Simon, Magnus, Liam Girdwood
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
---
sound/soc/sh/fsi.c | 33 +++++++++++++++++++++++++--------
1 files changed, 25 insertions(+), 8 deletions(-)
diff --git a/sound/soc/sh/fsi.c b/sound/soc/sh/fsi.c
index a40d15b..faca6ad 100644
--- a/sound/soc/sh/fsi.c
+++ b/sound/soc/sh/fsi.c
@@ -146,10 +146,12 @@ struct fsi_priv {
void __iomem *base;
struct fsi_master *master;
- int chan_num;
struct fsi_stream playback;
struct fsi_stream capture;
+ int chan_num:16;
+ int clk_master:1;
+
long rate;
/* for suspend/resume */
@@ -258,6 +260,11 @@ static struct fsi_master *fsi_get_master(struct fsi_priv *fsi)
return fsi->master;
}
+static int fsi_is_clk_master(struct fsi_priv *fsi)
+{
+ return fsi->clk_master;
+}
+
static int fsi_is_port_a(struct fsi_priv *fsi)
{
return fsi->master->base == fsi->base;
@@ -807,14 +814,15 @@ static void fsi_dai_shutdown(struct snd_pcm_substream *substream,
struct fsi_priv *fsi = fsi_get_priv(substream);
int is_play = fsi_is_play(substream);
struct fsi_master *master = fsi_get_master(fsi);
- set_rate_func set_rate;
+ set_rate_func set_rate = fsi_get_info_set_rate(master);
fsi_irq_disable(fsi, is_play);
- fsi_clk_ctrl(fsi, 0);
- set_rate = fsi_get_info_set_rate(master);
- if (set_rate && fsi->rate)
+ if (fsi_is_clk_master(fsi)) {
+ fsi_clk_ctrl(fsi, 0);
set_rate(dai->dev, fsi_is_port_a(fsi), fsi->rate, 0);
+ }
+
fsi->rate = 0;
pm_runtime_put_sync(dai->dev);
@@ -890,6 +898,8 @@ static int fsi_set_fmt_spdif(struct fsi_priv *fsi)
static int fsi_dai_set_fmt(struct snd_soc_dai *dai, unsigned int fmt)
{
struct fsi_priv *fsi = fsi_get_priv_frm_dai(dai);
+ struct fsi_master *master = fsi_get_master(fsi);
+ set_rate_func set_rate = fsi_get_info_set_rate(master);
u32 flags = fsi_get_info_flags(fsi);
u32 data = 0;
int ret;
@@ -900,6 +910,7 @@ static int fsi_dai_set_fmt(struct snd_soc_dai *dai, unsigned int fmt)
switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) {
case SND_SOC_DAIFMT_CBM_CFM:
data = DIMD | DOMD;
+ fsi->clk_master = 1;
break;
case SND_SOC_DAIFMT_CBS_CFS:
break;
@@ -907,6 +918,13 @@ static int fsi_dai_set_fmt(struct snd_soc_dai *dai, unsigned int fmt)
ret = -EINVAL;
goto set_fmt_exit;
}
+
+ if (fsi_is_clk_master(fsi) && !set_rate) {
+ dev_err(dai->dev, "platform doesn't have set_rate\n");
+ ret = -EINVAL;
+ goto set_fmt_exit;
+ }
+
fsi_reg_mask_set(fsi, CKG1, (DIMD | DOMD), data);
/* set format */
@@ -933,13 +951,12 @@ static int fsi_dai_hw_params(struct snd_pcm_substream *substream,
{
struct fsi_priv *fsi = fsi_get_priv(substream);
struct fsi_master *master = fsi_get_master(fsi);
- set_rate_func set_rate;
+ set_rate_func set_rate = fsi_get_info_set_rate(master);
int fsi_ver = master->core->ver;
long rate = params_rate(params);
int ret;
- set_rate = fsi_get_info_set_rate(master);
- if (!set_rate)
+ if (!fsi_is_clk_master(fsi))
return 0;
ret = set_rate(dai->dev, fsi_is_port_a(fsi), rate, 1);
--
1.7.1
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH 2/2] ASoC: sh: fsi: Add module/port control function
2011-04-19 6:54 [PATCH 0/2] ASoC: sh: fsi: Add module/port control Kuninori Morimoto
2011-04-19 6:54 ` [PATCH 1/2] ASoC: sh: fsi: add fsi_is_clk_master function Kuninori Morimoto
@ 2011-04-19 6:54 ` Kuninori Morimoto
2011-04-20 11:11 ` [PATCH 0/2] ASoC: sh: fsi: Add module/port control Liam Girdwood
2 siblings, 0 replies; 6+ messages in thread
From: Kuninori Morimoto @ 2011-04-19 6:54 UTC (permalink / raw)
To: Mark Brown; +Cc: yoshii, Linux-ALSA, Simon, Magnus, Liam Girdwood
The FIFO of each port were always working though it was not used
in current FSI driver.
This patch add module/port clock control functions
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
---
sound/soc/sh/fsi.c | 81 ++++++++++++++++++++++++++++++++--------------------
1 files changed, 50 insertions(+), 31 deletions(-)
diff --git a/sound/soc/sh/fsi.c b/sound/soc/sh/fsi.c
index faca6ad..161461b 100644
--- a/sound/soc/sh/fsi.c
+++ b/sound/soc/sh/fsi.c
@@ -86,8 +86,8 @@
#define SE (1 << 0) /* Fix the master clock */
/* CLK_RST */
-#define B_CLK 0x00000010
-#define A_CLK 0x00000001
+#define CRB (1 << 4)
+#define CRA (1 << 0)
/* IO SHIFT / MACRO */
#define BI_SHIFT 12
@@ -187,6 +187,7 @@ struct fsi_master {
u32 saved_iemsk;
u32 saved_imsk;
u32 saved_clk_rst;
+ u32 saved_soft_rst;
};
/*
@@ -556,20 +557,45 @@ static void fsi_spdif_clk_ctrl(struct fsi_priv *fsi, int enable)
}
/*
- * ctrl function
+ * clock function
*/
+#define fsi_module_init(m, d) __fsi_module_clk_ctrl(m, d, 1)
+#define fsi_module_kill(m, d) __fsi_module_clk_ctrl(m, d, 0)
+static void __fsi_module_clk_ctrl(struct fsi_master *master,
+ struct device *dev,
+ int enable)
+{
+ pm_runtime_get_sync(dev);
-static void fsi_clk_ctrl(struct fsi_priv *fsi, int enable)
+ if (enable) {
+ /* enable only SR */
+ fsi_master_mask_set(master, SOFT_RST, FSISR, FSISR);
+ fsi_master_mask_set(master, SOFT_RST, PASR | PBSR, 0);
+ } else {
+ /* clear all registers */
+ fsi_master_mask_set(master, SOFT_RST, FSISR, 0);
+ }
+
+ pm_runtime_put_sync(dev);
+}
+
+#define fsi_port_start(f) __fsi_port_clk_ctrl(f, 1)
+#define fsi_port_stop(f) __fsi_port_clk_ctrl(f, 0)
+static void __fsi_port_clk_ctrl(struct fsi_priv *fsi, int enable)
{
- u32 val = fsi_is_port_a(fsi) ? (1 << 0) : (1 << 4);
struct fsi_master *master = fsi_get_master(fsi);
+ u32 soft = fsi_is_port_a(fsi) ? PASR : PBSR;
+ u32 clk = fsi_is_port_a(fsi) ? CRA : CRB;
+ int is_master = fsi_is_clk_master(fsi);
- if (enable)
- fsi_master_mask_set(master, CLK_RST, val, val);
- else
- fsi_master_mask_set(master, CLK_RST, val, 0);
+ fsi_master_mask_set(master, SOFT_RST, soft, (enable) ? soft : 0);
+ if (is_master)
+ fsi_master_mask_set(master, CLK_RST, clk, (enable) ? clk : 0);
}
+/*
+ * ctrl function
+ */
static void fsi_fifo_init(struct fsi_priv *fsi,
int is_play,
struct snd_soc_dai *dai)
@@ -622,18 +648,6 @@ static void fsi_fifo_init(struct fsi_priv *fsi,
}
}
-static void fsi_soft_all_reset(struct fsi_master *master)
-{
- /* port AB reset */
- fsi_master_mask_set(master, SOFT_RST, PASR | PBSR, 0);
- mdelay(10);
-
- /* soft reset */
- fsi_master_mask_set(master, SOFT_RST, FSISR, 0);
- fsi_master_mask_set(master, SOFT_RST, FSISR, FSISR);
- mdelay(10);
-}
-
static int fsi_fifo_data_ctrl(struct fsi_priv *fsi, int stream)
{
struct snd_pcm_runtime *runtime;
@@ -818,10 +832,8 @@ static void fsi_dai_shutdown(struct snd_pcm_substream *substream,
fsi_irq_disable(fsi, is_play);
- if (fsi_is_clk_master(fsi)) {
- fsi_clk_ctrl(fsi, 0);
+ if (fsi_is_clk_master(fsi))
set_rate(dai->dev, fsi_is_port_a(fsi), fsi->rate, 0);
- }
fsi->rate = 0;
@@ -843,8 +855,10 @@ static int fsi_dai_trigger(struct snd_pcm_substream *substream, int cmd,
frames_to_bytes(runtime, runtime->period_size));
ret = is_play ? fsi_data_push(fsi) : fsi_data_pop(fsi);
fsi_irq_enable(fsi, is_play);
+ fsi_port_start(fsi);
break;
case SNDRV_PCM_TRIGGER_STOP:
+ fsi_port_stop(fsi);
fsi_irq_disable(fsi, is_play);
fsi_stream_pop(fsi, is_play);
break;
@@ -1018,7 +1032,6 @@ static int fsi_dai_hw_params(struct snd_pcm_substream *substream,
fsi_reg_mask_set(fsi, CKG1, (ACKMD_MASK | BPFMD_MASK) , data);
udelay(10);
- fsi_clk_ctrl(fsi, 1);
ret = 0;
}
@@ -1233,9 +1246,7 @@ static int fsi_probe(struct platform_device *pdev)
pm_runtime_enable(&pdev->dev);
dev_set_drvdata(&pdev->dev, master);
- pm_runtime_get_sync(&pdev->dev);
- fsi_soft_all_reset(master);
- pm_runtime_put_sync(&pdev->dev);
+ fsi_module_init(master, &pdev->dev);
ret = request_irq(irq, &fsi_interrupt, IRQF_DISABLED,
id_entry->name, master);
@@ -1279,6 +1290,8 @@ static int fsi_remove(struct platform_device *pdev)
master = dev_get_drvdata(&pdev->dev);
+ fsi_module_kill(master, &pdev->dev);
+
free_irq(master->irq, master);
pm_runtime_disable(&pdev->dev);
@@ -1334,6 +1347,9 @@ static int fsi_suspend(struct device *dev)
master->saved_iemsk = fsi_core_read(master, iemsk);
master->saved_imsk = fsi_core_read(master, imsk);
master->saved_clk_rst = fsi_master_read(master, CLK_RST);
+ master->saved_soft_rst = fsi_master_read(master, SOFT_RST);
+
+ fsi_module_kill(master, dev);
pm_runtime_put_sync(dev);
@@ -1347,14 +1363,17 @@ static int fsi_resume(struct device *dev)
pm_runtime_get_sync(dev);
- __fsi_resume(&master->fsia, dev, set_rate);
- __fsi_resume(&master->fsib, dev, set_rate);
+ fsi_module_init(master, dev);
+ fsi_master_mask_set(master, SOFT_RST, 0xffff, master->saved_soft_rst);
+ fsi_master_mask_set(master, CLK_RST, 0xffff, master->saved_clk_rst);
fsi_core_mask_set(master, a_mclk, 0xffff, master->saved_a_mclk);
fsi_core_mask_set(master, b_mclk, 0xffff, master->saved_b_mclk);
fsi_core_mask_set(master, iemsk, 0xffff, master->saved_iemsk);
fsi_core_mask_set(master, imsk, 0xffff, master->saved_imsk);
- fsi_master_mask_set(master, CLK_RST, 0xffff, master->saved_clk_rst);
+
+ __fsi_resume(&master->fsia, dev, set_rate);
+ __fsi_resume(&master->fsib, dev, set_rate);
pm_runtime_put_sync(dev);
--
1.7.1
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH 1/2] ASoC: sh: fsi: add fsi_is_clk_master function
2011-04-19 6:54 ` [PATCH 1/2] ASoC: sh: fsi: add fsi_is_clk_master function Kuninori Morimoto
@ 2011-04-19 23:34 ` Simon Horman
2011-04-20 13:00 ` Mark Brown
1 sibling, 0 replies; 6+ messages in thread
From: Simon Horman @ 2011-04-19 23:34 UTC (permalink / raw)
To: Kuninori Morimoto; +Cc: yoshii, Linux-ALSA, Mark Brown, Magnus, Liam Girdwood
On Tue, Apr 19, 2011 at 03:54:42PM +0900, Kuninori Morimoto wrote:
> Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Hi Morimoto-san,
this looks good, but it would be nice if your patch description
was a bit longer :-)
Reviewed-by: Simon Horman <simon@horms.net>
> ---
> sound/soc/sh/fsi.c | 33 +++++++++++++++++++++++++--------
> 1 files changed, 25 insertions(+), 8 deletions(-)
>
> diff --git a/sound/soc/sh/fsi.c b/sound/soc/sh/fsi.c
> index a40d15b..faca6ad 100644
> --- a/sound/soc/sh/fsi.c
> +++ b/sound/soc/sh/fsi.c
> @@ -146,10 +146,12 @@ struct fsi_priv {
> void __iomem *base;
> struct fsi_master *master;
>
> - int chan_num;
> struct fsi_stream playback;
> struct fsi_stream capture;
>
> + int chan_num:16;
> + int clk_master:1;
> +
> long rate;
>
> /* for suspend/resume */
> @@ -258,6 +260,11 @@ static struct fsi_master *fsi_get_master(struct fsi_priv *fsi)
> return fsi->master;
> }
>
> +static int fsi_is_clk_master(struct fsi_priv *fsi)
> +{
> + return fsi->clk_master;
> +}
> +
> static int fsi_is_port_a(struct fsi_priv *fsi)
> {
> return fsi->master->base == fsi->base;
> @@ -807,14 +814,15 @@ static void fsi_dai_shutdown(struct snd_pcm_substream *substream,
> struct fsi_priv *fsi = fsi_get_priv(substream);
> int is_play = fsi_is_play(substream);
> struct fsi_master *master = fsi_get_master(fsi);
> - set_rate_func set_rate;
> + set_rate_func set_rate = fsi_get_info_set_rate(master);
>
> fsi_irq_disable(fsi, is_play);
> - fsi_clk_ctrl(fsi, 0);
>
> - set_rate = fsi_get_info_set_rate(master);
> - if (set_rate && fsi->rate)
> + if (fsi_is_clk_master(fsi)) {
> + fsi_clk_ctrl(fsi, 0);
> set_rate(dai->dev, fsi_is_port_a(fsi), fsi->rate, 0);
> + }
> +
> fsi->rate = 0;
>
> pm_runtime_put_sync(dai->dev);
> @@ -890,6 +898,8 @@ static int fsi_set_fmt_spdif(struct fsi_priv *fsi)
> static int fsi_dai_set_fmt(struct snd_soc_dai *dai, unsigned int fmt)
> {
> struct fsi_priv *fsi = fsi_get_priv_frm_dai(dai);
> + struct fsi_master *master = fsi_get_master(fsi);
> + set_rate_func set_rate = fsi_get_info_set_rate(master);
> u32 flags = fsi_get_info_flags(fsi);
> u32 data = 0;
> int ret;
> @@ -900,6 +910,7 @@ static int fsi_dai_set_fmt(struct snd_soc_dai *dai, unsigned int fmt)
> switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) {
> case SND_SOC_DAIFMT_CBM_CFM:
> data = DIMD | DOMD;
> + fsi->clk_master = 1;
> break;
> case SND_SOC_DAIFMT_CBS_CFS:
> break;
> @@ -907,6 +918,13 @@ static int fsi_dai_set_fmt(struct snd_soc_dai *dai, unsigned int fmt)
> ret = -EINVAL;
> goto set_fmt_exit;
> }
> +
> + if (fsi_is_clk_master(fsi) && !set_rate) {
> + dev_err(dai->dev, "platform doesn't have set_rate\n");
> + ret = -EINVAL;
> + goto set_fmt_exit;
> + }
> +
> fsi_reg_mask_set(fsi, CKG1, (DIMD | DOMD), data);
>
> /* set format */
> @@ -933,13 +951,12 @@ static int fsi_dai_hw_params(struct snd_pcm_substream *substream,
> {
> struct fsi_priv *fsi = fsi_get_priv(substream);
> struct fsi_master *master = fsi_get_master(fsi);
> - set_rate_func set_rate;
> + set_rate_func set_rate = fsi_get_info_set_rate(master);
> int fsi_ver = master->core->ver;
> long rate = params_rate(params);
> int ret;
>
> - set_rate = fsi_get_info_set_rate(master);
> - if (!set_rate)
> + if (!fsi_is_clk_master(fsi))
> return 0;
>
> ret = set_rate(dai->dev, fsi_is_port_a(fsi), rate, 1);
> --
> 1.7.1
>
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 0/2] ASoC: sh: fsi: Add module/port control
2011-04-19 6:54 [PATCH 0/2] ASoC: sh: fsi: Add module/port control Kuninori Morimoto
2011-04-19 6:54 ` [PATCH 1/2] ASoC: sh: fsi: add fsi_is_clk_master function Kuninori Morimoto
2011-04-19 6:54 ` [PATCH 2/2] ASoC: sh: fsi: Add module/port control function Kuninori Morimoto
@ 2011-04-20 11:11 ` Liam Girdwood
2 siblings, 0 replies; 6+ messages in thread
From: Liam Girdwood @ 2011-04-20 11:11 UTC (permalink / raw)
To: Kuninori Morimoto; +Cc: yoshii, Linux-ALSA, Mark Brown, Magnus, Simon
On Tue, 2011-04-19 at 15:54 +0900, Kuninori Morimoto wrote:
> Dear Mark, Liam
>
> Cc Magnus, Simon, yoshii-san
>
> These patches control FSI module/port power.
>
> Kuninori Morimoto:
> ASoC: sh: fsi: add fsi_is_clk_master function
> ASoC: sh: fsi: Add module/port control function
>
> The FIFO of each port were always working even though
> it was not used in current FSI driver.
>
> 2nd patch add module/port control functions.
>
> >> Mark
>
> these patches are depend on my
> [PATCH] ASoC: fsi: add dev_pm_ops :: suspend/resume
>
These do look fine, but as mentioned please do add some more text to the
commit messages.
Acked-by: Liam Girdwood <lrg@ti.com>
Liam
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 1/2] ASoC: sh: fsi: add fsi_is_clk_master function
2011-04-19 6:54 ` [PATCH 1/2] ASoC: sh: fsi: add fsi_is_clk_master function Kuninori Morimoto
2011-04-19 23:34 ` Simon Horman
@ 2011-04-20 13:00 ` Mark Brown
1 sibling, 0 replies; 6+ messages in thread
From: Mark Brown @ 2011-04-20 13:00 UTC (permalink / raw)
To: Kuninori Morimoto; +Cc: yoshii, Linux-ALSA, Simon, Magnus, Liam Girdwood
On Tue, Apr 19, 2011 at 03:54:42PM +0900, Kuninori Morimoto wrote:
> Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Neither of these patches appear to apply against for-2.6.40, please
rebase and resend.
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2011-04-20 13:00 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-04-19 6:54 [PATCH 0/2] ASoC: sh: fsi: Add module/port control Kuninori Morimoto
2011-04-19 6:54 ` [PATCH 1/2] ASoC: sh: fsi: add fsi_is_clk_master function Kuninori Morimoto
2011-04-19 23:34 ` Simon Horman
2011-04-20 13:00 ` Mark Brown
2011-04-19 6:54 ` [PATCH 2/2] ASoC: sh: fsi: Add module/port control function Kuninori Morimoto
2011-04-20 11:11 ` [PATCH 0/2] ASoC: sh: fsi: Add module/port control Liam Girdwood
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox