From: Jyri Sarha <jsarha@ti.com> To: linux-arm-kernel@lists.infradead.org, linux-omap@vger.kernel.org, alsa-devel@alsa-project.org, dri-devel@lists.freedesktop.org, broonie@kernel.org Cc: peter.ujfalusi@ti.com, detheridge@ti.com, Jyri Sarha <jsarha@ti.com> Subject: [PATCH RFC v3 3/8] ASoC: davinci-mcasp: Set BCLK divider if McASP is BCLK master Date: Mon, 27 Jan 2014 17:37:52 +0200 [thread overview] Message-ID: <27d041ee149081cd9b401939d4382e73fba5e7a5.1390836773.git.jsarha@ti.com> (raw) In-Reply-To: <cover.1390836773.git.jsarha@ti.com> Make BCLK divider setting implicite in hw_params call if McASP device is the bit clock master on the audio serial bus. Signed-off-by: Jyri Sarha <jsarha@ti.com> --- sound/soc/davinci/davinci-mcasp.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/sound/soc/davinci/davinci-mcasp.c b/sound/soc/davinci/davinci-mcasp.c index b7858bf..ae328be 100644 --- a/sound/soc/davinci/davinci-mcasp.c +++ b/sound/soc/davinci/davinci-mcasp.c @@ -53,6 +53,9 @@ struct davinci_mcasp { u16 bclk_lrclk_ratio; int streams; + int sysclk_freq; + bool bclk_master; + /* McASP FIFO related */ u8 txnumevt; u8 rxnumevt; @@ -292,6 +295,7 @@ static int davinci_mcasp_set_dai_fmt(struct snd_soc_dai *cpu_dai, mcasp_set_bits(mcasp, DAVINCI_MCASP_PDIR_REG, ACLKX | ACLKR); mcasp_set_bits(mcasp, DAVINCI_MCASP_PDIR_REG, AFSX | AFSR); + mcasp->bclk_master = 1; break; case SND_SOC_DAIFMT_CBM_CFS: /* codec is clock master and frame slave */ @@ -303,6 +307,7 @@ static int davinci_mcasp_set_dai_fmt(struct snd_soc_dai *cpu_dai, mcasp_clr_bits(mcasp, DAVINCI_MCASP_PDIR_REG, ACLKX | ACLKR); mcasp_set_bits(mcasp, DAVINCI_MCASP_PDIR_REG, AFSX | AFSR); + mcasp->bclk_master = 0; break; case SND_SOC_DAIFMT_CBM_CFM: /* codec is clock and frame master */ @@ -314,6 +319,7 @@ static int davinci_mcasp_set_dai_fmt(struct snd_soc_dai *cpu_dai, mcasp_clr_bits(mcasp, DAVINCI_MCASP_PDIR_REG, ACLKX | AHCLKX | AFSX | ACLKR | AHCLKR | AFSR); + mcasp->bclk_master = 0; break; default: @@ -405,6 +411,8 @@ static int davinci_mcasp_set_sysclk(struct snd_soc_dai *dai, int clk_id, mcasp_clr_bits(mcasp, DAVINCI_MCASP_PDIR_REG, AHCLKX); } + mcasp->sysclk_freq = freq; + return 0; } @@ -607,6 +615,18 @@ static int davinci_mcasp_hw_params(struct snd_pcm_substream *substream, int channels; struct snd_interval *pcm_channels = hw_param_interval(params, SNDRV_PCM_HW_PARAM_CHANNELS); + + /* If mcasp is BCLK master we need to set BCLK divider */ + if (mcasp->bclk_master) { + unsigned int bclk_freq = snd_soc_params_to_bclk(params); + if (mcasp->sysclk_freq % bclk_freq != 0) { + dev_err(mcasp->dev, "Can't produce requred BCLK\n"); + return -EINVAL; + } + davinci_mcasp_set_clkdiv( + cpu_dai, 1, mcasp->sysclk_freq / bclk_freq); + } + channels = pcm_channels->min; active_serializers = (channels + slots - 1) / slots; -- 1.7.9.5
WARNING: multiple messages have this Message-ID (diff)
From: jsarha@ti.com (Jyri Sarha) To: linux-arm-kernel@lists.infradead.org Subject: [PATCH RFC v3 3/8] ASoC: davinci-mcasp: Set BCLK divider if McASP is BCLK master Date: Mon, 27 Jan 2014 17:37:52 +0200 [thread overview] Message-ID: <27d041ee149081cd9b401939d4382e73fba5e7a5.1390836773.git.jsarha@ti.com> (raw) In-Reply-To: <cover.1390836773.git.jsarha@ti.com> Make BCLK divider setting implicite in hw_params call if McASP device is the bit clock master on the audio serial bus. Signed-off-by: Jyri Sarha <jsarha@ti.com> --- sound/soc/davinci/davinci-mcasp.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/sound/soc/davinci/davinci-mcasp.c b/sound/soc/davinci/davinci-mcasp.c index b7858bf..ae328be 100644 --- a/sound/soc/davinci/davinci-mcasp.c +++ b/sound/soc/davinci/davinci-mcasp.c @@ -53,6 +53,9 @@ struct davinci_mcasp { u16 bclk_lrclk_ratio; int streams; + int sysclk_freq; + bool bclk_master; + /* McASP FIFO related */ u8 txnumevt; u8 rxnumevt; @@ -292,6 +295,7 @@ static int davinci_mcasp_set_dai_fmt(struct snd_soc_dai *cpu_dai, mcasp_set_bits(mcasp, DAVINCI_MCASP_PDIR_REG, ACLKX | ACLKR); mcasp_set_bits(mcasp, DAVINCI_MCASP_PDIR_REG, AFSX | AFSR); + mcasp->bclk_master = 1; break; case SND_SOC_DAIFMT_CBM_CFS: /* codec is clock master and frame slave */ @@ -303,6 +307,7 @@ static int davinci_mcasp_set_dai_fmt(struct snd_soc_dai *cpu_dai, mcasp_clr_bits(mcasp, DAVINCI_MCASP_PDIR_REG, ACLKX | ACLKR); mcasp_set_bits(mcasp, DAVINCI_MCASP_PDIR_REG, AFSX | AFSR); + mcasp->bclk_master = 0; break; case SND_SOC_DAIFMT_CBM_CFM: /* codec is clock and frame master */ @@ -314,6 +319,7 @@ static int davinci_mcasp_set_dai_fmt(struct snd_soc_dai *cpu_dai, mcasp_clr_bits(mcasp, DAVINCI_MCASP_PDIR_REG, ACLKX | AHCLKX | AFSX | ACLKR | AHCLKR | AFSR); + mcasp->bclk_master = 0; break; default: @@ -405,6 +411,8 @@ static int davinci_mcasp_set_sysclk(struct snd_soc_dai *dai, int clk_id, mcasp_clr_bits(mcasp, DAVINCI_MCASP_PDIR_REG, AHCLKX); } + mcasp->sysclk_freq = freq; + return 0; } @@ -607,6 +615,18 @@ static int davinci_mcasp_hw_params(struct snd_pcm_substream *substream, int channels; struct snd_interval *pcm_channels = hw_param_interval(params, SNDRV_PCM_HW_PARAM_CHANNELS); + + /* If mcasp is BCLK master we need to set BCLK divider */ + if (mcasp->bclk_master) { + unsigned int bclk_freq = snd_soc_params_to_bclk(params); + if (mcasp->sysclk_freq % bclk_freq != 0) { + dev_err(mcasp->dev, "Can't produce requred BCLK\n"); + return -EINVAL; + } + davinci_mcasp_set_clkdiv( + cpu_dai, 1, mcasp->sysclk_freq / bclk_freq); + } + channels = pcm_channels->min; active_serializers = (channels + slots - 1) / slots; -- 1.7.9.5
next prev parent reply other threads:[~2014-01-27 15:38 UTC|newest] Thread overview: 46+ messages / expand[flat|nested] mbox.gz Atom feed top 2014-01-27 15:37 [PATCH RFC v3 0/8] Beaglebone-Black HDMI audio Jyri Sarha 2014-01-27 15:37 ` Jyri Sarha 2014-01-27 15:37 ` [PATCH RFC v3 1/8] clk: add gpio controlled clock Jyri Sarha 2014-01-27 15:37 ` Jyri Sarha 2014-01-27 15:37 ` [PATCH RFC v3 2/8] ASoC: davinci-evm: Add named clock reference to DT bindings Jyri Sarha 2014-01-27 15:37 ` Jyri Sarha 2014-01-27 18:10 ` Mark Brown 2014-01-27 18:10 ` Mark Brown 2014-01-27 15:37 ` Jyri Sarha [this message] 2014-01-27 15:37 ` [PATCH RFC v3 3/8] ASoC: davinci-mcasp: Set BCLK divider if McASP is BCLK master Jyri Sarha 2014-01-27 20:46 ` Mark Brown 2014-01-27 20:46 ` Mark Brown 2014-01-27 15:37 ` [PATCH RFC v3 4/8] ASoC: davinci-evm: HDMI audio support for TDA998x trough McASP I2S bus Jyri Sarha 2014-01-27 15:37 ` Jyri Sarha 2014-01-27 20:49 ` Mark Brown 2014-01-27 20:49 ` Mark Brown 2014-01-28 7:47 ` Jyri Sarha 2014-01-28 7:47 ` Jyri Sarha 2014-01-27 15:37 ` [PATCH RFC v3 5/8] ASoC: davinci: HDMI audio build for AM33XX and TDA998x Jyri Sarha 2014-01-27 15:37 ` Jyri Sarha 2014-01-27 15:37 ` [PATCH RFC v3 6/8] drm/tilcdc: Add I2C HDMI audio config for tda998x Jyri Sarha 2014-01-27 15:37 ` Jyri Sarha 2014-01-27 15:37 ` [PATCH RFC v3 7/8] ARM: OMAP2+: omap2plus_defconfig: Enable tilcdc and TDA998X HDMI support Jyri Sarha 2014-01-27 15:37 ` Jyri Sarha 2014-01-27 15:37 ` [PATCH RFC v3 8/8] ARM: OMAP2+: omap2plus_defconfig: Enable BeagleBone Black HDMI audio support Jyri Sarha 2014-01-27 15:37 ` Jyri Sarha 2014-01-27 15:51 ` [PATCH RFC v3 0/8] Beaglebone-Black HDMI audio Lars-Peter Clausen 2014-01-27 15:51 ` [alsa-devel] " Lars-Peter Clausen 2014-01-27 16:17 ` Jyri Sarha 2014-01-27 16:17 ` [alsa-devel] " Jyri Sarha 2014-01-27 16:32 ` Lars-Peter Clausen 2014-01-27 16:32 ` Lars-Peter Clausen 2014-01-27 19:40 ` Jyri Sarha 2014-01-27 19:40 ` [alsa-devel] " Jyri Sarha 2014-01-27 19:47 ` Lars-Peter Clausen 2014-01-27 19:47 ` Lars-Peter Clausen 2014-01-27 18:06 ` Jean-Francois Moine 2014-01-27 18:06 ` Jean-Francois Moine 2014-01-27 19:31 ` Jyri Sarha 2014-01-27 19:31 ` [alsa-devel] " Jyri Sarha 2014-01-28 9:23 ` Jean-Francois Moine 2014-01-28 9:23 ` Jean-Francois Moine 2014-01-30 12:20 ` Jyri Sarha 2014-01-30 12:20 ` [alsa-devel] " Jyri Sarha 2014-01-30 18:00 ` Jean-Francois Moine 2014-01-30 18:00 ` Jean-Francois Moine
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=27d041ee149081cd9b401939d4382e73fba5e7a5.1390836773.git.jsarha@ti.com \ --to=jsarha@ti.com \ --cc=alsa-devel@alsa-project.org \ --cc=broonie@kernel.org \ --cc=detheridge@ti.com \ --cc=dri-devel@lists.freedesktop.org \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-omap@vger.kernel.org \ --cc=peter.ujfalusi@ti.com \ /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: linkBe 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.