From: Peter Griffin <peter.griffin@linaro.org>
To: linux-arm-kernel@lists.infradead.org,
linux-kernel@vger.kernel.org, srinivas.kandagatla@gmail.com,
maxime.coquelin@st.com, patrice.chotard@st.com,
vinod.koul@intel.com
Cc: peter.griffin@linaro.org, lee.jones@linaro.org,
dmaengine@vger.kernel.org, devicetree@vger.kernel.org,
arnd@arndb.de, broonie@kernel.org, ludovic.barre@st.com,
arnaud.pouliquen@st.com
Subject: [PATCH 10/18] ASoC: sti: Update example to include assigned-clocks and mclk-fs
Date: Thu, 21 Apr 2016 12:04:27 +0100 [thread overview]
Message-ID: <1461236675-10176-11-git-send-email-peter.griffin@linaro.org> (raw)
In-Reply-To: <1461236675-10176-1-git-send-email-peter.griffin@linaro.org>
Update the examples, as otherwise driver errors with an incorrect
mclk ratio at runtime.
Signed-off-by: Peter Griffin <peter.griffin@linaro.org>
Cc: arnaud.pouliquen@st.com
---
Documentation/devicetree/bindings/sound/st,sti-asoc-card.txt | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/Documentation/devicetree/bindings/sound/st,sti-asoc-card.txt b/Documentation/devicetree/bindings/sound/st,sti-asoc-card.txt
index ef2e0c6..e6ef96a8 100644
--- a/Documentation/devicetree/bindings/sound/st,sti-asoc-card.txt
+++ b/Documentation/devicetree/bindings/sound/st,sti-asoc-card.txt
@@ -62,6 +62,9 @@ Example:
#sound-dai-cells = <0>;
st,syscfg = <&syscfg_core>;
clocks = <&clk_s_d0_flexgen CLK_PCM_2>;
+ assigned-clocks = <&clk_s_d0_flexgen CLK_PCM_2>;
+ assigned-clock-parents = <&clk_s_d0_quadfs 2>;
+ assigned-clock-rates = <50000000>;
reg = <0x8D82000 0x158>;
interrupts = <GIC_SPI 86 IRQ_TYPE_NONE>;
dmas = <&fdma0 4 0 1>;
@@ -78,6 +81,9 @@ Example:
#sound-dai-cells = <0>;
st,syscfg = <&syscfg_core>;
clocks = <&clk_s_d0_flexgen CLK_SPDIFF>;
+ assigned-clocks = <&clk_s_d0_flexgen CLK_SPDIFF>;
+ assigned-clock-parents = <&clk_s_d0_quadfs 3>;
+ assigned-clock-rates = <50000000>;
reg = <0x8D85000 0x158>;
interrupts = <GIC_SPI 89 IRQ_TYPE_NONE>;
dmas = <&fdma0 7 0 1>;
@@ -133,6 +139,7 @@ Example of audio card declaration:
/* DAC */
format = "i2s";
dai-tdm-slot-width = <32>;
+ mclk-fs = <256>;
cpu {
sound-dai = <&sti_uni_player2>;
};
@@ -144,6 +151,7 @@ Example of audio card declaration:
simple-audio-card,dai-link@1 {
/* SPDIF */
format = "left_j";
+ mclk-fs = <128>;
cpu {
sound-dai = <&sti_uni_player3>;
};
--
1.9.1
next prev parent reply other threads:[~2016-04-21 11:04 UTC|newest]
Thread overview: 53+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-04-21 11:04 [PATCH 00/18] Add support for FDMA DMA controller found on STi chipsets Peter Griffin
2016-04-21 11:04 ` [PATCH 01/18] dmaengine: st_fdma: Add STMicroelectronics FDMA DT binding documentation Peter Griffin
[not found] ` <1461236675-10176-2-git-send-email-peter.griffin-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>
2016-04-21 11:25 ` Arnd Bergmann
2016-04-26 12:00 ` Peter Griffin
2016-04-21 11:04 ` [PATCH 02/18] dmaengine: st_fdma: Add STMicroelectronics FDMA driver header file Peter Griffin
[not found] ` <1461236675-10176-3-git-send-email-peter.griffin-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>
2016-04-21 11:20 ` Arnd Bergmann
2016-04-21 11:04 ` [PATCH 03/18] dmaengine: st_fdma: Add STMicroelectronics FDMA engine driver support Peter Griffin
2016-04-21 11:24 ` Arnd Bergmann
2016-04-21 11:26 ` Appana Durga Kedareswara Rao
[not found] ` <C246CAC1457055469EF09E3A7AC4E11A4A57989B-4lKfpRxZ5enZMOc0yg5rMog+Gb3gawCHQz34XiSyOiE@public.gmane.org>
2016-04-21 14:58 ` Peter Griffin
2016-04-25 9:04 ` Lee Jones
2016-04-26 16:56 ` Vinod Koul
2016-04-27 12:59 ` Peter Griffin
2016-05-02 9:30 ` Vinod Koul
2016-05-09 17:30 ` Peter Griffin
2016-04-21 11:04 ` [PATCH 04/18] dmaengine: st_fdma: Add xp70 firmware loading mechanism Peter Griffin
[not found] ` <1461236675-10176-5-git-send-email-peter.griffin-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>
2016-04-26 17:00 ` Vinod Koul
2016-05-11 7:57 ` Peter Griffin
2016-05-12 5:40 ` Vinod Koul
2016-04-21 11:04 ` [PATCH 05/18] dmaengine: st_fdma: Add fdma suspend and resume callbacks Peter Griffin
2016-04-21 11:04 ` [PATCH 06/18] ARM: STi: DT: STiH407: Add FDMA driver dt nodes Peter Griffin
[not found] ` <1461236675-10176-1-git-send-email-peter.griffin-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>
2016-04-21 11:04 ` [PATCH 07/18] MAINTAINERS: Add FDMA driver files to STi section Peter Griffin
2016-04-21 11:04 ` [PATCH 08/18] ARM: multi_v7_defconfig: Enable STi FDMA driver Peter Griffin
2016-04-21 11:25 ` Arnd Bergmann
2016-04-26 10:42 ` Peter Griffin
2016-04-21 11:04 ` [PATCH 09/18] ASoC: sti: Update DT example to match the driver code Peter Griffin
2016-04-21 11:27 ` Arnd Bergmann
2016-04-26 10:11 ` Peter Griffin
2016-04-26 10:58 ` Arnd Bergmann
2016-04-26 11:15 ` Peter Griffin
2016-04-26 11:44 ` Arnd Bergmann
2016-05-04 7:52 ` Arnaud Pouliquen
2016-05-04 9:05 ` Arnd Bergmann
[not found] ` <1461236675-10176-10-git-send-email-peter.griffin-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>
2016-04-21 15:57 ` Mark Brown
[not found] ` <20160421155753.GS3217-GFdadSzt00ze9xe1eoZjHA@public.gmane.org>
2016-04-26 11:02 ` Peter Griffin
2016-05-03 15:46 ` Arnaud Pouliquen
2016-04-21 11:04 ` Peter Griffin [this message]
[not found] ` <1461236675-10176-11-git-send-email-peter.griffin-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>
2016-04-21 15:49 ` [PATCH 10/18] ASoC: sti: Update example to include assigned-clocks and mclk-fs Mark Brown
[not found] ` <20160421154933.GR3217-GFdadSzt00ze9xe1eoZjHA@public.gmane.org>
2016-04-26 11:52 ` Peter Griffin
2016-04-26 14:23 ` Mark Brown
2016-04-26 14:51 ` Peter Griffin
2016-04-26 15:03 ` Mark Brown
[not found] ` <20160426150319.GY3217-GFdadSzt00ze9xe1eoZjHA@public.gmane.org>
2016-04-26 16:14 ` Peter Griffin
2016-04-26 16:41 ` Mark Brown
[not found] ` <20160426164104.GC3217-GFdadSzt00ze9xe1eoZjHA@public.gmane.org>
2016-04-26 17:49 ` Peter Griffin
2016-04-21 11:04 ` [PATCH 11/18] ARM: multi_v7_defconfig: Enable STi and simple-card drivers Peter Griffin
2016-04-21 11:04 ` [PATCH 12/18] ARM: DT: STiH407: Add i2s_out pinctrl configuration Peter Griffin
2016-04-21 11:04 ` [PATCH 13/18] ARM: DT: STiH407: Add i2s_in " Peter Griffin
2016-04-21 11:04 ` [PATCH 14/18] ARM: DT: STiH407: Add spdif_out pinctrl config Peter Griffin
2016-04-21 11:04 ` [PATCH 15/18] ARM: STi: DT: STiH407: Add sti-sasg-codec dt node Peter Griffin
2016-04-21 11:04 ` [PATCH 16/18] ARM: STi: DT: STiH407: Add uniperif player dt nodes Peter Griffin
2016-04-21 11:04 ` [PATCH 17/18] ARM: STi: DT: STiH407: Add uniperif reader " Peter Griffin
2016-04-21 11:04 ` [PATCH 18/18] ARM: DT: STi: stihxxx-b2120: Add DT nodes for STi audio card Peter Griffin
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=1461236675-10176-11-git-send-email-peter.griffin@linaro.org \
--to=peter.griffin@linaro.org \
--cc=arnaud.pouliquen@st.com \
--cc=arnd@arndb.de \
--cc=broonie@kernel.org \
--cc=devicetree@vger.kernel.org \
--cc=dmaengine@vger.kernel.org \
--cc=lee.jones@linaro.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=ludovic.barre@st.com \
--cc=maxime.coquelin@st.com \
--cc=patrice.chotard@st.com \
--cc=srinivas.kandagatla@gmail.com \
--cc=vinod.koul@intel.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: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).