Skip to contentSkip to conversation

ASoC: fsl ssi doc: Move 'fsl, ssi-asynchronous' to the optional section

PATCH Superseded Fabio Estevam 2 participants 3 messages Apr 12, 2017

Subsystems (2)

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 ASoC: fsl ssi doc: Move 'fsl, ssi-asynchronous' to the optional section

Property 'fsl,ssi-asynchronous' is optional, so move it to the optional section of the document.

---
 Documentation/devicetree/bindings/sound/fsl,ssi.txt | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)
Documentation/devicetree/bindings/sound/fsl,ssi.txt +10 -10
index 5b76be4..1d292d7 100644
@@ -28,16 +28,6 @@ Required properties:
                     by SOC design.  See the notes below.
 - fsl,fifo-depth:   The number of elements in the transmit and receive FIFOs.
                     This number is the maximum allowed value for SFCSR[TFWM0].
-- fsl,ssi-asynchronous:
-                    If specified, the SSI is to be programmed in asynchronous
-                    mode.  In this mode, pins SRCK, STCK, SRFS, and STFS must
-                    all be connected to valid signals.  In synchronous mode,
-                    SRCK and SRFS are ignored.  Asynchronous mode allows
-                    playback and capture to use different sample sizes and
-                    sample rates.  Some drivers may require that SRCK and STCK
-                    be connected together, and SRFS and STFS be connected
-                    together.  This would still allow different sample sizes,
-                    but not different sample rates.
  - clocks:          "ipg" - Required clock for the SSI unit
                     "baud" - Required clock for SSI master mode. Otherwise this
 		      clock is not used
@@ -61,6 +51,16 @@ Optional properties:
 - fsl,mode:         The operating mode for the AC97 interface only.
                     "ac97-slave" - AC97 mode, SSI is clock slave
                     "ac97-master" - AC97 mode, SSI is clock master
+- fsl,ssi-asynchronous:
+                    If specified, the SSI is to be programmed in asynchronous
+                    mode.  In this mode, pins SRCK, STCK, SRFS, and STFS must
+                    all be connected to valid signals.  In synchronous mode,
+                    SRCK and SRFS are ignored.  Asynchronous mode allows
+                    playback and capture to use different sample sizes and
+                    sample rates.  Some drivers may require that SRCK and STCK
+                    be connected together, and SRFS and STFS be connected
+                    together.  This would still allow different sample sizes,
+                    but not different sample rates.
 
 Child 'codec' node required properties:
 - compatible:       Compatible list, contains the name of the codec
Signature · 1 line
2.7.4
#1 lore raw

PATCH 2/2 ASoC: fsl ssi doc: Move playback/capture dma properties to the optional section

Properties 'fsl,playback-dma' and 'fsl,capture-dma' are optional, so move them to the optional section of the document.

While at it mention that they only apply to Power Architecture.

---
 Documentation/devicetree/bindings/sound/fsl,ssi.txt | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)
Documentation/devicetree/bindings/sound/fsl,ssi.txt +8 -6
index 1d292d7..d593902 100644
@@ -20,12 +20,6 @@ Required properties:
                     have.
 - interrupt-parent: The phandle for the interrupt controller that
                     services interrupts for this device.
-- fsl,playback-dma: Phandle to a node for the DMA channel to use for
-                    playback of audio.  This is typically dictated by SOC
-                    design.  See the notes below.
-- fsl,capture-dma:  Phandle to a node for the DMA channel to use for
-                    capture (recording) of audio.  This is typically dictated
-                    by SOC design.  See the notes below.
 - fsl,fifo-depth:   The number of elements in the transmit and receive FIFOs.
                     This number is the maximum allowed value for SFCSR[TFWM0].
  - clocks:          "ipg" - Required clock for the SSI unit
@@ -61,6 +55,14 @@ Optional properties:
                     be connected together, and SRFS and STFS be connected
                     together.  This would still allow different sample sizes,
                     but not different sample rates.
+- fsl,playback-dma: Phandle to a node for the DMA channel to use for
+                    playback of audio.  This is typically dictated by SOC
+                    design.  See the notes below.
+		    Only used on Power Architecture.
+- fsl,capture-dma:  Phandle to a node for the DMA channel to use for
+                    capture (recording) of audio.  This is typically dictated
+                    by SOC design.  See the notes below.
+		    Only used on Power Architecture.
 
 Child 'codec' node required properties:
 - compatible:       Compatible list, contains the name of the codec
Signature · 1 line
2.7.4
#2 lore raw

Re: [PATCH 2/2] ASoC: fsl ssi doc: Move playback/capture dma properties to the optional section

Documentation/devicetree/bindings/sound/fsl,ssi.txt Optional properties: · line 61

Quoted 4 lines · Fabio Estevam

+- fsl,playback-dma: Phandle to a node for the DMA channel to use for

Documentation/devicetree/bindings/sound/fsl,ssi.txt +3 -0
+                    playback of audio.  This is typically dictated by SOC
+                    design.  See the notes below.
+		    Only used on Power Architecture.

Looks like you have an indentation problem.

Also, I think you should combine these two patches into one.