Hi, > -----Original Message----- > From: Lad Prabhakar [mailto:prabhakar.mahadev-lad.rj@bp.renesas.com] > Sent: Wednesday, November 4, 2020 2:34 AM > To: cip-dev@lists.cip-project.org; iwamatsu nobuhiro(岩松 信洋 □ＳＷＣ◯ＡＣＴ) > ; Pavel Machek > Cc: Biju Das > Subject: [PATCH 4.19.y-cip 17/17] arm64: dts: renesas: r8a774e1: Add audio support > > commit 8183a7938cfec0569d77755af5ce5ff5589f3540 upstream. > > Add sound support for the RZ/G2H SoC (a.k.a. R8A774E1). > > Signed-off-by: Lad Prabhakar > Reviewed-by: Marian-Cristian Rotariu > Link: https://lore.kernel.org/r/1594919915-5225-16-git-send-email-prabhakar.mahadev-lad.rj@bp.renesas.com > Signed-off-by: Geert Uytterhoeven > [PL: Manually applied the changes to dtsi] > Signed-off-by: Lad Prabhakar > --- > arch/arm64/boot/dts/renesas/r8a774e1.dtsi | 478 +++++++++++++++++++++- > 1 file changed, 475 insertions(+), 3 deletions(-) > > diff --git a/arch/arm64/boot/dts/renesas/r8a774e1.dtsi b/arch/arm64/boot/dts/renesas/r8a774e1.dtsi > index 271045556aa0..9af3ddbe5454 100644 > --- a/arch/arm64/boot/dts/renesas/r8a774e1.dtsi > +++ b/arch/arm64/boot/dts/renesas/r8a774e1.dtsi > @@ -1435,6 +1435,19 @@ > }; > > rcar_sound: sound@ec500000 { > + /* > + * #sound-dai-cells is required > + * > + * Single DAI : #sound-dai-cells = <0>; <&rcar_sound>; > + * Multi DAI : #sound-dai-cells = <1>; <&rcar_sound N>; > + */ > + /* > + * #clock-cells is required for audio_clkout0/1/2/3 > + * > + * clkout : #clock-cells = <0>; <&rcar_sound>; > + * clkout0/1/2/3: #clock-cells = <1>; <&rcar_sound N>; > + */ > + compatible = "renesas,rcar_sound-r8a774e1", "renesas,rcar_sound-gen3"; > reg = <0 0xec500000 0 0x1000>, /* SCU */ > <0 0xec5a0000 0 0x100>, /* ADG */ > <0 0xec540000 0 0x1000>, /* SSIU */ > @@ -1442,17 +1455,476 @@ > <0 0xec760000 0 0x200>; /* Audio DMAC peri peri*/ > reg-names = "scu", "adg", "ssiu", "ssi", "audmapp"; > > - status = "disabled"; > + clocks = <&cpg CPG_MOD 1005>, > + <&cpg CPG_MOD 1006>, <&cpg CPG_MOD 1007>, > + <&cpg CPG_MOD 1008>, <&cpg CPG_MOD 1009>, > + <&cpg CPG_MOD 1010>, <&cpg CPG_MOD 1011>, > + <&cpg CPG_MOD 1012>, <&cpg CPG_MOD 1013>, > + <&cpg CPG_MOD 1014>, <&cpg CPG_MOD 1015>, > + <&cpg CPG_MOD 1022>, <&cpg CPG_MOD 1023>, > + <&cpg CPG_MOD 1024>, <&cpg CPG_MOD 1025>, > + <&cpg CPG_MOD 1026>, <&cpg CPG_MOD 1027>, > + <&cpg CPG_MOD 1028>, <&cpg CPG_MOD 1029>, > + <&cpg CPG_MOD 1030>, <&cpg CPG_MOD 1031>, > + <&cpg CPG_MOD 1020>, <&cpg CPG_MOD 1021>, > + <&cpg CPG_MOD 1020>, <&cpg CPG_MOD 1021>, > + <&cpg CPG_MOD 1019>, <&cpg CPG_MOD 1018>, > + <&audio_clk_a>, <&audio_clk_b>, There is no definition for audio_clk_b. The clock will be overwritten by hihope-rev4.dtsi, but I think it needs to be define like audio_clk_a. Best regards, Nobuhiro > + <&audio_clk_c>, > + <&cpg CPG_CORE R8A774E1_CLK_S0D4>; > + clock-names = "ssi-all", > + "ssi.9", "ssi.8", "ssi.7", "ssi.6", > + "ssi.5", "ssi.4", "ssi.3", "ssi.2", > + "ssi.1", "ssi.0", > + "src.9", "src.8", "src.7", "src.6", > + "src.5", "src.4", "src.3", "src.2", > + "src.1", "src.0", > + "mix.1", "mix.0", > + "ctu.1", "ctu.0", > + "dvc.0", "dvc.1", > + "clk_a", "clk_b", "clk_c", "clk_i"; > + power-domains = <&sysc R8A774E1_PD_ALWAYS_ON>; > + resets = <&cpg 1005>, > + <&cpg 1006>, <&cpg 1007>, > + <&cpg 1008>, <&cpg 1009>, > + <&cpg 1010>, <&cpg 1011>, > + <&cpg 1012>, <&cpg 1013>, > + <&cpg 1014>, <&cpg 1015>; > + reset-names = "ssi-all", > + "ssi.9", "ssi.8", "ssi.7", "ssi.6", > + "ssi.5", "ssi.4", "ssi.3", "ssi.2", > + "ssi.1", "ssi.0"; > + status = "disabled"; > + > + rcar_sound,dvc { > + dvc0: dvc-0 { > + dmas = <&audma1 0xbc>; > + dma-names = "tx"; > + }; > + dvc1: dvc-1 { > + dmas = <&audma1 0xbe>; > + dma-names = "tx"; > + }; > + }; > > - /* placeholder */ > + rcar_sound,mix { > + mix0: mix-0 { }; > + mix1: mix-1 { }; > + }; > + > + rcar_sound,ctu { > + ctu00: ctu-0 { }; > + ctu01: ctu-1 { }; > + ctu02: ctu-2 { }; > + ctu03: ctu-3 { }; > + ctu10: ctu-4 { }; > + ctu11: ctu-5 { }; > + ctu12: ctu-6 { }; > + ctu13: ctu-7 { }; > + }; > + > + rcar_sound,src { > + src0: src-0 { > + interrupts = ; > + dmas = <&audma0 0x85>, <&audma1 0x9a>; > + dma-names = "rx", "tx"; > + }; > + src1: src-1 { > + interrupts = ; > + dmas = <&audma0 0x87>, <&audma1 0x9c>; > + dma-names = "rx", "tx"; > + }; > + src2: src-2 { > + interrupts = ; > + dmas = <&audma0 0x89>, <&audma1 0x9e>; > + dma-names = "rx", "tx"; > + }; > + src3: src-3 { > + interrupts = ; > + dmas = <&audma0 0x8b>, <&audma1 0xa0>; > + dma-names = "rx", "tx"; > + }; > + src4: src-4 { > + interrupts = ; > + dmas = <&audma0 0x8d>, <&audma1 0xb0>; > + dma-names = "rx", "tx"; > + }; > + src5: src-5 { > + interrupts = ; > + dmas = <&audma0 0x8f>, <&audma1 0xb2>; > + dma-names = "rx", "tx"; > + }; > + src6: src-6 { > + interrupts = ; > + dmas = <&audma0 0x91>, <&audma1 0xb4>; > + dma-names = "rx", "tx"; > + }; > + src7: src-7 { > + interrupts = ; > + dmas = <&audma0 0x93>, <&audma1 0xb6>; > + dma-names = "rx", "tx"; > + }; > + src8: src-8 { > + interrupts = ; > + dmas = <&audma0 0x95>, <&audma1 0xb8>; > + dma-names = "rx", "tx"; > + }; > + src9: src-9 { > + interrupts = ; > + dmas = <&audma0 0x97>, <&audma1 0xba>; > + dma-names = "rx", "tx"; > + }; > + }; > + > + rcar_sound,ssiu { > + ssiu00: ssiu-0 { > + dmas = <&audma0 0x15>, <&audma1 0x16>; > + dma-names = "rx", "tx"; > + }; > + ssiu01: ssiu-1 { > + dmas = <&audma0 0x35>, <&audma1 0x36>; > + dma-names = "rx", "tx"; > + }; > + ssiu02: ssiu-2 { > + dmas = <&audma0 0x37>, <&audma1 0x38>; > + dma-names = "rx", "tx"; > + }; > + ssiu03: ssiu-3 { > + dmas = <&audma0 0x47>, <&audma1 0x48>; > + dma-names = "rx", "tx"; > + }; > + ssiu04: ssiu-4 { > + dmas = <&audma0 0x3F>, <&audma1 0x40>; > + dma-names = "rx", "tx"; > + }; > + ssiu05: ssiu-5 { > + dmas = <&audma0 0x43>, <&audma1 0x44>; > + dma-names = "rx", "tx"; > + }; > + ssiu06: ssiu-6 { > + dmas = <&audma0 0x4F>, <&audma1 0x50>; > + dma-names = "rx", "tx"; > + }; > + ssiu07: ssiu-7 { > + dmas = <&audma0 0x53>, <&audma1 0x54>; > + dma-names = "rx", "tx"; > + }; > + ssiu10: ssiu-8 { > + dmas = <&audma0 0x49>, <&audma1 0x4a>; > + dma-names = "rx", "tx"; > + }; > + ssiu11: ssiu-9 { > + dmas = <&audma0 0x4B>, <&audma1 0x4C>; > + dma-names = "rx", "tx"; > + }; > + ssiu12: ssiu-10 { > + dmas = <&audma0 0x57>, <&audma1 0x58>; > + dma-names = "rx", "tx"; > + }; > + ssiu13: ssiu-11 { > + dmas = <&audma0 0x59>, <&audma1 0x5A>; > + dma-names = "rx", "tx"; > + }; > + ssiu14: ssiu-12 { > + dmas = <&audma0 0x5F>, <&audma1 0x60>; > + dma-names = "rx", "tx"; > + }; > + ssiu15: ssiu-13 { > + dmas = <&audma0 0xC3>, <&audma1 0xC4>; > + dma-names = "rx", "tx"; > + }; > + ssiu16: ssiu-14 { > + dmas = <&audma0 0xC7>, <&audma1 0xC8>; > + dma-names = "rx", "tx"; > + }; > + ssiu17: ssiu-15 { > + dmas = <&audma0 0xCB>, <&audma1 0xCC>; > + dma-names = "rx", "tx"; > + }; > + ssiu20: ssiu-16 { > + dmas = <&audma0 0x63>, <&audma1 0x64>; > + dma-names = "rx", "tx"; > + }; > + ssiu21: ssiu-17 { > + dmas = <&audma0 0x67>, <&audma1 0x68>; > + dma-names = "rx", "tx"; > + }; > + ssiu22: ssiu-18 { > + dmas = <&audma0 0x6B>, <&audma1 0x6C>; > + dma-names = "rx", "tx"; > + }; > + ssiu23: ssiu-19 { > + dmas = <&audma0 0x6D>, <&audma1 0x6E>; > + dma-names = "rx", "tx"; > + }; > + ssiu24: ssiu-20 { > + dmas = <&audma0 0xCF>, <&audma1 0xCE>; > + dma-names = "rx", "tx"; > + }; > + ssiu25: ssiu-21 { > + dmas = <&audma0 0xEB>, <&audma1 0xEC>; > + dma-names = "rx", "tx"; > + }; > + ssiu26: ssiu-22 { > + dmas = <&audma0 0xED>, <&audma1 0xEE>; > + dma-names = "rx", "tx"; > + }; > + ssiu27: ssiu-23 { > + dmas = <&audma0 0xEF>, <&audma1 0xF0>; > + dma-names = "rx", "tx"; > + }; > + ssiu30: ssiu-24 { > + dmas = <&audma0 0x6f>, <&audma1 0x70>; > + dma-names = "rx", "tx"; > + }; > + ssiu31: ssiu-25 { > + dmas = <&audma0 0x21>, <&audma1 0x22>; > + dma-names = "rx", "tx"; > + }; > + ssiu32: ssiu-26 { > + dmas = <&audma0 0x23>, <&audma1 0x24>; > + dma-names = "rx", "tx"; > + }; > + ssiu33: ssiu-27 { > + dmas = <&audma0 0x25>, <&audma1 0x26>; > + dma-names = "rx", "tx"; > + }; > + ssiu34: ssiu-28 { > + dmas = <&audma0 0x27>, <&audma1 0x28>; > + dma-names = "rx", "tx"; > + }; > + ssiu35: ssiu-29 { > + dmas = <&audma0 0x29>, <&audma1 0x2A>; > + dma-names = "rx", "tx"; > + }; > + ssiu36: ssiu-30 { > + dmas = <&audma0 0x2B>, <&audma1 0x2C>; > + dma-names = "rx", "tx"; > + }; > + ssiu37: ssiu-31 { > + dmas = <&audma0 0x2D>, <&audma1 0x2E>; > + dma-names = "rx", "tx"; > + }; > + ssiu40: ssiu-32 { > + dmas = <&audma0 0x71>, <&audma1 0x72>; > + dma-names = "rx", "tx"; > + }; > + ssiu41: ssiu-33 { > + dmas = <&audma0 0x17>, <&audma1 0x18>; > + dma-names = "rx", "tx"; > + }; > + ssiu42: ssiu-34 { > + dmas = <&audma0 0x19>, <&audma1 0x1A>; > + dma-names = "rx", "tx"; > + }; > + ssiu43: ssiu-35 { > + dmas = <&audma0 0x1B>, <&audma1 0x1C>; > + dma-names = "rx", "tx"; > + }; > + ssiu44: ssiu-36 { > + dmas = <&audma0 0x1D>, <&audma1 0x1E>; > + dma-names = "rx", "tx"; > + }; > + ssiu45: ssiu-37 { > + dmas = <&audma0 0x1F>, <&audma1 0x20>; > + dma-names = "rx", "tx"; > + }; > + ssiu46: ssiu-38 { > + dmas = <&audma0 0x31>, <&audma1 0x32>; > + dma-names = "rx", "tx"; > + }; > + ssiu47: ssiu-39 { > + dmas = <&audma0 0x33>, <&audma1 0x34>; > + dma-names = "rx", "tx"; > + }; > + ssiu50: ssiu-40 { > + dmas = <&audma0 0x73>, <&audma1 0x74>; > + dma-names = "rx", "tx"; > + }; > + ssiu60: ssiu-41 { > + dmas = <&audma0 0x75>, <&audma1 0x76>; > + dma-names = "rx", "tx"; > + }; > + ssiu70: ssiu-42 { > + dmas = <&audma0 0x79>, <&audma1 0x7a>; > + dma-names = "rx", "tx"; > + }; > + ssiu80: ssiu-43 { > + dmas = <&audma0 0x7b>, <&audma1 0x7c>; > + dma-names = "rx", "tx"; > + }; > + ssiu90: ssiu-44 { > + dmas = <&audma0 0x7d>, <&audma1 0x7e>; > + dma-names = "rx", "tx"; > + }; > + ssiu91: ssiu-45 { > + dmas = <&audma0 0x7F>, <&audma1 0x80>; > + dma-names = "rx", "tx"; > + }; > + ssiu92: ssiu-46 { > + dmas = <&audma0 0x81>, <&audma1 0x82>; > + dma-names = "rx", "tx"; > + }; > + ssiu93: ssiu-47 { > + dmas = <&audma0 0x83>, <&audma1 0x84>; > + dma-names = "rx", "tx"; > + }; > + ssiu94: ssiu-48 { > + dmas = <&audma0 0xA3>, <&audma1 0xA4>; > + dma-names = "rx", "tx"; > + }; > + ssiu95: ssiu-49 { > + dmas = <&audma0 0xA5>, <&audma1 0xA6>; > + dma-names = "rx", "tx"; > + }; > + ssiu96: ssiu-50 { > + dmas = <&audma0 0xA7>, <&audma1 0xA8>; > + dma-names = "rx", "tx"; > + }; > + ssiu97: ssiu-51 { > + dmas = <&audma0 0xA9>, <&audma1 0xAA>; > + dma-names = "rx", "tx"; > + }; > + }; > > rcar_sound,ssi { > + ssi0: ssi-0 { > + interrupts = ; > + dmas = <&audma0 0x01>, <&audma1 0x02>; > + dma-names = "rx", "tx"; > + }; > + ssi1: ssi-1 { > + interrupts = ; > + dmas = <&audma0 0x03>, <&audma1 0x04>; > + dma-names = "rx", "tx"; > + }; > ssi2: ssi-2 { > - /* placeholder */ > + interrupts = ; > + dmas = <&audma0 0x05>, <&audma1 0x06>; > + dma-names = "rx", "tx"; > + }; > + ssi3: ssi-3 { > + interrupts = ; > + dmas = <&audma0 0x07>, <&audma1 0x08>; > + dma-names = "rx", "tx"; > + }; > + ssi4: ssi-4 { > + interrupts = ; > + dmas = <&audma0 0x09>, <&audma1 0x0a>; > + dma-names = "rx", "tx"; > + }; > + ssi5: ssi-5 { > + interrupts = ; > + dmas = <&audma0 0x0b>, <&audma1 0x0c>; > + dma-names = "rx", "tx"; > + }; > + ssi6: ssi-6 { > + interrupts = ; > + dmas = <&audma0 0x0d>, <&audma1 0x0e>; > + dma-names = "rx", "tx"; > + }; > + ssi7: ssi-7 { > + interrupts = ; > + dmas = <&audma0 0x0f>, <&audma1 0x10>; > + dma-names = "rx", "tx"; > + }; > + ssi8: ssi-8 { > + interrupts = ; > + dmas = <&audma0 0x11>, <&audma1 0x12>; > + dma-names = "rx", "tx"; > + }; > + ssi9: ssi-9 { > + interrupts = ; > + dmas = <&audma0 0x13>, <&audma1 0x14>; > + dma-names = "rx", "tx"; > }; > }; > }; > > + audma0: dma-controller@ec700000 { > + compatible = "renesas,dmac-r8a774e1", > + "renesas,rcar-dmac"; > + reg = <0 0xec700000 0 0x10000>; > + interrupts = , > + , > + , > + , > + , > + , > + , > + , > + , > + , > + , > + , > + , > + , > + , > + , > + ; > + interrupt-names = "error", > + "ch0", "ch1", "ch2", "ch3", > + "ch4", "ch5", "ch6", "ch7", > + "ch8", "ch9", "ch10", "ch11", > + "ch12", "ch13", "ch14", "ch15"; > + clocks = <&cpg CPG_MOD 502>; > + clock-names = "fck"; > + power-domains = <&sysc R8A774E1_PD_ALWAYS_ON>; > + resets = <&cpg 502>; > + #dma-cells = <1>; > + dma-channels = <16>; > + iommus = <&ipmmu_mp0 0>, <&ipmmu_mp0 1>, > + <&ipmmu_mp0 2>, <&ipmmu_mp0 3>, > + <&ipmmu_mp0 4>, <&ipmmu_mp0 5>, > + <&ipmmu_mp0 6>, <&ipmmu_mp0 7>, > + <&ipmmu_mp0 8>, <&ipmmu_mp0 9>, > + <&ipmmu_mp0 10>, <&ipmmu_mp0 11>, > + <&ipmmu_mp0 12>, <&ipmmu_mp0 13>, > + <&ipmmu_mp0 14>, <&ipmmu_mp0 15>; > + }; > + > + audma1: dma-controller@ec720000 { > + compatible = "renesas,dmac-r8a774e1", > + "renesas,rcar-dmac"; > + reg = <0 0xec720000 0 0x10000>; > + interrupts = , > + , > + , > + , > + , > + , > + , > + , > + , > + , > + , > + , > + , > + , > + , > + , > + ; > + interrupt-names = "error", > + "ch0", "ch1", "ch2", "ch3", > + "ch4", "ch5", "ch6", "ch7", > + "ch8", "ch9", "ch10", "ch11", > + "ch12", "ch13", "ch14", "ch15"; > + clocks = <&cpg CPG_MOD 501>; > + clock-names = "fck"; > + power-domains = <&sysc R8A774E1_PD_ALWAYS_ON>; > + resets = <&cpg 501>; > + #dma-cells = <1>; > + dma-channels = <16>; > + iommus = <&ipmmu_mp0 16>, <&ipmmu_mp0 17>, > + <&ipmmu_mp0 18>, <&ipmmu_mp0 19>, > + <&ipmmu_mp0 20>, <&ipmmu_mp0 21>, > + <&ipmmu_mp0 22>, <&ipmmu_mp0 23>, > + <&ipmmu_mp0 24>, <&ipmmu_mp0 25>, > + <&ipmmu_mp0 26>, <&ipmmu_mp0 27>, > + <&ipmmu_mp0 28>, <&ipmmu_mp0 29>, > + <&ipmmu_mp0 30>, <&ipmmu_mp0 31>; > + }; > + > xhci0: usb@ee000000 { > reg = <0 0xee000000 0 0xc00>; > status = "disabled"; > -- > 2.17.1