* [PATCH 0/2] ASoC: fsi: add audio clock calculation
@ 2012-10-31 2:58 Kuninori Morimoto
2012-10-31 2:59 ` [PATCH 1/2] ASoC: fsi: care fsi_hw_start/stop() return value Kuninori Morimoto
2012-10-31 2:59 ` [PATCH 2/2] ASoC: fsi: add master clock control functions Kuninori Morimoto
0 siblings, 2 replies; 9+ messages in thread
From: Kuninori Morimoto @ 2012-10-31 2:58 UTC (permalink / raw)
To: Mark Brown; +Cc: Linux-ALSA, Simon, Liam Girdwood, Kuninori Morimoto
Hi Mark
These patches add audio clock calculation method to FSI driver
Kuninori Morimoto (2):
ASoC: fsi: care fsi_hw_start/stop() return value
ASoC: fsi: add master clock control functions
include/sound/sh_fsi.h | 6 +
sound/soc/sh/fsi.c | 318 ++++++++++++++++++++++++++++++++++++++++++++++--
2 files changed, 313 insertions(+), 11 deletions(-)
Best regards
---
Kuninori Morimoto
^ permalink raw reply [flat|nested] 9+ messages in thread* [PATCH 1/2] ASoC: fsi: care fsi_hw_start/stop() return value 2012-10-31 2:58 [PATCH 0/2] ASoC: fsi: add audio clock calculation Kuninori Morimoto @ 2012-10-31 2:59 ` Kuninori Morimoto 2012-11-01 14:48 ` Mark Brown 2012-10-31 2:59 ` [PATCH 2/2] ASoC: fsi: add master clock control functions Kuninori Morimoto 1 sibling, 1 reply; 9+ messages in thread From: Kuninori Morimoto @ 2012-10-31 2:59 UTC (permalink / raw) To: Mark Brown; +Cc: Linux-ALSA, Simon, Liam Girdwood, Kuninori Morimoto Current FSI driver didn't care fsi_hw_start/stop() return value, and it causes WARNING() call if SNDRV_PCM_TRIGGER_START failed. This patch solved this issue Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> --- sound/soc/sh/fsi.c | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/sound/soc/sh/fsi.c b/sound/soc/sh/fsi.c index e97501b..474b8d3 100644 --- a/sound/soc/sh/fsi.c +++ b/sound/soc/sh/fsi.c @@ -1366,17 +1366,19 @@ static int fsi_hw_startup(struct fsi_priv *fsi, /* start master clock */ if (fsi_is_clk_master(fsi)) - fsi_set_master_clk(dev, fsi, fsi->rate, 1); + return fsi_set_master_clk(dev, fsi, fsi->rate, 1); return 0; } -static void fsi_hw_shutdown(struct fsi_priv *fsi, +static int fsi_hw_shutdown(struct fsi_priv *fsi, struct device *dev) { /* stop master clock */ if (fsi_is_clk_master(fsi)) - fsi_set_master_clk(dev, fsi, fsi->rate, 0); + return fsi_set_master_clk(dev, fsi, fsi->rate, 0); + + return 0; } static int fsi_dai_startup(struct snd_pcm_substream *substream, @@ -1407,13 +1409,16 @@ static int fsi_dai_trigger(struct snd_pcm_substream *substream, int cmd, switch (cmd) { case SNDRV_PCM_TRIGGER_START: fsi_stream_init(fsi, io, substream); - fsi_hw_startup(fsi, io, dai->dev); - ret = fsi_stream_transfer(io); - if (0 == ret) + if (!ret) + ret = fsi_hw_startup(fsi, io, dai->dev); + if (!ret) + ret = fsi_stream_transfer(io); + if (!ret) fsi_stream_start(fsi, io); break; case SNDRV_PCM_TRIGGER_STOP: - fsi_hw_shutdown(fsi, dai->dev); + if (!ret) + ret = fsi_hw_shutdown(fsi, dai->dev); fsi_stream_stop(fsi, io); fsi_stream_quit(fsi, io); break; -- 1.7.9.5 ^ permalink raw reply related [flat|nested] 9+ messages in thread
* Re: [PATCH 1/2] ASoC: fsi: care fsi_hw_start/stop() return value 2012-10-31 2:59 ` [PATCH 1/2] ASoC: fsi: care fsi_hw_start/stop() return value Kuninori Morimoto @ 2012-11-01 14:48 ` Mark Brown 0 siblings, 0 replies; 9+ messages in thread From: Mark Brown @ 2012-11-01 14:48 UTC (permalink / raw) To: Kuninori Morimoto; +Cc: Linux-ALSA, Simon, Liam Girdwood, Kuninori Morimoto [-- Attachment #1.1: Type: text/plain, Size: 248 bytes --] On Tue, Oct 30, 2012 at 07:59:15PM -0700, Kuninori Morimoto wrote: > Current FSI driver didn't care fsi_hw_start/stop() return value, > and it causes WARNING() call if SNDRV_PCM_TRIGGER_START failed. > This patch solved this issue Applied, thanks [-- Attachment #1.2: Digital signature --] [-- Type: application/pgp-signature, Size: 836 bytes --] [-- Attachment #2: Type: text/plain, Size: 0 bytes --] ^ permalink raw reply [flat|nested] 9+ messages in thread
* [PATCH 2/2] ASoC: fsi: add master clock control functions 2012-10-31 2:58 [PATCH 0/2] ASoC: fsi: add audio clock calculation Kuninori Morimoto 2012-10-31 2:59 ` [PATCH 1/2] ASoC: fsi: care fsi_hw_start/stop() return value Kuninori Morimoto @ 2012-10-31 2:59 ` Kuninori Morimoto 2012-11-01 14:47 ` Mark Brown 1 sibling, 1 reply; 9+ messages in thread From: Kuninori Morimoto @ 2012-10-31 2:59 UTC (permalink / raw) To: Mark Brown; +Cc: Linux-ALSA, Simon, Liam Girdwood, Kuninori Morimoto Current FSI driver needed set_rate() platform callback function to set audio clock if it was master mode, because it seems that calculation of CPG/FSI-DIV clocks depend on platform/board/cpu. But it is calculable regardless of platform. This patch supports audio clock calculation method, but the sampling rate under 32kHz is not supported at this point. Old type set_rate() is still supported now, but it will be deleted on next version Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> --- include/sound/sh_fsi.h | 6 + sound/soc/sh/fsi.c | 299 +++++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 301 insertions(+), 4 deletions(-) diff --git a/include/sound/sh_fsi.h b/include/sound/sh_fsi.h index 9060103..27ee1dc 100644 --- a/include/sound/sh_fsi.h +++ b/include/sound/sh_fsi.h @@ -26,6 +26,7 @@ * A: inversion * B: format mode * C: chip specific + * D: clock selecter if master mode */ /* A: clock inversion */ @@ -44,6 +45,11 @@ #define SH_FSI_OPTION_MASK 0x00000F00 #define SH_FSI_ENABLE_STREAM_MODE (1 << 8) /* for 16bit data */ +/* D: clock selecter if master mode */ +#define SH_FSI_CLK_MASK 0x0000F000 +#define SH_FSI_CLK_EXTERNAL (1 << 12) +#define SH_FSI_CLK_CPG (2 << 12) /* FSIxCK + FSI-DIV */ + /* * set_rate return value * diff --git a/sound/soc/sh/fsi.c b/sound/soc/sh/fsi.c index 474b8d3..b1c43ee 100644 --- a/sound/soc/sh/fsi.c +++ b/sound/soc/sh/fsi.c @@ -11,7 +11,6 @@ * it under the terms of the GNU General Public License version 2 as * published by the Free Software Foundation. */ - #include <linux/delay.h> #include <linux/dma-mapping.h> #include <linux/pm_runtime.h> @@ -22,6 +21,7 @@ #include <linux/module.h> #include <linux/workqueue.h> #include <sound/soc.h> +#include <sound/pcm_params.h> #include <sound/sh_fsi.h> /* PortA/PortB register */ @@ -243,6 +243,7 @@ struct fsi_priv { int spdif:1; long rate; + int (*set_rate)(struct device *dev, struct fsi_priv *fsi, int enable); }; struct fsi_stream_handler { @@ -747,12 +748,289 @@ static void fsi_spdif_clk_ctrl(struct fsi_priv *fsi, int enable) /* * clock function */ +static int fsi_clk_gets(struct device *dev, + struct fsi_priv *fsi, + struct clk **xck, + struct clk **ick, + struct clk **div) +{ + struct clk *own; + + own = clk_get(dev, NULL); + if (IS_ERR(own)) + return -EINVAL; + + if (xck) { + *xck = clk_get(NULL, fsi_is_port_a(fsi) ? "fsiack" : "fsibck"); + if (IS_ERR(*xck)) { + dev_err(dev, "can't get fsixck clock\n"); + return -EINVAL; + } + } + + if (ick) { + *ick = clk_get(dev, fsi_is_port_a(fsi) ? "icka" : "ickb"); + if (IS_ERR(*ick)) { + dev_err(dev, "can't get fsi ickx clock\n"); + return -EINVAL; + } + + if (own == *ick) { + dev_err(dev, "cpu doesn't support fsi ick clock\n"); + return -EIO; + } + } + + if (div) { + *div = clk_get(dev, fsi_is_port_a(fsi) ? "diva" : "divb"); + if (IS_ERR(*div)) { + dev_err(dev, "can't get fsi div clock\n"); + return -EINVAL; + } + + if (own == *div) { + dev_err(dev, "cpu doens't support fsi div clock\n"); + return -EIO; + } + } + + return 0; +} + +static int fsi_clk_set_ackbpf(struct device *dev, + struct fsi_priv *fsi, + int ackmd, int bpfmd) +{ + u32 data = 0; + + /* check ackmd/bpfmd relationship */ + if (bpfmd > ackmd) { + dev_err(dev, "unsupported rate (%d/%d)\n", ackmd, bpfmd); + return -EINVAL; + } + + /* ACKMD */ + switch (ackmd) { + case 512: + data |= (0x0 << 12); + break; + case 256: + data |= (0x1 << 12); + break; + case 128: + data |= (0x2 << 12); + break; + case 64: + data |= (0x3 << 12); + break; + case 32: + data |= (0x4 << 12); + break; + default: + dev_err(dev, "unsupported ackmd (%d)\n", ackmd); + return -EINVAL; + } + + /* BPFMD */ + switch (bpfmd) { + case 32: + data |= (0x0 << 8); + break; + case 64: + data |= (0x1 << 8); + break; + case 128: + data |= (0x2 << 8); + break; + case 256: + data |= (0x3 << 8); + break; + case 512: + data |= (0x4 << 8); + break; + case 16: + data |= (0x7 << 8); + break; + default: + dev_err(dev, "unsupported bpfmd (%d)\n", bpfmd); + return -EINVAL; + } + + dev_dbg(dev, "ACKMD/BPFMD = %d/%d\n", ackmd, bpfmd); + + fsi_reg_mask_set(fsi, CKG1, (ACKMD_MASK | BPFMD_MASK) , data); + udelay(10); + + return 0; +} + +static int fsi_clk_set_rate_external(struct device *dev, + struct fsi_priv *fsi, + int enable) +{ + struct clk *xck, *ick; + int ret = 0; + + ret = fsi_clk_gets(dev, fsi, &xck, &ick, NULL); + if (ret < 0) { + dev_err(dev, "clk gets failed\n"); + return ret; + } + + if (enable) { + clk_disable(ick); + } else { + unsigned long rate = fsi->rate; + unsigned long xrate; + int ackmd, bpfmd; + + /* check clock rate */ + xrate = clk_get_rate(xck); + if (xrate % rate) { + dev_err(dev, "unsupported clock rate\n"); + return -EINVAL; + } + + clk_set_parent(ick, xck); + clk_set_rate(ick, xrate); + + bpfmd = fsi->chan_num * 32; + ackmd = xrate / rate; + + dev_dbg(dev, "external/rate = %ld/%ld\n", xrate, rate); + + ret = fsi_clk_set_ackbpf(dev, fsi, ackmd, bpfmd); + if (ret < 0) { + dev_err(dev, "%s failed", __func__); + return ret; + } + + clk_enable(ick); + } + + return ret; +} + +static int fsi_clk_set_rate_cpg(struct device *dev, + struct fsi_priv *fsi, + int enable) +{ + struct clk *ick, *div; + int ret = 0; + + ret = fsi_clk_gets(dev, fsi, NULL, &ick, &div); + if (ret < 0) { + dev_err(dev, "clk gets failed\n"); + return ret; + } + + if (!enable) { + clk_disable(div); + clk_disable(ick); + } else { + unsigned long rate = fsi->rate; + unsigned long target = 0; /* 12288000 or 11289600 */ + unsigned long actual, cout; + unsigned long diff, min; + unsigned long best_cout, best_act; + int adj; + int ackmd, bpfmd; + + if (!(12288000 % rate)) + target = 12288000; + if (!(11289600 % rate)) + target = 11289600; + if (!target) { + dev_err(dev, "unsupported rate\n"); + return ret; + } + + bpfmd = fsi->chan_num * 32; + ackmd = target / rate; + ret = fsi_clk_set_ackbpf(dev, fsi, ackmd, bpfmd); + if (ret < 0) { + dev_err(dev, "%s failed", __func__); + return ret; + } + + /* + * The clock flow is + * + * [CPG] = cout => [FSI_DIV] = audio => [FSI] => [codec] + * + * But, it needs to find best match of CPG and FSI_DIV + * combination, since it is difficult to generate correct + * frequency of audio clock from ick clock only. + * Because ick is created from its parent clock. + * + * target = rate x [512/256/128/64]fs + * cout = round(target x adjustment) + * actual = cout / adjustment (by FSI-DIV) ~= target + * audio = actual + */ + min = ~0; + best_cout = 0; + best_act = 0; + for (adj = 1; adj < 0xffff; adj++) { + + cout = target * adj; + if (cout > 100000000) /* max clock = 100MHz */ + break; + + /* cout/actual audio clock */ + cout = clk_round_rate(ick, cout); + actual = cout / adj; + + /* find best frequency */ + diff = abs(actual - target); + if (diff < min) { + min = diff; + best_cout = cout; + best_act = actual; + } + } + + ret = clk_set_rate(ick, best_cout); + if (ret < 0) { + dev_err(dev, "ick clock failed\n"); + return -EIO; + } + + ret = clk_set_rate(div, clk_round_rate(div, best_act)); + if (ret < 0) { + dev_err(dev, "div clock failed\n"); + return -EIO; + } + + dev_dbg(dev, "ick/div = %ld/%ld\n", + clk_get_rate(ick), clk_get_rate(div)); + + clk_enable(ick); + clk_enable(div); + } + + return ret; +} + static int fsi_set_master_clk(struct device *dev, struct fsi_priv *fsi, long rate, int enable) { set_rate_func set_rate = fsi_get_info_set_rate(fsi); int ret; + if (fsi->set_rate && fsi->rate) { + ret = fsi->set_rate(dev, fsi, enable); + if (ret < 0) { + fsi->rate = 0; + return ret; + } + } + + /* + * CAUTION + * + * set_rate will be deleted + */ if (!set_rate) return 0; @@ -1477,9 +1755,22 @@ static int fsi_dai_set_fmt(struct snd_soc_dai *dai, unsigned int fmt) return -EINVAL; } - if (fsi_is_clk_master(fsi) && !set_rate) { - dev_err(dai->dev, "platform doesn't have set_rate\n"); - return -EINVAL; + if (fsi_is_clk_master(fsi)) { + /* CAUTION + * + * set_rate will be deleted + */ + if (set_rate) + dev_warn(dai->dev, "set_rate will be removed soon\n"); + + switch (flags & SH_FSI_CLK_MASK) { + case SH_FSI_CLK_EXTERNAL: + fsi->set_rate = fsi_clk_set_rate_external; + break; + case SH_FSI_CLK_CPG: + fsi->set_rate = fsi_clk_set_rate_cpg; + break; + } } /* set format */ -- 1.7.9.5 ^ permalink raw reply related [flat|nested] 9+ messages in thread
* Re: [PATCH 2/2] ASoC: fsi: add master clock control functions 2012-10-31 2:59 ` [PATCH 2/2] ASoC: fsi: add master clock control functions Kuninori Morimoto @ 2012-11-01 14:47 ` Mark Brown 2012-11-05 1:05 ` Kuninori Morimoto 0 siblings, 1 reply; 9+ messages in thread From: Mark Brown @ 2012-11-01 14:47 UTC (permalink / raw) To: Kuninori Morimoto; +Cc: Linux-ALSA, Simon, Liam Girdwood, Kuninori Morimoto [-- Attachment #1.1: Type: text/plain, Size: 1060 bytes --] On Tue, Oct 30, 2012 at 07:59:45PM -0700, Kuninori Morimoto wrote: > + own = clk_get(dev, NULL); > + if (IS_ERR(own)) > + return -EINVAL; Any reason not to use devm_clk_get()? > + if (xck) { > + *xck = clk_get(NULL, fsi_is_port_a(fsi) ? "fsiack" : "fsibck"); > + if (IS_ERR(*xck)) { > + dev_err(dev, "can't get fsixck clock\n"); > + return -EINVAL; > + } > + } This looks wrong - I would expect the driver to be requesting the clock with some fixed name and the struct device. The platform should remap this onto the appropriate underlying clock using clkdev or something. > +static int fsi_clk_set_rate_external(struct device *dev, > + struct fsi_priv *fsi, > + int enable) > +{ > + struct clk *xck, *ick; > + int ret = 0; > + > + ret = fsi_clk_gets(dev, fsi, &xck, &ick, NULL); > + if (ret < 0) { > + dev_err(dev, "clk gets failed\n"); > + return ret; > + } > + > + if (enable) { > + clk_disable(ick); Are we sure that calls to this function are always balanced so that calls to clk_enable() and clk_disable() are balanced? [-- Attachment #1.2: Digital signature --] [-- Type: application/pgp-signature, Size: 836 bytes --] [-- Attachment #2: Type: text/plain, Size: 0 bytes --] ^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH 2/2] ASoC: fsi: add master clock control functions 2012-11-01 14:47 ` Mark Brown @ 2012-11-05 1:05 ` Kuninori Morimoto 2012-11-05 8:03 ` Mark Brown 0 siblings, 1 reply; 9+ messages in thread From: Kuninori Morimoto @ 2012-11-05 1:05 UTC (permalink / raw) To: Mark Brown; +Cc: Linux-ALSA, Simon, Liam Girdwood, Kuninori Morimoto Hi Mark Thank you for checking this patch > > + own = clk_get(dev, NULL); > > + if (IS_ERR(own)) > > + return -EINVAL; > > Any reason not to use devm_clk_get()? Ahh yes, Sorry. BTW, currect code calls this function many times now, (this clk is local variable now) then should I use... 1) use devm_clk_get() / devm_clk_put() pair 2) use clk_get() / clk_put() pair 3) keep these clocks under private date (struct fsi_prive) and use devm_clk_get() only _probe timing. > > + if (xck) { > > + *xck = clk_get(NULL, fsi_is_port_a(fsi) ? "fsiack" : "fsibck"); > > + if (IS_ERR(*xck)) { > > + dev_err(dev, "can't get fsixck clock\n"); > > + return -EINVAL; > > + } > > + } > > This looks wrong - I would expect the driver to be requesting the clock > with some fixed name and the struct device. The platform should remap > this onto the appropriate underlying clock using clkdev or something. I see. I will fix in v2. > > +static int fsi_clk_set_rate_external(struct device *dev, > > + struct fsi_priv *fsi, > > + int enable) > > +{ > > + struct clk *xck, *ick; > > + int ret = 0; > > + > > + ret = fsi_clk_gets(dev, fsi, &xck, &ick, NULL); > > + if (ret < 0) { > > + dev_err(dev, "clk gets failed\n"); > > + return ret; > > + } > > + > > + if (enable) { > > + clk_disable(ick); > > Are we sure that calls to this function are always balanced so that > calls to clk_enable() and clk_disable() are balanced? I balanced it by local technic. But I can say it is un-understandable. Can I use counter ? Best regards --- Kuninori Morimoto ^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH 2/2] ASoC: fsi: add master clock control functions 2012-11-05 1:05 ` Kuninori Morimoto @ 2012-11-05 8:03 ` Mark Brown 2012-11-06 2:30 ` [PATCH 2/2 v2] " Kuninori Morimoto 0 siblings, 1 reply; 9+ messages in thread From: Mark Brown @ 2012-11-05 8:03 UTC (permalink / raw) To: Kuninori Morimoto; +Cc: Linux-ALSA, Simon, Liam Girdwood, Kuninori Morimoto [-- Attachment #1.1: Type: text/plain, Size: 1068 bytes --] On Sun, Nov 04, 2012 at 05:05:34PM -0800, Kuninori Morimoto wrote: > > > + own = clk_get(dev, NULL); > > > + if (IS_ERR(own)) > > > + return -EINVAL; > > Any reason not to use devm_clk_get()? > > Ahh yes, Sorry. > BTW, currect code calls this function many times now, > (this clk is local variable now) > then should I use... > 1) use devm_clk_get() / devm_clk_put() pair > 2) use clk_get() / clk_put() pair > 3) keep these clocks under private date (struct fsi_prive) > and use devm_clk_get() only _probe timing. Option 3 is the normal approach here. > > > + if (enable) { > > > + clk_disable(ick); > > Are we sure that calls to this function are always balanced so that > > calls to clk_enable() and clk_disable() are balanced? > I balanced it by local technic. > But I can say it is un-understandable. > Can I use counter ? Well, the whole thing is that the clk_enable() will count too so if you don't make sure the calls are balanced you'll run into issues. I'd add some comments which explain why this is safe. [-- Attachment #1.2: Digital signature --] [-- Type: application/pgp-signature, Size: 836 bytes --] [-- Attachment #2: Type: text/plain, Size: 0 bytes --] ^ permalink raw reply [flat|nested] 9+ messages in thread
* [PATCH 2/2 v2] ASoC: fsi: add master clock control functions 2012-11-05 8:03 ` Mark Brown @ 2012-11-06 2:30 ` Kuninori Morimoto 2012-11-06 8:56 ` Mark Brown 0 siblings, 1 reply; 9+ messages in thread From: Kuninori Morimoto @ 2012-11-06 2:30 UTC (permalink / raw) To: Mark Brown; +Cc: Linux-ALSA, Simon, Liam Girdwood, Kuninori Morimoto Current FSI driver required set_rate() platform callback function to set audio clock if it was master mode, because it seemed that CPG/FSI-DIV clocks calculation depend on platform/board/cpu. But it was calculable regardless of platform. This patch supports audio clock calculation method, but the sampling rate under 32kHz is not supported at this point. Old type set_rate() is still supported now, but it will be deleted on next version Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> --- v1 -> v2 - use devm_clk_get() - add struct fsi_clk - add fsi_clk_enable/disable functions - add clock counter include/sound/sh_fsi.h | 6 + sound/soc/sh/fsi.c | 378 +++++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 378 insertions(+), 6 deletions(-) diff --git a/include/sound/sh_fsi.h b/include/sound/sh_fsi.h index 9060103..27ee1dc 100644 --- a/include/sound/sh_fsi.h +++ b/include/sound/sh_fsi.h @@ -26,6 +26,7 @@ * A: inversion * B: format mode * C: chip specific + * D: clock selecter if master mode */ /* A: clock inversion */ @@ -44,6 +45,11 @@ #define SH_FSI_OPTION_MASK 0x00000F00 #define SH_FSI_ENABLE_STREAM_MODE (1 << 8) /* for 16bit data */ +/* D: clock selecter if master mode */ +#define SH_FSI_CLK_MASK 0x0000F000 +#define SH_FSI_CLK_EXTERNAL (1 << 12) +#define SH_FSI_CLK_CPG (2 << 12) /* FSIxCK + FSI-DIV */ + /* * set_rate return value * diff --git a/sound/soc/sh/fsi.c b/sound/soc/sh/fsi.c index ab58375..4a10e4d 100644 --- a/sound/soc/sh/fsi.c +++ b/sound/soc/sh/fsi.c @@ -22,6 +22,7 @@ #include <linux/module.h> #include <linux/workqueue.h> #include <sound/soc.h> +#include <sound/pcm_params.h> #include <sound/sh_fsi.h> /* PortA/PortB register */ @@ -189,6 +190,14 @@ typedef int (*set_rate_func)(struct device *dev, int rate, int enable); */ /* + * FSI clock + * + * FSIxCLK [CPG] (ick) -------> | + * |-> FSI_DIV (div)-> FSI2 + * FSIxCK [external] (xck) ---> | + */ + +/* * struct */ @@ -228,6 +237,20 @@ struct fsi_stream { dma_addr_t dma; }; +struct fsi_clk { + /* see [FSI clock] */ + struct clk *own; + struct clk *xck; + struct clk *ick; + struct clk *div; + int (*set_rate)(struct device *dev, + struct fsi_priv *fsi, + unsigned long rate); + + unsigned long rate; + unsigned int count; +}; + struct fsi_priv { void __iomem *base; struct fsi_master *master; @@ -236,6 +259,8 @@ struct fsi_priv { struct fsi_stream playback; struct fsi_stream capture; + struct fsi_clk clock; + u32 fmt; int chan_num:16; @@ -717,14 +742,335 @@ static void fsi_spdif_clk_ctrl(struct fsi_priv *fsi, int enable) /* * clock function */ +static int fsi_clk_init(struct device *dev, + struct fsi_priv *fsi, + int xck, + int ick, + int div, + int (*set_rate)(struct device *dev, + struct fsi_priv *fsi, + unsigned long rate)) +{ + struct fsi_clk *clock = &fsi->clock; + int is_porta = fsi_is_port_a(fsi); + + clock->xck = NULL; + clock->ick = NULL; + clock->div = NULL; + clock->rate = 0; + clock->count = 0; + clock->set_rate = set_rate; + + clock->own = devm_clk_get(dev, NULL); + if (IS_ERR(clock->own)) + return -EINVAL; + + /* external clock */ + if (xck) { + clock->xck = devm_clk_get(dev, is_porta ? "xcka" : "xckb"); + if (IS_ERR(clock->xck)) { + dev_err(dev, "can't get xck clock\n"); + return -EINVAL; + } + if (clock->xck == clock->own) { + dev_err(dev, "cpu doesn't support xck clock\n"); + return -EINVAL; + } + } + + /* FSIACLK/FSIBCLK */ + if (ick) { + clock->ick = devm_clk_get(dev, is_porta ? "icka" : "ickb"); + if (IS_ERR(clock->ick)) { + dev_err(dev, "can't get ick clock\n"); + return -EINVAL; + } + if (clock->ick == clock->own) { + dev_err(dev, "cpu doesn't support ick clock\n"); + return -EINVAL; + } + } + + /* FSI-DIV */ + if (div) { + clock->div = devm_clk_get(dev, is_porta ? "diva" : "divb"); + if (IS_ERR(clock->div)) { + dev_err(dev, "can't get div clock\n"); + return -EINVAL; + } + if (clock->div == clock->own) { + dev_err(dev, "cpu doens't support div clock\n"); + return -EINVAL; + } + } + + return 0; +} + +#define fsi_clk_invalid(fsi) fsi_clk_valid(fsi, 0) +static void fsi_clk_valid(struct fsi_priv *fsi, unsigned long rate) +{ + fsi->clock.rate = rate; +} + +static int fsi_clk_is_valid(struct fsi_priv *fsi) +{ + return fsi->clock.set_rate && + fsi->clock.rate; +} + +static int fsi_clk_enable(struct device *dev, + struct fsi_priv *fsi, + unsigned long rate) +{ + struct fsi_clk *clock = &fsi->clock; + int ret = -EINVAL; + + if (!fsi_clk_is_valid(fsi)) + return ret; + + if (0 == clock->count) { + ret = clock->set_rate(dev, fsi, rate); + if (ret < 0) { + fsi_clk_invalid(fsi); + return ret; + } + + if (clock->xck) + clk_enable(clock->xck); + if (clock->ick) + clk_enable(clock->ick); + if (clock->div) + clk_enable(clock->div); + + clock->count++; + } + + return ret; +} + +static int fsi_clk_disable(struct device *dev, + struct fsi_priv *fsi) +{ + struct fsi_clk *clock = &fsi->clock; + + if (!fsi_clk_is_valid(fsi)) + return -EINVAL; + + if (1 == clock->count--) { + if (clock->xck) + clk_disable(clock->xck); + if (clock->ick) + clk_disable(clock->ick); + if (clock->div) + clk_disable(clock->div); + } + + return 0; +} + +static int fsi_clk_set_ackbpf(struct device *dev, + struct fsi_priv *fsi, + int ackmd, int bpfmd) +{ + u32 data = 0; + + /* check ackmd/bpfmd relationship */ + if (bpfmd > ackmd) { + dev_err(dev, "unsupported rate (%d/%d)\n", ackmd, bpfmd); + return -EINVAL; + } + + /* ACKMD */ + switch (ackmd) { + case 512: + data |= (0x0 << 12); + break; + case 256: + data |= (0x1 << 12); + break; + case 128: + data |= (0x2 << 12); + break; + case 64: + data |= (0x3 << 12); + break; + case 32: + data |= (0x4 << 12); + break; + default: + dev_err(dev, "unsupported ackmd (%d)\n", ackmd); + return -EINVAL; + } + + /* BPFMD */ + switch (bpfmd) { + case 32: + data |= (0x0 << 8); + break; + case 64: + data |= (0x1 << 8); + break; + case 128: + data |= (0x2 << 8); + break; + case 256: + data |= (0x3 << 8); + break; + case 512: + data |= (0x4 << 8); + break; + case 16: + data |= (0x7 << 8); + break; + default: + dev_err(dev, "unsupported bpfmd (%d)\n", bpfmd); + return -EINVAL; + } + + dev_dbg(dev, "ACKMD/BPFMD = %d/%d\n", ackmd, bpfmd); + + fsi_reg_mask_set(fsi, CKG1, (ACKMD_MASK | BPFMD_MASK) , data); + udelay(10); + + return 0; +} + +static int fsi_clk_set_rate_external(struct device *dev, + struct fsi_priv *fsi, + unsigned long rate) +{ + struct clk *xck = fsi->clock.xck; + struct clk *ick = fsi->clock.ick; + unsigned long xrate; + int ackmd, bpfmd; + int ret = 0; + + /* check clock rate */ + xrate = clk_get_rate(xck); + if (xrate % rate) { + dev_err(dev, "unsupported clock rate\n"); + return -EINVAL; + } + + clk_set_parent(ick, xck); + clk_set_rate(ick, xrate); + + bpfmd = fsi->chan_num * 32; + ackmd = xrate / rate; + + dev_dbg(dev, "external/rate = %ld/%ld\n", xrate, rate); + + ret = fsi_clk_set_ackbpf(dev, fsi, ackmd, bpfmd); + if (ret < 0) + dev_err(dev, "%s failed", __func__); + + return ret; +} + +static int fsi_clk_set_rate_cpg(struct device *dev, + struct fsi_priv *fsi, + unsigned long rate) +{ + struct clk *ick = fsi->clock.ick; + struct clk *div = fsi->clock.div; + unsigned long target = 0; /* 12288000 or 11289600 */ + unsigned long actual, cout; + unsigned long diff, min; + unsigned long best_cout, best_act; + int adj; + int ackmd, bpfmd; + int ret = -EINVAL; + + if (!(12288000 % rate)) + target = 12288000; + if (!(11289600 % rate)) + target = 11289600; + if (!target) { + dev_err(dev, "unsupported rate\n"); + return ret; + } + + bpfmd = fsi->chan_num * 32; + ackmd = target / rate; + ret = fsi_clk_set_ackbpf(dev, fsi, ackmd, bpfmd); + if (ret < 0) { + dev_err(dev, "%s failed", __func__); + return ret; + } + + /* + * The clock flow is + * + * [CPG] = cout => [FSI_DIV] = audio => [FSI] => [codec] + * + * But, it needs to find best match of CPG and FSI_DIV + * combination, since it is difficult to generate correct + * frequency of audio clock from ick clock only. + * Because ick is created from its parent clock. + * + * target = rate x [512/256/128/64]fs + * cout = round(target x adjustment) + * actual = cout / adjustment (by FSI-DIV) ~= target + * audio = actual + */ + min = ~0; + best_cout = 0; + best_act = 0; + for (adj = 1; adj < 0xffff; adj++) { + + cout = target * adj; + if (cout > 100000000) /* max clock = 100MHz */ + break; + + /* cout/actual audio clock */ + cout = clk_round_rate(ick, cout); + actual = cout / adj; + + /* find best frequency */ + diff = abs(actual - target); + if (diff < min) { + min = diff; + best_cout = cout; + best_act = actual; + } + } + + ret = clk_set_rate(ick, best_cout); + if (ret < 0) { + dev_err(dev, "ick clock failed\n"); + return -EIO; + } + + ret = clk_set_rate(div, clk_round_rate(div, best_act)); + if (ret < 0) { + dev_err(dev, "div clock failed\n"); + return -EIO; + } + + dev_dbg(dev, "ick/div = %ld/%ld\n", + clk_get_rate(ick), clk_get_rate(div)); + + return ret; +} + static int fsi_set_master_clk(struct device *dev, struct fsi_priv *fsi, long rate, int enable) { set_rate_func set_rate = fsi_get_info_set_rate(fsi); int ret; - if (!set_rate) - return 0; + /* + * CAUTION + * + * set_rate will be deleted + */ + if (!set_rate) { + if (enable) + return fsi_clk_enable(dev, fsi, rate); + else + return fsi_clk_disable(dev, fsi); + } ret = set_rate(dev, rate, enable); if (ret < 0) /* error */ @@ -1356,6 +1702,7 @@ static int fsi_dai_startup(struct snd_pcm_substream *substream, { struct fsi_priv *fsi = fsi_get_priv(substream); + fsi_clk_invalid(fsi); fsi->rate = 0; return 0; @@ -1366,6 +1713,7 @@ static void fsi_dai_shutdown(struct snd_pcm_substream *substream, { struct fsi_priv *fsi = fsi_get_priv(substream); + fsi_clk_invalid(fsi); fsi->rate = 0; } @@ -1447,9 +1795,25 @@ static int fsi_dai_set_fmt(struct snd_soc_dai *dai, unsigned int fmt) return -EINVAL; } - if (fsi_is_clk_master(fsi) && !set_rate) { - dev_err(dai->dev, "platform doesn't have set_rate\n"); - return -EINVAL; + if (fsi_is_clk_master(fsi)) { + /* + * CAUTION + * + * set_rate will be deleted + */ + if (set_rate) + dev_warn(dai->dev, "set_rate will be removed soon\n"); + + switch (flags & SH_FSI_CLK_MASK) { + case SH_FSI_CLK_EXTERNAL: + fsi_clk_init(dai->dev, fsi, 1, 1, 0, + fsi_clk_set_rate_external); + break; + case SH_FSI_CLK_CPG: + fsi_clk_init(dai->dev, fsi, 0, 1, 1, + fsi_clk_set_rate_cpg); + break; + } } /* set format */ @@ -1473,8 +1837,10 @@ static int fsi_dai_hw_params(struct snd_pcm_substream *substream, { struct fsi_priv *fsi = fsi_get_priv(substream); - if (fsi_is_clk_master(fsi)) + if (fsi_is_clk_master(fsi)) { fsi->rate = params_rate(params); + fsi_clk_valid(fsi, fsi->rate); + } return 0; } -- 1.7.9.5 ^ permalink raw reply related [flat|nested] 9+ messages in thread
* Re: [PATCH 2/2 v2] ASoC: fsi: add master clock control functions 2012-11-06 2:30 ` [PATCH 2/2 v2] " Kuninori Morimoto @ 2012-11-06 8:56 ` Mark Brown 0 siblings, 0 replies; 9+ messages in thread From: Mark Brown @ 2012-11-06 8:56 UTC (permalink / raw) To: Kuninori Morimoto; +Cc: Linux-ALSA, Simon, Liam Girdwood, Kuninori Morimoto [-- Attachment #1.1: Type: text/plain, Size: 285 bytes --] On Mon, Nov 05, 2012 at 06:30:38PM -0800, Kuninori Morimoto wrote: > Current FSI driver required set_rate() platform callback function > to set audio clock if it was master mode, > because it seemed that CPG/FSI-DIV clocks calculation depend on > platform/board/cpu. Applied, thanks. [-- Attachment #1.2: Digital signature --] [-- Type: application/pgp-signature, Size: 836 bytes --] [-- Attachment #2: Type: text/plain, Size: 0 bytes --] ^ permalink raw reply [flat|nested] 9+ messages in thread
end of thread, other threads:[~2012-11-06 8:56 UTC | newest] Thread overview: 9+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2012-10-31 2:58 [PATCH 0/2] ASoC: fsi: add audio clock calculation Kuninori Morimoto 2012-10-31 2:59 ` [PATCH 1/2] ASoC: fsi: care fsi_hw_start/stop() return value Kuninori Morimoto 2012-11-01 14:48 ` Mark Brown 2012-10-31 2:59 ` [PATCH 2/2] ASoC: fsi: add master clock control functions Kuninori Morimoto 2012-11-01 14:47 ` Mark Brown 2012-11-05 1:05 ` Kuninori Morimoto 2012-11-05 8:03 ` Mark Brown 2012-11-06 2:30 ` [PATCH 2/2 v2] " Kuninori Morimoto 2012-11-06 8:56 ` Mark Brown
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.