Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1407046

[PATCH v4 10/18] ASoC: sti: Update DT example to match the driver code

Show all headers | View raw

uniperiph-id, version and mode are ST specific bindings and
need the 'st,' prefix. Update the examples, as otherwise copying
them yields a runtime error parsing the DT node.

Signed-off-by: Peter Griffin <peter.griffin@linaro.org>
Cc: arnaud.pouliquen@st.com
Cc: broonie@kernel.org
---
 .../devicetree/bindings/sound/st,sti-asoc-card.txt   | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/Documentation/devicetree/bindings/sound/st,sti-asoc-card.txt b/Documentation/devicetree/bindings/sound/st,sti-asoc-card.txt
index 028fa1c..fe1b72c 100644
--- a/Documentation/devicetree/bindings/sound/st,sti-asoc-card.txt
+++ b/Documentation/devicetree/bindings/sound/st,sti-asoc-card.txt
@@ -33,7 +33,7 @@ Required properties:
 	"tx" for "st,sti-uni-player" compatibility
 	"rx" for "st,sti-uni-reader" compatibility
 
-  - version: IP version integrated in SOC.
+  - st,version: IP version integrated in SOC.
 
   - dai-name: DAI name that describes the IP.
 
@@ -41,9 +41,9 @@ Required properties ("st,sti-uni-player" compatibility only):
   - clocks: CPU_DAI IP clock source, listed in the same order than the
 	    CPU_DAI properties.
 
-  - uniperiph-id: internal SOC IP instance ID.
+  - st,uniperiph-id: internal SOC IP instance ID.
 
-  - IP mode: IP working mode depending on associated codec.
+  - st,mode: IP working mode depending on associated codec.
 	"HDMI" connected to HDMI codec IP and IEC HDMI formats.
 	"SPDIF"connected to SPDIF codec and support SPDIF formats.
 	"PCM"  PCM standard mode for I2S or TDM bus.
@@ -67,9 +67,9 @@ Example:
 		dmas = <&fdma0 4 0 1>;
 		dai-name = "Uni Player #1 (DAC)";
 		dma-names = "tx";
-		uniperiph-id = <2>;
-		version = <5>;
-		mode = "PCM";
+		st,uniperiph-id = <2>;
+		st,version = <5>;
+		st,mode = "PCM";
 	};
 
 	sti_uni_player3: sti-uni-player@3 {
@@ -83,9 +83,9 @@ Example:
 		dmas = <&fdma0 7 0 1>;
 		dma-names = "tx";
 		dai-name = "Uni Player #1 (PIO)";
-		uniperiph-id = <3>;
-		version = <5>;
-		mode = "SPDIF";
+		st,uniperiph-id = <3>;
+		st,version = <5>;
+		st,mode = "SPDIF";
 	};
 
 	sti_uni_reader1: sti-uni-reader@1 {
@@ -98,7 +98,7 @@ Example:
 		dmas = <&fdma0 6 0 1>;
 		dma-names = "rx";
 		dai-name = "Uni Reader #1 (HDMI RX)";
-		version = <3>;
+		st,version = <3>;
 	};
 
 2) sti-sas-codec: internal audio codec IPs driver
-- 
1.9.1

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH 00/18]  Add support for FDMA DMA controller and xp70 rproc found on STi chipsets Peter Griffin <peter.griffin@linaro.org> - 2016-05-25 18:10 +0200
  [PATCH v4 18/18] ARM: DT: STi: stihxxx-b2120: Add DT nodes for STi audio card Peter Griffin <peter.griffin@linaro.org> - 2016-05-25 18:10 +0200
  [PATCH v4 17/18] ARM: STi: DT: STiH407: Add uniperif reader dt nodes Peter Griffin <peter.griffin@linaro.org> - 2016-05-25 18:10 +0200
  [PATCH v4 09/18] ARM: multi_v7_defconfig: Enable STi FDMA driver Peter Griffin <peter.griffin@linaro.org> - 2016-05-25 18:20 +0200
  [PATCH v4 04/18] dmaengine: st_fdma: Add STMicroelectronics FDMA DT binding documentation Peter Griffin <peter.griffin@linaro.org> - 2016-05-25 18:20 +0200
    Re: [PATCH v4 04/18] dmaengine: st_fdma: Add STMicroelectronics FDMA  DT binding documentation Rob Herring <robh@kernel.org> - 2016-05-27 17:50 +0200
  [PATCH v4 08/18] MAINTAINERS: Add FDMA driver files to STi section. Peter Griffin <peter.griffin@linaro.org> - 2016-05-25 18:20 +0200
  [PATCH v4 06/18] dmaengine: st_fdma: Add STMicroelectronics FDMA engine driver support Peter Griffin <peter.griffin@linaro.org> - 2016-05-25 18:20 +0200
    Re: [PATCH v4 06/18] dmaengine: st_fdma: Add STMicroelectronics FDMA  engine driver support Bjorn Andersson <bjorn.andersson@linaro.org> - 2016-05-25 19:30 +0200
  [PATCH v4 10/18] ASoC: sti: Update DT example to match the driver code Peter Griffin <peter.griffin@linaro.org> - 2016-05-25 18:20 +0200
    Re: [PATCH v4 10/18] ASoC: sti: Update DT example to match the  driver code Rob Herring <robh@kernel.org> - 2016-05-27 17:50 +0200
    Re: [PATCH v4 10/18] ASoC: sti: Update DT example to match the  driver code Mark Brown <broonie@kernel.org> - 2016-05-27 19:20 +0200
  [PATCH v4 02/18] ARM: multi_v7_defconfig: enable st xp70 rproc driver. Peter Griffin <peter.griffin@linaro.org> - 2016-05-25 18:20 +0200
  [PATCH v4 05/18] dmaengine: st_fdma: Add STMicroelectronics FDMA driver header file Peter Griffin <peter.griffin@linaro.org> - 2016-05-25 18:20 +0200
  [PATCH v4 01/18] remoteproc: st_xp70_rproc: add a xp70 slimcore rproc driver Peter Griffin <peter.griffin@linaro.org> - 2016-05-25 18:20 +0200
    Re: [PATCH v4 01/18] remoteproc: st_xp70_rproc: add a xp70 slimcore  rproc driver Bjorn Andersson <bjorn.andersson@linaro.org> - 2016-05-25 19:20 +0200
    Re: [PATCH v4 01/18] remoteproc: st_xp70_rproc: add a xp70 slimcore  rproc driver Patrice Chotard <patrice.chotard@st.com> - 2016-05-27 15:20 +0200
      Re: [PATCH v4 01/18] remoteproc: st_xp70_rproc: add a xp70 slimcore  rproc driver Peter Griffin <peter.griffin@linaro.org> - 2016-05-27 18:20 +0200

csiph-web