From: Michael Walle <michael@walle.cc> To: spujar@nvidia.com Cc: alsa-devel@alsa-project.org, broonie@kernel.org, devicetree@vger.kernel.org, jonathanh@nvidia.com, kuninori.morimoto.gx@renesas.com, linux-kernel@vger.kernel.org, linux-tegra@vger.kernel.org, robh@kernel.org, sharadg@nvidia.com, thierry.reding@gmail.com Subject: [PATCH 1/3] ASoC: simple-card-utils: Fix device module clock Date: Tue, 9 Mar 2021 15:41:56 +0100 [thread overview] Message-ID: <20210309144156.18887-1-michael@walle.cc> (raw) In-Reply-To: <1612939421-19900-2-git-send-email-spujar@nvidia.com> Hi, > If "clocks = <&xxx>" is specified from the CPU or Codec component > device node, the clock is not getting enabled. Thus audio playback > or capture fails. > > Fix this by populating "simple_dai->clk" field when clocks property > is specified from device node as well. Also tidy up by re-organising > conditional statements of parsing logic. > > Fixes: bb6fc620c2ed ("ASoC: simple-card-utils: add asoc_simple_card_parse_clk()") > Cc: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> > Signed-off-by: Sameer Pujar <spujar@nvidia.com> This actually breaks sound on my board (arch/arm64/boot/dts/freescale/fsl-ls1028a-kontron-sl28-var3-ads2.dts). The codec on this board (wm8904) has a fixed clock input (only distinct frequencies are supported) and uses the FLL of the codec to generate the desired sample rate. It seems that after this patch the clock rate of the codecs clock (rather than the FLL) is tried to be changed. Which fails, because it doesn't support arbitrary frequencies. -michael > --- > sound/soc/generic/simple-card-utils.c | 13 ++++++------- > 1 file changed, 6 insertions(+), 7 deletions(-) > > diff --git a/sound/soc/generic/simple-card-utils.c b/sound/soc/generic/simple-card-utils.c > index bc0b62e..0754d70 100644 > --- a/sound/soc/generic/simple-card-utils.c > +++ b/sound/soc/generic/simple-card-utils.c > @@ -173,16 +173,15 @@ int asoc_simple_parse_clk(struct device *dev, > * or device's module clock. > */ > clk = devm_get_clk_from_child(dev, node, NULL); > - if (!IS_ERR(clk)) { > - simple_dai->sysclk = clk_get_rate(clk); > + if (IS_ERR(clk)) > + clk = devm_get_clk_from_child(dev, dlc->of_node, NULL); > > + if (!IS_ERR(clk)) { > simple_dai->clk = clk; > - } else if (!of_property_read_u32(node, "system-clock-frequency", &val)) { > + simple_dai->sysclk = clk_get_rate(clk); > + } else if (!of_property_read_u32(node, "system-clock-frequency", > + &val)) { > simple_dai->sysclk = val; > - } else { > - clk = devm_get_clk_from_child(dev, dlc->of_node, NULL); > - if (!IS_ERR(clk)) > - simple_dai->sysclk = clk_get_rate(clk); > } > > if (of_property_read_bool(node, "system-clock-direction-out")) > -- > 2.7.4 > >
WARNING: multiple messages have this Message-ID (diff)
From: Michael Walle <michael@walle.cc> To: spujar@nvidia.com Cc: devicetree@vger.kernel.org, alsa-devel@alsa-project.org, kuninori.morimoto.gx@renesas.com, robh@kernel.org, linux-kernel@vger.kernel.org, jonathanh@nvidia.com, sharadg@nvidia.com, broonie@kernel.org, thierry.reding@gmail.com, linux-tegra@vger.kernel.org Subject: [PATCH 1/3] ASoC: simple-card-utils: Fix device module clock Date: Tue, 9 Mar 2021 15:41:56 +0100 [thread overview] Message-ID: <20210309144156.18887-1-michael@walle.cc> (raw) In-Reply-To: <1612939421-19900-2-git-send-email-spujar@nvidia.com> Hi, > If "clocks = <&xxx>" is specified from the CPU or Codec component > device node, the clock is not getting enabled. Thus audio playback > or capture fails. > > Fix this by populating "simple_dai->clk" field when clocks property > is specified from device node as well. Also tidy up by re-organising > conditional statements of parsing logic. > > Fixes: bb6fc620c2ed ("ASoC: simple-card-utils: add asoc_simple_card_parse_clk()") > Cc: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> > Signed-off-by: Sameer Pujar <spujar@nvidia.com> This actually breaks sound on my board (arch/arm64/boot/dts/freescale/fsl-ls1028a-kontron-sl28-var3-ads2.dts). The codec on this board (wm8904) has a fixed clock input (only distinct frequencies are supported) and uses the FLL of the codec to generate the desired sample rate. It seems that after this patch the clock rate of the codecs clock (rather than the FLL) is tried to be changed. Which fails, because it doesn't support arbitrary frequencies. -michael > --- > sound/soc/generic/simple-card-utils.c | 13 ++++++------- > 1 file changed, 6 insertions(+), 7 deletions(-) > > diff --git a/sound/soc/generic/simple-card-utils.c b/sound/soc/generic/simple-card-utils.c > index bc0b62e..0754d70 100644 > --- a/sound/soc/generic/simple-card-utils.c > +++ b/sound/soc/generic/simple-card-utils.c > @@ -173,16 +173,15 @@ int asoc_simple_parse_clk(struct device *dev, > * or device's module clock. > */ > clk = devm_get_clk_from_child(dev, node, NULL); > - if (!IS_ERR(clk)) { > - simple_dai->sysclk = clk_get_rate(clk); > + if (IS_ERR(clk)) > + clk = devm_get_clk_from_child(dev, dlc->of_node, NULL); > > + if (!IS_ERR(clk)) { > simple_dai->clk = clk; > - } else if (!of_property_read_u32(node, "system-clock-frequency", &val)) { > + simple_dai->sysclk = clk_get_rate(clk); > + } else if (!of_property_read_u32(node, "system-clock-frequency", > + &val)) { > simple_dai->sysclk = val; > - } else { > - clk = devm_get_clk_from_child(dev, dlc->of_node, NULL); > - if (!IS_ERR(clk)) > - simple_dai->sysclk = clk_get_rate(clk); > } > > if (of_property_read_bool(node, "system-clock-direction-out")) > -- > 2.7.4 > >
next prev parent reply other threads:[~2021-03-09 14:42 UTC|newest] Thread overview: 74+ messages / expand[flat|nested] mbox.gz Atom feed top 2021-02-10 6:43 [PATCH 0/3] Use clocks property in a device node Sameer Pujar 2021-02-10 6:43 ` Sameer Pujar 2021-02-10 6:43 ` [PATCH 1/3] ASoC: simple-card-utils: Fix device module clock Sameer Pujar 2021-02-10 6:43 ` Sameer Pujar 2021-02-11 23:44 ` Kuninori Morimoto 2021-02-11 23:44 ` Kuninori Morimoto 2021-02-14 17:56 ` Sameer Pujar 2021-02-14 17:56 ` Sameer Pujar 2021-02-14 23:25 ` Kuninori Morimoto 2021-02-14 23:25 ` Kuninori Morimoto 2021-03-09 14:41 ` Michael Walle [this message] 2021-03-09 14:41 ` Michael Walle 2021-03-09 16:27 ` Sameer Pujar 2021-03-09 16:27 ` Sameer Pujar 2021-03-09 22:30 ` Michael Walle 2021-03-09 22:30 ` Michael Walle 2021-03-10 14:50 ` Sameer Pujar 2021-03-10 14:50 ` Sameer Pujar 2021-03-10 18:14 ` Michael Walle 2021-03-10 18:14 ` Michael Walle 2021-03-10 19:19 ` Sameer Pujar 2021-03-10 19:19 ` Sameer Pujar 2021-03-11 10:27 ` Michael Walle 2021-03-11 10:27 ` Michael Walle 2021-03-11 11:05 ` Sameer Pujar 2021-03-11 11:05 ` Sameer Pujar 2021-03-11 11:16 ` Michael Walle 2021-03-11 11:16 ` Michael Walle 2021-03-11 14:29 ` Sameer Pujar 2021-03-11 14:29 ` Sameer Pujar 2021-03-11 15:43 ` Michael Walle 2021-03-11 15:43 ` Michael Walle 2021-03-11 16:41 ` Mark Brown 2021-03-11 16:41 ` Mark Brown 2021-03-11 16:15 ` Mark Brown 2021-03-11 16:15 ` Mark Brown 2021-03-11 22:11 ` Michael Walle 2021-03-11 22:11 ` Michael Walle 2021-03-12 11:35 ` Mark Brown 2021-03-12 11:35 ` Mark Brown 2021-03-12 12:01 ` Michael Walle 2021-03-12 12:01 ` Michael Walle 2021-03-12 12:04 ` Mark Brown 2021-03-12 12:04 ` Mark Brown 2021-03-12 12:30 ` Michael Walle 2021-03-12 12:30 ` Michael Walle 2021-03-12 13:46 ` Mark Brown 2021-03-12 13:46 ` Mark Brown 2021-03-15 12:05 ` Michael Walle 2021-03-15 12:05 ` Michael Walle 2021-03-15 15:19 ` Sameer Pujar 2021-03-15 15:19 ` Sameer Pujar 2021-03-15 15:33 ` Michael Walle 2021-03-15 15:33 ` Michael Walle 2021-03-15 15:57 ` Sameer Pujar 2021-03-15 15:57 ` Sameer Pujar 2021-03-15 15:39 ` Mark Brown 2021-03-15 15:39 ` Mark Brown 2021-03-15 17:10 ` Sameer Pujar 2021-03-15 17:10 ` Sameer Pujar 2021-03-15 17:13 ` Michael Walle 2021-03-15 17:13 ` Michael Walle 2021-03-11 16:00 ` Mark Brown 2021-03-11 16:00 ` Mark Brown 2021-03-11 21:34 ` Michael Walle 2021-03-11 21:34 ` Michael Walle 2021-02-10 6:43 ` [PATCH 2/3] Revert "ASoC: audio-graph-card: Add clocks property to endpoint node" Sameer Pujar 2021-02-10 6:43 ` Sameer Pujar 2021-02-11 13:00 ` Mark Brown 2021-02-11 13:00 ` Mark Brown 2021-02-10 6:43 ` [PATCH 3/3] arm64: tegra: Move clocks from RT5658 endpoint to device node Sameer Pujar 2021-02-10 6:43 ` Sameer Pujar 2021-02-11 15:38 ` [PATCH 0/3] Use clocks property in a " Mark Brown 2021-02-11 15:38 ` 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=20210309144156.18887-1-michael@walle.cc \ --to=michael@walle.cc \ --cc=alsa-devel@alsa-project.org \ --cc=broonie@kernel.org \ --cc=devicetree@vger.kernel.org \ --cc=jonathanh@nvidia.com \ --cc=kuninori.morimoto.gx@renesas.com \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-tegra@vger.kernel.org \ --cc=robh@kernel.org \ --cc=sharadg@nvidia.com \ --cc=spujar@nvidia.com \ --cc=thierry.reding@gmail.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.