[10/18] ASoC: sti: Update example to include assigned-clocks and mclk-fs

Message ID 1461236675-10176-11-git-send-email-peter.griffin@linaro.org
State New
Headers show

Commit Message

Peter Griffin April 21, 2016, 11:04 a.m.
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(+)

-- 
1.9.1

Comments

Mark Brown April 26, 2016, 4:41 p.m. | #1
On Tue, Apr 26, 2016 at 05:14:32PM +0100, Peter Griffin wrote:
> On Tue, 26 Apr 2016, Mark Brown wrote:


> > A lot of this is details of the system integration for this SoC, not

> > actual errors.


> This particular clock patch yes, but the other ASoC dt doc update is fixing

> bindings which haven't progressed in lockstep with the driver code. Presumably

> this happened during the review process when they were changed to being st,

> prefixed in the driver, but the doc wasn't also updated.


The bits where you are correcting the names of the properties are not
details of the system integration and are therefore fine.  The bits
where you're documenting the particular clocking arrangements for the
SoC you happen to be using less so.

> > it's fairly routine

> > to have to explain to people that just because some old driver did

> > something that doesn't mean it's something we want in new drivers.


> I'm sure it is. Although I fail to see why leaving the documentation with

> mistakes in is helpful to anybody.


Fixing actual mistakes is fine.

Patch

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>;
 			};