diff mbox

[v4,6/9] ARM: shmobile: r8a7778: add sound to DT

Message ID 1424968934-30577-7-git-send-email-ulrich.hecht+renesas@gmail.com (mailing list archive)
State Accepted
Commit 39a96792c5d351e002fadbdaaba5fc0c20450f1d
Headers show

Commit Message

Ulrich Hecht Feb. 26, 2015, 4:42 p.m. UTC 
Adds an entry for an R-Car Gen. 1 sound controller.

Signed-off-by: Ulrich Hecht <ulrich.hecht+renesas@gmail.com>
---
 arch/arm/boot/dts/r8a7778.dtsi | 55 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 55 insertions(+)

Comments

Simon Horman Feb. 27, 2015, 1:49 a.m. UTC | #1 
On Thu, Feb 26, 2015 at 05:42:11PM +0100, Ulrich Hecht wrote:
> Adds an entry for an R-Car Gen. 1 sound controller.
> 
> Signed-off-by: Ulrich Hecht <ulrich.hecht+renesas@gmail.com>

Thanks, I have queued this up.

> ---
>  arch/arm/boot/dts/r8a7778.dtsi | 55 ++++++++++++++++++++++++++++++++++++++++++
>  1 file changed, 55 insertions(+)
> 
> diff --git a/arch/arm/boot/dts/r8a7778.dtsi b/arch/arm/boot/dts/r8a7778.dtsi
> index 5d486b9..e5c7518 100644
> --- a/arch/arm/boot/dts/r8a7778.dtsi
> +++ b/arch/arm/boot/dts/r8a7778.dtsi
> @@ -227,6 +227,61 @@
>  		status = "disabled";
>  	};
>  
> +	rcar_sound: sound@ffd90000 {
> +		#sound-dai-cells = <1>;
> +		compatible = "renesas,rcar_sound-r8a7778", "renesas,rcar_sound-gen1", "renesas,rcar_sound";
> +		reg =	<0xffd90000 0x1000>,	/* SRU */
> +			<0xffd91000 0x1240>,	/* SSI */
> +			<0xfffe0000 0x24>;	/* ADG */
> +		clocks = <&mstp3_clks R8A7778_CLK_SSI8>,
> +			<&mstp3_clks R8A7778_CLK_SSI7>,
> +			<&mstp3_clks R8A7778_CLK_SSI6>,
> +			<&mstp3_clks R8A7778_CLK_SSI5>,
> +			<&mstp3_clks R8A7778_CLK_SSI4>,
> +			<&mstp0_clks R8A7778_CLK_SSI3>,
> +			<&mstp0_clks R8A7778_CLK_SSI2>,
> +			<&mstp0_clks R8A7778_CLK_SSI1>,
> +			<&mstp0_clks R8A7778_CLK_SSI0>,
> +			<&mstp5_clks R8A7778_CLK_SRU_SRC8>,
> +			<&mstp5_clks R8A7778_CLK_SRU_SRC7>,
> +			<&mstp5_clks R8A7778_CLK_SRU_SRC6>,
> +			<&mstp5_clks R8A7778_CLK_SRU_SRC5>,
> +			<&mstp5_clks R8A7778_CLK_SRU_SRC4>,
> +			<&mstp5_clks R8A7778_CLK_SRU_SRC3>,
> +			<&mstp5_clks R8A7778_CLK_SRU_SRC2>,
> +			<&mstp5_clks R8A7778_CLK_SRU_SRC1>,
> +			<&mstp5_clks R8A7778_CLK_SRU_SRC0>,
> +			<&audio_clk_a>, <&audio_clk_b>, <&audio_clk_c>,
> +			<&cpg_clocks R8A7778_CLK_S1>;
> +		clock-names = "ssi.8", "ssi.7", "ssi.6", "ssi.5", "ssi.4",
> +			"ssi.3", "ssi.2", "ssi.1", "ssi.0",
> +			"src.8", "src.7", "src.6", "src.5", "src.4",
> +			"src.3", "src.2", "src.1", "src.0",
> +			"clk_a", "clk_b", "clk_c", "clk_i";
> +
> +		status = "disabled";
> +
> +		rcar_sound,src {
> +			src3: src@3 { };
> +			src4: src@4 { };
> +			src5: src@5 { };
> +			src6: src@6 { };
> +			src7: src@7 { };
> +			src8: src@8 { };
> +			src9: src@9 { };
> +		};
> +
> +		rcar_sound,ssi {
> +			ssi3: ssi@3 { interrupts = <0 0x85 IRQ_TYPE_LEVEL_HIGH>; };
> +			ssi4: ssi@4 { interrupts = <0 0x85 IRQ_TYPE_LEVEL_HIGH>; };
> +			ssi5: ssi@5 { interrupts = <0 0x86 IRQ_TYPE_LEVEL_HIGH>; };
> +			ssi6: ssi@6 { interrupts = <0 0x86 IRQ_TYPE_LEVEL_HIGH>; };
> +			ssi7: ssi@7 { interrupts = <0 0x86 IRQ_TYPE_LEVEL_HIGH>; };
> +			ssi8: ssi@8 { interrupts = <0 0x86 IRQ_TYPE_LEVEL_HIGH>; };
> +			ssi9: ssi@9 { interrupts = <0 0x86 IRQ_TYPE_LEVEL_HIGH>; };
> +		};
> +	};
> +
>  	scif0: serial@ffe40000 {
>  		compatible = "renesas,scif-r8a7778", "renesas,scif";
>  		reg = <0xffe40000 0x100>;
> -- 
> 2.2.2
> 
> --
> To unsubscribe from this list: send the line "unsubscribe linux-sh" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
> 
--
To unsubscribe from this list: send the line "unsubscribe linux-sh" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Geert Uytterhoeven Feb. 27, 2015, 8:08 a.m. UTC | #2 
On Thu, Feb 26, 2015 at 5:42 PM, Ulrich Hecht
<ulrich.hecht+renesas@gmail.com> wrote:
> --- a/arch/arm/boot/dts/r8a7778.dtsi
> +++ b/arch/arm/boot/dts/r8a7778.dtsi
> @@ -227,6 +227,61 @@
>                 status = "disabled";
>         };
>
> +       rcar_sound: sound@ffd90000 {
> +               #sound-dai-cells = <1>;
> +               compatible = "renesas,rcar_sound-r8a7778", "renesas,rcar_sound-gen1", "renesas,rcar_sound";

Please drop the "renesas,rcar_sound" compatible value, as it was never
processed nor documented.

Cfr. e.g. commit f49cd2b3d2caf075d7 ("ARM: shmobile: r8a7791 dtsi:
Drop "renesas,rcar_sound" compatible value").

Sorry for not noticing before.

Gr{oetje,eeting}s,

                        Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
                                -- Linus Torvalds
--
To unsubscribe from this list: send the line "unsubscribe linux-sh" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Simon Horman March 1, 2015, 2:07 a.m. UTC | #3 
On Fri, Feb 27, 2015 at 09:08:22AM +0100, Geert Uytterhoeven wrote:
> On Thu, Feb 26, 2015 at 5:42 PM, Ulrich Hecht
> <ulrich.hecht+renesas@gmail.com> wrote:
> > --- a/arch/arm/boot/dts/r8a7778.dtsi
> > +++ b/arch/arm/boot/dts/r8a7778.dtsi
> > @@ -227,6 +227,61 @@
> >                 status = "disabled";
> >         };
> >
> > +       rcar_sound: sound@ffd90000 {
> > +               #sound-dai-cells = <1>;
> > +               compatible = "renesas,rcar_sound-r8a7778", "renesas,rcar_sound-gen1", "renesas,rcar_sound";
> 
> Please drop the "renesas,rcar_sound" compatible value, as it was never
> processed nor documented.
> 
> Cfr. e.g. commit f49cd2b3d2caf075d7 ("ARM: shmobile: r8a7791 dtsi:
> Drop "renesas,rcar_sound" compatible value").
> 
> Sorry for not noticing before.

Thanks for pointing this out.

I have taken the unusual step (for me) of updating the patch which
is already queued up.
--
To unsubscribe from this list: send the line "unsubscribe linux-sh" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

Patch

diff --git a/arch/arm/boot/dts/r8a7778.dtsi b/arch/arm/boot/dts/r8a7778.dtsi
index 5d486b9..e5c7518 100644
--- a/arch/arm/boot/dts/r8a7778.dtsi
+++ b/arch/arm/boot/dts/r8a7778.dtsi
@@ -227,6 +227,61 @@ 
 		status = "disabled";
 	};
 
+	rcar_sound: sound@ffd90000 {
+		#sound-dai-cells = <1>;
+		compatible = "renesas,rcar_sound-r8a7778", "renesas,rcar_sound-gen1", "renesas,rcar_sound";
+		reg =	<0xffd90000 0x1000>,	/* SRU */
+			<0xffd91000 0x1240>,	/* SSI */
+			<0xfffe0000 0x24>;	/* ADG */
+		clocks = <&mstp3_clks R8A7778_CLK_SSI8>,
+			<&mstp3_clks R8A7778_CLK_SSI7>,
+			<&mstp3_clks R8A7778_CLK_SSI6>,
+			<&mstp3_clks R8A7778_CLK_SSI5>,
+			<&mstp3_clks R8A7778_CLK_SSI4>,
+			<&mstp0_clks R8A7778_CLK_SSI3>,
+			<&mstp0_clks R8A7778_CLK_SSI2>,
+			<&mstp0_clks R8A7778_CLK_SSI1>,
+			<&mstp0_clks R8A7778_CLK_SSI0>,
+			<&mstp5_clks R8A7778_CLK_SRU_SRC8>,
+			<&mstp5_clks R8A7778_CLK_SRU_SRC7>,
+			<&mstp5_clks R8A7778_CLK_SRU_SRC6>,
+			<&mstp5_clks R8A7778_CLK_SRU_SRC5>,
+			<&mstp5_clks R8A7778_CLK_SRU_SRC4>,
+			<&mstp5_clks R8A7778_CLK_SRU_SRC3>,
+			<&mstp5_clks R8A7778_CLK_SRU_SRC2>,
+			<&mstp5_clks R8A7778_CLK_SRU_SRC1>,
+			<&mstp5_clks R8A7778_CLK_SRU_SRC0>,
+			<&audio_clk_a>, <&audio_clk_b>, <&audio_clk_c>,
+			<&cpg_clocks R8A7778_CLK_S1>;
+		clock-names = "ssi.8", "ssi.7", "ssi.6", "ssi.5", "ssi.4",
+			"ssi.3", "ssi.2", "ssi.1", "ssi.0",
+			"src.8", "src.7", "src.6", "src.5", "src.4",
+			"src.3", "src.2", "src.1", "src.0",
+			"clk_a", "clk_b", "clk_c", "clk_i";
+
+		status = "disabled";
+
+		rcar_sound,src {
+			src3: src@3 { };
+			src4: src@4 { };
+			src5: src@5 { };
+			src6: src@6 { };
+			src7: src@7 { };
+			src8: src@8 { };
+			src9: src@9 { };
+		};
+
+		rcar_sound,ssi {
+			ssi3: ssi@3 { interrupts = <0 0x85 IRQ_TYPE_LEVEL_HIGH>; };
+			ssi4: ssi@4 { interrupts = <0 0x85 IRQ_TYPE_LEVEL_HIGH>; };
+			ssi5: ssi@5 { interrupts = <0 0x86 IRQ_TYPE_LEVEL_HIGH>; };
+			ssi6: ssi@6 { interrupts = <0 0x86 IRQ_TYPE_LEVEL_HIGH>; };
+			ssi7: ssi@7 { interrupts = <0 0x86 IRQ_TYPE_LEVEL_HIGH>; };
+			ssi8: ssi@8 { interrupts = <0 0x86 IRQ_TYPE_LEVEL_HIGH>; };
+			ssi9: ssi@9 { interrupts = <0 0x86 IRQ_TYPE_LEVEL_HIGH>; };
+		};
+	};
+
 	scif0: serial@ffe40000 {
 		compatible = "renesas,scif-r8a7778", "renesas,scif";
 		reg = <0xffe40000 0x100>;