[alsa-devel] [PATCH 0/5] ARM: shmobile: Sound binding updates
Hi Mark, Liam, Simon, Magnus, Morimoto-san,
THis patch series add SoC-specific binding to the shmobile sound bindings, and updates/cleans up the affected dtsi files.
Patches 1 and 3 are meant for the ASoC tree. Patches 2, 4, 5 and are meant for the shmobile tree.
Thanks!
Geert Uytterhoeven (5): ASoC: sh: fsi: Document SoC-specific bindings ARM: shmobile: sh73a0 dtsi: Add SoC-specific FSI2 compatible property ASoC: rsnd: Document SoC-specific bindings ARM: shmobile: r8a7790 dtsi: Drop "renesas,rcar_sound" compatible value ARM: shmobile: r8a7791 dtsi: Drop "renesas,rcar_sound" compatible value
Documentation/devicetree/bindings/sound/renesas,fsi.txt | 9 +++++++-- Documentation/devicetree/bindings/sound/renesas,rsnd.txt | 10 +++++++--- arch/arm/boot/dts/r8a7790.dtsi | 2 +- arch/arm/boot/dts/r8a7791.dtsi | 2 +- arch/arm/boot/dts/sh73a0.dtsi | 2 +- 5 files changed, 17 insertions(+), 8 deletions(-)
The documentation only mentioned the generic fallback compatible property. Add the missing SoC-specific compatible properties, some of which are already in use.
Also fix a small typo, while we're at it.
Signed-off-by: Geert Uytterhoeven geert+renesas@glider.be --- Documentation/devicetree/bindings/sound/renesas,fsi.txt | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/Documentation/devicetree/bindings/sound/renesas,fsi.txt b/Documentation/devicetree/bindings/sound/renesas,fsi.txt index c5be003f413e3aa3..0d0ab51105b01ece 100644 --- a/Documentation/devicetree/bindings/sound/renesas,fsi.txt +++ b/Documentation/devicetree/bindings/sound/renesas,fsi.txt @@ -1,11 +1,16 @@ Renesas FSI
Required properties: -- compatible : "renesas,sh_fsi2" or "renesas,sh_fsi" +- compatible : "renesas,fsi2-<soctype>", + "renesas,sh_fsi2" or "renesas,sh_fsi" as + fallback. + Examples with soctypes are: + - "renesas,fsi2-r8a7740" (R-Mobile A1) + - "renesas,fsi2-sh73a0" (SH-Mobile AG5) - reg : Should contain the register physical address and length - interrupts : Should contain FSI interrupt
-- fsia,spdif-connection : FSI is connected by S/PDFI +- fsia,spdif-connection : FSI is connected by S/PDIF - fsia,stream-mode-support : FSI supports 16bit stream mode. - fsia,use-internal-clock : FSI uses internal clock when master mode.
On Mon, Nov 10, 2014 at 08:00:40PM +0100, Geert Uytterhoeven wrote:
The documentation only mentioned the generic fallback compatible property. Add the missing SoC-specific compatible properties, some of which are already in use.
Also fix a small typo, while we're at it.
Signed-off-by: Geert Uytterhoeven geert+renesas@glider.be
Acked-by: Simon Horman horms+renesas@verge.net.au
Documentation/devicetree/bindings/sound/renesas,fsi.txt | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/Documentation/devicetree/bindings/sound/renesas,fsi.txt b/Documentation/devicetree/bindings/sound/renesas,fsi.txt index c5be003f413e3aa3..0d0ab51105b01ece 100644 --- a/Documentation/devicetree/bindings/sound/renesas,fsi.txt +++ b/Documentation/devicetree/bindings/sound/renesas,fsi.txt @@ -1,11 +1,16 @@ Renesas FSI
Required properties: -- compatible : "renesas,sh_fsi2" or "renesas,sh_fsi" +- compatible : "renesas,fsi2-<soctype>",
"renesas,sh_fsi2" or "renesas,sh_fsi" asfallback.Examples with soctypes are:- "renesas,fsi2-r8a7740" (R-Mobile A1)- "renesas,fsi2-sh73a0" (SH-Mobile AG5)
- reg : Should contain the register physical address and length
- interrupts : Should contain FSI interrupt
-- fsia,spdif-connection : FSI is connected by S/PDFI +- fsia,spdif-connection : FSI is connected by S/PDIF
- fsia,stream-mode-support : FSI supports 16bit stream mode.
- fsia,use-internal-clock : FSI uses internal clock when master mode.
-- 1.9.1
On Mon, Nov 10, 2014 at 08:00:40PM +0100, Geert Uytterhoeven wrote:
The documentation only mentioned the generic fallback compatible property. Add the missing SoC-specific compatible properties, some of which are already in use.
Applied, thanks.
The FSI2 sound node used the generic compatible property only. Add the SoC-specific one, to make it future proof.
Signed-off-by: Geert Uytterhoeven geert+renesas@glider.be --- arch/arm/boot/dts/sh73a0.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/arm/boot/dts/sh73a0.dtsi b/arch/arm/boot/dts/sh73a0.dtsi index ccb2b2c54d4711c4..f2f39b9dc8afa25f 100644 --- a/arch/arm/boot/dts/sh73a0.dtsi +++ b/arch/arm/boot/dts/sh73a0.dtsi @@ -347,7 +347,7 @@
sh_fsi2: sound@ec230000 { #sound-dai-cells = <1>; - compatible = "renesas,sh_fsi2"; + compatible = "renesas,fsi2-sh73a0", "renesas,sh_fsi2"; reg = <0xec230000 0x400>; interrupts = <0 146 0x4>; status = "disabled";
The documentation only mentioned the generic fallback compatible property. Add the missing SoC-specific compatible properties, which are already in use.
Also drop a bogus 0x unit-address prefix while we're at it.
Signed-off-by: Geert Uytterhoeven geert+renesas@glider.be --- Documentation/devicetree/bindings/sound/renesas,rsnd.txt | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/Documentation/devicetree/bindings/sound/renesas,rsnd.txt b/Documentation/devicetree/bindings/sound/renesas,rsnd.txt index aa697abf337e7aa6..2dd690bc19cc6436 100644 --- a/Documentation/devicetree/bindings/sound/renesas,rsnd.txt +++ b/Documentation/devicetree/bindings/sound/renesas,rsnd.txt @@ -1,8 +1,12 @@ Renesas R-Car sound
Required properties: -- compatible : "renesas,rcar_sound-gen1" if generation1 +- compatible : "renesas,rcar_sound-<soctype>", fallbacks + "renesas,rcar_sound-gen1" if generation1, and "renesas,rcar_sound-gen2" if generation2 + Examples with soctypes are: + - "renesas,rcar_sound-r8a7790" (R-Car H2) + - "renesas,rcar_sound-r8a7791" (R-Car M2-W) - reg : Should contain the register physical address. required register is SRU/ADG/SSI if generation1 @@ -35,9 +39,9 @@ DAI subnode properties:
Example:
-rcar_sound: rcar_sound@0xffd90000 { +rcar_sound: rcar_sound@ec500000 { #sound-dai-cells = <1>; - compatible = "renesas,rcar_sound-gen2"; + compatible = "renesas,rcar_sound-r8a7791", "renesas,rcar_sound-gen2"; reg = <0 0xec500000 0 0x1000>, /* SCU */ <0 0xec5a0000 0 0x100>, /* ADG */ <0 0xec540000 0 0x1000>, /* SSIU */
On Mon, Nov 10, 2014 at 08:00:42PM +0100, Geert Uytterhoeven wrote:
The documentation only mentioned the generic fallback compatible property. Add the missing SoC-specific compatible properties, which are already in use.
Also drop a bogus 0x unit-address prefix while we're at it.
Signed-off-by: Geert Uytterhoeven geert+renesas@glider.be
Acked-by: Simon Horman horms+renesas@verge.net.au
Documentation/devicetree/bindings/sound/renesas,rsnd.txt | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/Documentation/devicetree/bindings/sound/renesas,rsnd.txt b/Documentation/devicetree/bindings/sound/renesas,rsnd.txt index aa697abf337e7aa6..2dd690bc19cc6436 100644 --- a/Documentation/devicetree/bindings/sound/renesas,rsnd.txt +++ b/Documentation/devicetree/bindings/sound/renesas,rsnd.txt @@ -1,8 +1,12 @@ Renesas R-Car sound
Required properties: -- compatible : "renesas,rcar_sound-gen1" if generation1 +- compatible : "renesas,rcar_sound-<soctype>", fallbacks
"renesas,rcar_sound-gen1" if generation1, and "renesas,rcar_sound-gen2" if generation2Examples with soctypes are:- "renesas,rcar_sound-r8a7790" (R-Car H2)- "renesas,rcar_sound-r8a7791" (R-Car M2-W)
- reg : Should contain the register physical address. required register is SRU/ADG/SSI if generation1
@@ -35,9 +39,9 @@ DAI subnode properties:
Example:
-rcar_sound: rcar_sound@0xffd90000 { +rcar_sound: rcar_sound@ec500000 { #sound-dai-cells = <1>;
- compatible = "renesas,rcar_sound-gen2";
- compatible = "renesas,rcar_sound-r8a7791", "renesas,rcar_sound-gen2"; reg = <0 0xec500000 0 0x1000>, /* SCU */ <0 0xec5a0000 0 0x100>, /* ADG */ <0 0xec540000 0 0x1000>, /* SSIU */
-- 1.9.1
The "renesas,rcar_sound" compatible property value was never processed nor documented.
Signed-off-by: Geert Uytterhoeven geert+renesas@glider.be --- arch/arm/boot/dts/r8a7790.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/arm/boot/dts/r8a7790.dtsi b/arch/arm/boot/dts/r8a7790.dtsi index 46d6898de290d2d0..2548890925a9f16e 100644 --- a/arch/arm/boot/dts/r8a7790.dtsi +++ b/arch/arm/boot/dts/r8a7790.dtsi @@ -1389,7 +1389,7 @@
rcar_sound: rcar_sound@ec500000 { #sound-dai-cells = <1>; - compatible = "renesas,rcar_sound-r8a7790", "renesas,rcar_sound-gen2", "renesas,rcar_sound"; + compatible = "renesas,rcar_sound-r8a7790", "renesas,rcar_sound-gen2"; reg = <0 0xec500000 0 0x1000>, /* SCU */ <0 0xec5a0000 0 0x100>, /* ADG */ <0 0xec540000 0 0x1000>, /* SSIU */
The "renesas,rcar_sound" compatible property value was never processed nor documented.
Signed-off-by: Geert Uytterhoeven geert+renesas@glider.be --- arch/arm/boot/dts/r8a7791.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/arm/boot/dts/r8a7791.dtsi b/arch/arm/boot/dts/r8a7791.dtsi index feb6b9a26e1ce73f..54643a2f5240376f 100644 --- a/arch/arm/boot/dts/r8a7791.dtsi +++ b/arch/arm/boot/dts/r8a7791.dtsi @@ -1375,7 +1375,7 @@
rcar_sound: rcar_sound@ec500000 { #sound-dai-cells = <1>; - compatible = "renesas,rcar_sound-r8a7791", "renesas,rcar_sound-gen2", "renesas,rcar_sound"; + compatible = "renesas,rcar_sound-r8a7791", "renesas,rcar_sound-gen2"; reg = <0 0xec500000 0 0x1000>, /* SCU */ <0 0xec5a0000 0 0x100>, /* ADG */ <0 0xec540000 0 0x1000>, /* SSIU */
participants (3)
-
Geert Uytterhoeven -
Mark Brown -
Simon Horman