* [PATCH 0/5] Add R8A7794 sound DT support
@ 2016-02-08 22:55 Sergei Shtylyov
2016-02-08 22:57 ` [PATCH 1/5] ARM: dts: r8a7794: add audio clocks Sergei Shtylyov
` (4 more replies)
0 siblings, 5 replies; 11+ messages in thread
From: Sergei Shtylyov @ 2016-02-08 22:55 UTC (permalink / raw)
To: horms, linux-renesas-soc, robh+dt, pawel.moll, mark.rutland,
ijc+devicetree, galak, devicetree
Cc: magnus.damm, linux, linux-arm-kernel
Hello.
Here's the set of 5 patches against Simon Horman's 'renesas.git' repo,
'renesas-devel-20160208-v4.5-rc3' tag. I'm adding the sound device tree support
for the R8A7794 SoC. The sound patch for the SILK board will be posted RSN. :-)
[1/5] ARM: dts: r8a7794: add audio clocks
[2/5] ARM: dts: r8a7794: add MSTP5 clocks
[3/5] ARM: dts: r8a7794: add MSTP10 clocks
[4/5] ARM: dts: r8a7794: add Audio-DMAC support
[5/5] ARM: dts: r8a7794 add sound support
WBR, Sergei
^ permalink raw reply [flat|nested] 11+ messages in thread* [PATCH 1/5] ARM: dts: r8a7794: add audio clocks 2016-02-08 22:55 [PATCH 0/5] Add R8A7794 sound DT support Sergei Shtylyov @ 2016-02-08 22:57 ` Sergei Shtylyov 2016-02-08 22:58 ` [PATCH 2/5] ARM: dts: r8a7794: add MSTP5 clocks Sergei Shtylyov ` (3 subsequent siblings) 4 siblings, 0 replies; 11+ messages in thread From: Sergei Shtylyov @ 2016-02-08 22:57 UTC (permalink / raw) To: horms, linux-renesas-soc, robh+dt, pawel.moll, mark.rutland, ijc+devicetree, galak, devicetree Cc: magnus.damm, linux, linux-arm-kernel Describe the external audio clocks (signals AUDIO_CLK[ABC]) required by the sound driver. Boards that provide audio clocks need to override the clock frequencies. This patch is based on the commit 0d3dbde84a45 ("ARM: shmobile: r8a7791: add audio clock on DTSI"). Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com> --- arch/arm/boot/dts/r8a7794.dtsi | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) Index: renesas/arch/arm/boot/dts/r8a7794.dtsi =================================================================== --- renesas.orig/arch/arm/boot/dts/r8a7794.dtsi +++ renesas/arch/arm/boot/dts/r8a7794.dtsi @@ -833,6 +833,30 @@ status = "disabled"; }; + /* + * The external audio clocks are configured as 0 Hz fixed + * frequency clocks by default. Boards that provide audio + * clocks should override them. + */ + audio_clka: audio_clka { + compatible = "fixed-clock"; + #clock-cells = <0>; + clock-frequency = <0>; + clock-output-names = "audio_clka"; + }; + audio_clkb: audio_clkb { + compatible = "fixed-clock"; + #clock-cells = <0>; + clock-frequency = <0>; + clock-output-names = "audio_clkb"; + }; + audio_clkc: audio_clkc { + compatible = "fixed-clock"; + #clock-cells = <0>; + clock-frequency = <0>; + clock-output-names = "audio_clkc"; + }; + /* Special CPG clocks */ cpg_clocks: cpg_clocks@e6150000 { compatible = "renesas,r8a7794-cpg-clocks", ^ permalink raw reply [flat|nested] 11+ messages in thread
* [PATCH 2/5] ARM: dts: r8a7794: add MSTP5 clocks 2016-02-08 22:55 [PATCH 0/5] Add R8A7794 sound DT support Sergei Shtylyov 2016-02-08 22:57 ` [PATCH 1/5] ARM: dts: r8a7794: add audio clocks Sergei Shtylyov @ 2016-02-08 22:58 ` Sergei Shtylyov 2016-02-08 22:59 ` [PATCH 3/5] ARM: dts: r8a7794: add MSTP10 clocks Sergei Shtylyov ` (2 subsequent siblings) 4 siblings, 0 replies; 11+ messages in thread From: Sergei Shtylyov @ 2016-02-08 22:58 UTC (permalink / raw) To: horms, linux-renesas-soc, robh+dt, pawel.moll, mark.rutland, ijc+devicetree, galak, devicetree Cc: magnus.damm, linux, linux-arm-kernel Add some MSTP5 clocks to R8A7794 device tree. Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com> --- arch/arm/boot/dts/r8a7794.dtsi | 9 +++++++++ include/dt-bindings/clock/r8a7794-clock.h | 1 + 2 files changed, 10 insertions(+) Index: renesas/arch/arm/boot/dts/r8a7794.dtsi =================================================================== --- renesas.orig/arch/arm/boot/dts/r8a7794.dtsi +++ renesas/arch/arm/boot/dts/r8a7794.dtsi @@ -1105,6 +1105,15 @@ clock-indices = <R8A7794_CLK_IRQC>; clock-output-names = "irqc"; }; + mstp5_clks: mstp5_clks@e6150144 { + compatible = "renesas,r8a7794-mstp-clocks", "renesas,cpg-mstp-clocks"; + reg = <0 0xe6150144 0 4>, <0 0xe615003c 0 4>; + clocks = <&hp_clk>, <&extal_clk>, <&p_clk>; + #clock-cells = <1>; + clock-indices = <R8A7794_CLK_AUDIO_DMAC0 + R8A7794_CLK_THERMAL R8A7794_CLK_PWM>; + clock-output-names = "audmac0", "thermal", "pwm"; + }; mstp7_clks: mstp7_clks@e615014c { compatible = "renesas,r8a7794-mstp-clocks", "renesas,cpg-mstp-clocks"; reg = <0 0xe615014c 0 4>, <0 0xe61501c4 0 4>; Index: renesas/include/dt-bindings/clock/r8a7794-clock.h =================================================================== --- renesas.orig/include/dt-bindings/clock/r8a7794-clock.h +++ renesas/include/dt-bindings/clock/r8a7794-clock.h @@ -64,6 +64,7 @@ #define R8A7794_CLK_IRQC 7 /* MSTP5 */ +#define R8A7794_CLK_AUDIO_DMAC0 2 #define R8A7794_CLK_THERMAL 22 #define R8A7794_CLK_PWM 23 ^ permalink raw reply [flat|nested] 11+ messages in thread
* [PATCH 3/5] ARM: dts: r8a7794: add MSTP10 clocks 2016-02-08 22:55 [PATCH 0/5] Add R8A7794 sound DT support Sergei Shtylyov 2016-02-08 22:57 ` [PATCH 1/5] ARM: dts: r8a7794: add audio clocks Sergei Shtylyov 2016-02-08 22:58 ` [PATCH 2/5] ARM: dts: r8a7794: add MSTP5 clocks Sergei Shtylyov @ 2016-02-08 22:59 ` Sergei Shtylyov 2016-02-08 23:03 ` [PATCH 4/5] ARM: dts: r8a7794: add Audio-DMAC support Sergei Shtylyov 2016-02-08 23:04 ` [PATCH 5/5] ARM: dts: r8a7794 add sound support Sergei Shtylyov 4 siblings, 0 replies; 11+ messages in thread From: Sergei Shtylyov @ 2016-02-08 22:59 UTC (permalink / raw) To: horms, linux-renesas-soc, robh+dt, pawel.moll, mark.rutland, ijc+devicetree, galak, devicetree Cc: magnus.damm, linux, linux-arm-kernel Add MSTP10 clocks to R8A7790 device tree. This patch is based on the commit ee9141522dcf ("ARM: shmobile: r8a7791: add MSTP10 support on DTSI"). Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com> --- arch/arm/boot/dts/r8a7794.dtsi | 53 ++++++++++++++++++++++++++++++ include/dt-bindings/clock/r8a7794-clock.h | 28 +++++++++++++++ 2 files changed, 81 insertions(+) Index: renesas/arch/arm/boot/dts/r8a7794.dtsi =================================================================== --- renesas.orig/arch/arm/boot/dts/r8a7794.dtsi +++ renesas/arch/arm/boot/dts/r8a7794.dtsi @@ -1165,6 +1165,59 @@ "gpio1", "gpio0", "qspi_mod", "i2c5", "i2c4", "i2c3", "i2c2", "i2c1", "i2c0"; }; + mstp10_clks: mstp10_clks@e6150998 { + compatible = "renesas,r8a7794-mstp-clocks", + "renesas,cpg-mstp-clocks"; + reg = <0 0xe6150998 0 4>, <0 0xe61509a8 0 4>; + clocks = <&p_clk>, <&p_clk>, <&p_clk>, <&p_clk>, + <&p_clk>, <&p_clk>, <&p_clk>, <&p_clk>, + <&p_clk>, <&p_clk>, <&p_clk>, <&p_clk>, + <&mstp10_clks R8A7794_CLK_SCU_ALL>, + <&mstp10_clks R8A7794_CLK_SCU_ALL>, + <&mstp10_clks R8A7794_CLK_SCU_ALL>, + <&mstp10_clks R8A7794_CLK_SCU_ALL>, + <&mstp10_clks R8A7794_CLK_SCU_ALL>, + <&mstp10_clks R8A7794_CLK_SCU_ALL>, + <&mstp10_clks R8A7794_CLK_SCU_ALL>, + <&mstp10_clks R8A7794_CLK_SCU_ALL>, + <&mstp10_clks R8A7794_CLK_SCU_ALL>, + <&mstp10_clks R8A7794_CLK_SCU_ALL>, + <&mstp10_clks R8A7794_CLK_SCU_ALL>, + <&mstp10_clks R8A7794_CLK_SCU_ALL>, + <&mstp10_clks R8A7794_CLK_SCU_ALL>, + <&mstp10_clks R8A7794_CLK_SCU_ALL>; + #clock-cells = <1>; + clock-indices = <R8A7794_CLK_SSI_ALL + R8A7794_CLK_SSI9 R8A7794_CLK_SSI8 + R8A7794_CLK_SSI7 R8A7794_CLK_SSI6 + R8A7794_CLK_SSI5 R8A7794_CLK_SSI4 + R8A7794_CLK_SSI3 R8A7794_CLK_SSI2 + R8A7794_CLK_SSI1 R8A7794_CLK_SSI0 + R8A7794_CLK_SCU_ALL + R8A7794_CLK_SCU_DVC1 + R8A7794_CLK_SCU_DVC0 + R8A7794_CLK_SCU_CTU1_MIX1 + R8A7794_CLK_SCU_CTU0_MIX0 + R8A7794_CLK_SCU_SRC9 + R8A7794_CLK_SCU_SRC8 + R8A7794_CLK_SCU_SRC7 + R8A7794_CLK_SCU_SRC6 + R8A7794_CLK_SCU_SRC5 + R8A7794_CLK_SCU_SRC4 + R8A7794_CLK_SCU_SRC3 + R8A7794_CLK_SCU_SRC2 + R8A7794_CLK_SCU_SRC1 + R8A7794_CLK_SCU_SRC0>; + clock-output-names = "ssi-all", "ssi9", "ssi8", "ssi7", + "ssi6", "ssi5", "ssi4", "ssi3", + "ssi2", "ssi1", "ssi0", + "scu-all", "scu-dvc1", "scu-dvc0", + "scu-ctu1-mix1", "scu-ctu0-mix0", + "scu-src9", "scu-src8", "scu-src7", + "scu-src6", "scu-src5", "scu-src4", + "scu-src3", "scu-src2", "scu-src1", + "scu-src0"; + }; mstp11_clks: mstp11_clks@e615099c { compatible = "renesas,r8a7794-mstp-clocks", "renesas,cpg-mstp-clocks"; reg = <0 0xe615099c 0 4>, <0 0xe61509ac 0 4>; Index: renesas/include/dt-bindings/clock/r8a7794-clock.h =================================================================== --- renesas.orig/include/dt-bindings/clock/r8a7794-clock.h +++ renesas/include/dt-bindings/clock/r8a7794-clock.h @@ -103,6 +103,34 @@ #define R8A7794_CLK_I2C1 30 #define R8A7794_CLK_I2C0 31 +/* MSTP10 */ +#define R8A7794_CLK_SSI_ALL 5 +#define R8A7794_CLK_SSI9 6 +#define R8A7794_CLK_SSI8 7 +#define R8A7794_CLK_SSI7 8 +#define R8A7794_CLK_SSI6 9 +#define R8A7794_CLK_SSI5 10 +#define R8A7794_CLK_SSI4 11 +#define R8A7794_CLK_SSI3 12 +#define R8A7794_CLK_SSI2 13 +#define R8A7794_CLK_SSI1 14 +#define R8A7794_CLK_SSI0 15 +#define R8A7794_CLK_SCU_ALL 17 +#define R8A7794_CLK_SCU_DVC1 18 +#define R8A7794_CLK_SCU_DVC0 19 +#define R8A7794_CLK_SCU_CTU1_MIX1 20 +#define R8A7794_CLK_SCU_CTU0_MIX0 21 +#define R8A7794_CLK_SCU_SRC9 22 +#define R8A7794_CLK_SCU_SRC8 23 +#define R8A7794_CLK_SCU_SRC7 24 +#define R8A7794_CLK_SCU_SRC6 25 +#define R8A7794_CLK_SCU_SRC5 26 +#define R8A7794_CLK_SCU_SRC4 27 +#define R8A7794_CLK_SCU_SRC3 28 +#define R8A7794_CLK_SCU_SRC2 29 +#define R8A7794_CLK_SCU_SRC1 30 +#define R8A7794_CLK_SCU_SRC0 31 + /* MSTP11 */ #define R8A7794_CLK_SCIFA3 6 #define R8A7794_CLK_SCIFA4 7 ^ permalink raw reply [flat|nested] 11+ messages in thread
* [PATCH 4/5] ARM: dts: r8a7794: add Audio-DMAC support 2016-02-08 22:55 [PATCH 0/5] Add R8A7794 sound DT support Sergei Shtylyov ` (2 preceding siblings ...) 2016-02-08 22:59 ` [PATCH 3/5] ARM: dts: r8a7794: add MSTP10 clocks Sergei Shtylyov @ 2016-02-08 23:03 ` Sergei Shtylyov 2016-02-08 23:04 ` [PATCH 5/5] ARM: dts: r8a7794 add sound support Sergei Shtylyov 4 siblings, 0 replies; 11+ messages in thread From: Sergei Shtylyov @ 2016-02-08 23:03 UTC (permalink / raw) To: horms, linux-renesas-soc, robh+dt, pawel.moll, mark.rutland, ijc+devicetree, galak, devicetree Cc: magnus.damm, linux, linux-arm-kernel Describe Audio-DMAC in the R8A7794 device tree. This patch is loosely based on the commit 8994fff67761 ("ARM: shmobile: r8a7791: Add Audio DMAC devices to DT"). Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com> --- arch/arm/boot/dts/r8a7794.dtsi | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) Index: renesas/arch/arm/boot/dts/r8a7794.dtsi =================================================================== --- renesas.orig/arch/arm/boot/dts/r8a7794.dtsi +++ renesas/arch/arm/boot/dts/r8a7794.dtsi @@ -281,6 +281,34 @@ dma-channels = <15>; }; + audma0: dma-controller@ec700000 { + compatible = "renesas,dmac-r8a7794", "renesas,rcar-dmac"; + reg = <0 0xec700000 0 0x10000>; + interrupts = <GIC_SPI 346 IRQ_TYPE_LEVEL_HIGH + GIC_SPI 320 IRQ_TYPE_LEVEL_HIGH + GIC_SPI 321 IRQ_TYPE_LEVEL_HIGH + GIC_SPI 322 IRQ_TYPE_LEVEL_HIGH + GIC_SPI 323 IRQ_TYPE_LEVEL_HIGH + GIC_SPI 324 IRQ_TYPE_LEVEL_HIGH + GIC_SPI 325 IRQ_TYPE_LEVEL_HIGH + GIC_SPI 326 IRQ_TYPE_LEVEL_HIGH + GIC_SPI 327 IRQ_TYPE_LEVEL_HIGH + GIC_SPI 328 IRQ_TYPE_LEVEL_HIGH + GIC_SPI 329 IRQ_TYPE_LEVEL_HIGH + GIC_SPI 330 IRQ_TYPE_LEVEL_HIGH + GIC_SPI 331 IRQ_TYPE_LEVEL_HIGH + GIC_SPI 332 IRQ_TYPE_LEVEL_HIGH>; + interrupt-names = "error", + "ch0", "ch1", "ch2", "ch3", "ch4", "ch5", + "ch6", "ch7", "ch8", "ch9", "ch10", "ch11", + "ch12"; + clocks = <&mstp5_clks R8A7794_CLK_AUDIO_DMAC0>; + clock-names = "fck"; + power-domains = <&cpg_clocks>; + #dma-cells = <1>; + dma-channels = <13>; + }; + scifa0: serial@e6c40000 { compatible = "renesas,scifa-r8a7794", "renesas,rcar-gen2-scifa", "renesas,scifa"; ^ permalink raw reply [flat|nested] 11+ messages in thread
* [PATCH 5/5] ARM: dts: r8a7794 add sound support 2016-02-08 22:55 [PATCH 0/5] Add R8A7794 sound DT support Sergei Shtylyov ` (3 preceding siblings ...) 2016-02-08 23:03 ` [PATCH 4/5] ARM: dts: r8a7794: add Audio-DMAC support Sergei Shtylyov @ 2016-02-08 23:04 ` Sergei Shtylyov 2016-02-09 0:08 ` Kuninori Morimoto 2016-02-09 19:50 ` Simon Horman 4 siblings, 2 replies; 11+ messages in thread From: Sergei Shtylyov @ 2016-02-08 23:04 UTC (permalink / raw) To: horms, linux-renesas-soc, robh+dt, pawel.moll, mark.rutland, ijc+devicetree, galak, devicetree Cc: magnus.damm, linux, linux-arm-kernel Define the generic R8A7794 part of the sound device node. This sound device is a complex one and comprises the Audio Clock Generator (ADG), Sampling Rate Converter Unit (SCU), Serial Sound Interface [Unit] (SSI[U]), and Audio DMAC-Peripheral-Peripheral. It is up to the board file to enable the device. This patch is based on the R8A7791 sound work by Kuninori Morimoto. Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com> --- arch/arm/boot/dts/r8a7794.dtsi | 171 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 171 insertions(+) Index: renesas/arch/arm/boot/dts/r8a7794.dtsi =================================================================== --- renesas.orig/arch/arm/boot/dts/r8a7794.dtsi +++ renesas/arch/arm/boot/dts/r8a7794.dtsi @@ -1309,4 +1309,175 @@ #iommu-cells = <1>; status = "disabled"; }; + + 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>; + */ + compatible = "renesas,rcar_sound-r8a7794", + "renesas,rcar_sound-gen2"; + reg = <0 0xec500000 0 0x1000>, /* SCU */ + <0 0xec5a0000 0 0x100>, /* ADG */ + <0 0xec540000 0 0x1000>, /* SSIU */ + <0 0xec541000 0 0x280>, /* SSI */ + <0 0xec740000 0 0x200>; /* Audio DMAC peri peri */ + reg-names = "scu", "adg", "ssiu", "ssi", "audmapp"; + + clocks = <&mstp10_clks R8A7794_CLK_SSI_ALL>, + <&mstp10_clks R8A7794_CLK_SSI9>, + <&mstp10_clks R8A7794_CLK_SSI8>, + <&mstp10_clks R8A7794_CLK_SSI7>, + <&mstp10_clks R8A7794_CLK_SSI6>, + <&mstp10_clks R8A7794_CLK_SSI5>, + <&mstp10_clks R8A7794_CLK_SSI4>, + <&mstp10_clks R8A7794_CLK_SSI3>, + <&mstp10_clks R8A7794_CLK_SSI2>, + <&mstp10_clks R8A7794_CLK_SSI1>, + <&mstp10_clks R8A7794_CLK_SSI0>, + <&mstp10_clks R8A7794_CLK_SCU_SRC9>, + <&mstp10_clks R8A7794_CLK_SCU_SRC8>, + <&mstp10_clks R8A7794_CLK_SCU_SRC7>, + <&mstp10_clks R8A7794_CLK_SCU_SRC6>, + <&mstp10_clks R8A7794_CLK_SCU_SRC5>, + <&mstp10_clks R8A7794_CLK_SCU_SRC4>, + <&mstp10_clks R8A7794_CLK_SCU_SRC3>, + <&mstp10_clks R8A7794_CLK_SCU_SRC2>, + <&mstp10_clks R8A7794_CLK_SCU_SRC1>, + <&mstp10_clks R8A7794_CLK_SCU_SRC0>, + <&mstp10_clks R8A7794_CLK_SCU_CTU0_MIX0>, + <&mstp10_clks R8A7794_CLK_SCU_CTU1_MIX1>, + <&mstp10_clks R8A7794_CLK_SCU_CTU0_MIX0>, + <&mstp10_clks R8A7794_CLK_SCU_CTU1_MIX1>, + <&mstp10_clks R8A7794_CLK_SCU_DVC0>, + <&mstp10_clks R8A7794_CLK_SCU_DVC1>, + <&audio_clka>, <&audio_clkb>, <&audio_clkc>, + <&m2_clk>; + 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", + "clk_a", "clk_b", "clk_c", "clk_i"; + power-domains = <&cpg_clocks>; + + status = "disabled"; + rcar_sound,src { + src0: src@0 { + interrupts = <GIC_SPI 352 IRQ_TYPE_LEVEL_HIGH>; + dmas = <&audma0 0x85>, <&audma0 0x9a>; + dma-names = "rx", "tx"; + }; + src1: src@1 { + interrupts = <GIC_SPI 353 IRQ_TYPE_LEVEL_HIGH>; + dmas = <&audma0 0x87>, <&audma0 0x9c>; + dma-names = "rx", "tx"; + }; + src2: src@2 { + interrupts = <GIC_SPI 354 IRQ_TYPE_LEVEL_HIGH>; + dmas = <&audma0 0x89>, <&audma0 0x9e>; + dma-names = "rx", "tx"; + }; + src3: src@3 { + interrupts = <GIC_SPI 355 IRQ_TYPE_LEVEL_HIGH>; + dmas = <&audma0 0x8b>, <&audma0 0xa0>; + dma-names = "rx", "tx"; + }; + src4: src@4 { + interrupts = <GIC_SPI 356 IRQ_TYPE_LEVEL_HIGH>; + dmas = <&audma0 0x8d>, <&audma0 0xb0>; + dma-names = "rx", "tx"; + }; + src5: src@5 { + interrupts = <GIC_SPI 357 IRQ_TYPE_LEVEL_HIGH>; + dmas = <&audma0 0x8f>, <&audma0 0xb2>; + dma-names = "rx", "tx"; + }; + src6: src@6 { + interrupts = <GIC_SPI 358 IRQ_TYPE_LEVEL_HIGH>; + dmas = <&audma0 0x91>, <&audma0 0xb4>; + dma-names = "rx", "tx"; + }; + src7: src@7 { + interrupts = <GIC_SPI 359 IRQ_TYPE_LEVEL_HIGH>; + dmas = <&audma0 0x93>, <&audma0 0xb6>; + dma-names = "rx", "tx"; + }; + src8: src@8 { + interrupts = <GIC_SPI 360 IRQ_TYPE_LEVEL_HIGH>; + dmas = <&audma0 0x95>, <&audma0 0xb8>; + dma-names = "rx", "tx"; + }; + src9: src@9 { + interrupts = <GIC_SPI 361 IRQ_TYPE_LEVEL_HIGH>; + dmas = <&audma0 0x97>, <&audma0 0xba>; + dma-names = "rx", "tx"; + }; + }; + + rcar_sound,ssi { + ssi0: ssi@0 { + interrupts = <GIC_SPI 370 IRQ_TYPE_LEVEL_HIGH>; + dmas = <&audma0 0x01>, <&audma0 0x02>, + <&audma0 0x15>, <&audma0 0x16>; + dma-names = "rx", "tx", "rxu", "txu"; + }; + ssi1: ssi@1 { + interrupts = <GIC_SPI 371 IRQ_TYPE_LEVEL_HIGH>; + dmas = <&audma0 0x03>, <&audma0 0x04>, + <&audma0 0x49>, <&audma0 0x4a>; + dma-names = "rx", "tx", "rxu", "txu"; + }; + ssi2: ssi@2 { + interrupts = <GIC_SPI 372 IRQ_TYPE_LEVEL_HIGH>; + dmas = <&audma0 0x05>, <&audma0 0x06>, + <&audma0 0x63>, <&audma0 0x64>; + dma-names = "rx", "tx", "rxu", "txu"; + }; + ssi3: ssi@3 { + interrupts = <GIC_SPI 373 IRQ_TYPE_LEVEL_HIGH>; + dmas = <&audma0 0x07>, <&audma0 0x08>, + <&audma0 0x6f>, <&audma0 0x70>; + dma-names = "rx", "tx", "rxu", "txu"; + }; + ssi4: ssi@4 { + interrupts = <GIC_SPI 374 IRQ_TYPE_LEVEL_HIGH>; + dmas = <&audma0 0x09>, <&audma0 0x0a>, + <&audma0 0x71>, <&audma0 0x72>; + dma-names = "rx", "tx", "rxu", "txu"; + }; + ssi5: ssi@5 { + interrupts = <GIC_SPI 375 IRQ_TYPE_LEVEL_HIGH>; + dmas = <&audma0 0x0b>, <&audma0 0x0c>, + <&audma0 0x73>, <&audma0 0x74>; + dma-names = "rx", "tx", "rxu", "txu"; + }; + ssi6: ssi@6 { + interrupts = <GIC_SPI 376 IRQ_TYPE_LEVEL_HIGH>; + dmas = <&audma0 0x0d>, <&audma0 0x0e>, + <&audma0 0x75>, <&audma0 0x76>; + dma-names = "rx", "tx", "rxu", "txu"; + }; + ssi7: ssi@7 { + interrupts = <GIC_SPI 377 IRQ_TYPE_LEVEL_HIGH>; + dmas = <&audma0 0x0f>, <&audma0 0x10>, + <&audma0 0x79>, <&audma0 0x7a>; + dma-names = "rx", "tx", "rxu", "txu"; + }; + ssi8: ssi@8 { + interrupts = <GIC_SPI 378 IRQ_TYPE_LEVEL_HIGH>; + dmas = <&audma0 0x11>, <&audma0 0x12>, + <&audma0 0x7b>, <&audma0 0x7c>; + dma-names = "rx", "tx", "rxu", "txu"; + }; + ssi9: ssi@9 { + interrupts = <GIC_SPI 379 IRQ_TYPE_LEVEL_HIGH>; + dmas = <&audma0 0x13>, <&audma0 0x14>, + <&audma0 0x7d>, <&audma0 0x7e>; + dma-names = "rx", "tx", "rxu", "txu"; + }; + }; + }; }; ^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH 5/5] ARM: dts: r8a7794 add sound support 2016-02-08 23:04 ` [PATCH 5/5] ARM: dts: r8a7794 add sound support Sergei Shtylyov @ 2016-02-09 0:08 ` Kuninori Morimoto 2016-02-09 10:52 ` Sergei Shtylyov 2016-02-09 19:50 ` Simon Horman 1 sibling, 1 reply; 11+ messages in thread From: Kuninori Morimoto @ 2016-02-09 0:08 UTC (permalink / raw) To: Sergei Shtylyov Cc: horms, linux-renesas-soc, robh+dt, pawel.moll, mark.rutland, ijc+devicetree, galak, devicetree, magnus.damm, linux, linux-arm-kernel Hi Sergei > Define the generic R8A7794 part of the sound device node. > This sound device is a complex one and comprises the Audio Clock Generator > (ADG), Sampling Rate Converter Unit (SCU), Serial Sound Interface [Unit] > (SSI[U]), and Audio DMAC-Peripheral-Peripheral. > It is up to the board file to enable the device. > > This patch is based on the R8A7791 sound work by Kuninori Morimoto. > > Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com> (snip) > + clocks = <&mstp10_clks R8A7794_CLK_SSI_ALL>, > + <&mstp10_clks R8A7794_CLK_SSI9>, > + <&mstp10_clks R8A7794_CLK_SSI8>, > + <&mstp10_clks R8A7794_CLK_SSI7>, > + <&mstp10_clks R8A7794_CLK_SSI6>, > + <&mstp10_clks R8A7794_CLK_SSI5>, > + <&mstp10_clks R8A7794_CLK_SSI4>, > + <&mstp10_clks R8A7794_CLK_SSI3>, > + <&mstp10_clks R8A7794_CLK_SSI2>, > + <&mstp10_clks R8A7794_CLK_SSI1>, > + <&mstp10_clks R8A7794_CLK_SSI0>, > + <&mstp10_clks R8A7794_CLK_SCU_SRC9>, > + <&mstp10_clks R8A7794_CLK_SCU_SRC8>, > + <&mstp10_clks R8A7794_CLK_SCU_SRC7>, > + <&mstp10_clks R8A7794_CLK_SCU_SRC6>, > + <&mstp10_clks R8A7794_CLK_SCU_SRC5>, > + <&mstp10_clks R8A7794_CLK_SCU_SRC4>, > + <&mstp10_clks R8A7794_CLK_SCU_SRC3>, > + <&mstp10_clks R8A7794_CLK_SCU_SRC2>, > + <&mstp10_clks R8A7794_CLK_SCU_SRC1>, > + <&mstp10_clks R8A7794_CLK_SCU_SRC0>, > + <&mstp10_clks R8A7794_CLK_SCU_CTU0_MIX0>, > + <&mstp10_clks R8A7794_CLK_SCU_CTU1_MIX1>, > + <&mstp10_clks R8A7794_CLK_SCU_CTU0_MIX0>, > + <&mstp10_clks R8A7794_CLK_SCU_CTU1_MIX1>, > + <&mstp10_clks R8A7794_CLK_SCU_DVC0>, > + <&mstp10_clks R8A7794_CLK_SCU_DVC1>, > + <&audio_clka>, <&audio_clkb>, <&audio_clkc>, > + <&m2_clk>; > + 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", > + "clk_a", "clk_b", "clk_c", "clk_i"; This patch doesn't support "CTU/MIX/DVC". Your "clocks" includes "R8A7794_CLK_SCU_CTUx_MIXx", and "R8A7794_CLK_SCU_DVCx", but "clock-names" doesn't include "ctu.x", "dvc.x". ^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH 5/5] ARM: dts: r8a7794 add sound support 2016-02-09 0:08 ` Kuninori Morimoto @ 2016-02-09 10:52 ` Sergei Shtylyov 0 siblings, 0 replies; 11+ messages in thread From: Sergei Shtylyov @ 2016-02-09 10:52 UTC (permalink / raw) To: Kuninori Morimoto Cc: horms, linux-renesas-soc, robh+dt, pawel.moll, mark.rutland, ijc+devicetree, galak, devicetree, magnus.damm, linux, linux-arm-kernel On 2/9/2016 3:08 AM, Kuninori Morimoto wrote: >> Define the generic R8A7794 part of the sound device node. >> This sound device is a complex one and comprises the Audio Clock Generator >> (ADG), Sampling Rate Converter Unit (SCU), Serial Sound Interface [Unit] >> (SSI[U]), and Audio DMAC-Peripheral-Peripheral. >> It is up to the board file to enable the device. >> >> This patch is based on the R8A7791 sound work by Kuninori Morimoto. >> >> Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com> > (snip) >> + clocks = <&mstp10_clks R8A7794_CLK_SSI_ALL>, >> + <&mstp10_clks R8A7794_CLK_SSI9>, >> + <&mstp10_clks R8A7794_CLK_SSI8>, >> + <&mstp10_clks R8A7794_CLK_SSI7>, >> + <&mstp10_clks R8A7794_CLK_SSI6>, >> + <&mstp10_clks R8A7794_CLK_SSI5>, >> + <&mstp10_clks R8A7794_CLK_SSI4>, >> + <&mstp10_clks R8A7794_CLK_SSI3>, >> + <&mstp10_clks R8A7794_CLK_SSI2>, >> + <&mstp10_clks R8A7794_CLK_SSI1>, >> + <&mstp10_clks R8A7794_CLK_SSI0>, >> + <&mstp10_clks R8A7794_CLK_SCU_SRC9>, >> + <&mstp10_clks R8A7794_CLK_SCU_SRC8>, >> + <&mstp10_clks R8A7794_CLK_SCU_SRC7>, >> + <&mstp10_clks R8A7794_CLK_SCU_SRC6>, >> + <&mstp10_clks R8A7794_CLK_SCU_SRC5>, >> + <&mstp10_clks R8A7794_CLK_SCU_SRC4>, >> + <&mstp10_clks R8A7794_CLK_SCU_SRC3>, >> + <&mstp10_clks R8A7794_CLK_SCU_SRC2>, >> + <&mstp10_clks R8A7794_CLK_SCU_SRC1>, >> + <&mstp10_clks R8A7794_CLK_SCU_SRC0>, >> + <&mstp10_clks R8A7794_CLK_SCU_CTU0_MIX0>, >> + <&mstp10_clks R8A7794_CLK_SCU_CTU1_MIX1>, >> + <&mstp10_clks R8A7794_CLK_SCU_CTU0_MIX0>, >> + <&mstp10_clks R8A7794_CLK_SCU_CTU1_MIX1>, >> + <&mstp10_clks R8A7794_CLK_SCU_DVC0>, >> + <&mstp10_clks R8A7794_CLK_SCU_DVC1>, >> + <&audio_clka>, <&audio_clkb>, <&audio_clkc>, >> + <&m2_clk>; >> + 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", >> + "clk_a", "clk_b", "clk_c", "clk_i"; > > This patch doesn't support "CTU/MIX/DVC". It doesn't. > Your "clocks" includes "R8A7794_CLK_SCU_CTUx_MIXx", and "R8A7794_CLK_SCU_DVCx", > but "clock-names" doesn't include "ctu.x", "dvc.x". Oops, thank you for noticing. Will fix. MBR, Sergei ^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH 5/5] ARM: dts: r8a7794 add sound support 2016-02-08 23:04 ` [PATCH 5/5] ARM: dts: r8a7794 add sound support Sergei Shtylyov 2016-02-09 0:08 ` Kuninori Morimoto @ 2016-02-09 19:50 ` Simon Horman 2016-02-09 20:25 ` Sergei Shtylyov 1 sibling, 1 reply; 11+ messages in thread From: Simon Horman @ 2016-02-09 19:50 UTC (permalink / raw) To: Sergei Shtylyov Cc: linux-renesas-soc, robh+dt, pawel.moll, mark.rutland, ijc+devicetree, galak, devicetree, magnus.damm, linux, linux-arm-kernel On Tue, Feb 09, 2016 at 02:04:07AM +0300, Sergei Shtylyov wrote: > Define the generic R8A7794 part of the sound device node. > This sound device is a complex one and comprises the Audio Clock Generator > (ADG), Sampling Rate Converter Unit (SCU), Serial Sound Interface [Unit] > (SSI[U]), and Audio DMAC-Peripheral-Peripheral. > It is up to the board file to enable the device. > > This patch is based on the R8A7791 sound work by Kuninori Morimoto. > > Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com> > > --- > arch/arm/boot/dts/r8a7794.dtsi | 171 +++++++++++++++++++++++++++++++++++++++++ > 1 file changed, 171 insertions(+) > > Index: renesas/arch/arm/boot/dts/r8a7794.dtsi > =================================================================== > --- renesas.orig/arch/arm/boot/dts/r8a7794.dtsi > +++ renesas/arch/arm/boot/dts/r8a7794.dtsi > @@ -1309,4 +1309,175 @@ > #iommu-cells = <1>; > status = "disabled"; > }; > + > + 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>; > + */ > + compatible = "renesas,rcar_sound-r8a7794", > + "renesas,rcar_sound-gen2"; > + reg = <0 0xec500000 0 0x1000>, /* SCU */ > + <0 0xec5a0000 0 0x100>, /* ADG */ > + <0 0xec540000 0 0x1000>, /* SSIU */ > + <0 0xec541000 0 0x280>, /* SSI */ > + <0 0xec740000 0 0x200>; /* Audio DMAC peri peri */ > + reg-names = "scu", "adg", "ssiu", "ssi", "audmapp"; > + > + clocks = <&mstp10_clks R8A7794_CLK_SSI_ALL>, > + <&mstp10_clks R8A7794_CLK_SSI9>, > + <&mstp10_clks R8A7794_CLK_SSI8>, > + <&mstp10_clks R8A7794_CLK_SSI7>, > + <&mstp10_clks R8A7794_CLK_SSI6>, > + <&mstp10_clks R8A7794_CLK_SSI5>, > + <&mstp10_clks R8A7794_CLK_SSI4>, > + <&mstp10_clks R8A7794_CLK_SSI3>, > + <&mstp10_clks R8A7794_CLK_SSI2>, > + <&mstp10_clks R8A7794_CLK_SSI1>, > + <&mstp10_clks R8A7794_CLK_SSI0>, > + <&mstp10_clks R8A7794_CLK_SCU_SRC9>, > + <&mstp10_clks R8A7794_CLK_SCU_SRC8>, > + <&mstp10_clks R8A7794_CLK_SCU_SRC7>, > + <&mstp10_clks R8A7794_CLK_SCU_SRC6>, > + <&mstp10_clks R8A7794_CLK_SCU_SRC5>, > + <&mstp10_clks R8A7794_CLK_SCU_SRC4>, > + <&mstp10_clks R8A7794_CLK_SCU_SRC3>, > + <&mstp10_clks R8A7794_CLK_SCU_SRC2>, > + <&mstp10_clks R8A7794_CLK_SCU_SRC1>, > + <&mstp10_clks R8A7794_CLK_SCU_SRC0>, > + <&mstp10_clks R8A7794_CLK_SCU_CTU0_MIX0>, > + <&mstp10_clks R8A7794_CLK_SCU_CTU1_MIX1>, > + <&mstp10_clks R8A7794_CLK_SCU_CTU0_MIX0>, > + <&mstp10_clks R8A7794_CLK_SCU_CTU1_MIX1>, > + <&mstp10_clks R8A7794_CLK_SCU_DVC0>, > + <&mstp10_clks R8A7794_CLK_SCU_DVC1>, > + <&audio_clka>, <&audio_clkb>, <&audio_clkc>, > + <&m2_clk>; > + 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", > + "clk_a", "clk_b", "clk_c", "clk_i"; > + power-domains = <&cpg_clocks>; > + > + status = "disabled"; > + rcar_sound,src { > + src0: src@0 { > + interrupts = <GIC_SPI 352 IRQ_TYPE_LEVEL_HIGH>; > + dmas = <&audma0 0x85>, <&audma0 0x9a>; > + dma-names = "rx", "tx"; > + }; > + src1: src@1 { > + interrupts = <GIC_SPI 353 IRQ_TYPE_LEVEL_HIGH>; > + dmas = <&audma0 0x87>, <&audma0 0x9c>; > + dma-names = "rx", "tx"; > + }; > + src2: src@2 { > + interrupts = <GIC_SPI 354 IRQ_TYPE_LEVEL_HIGH>; > + dmas = <&audma0 0x89>, <&audma0 0x9e>; > + dma-names = "rx", "tx"; > + }; > + src3: src@3 { > + interrupts = <GIC_SPI 355 IRQ_TYPE_LEVEL_HIGH>; > + dmas = <&audma0 0x8b>, <&audma0 0xa0>; > + dma-names = "rx", "tx"; > + }; > + src4: src@4 { > + interrupts = <GIC_SPI 356 IRQ_TYPE_LEVEL_HIGH>; > + dmas = <&audma0 0x8d>, <&audma0 0xb0>; > + dma-names = "rx", "tx"; > + }; > + src5: src@5 { > + interrupts = <GIC_SPI 357 IRQ_TYPE_LEVEL_HIGH>; > + dmas = <&audma0 0x8f>, <&audma0 0xb2>; > + dma-names = "rx", "tx"; > + }; > + src6: src@6 { > + interrupts = <GIC_SPI 358 IRQ_TYPE_LEVEL_HIGH>; > + dmas = <&audma0 0x91>, <&audma0 0xb4>; > + dma-names = "rx", "tx"; > + }; > + src7: src@7 { > + interrupts = <GIC_SPI 359 IRQ_TYPE_LEVEL_HIGH>; > + dmas = <&audma0 0x93>, <&audma0 0xb6>; > + dma-names = "rx", "tx"; > + }; > + src8: src@8 { > + interrupts = <GIC_SPI 360 IRQ_TYPE_LEVEL_HIGH>; > + dmas = <&audma0 0x95>, <&audma0 0xb8>; > + dma-names = "rx", "tx"; > + }; > + src9: src@9 { > + interrupts = <GIC_SPI 361 IRQ_TYPE_LEVEL_HIGH>; > + dmas = <&audma0 0x97>, <&audma0 0xba>; > + dma-names = "rx", "tx"; > + }; > + }; My reading of the documentation is that src0, 7, 8 and 9 are not present on the r8a7794. I am referring to Figure 38.1b or r1.02 of the R-Car Gen2 User's Manual. [snip] ^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH 5/5] ARM: dts: r8a7794 add sound support 2016-02-09 19:50 ` Simon Horman @ 2016-02-09 20:25 ` Sergei Shtylyov 2016-02-10 0:32 ` Kuninori Morimoto 0 siblings, 1 reply; 11+ messages in thread From: Sergei Shtylyov @ 2016-02-09 20:25 UTC (permalink / raw) To: Simon Horman Cc: linux-renesas-soc, robh+dt, pawel.moll, mark.rutland, ijc+devicetree, galak, devicetree, magnus.damm, linux, linux-arm-kernel Hello. On 02/09/2016 10:50 PM, Simon Horman wrote: >> Define the generic R8A7794 part of the sound device node. >> This sound device is a complex one and comprises the Audio Clock Generator >> (ADG), Sampling Rate Converter Unit (SCU), Serial Sound Interface [Unit] >> (SSI[U]), and Audio DMAC-Peripheral-Peripheral. >> It is up to the board file to enable the device. >> >> This patch is based on the R8A7791 sound work by Kuninori Morimoto. >> >> Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com> >> >> --- >> arch/arm/boot/dts/r8a7794.dtsi | 171 +++++++++++++++++++++++++++++++++++++++++ >> 1 file changed, 171 insertions(+) >> >> Index: renesas/arch/arm/boot/dts/r8a7794.dtsi >> =================================================================== >> --- renesas.orig/arch/arm/boot/dts/r8a7794.dtsi >> +++ renesas/arch/arm/boot/dts/r8a7794.dtsi >> @@ -1309,4 +1309,175 @@ >> #iommu-cells = <1>; >> status = "disabled"; >> }; >> + >> + 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>; >> + */ >> + compatible = "renesas,rcar_sound-r8a7794", >> + "renesas,rcar_sound-gen2"; >> + reg = <0 0xec500000 0 0x1000>, /* SCU */ >> + <0 0xec5a0000 0 0x100>, /* ADG */ >> + <0 0xec540000 0 0x1000>, /* SSIU */ >> + <0 0xec541000 0 0x280>, /* SSI */ >> + <0 0xec740000 0 0x200>; /* Audio DMAC peri peri */ >> + reg-names = "scu", "adg", "ssiu", "ssi", "audmapp"; >> + >> + clocks = <&mstp10_clks R8A7794_CLK_SSI_ALL>, >> + <&mstp10_clks R8A7794_CLK_SSI9>, >> + <&mstp10_clks R8A7794_CLK_SSI8>, >> + <&mstp10_clks R8A7794_CLK_SSI7>, >> + <&mstp10_clks R8A7794_CLK_SSI6>, >> + <&mstp10_clks R8A7794_CLK_SSI5>, >> + <&mstp10_clks R8A7794_CLK_SSI4>, >> + <&mstp10_clks R8A7794_CLK_SSI3>, >> + <&mstp10_clks R8A7794_CLK_SSI2>, >> + <&mstp10_clks R8A7794_CLK_SSI1>, >> + <&mstp10_clks R8A7794_CLK_SSI0>, >> + <&mstp10_clks R8A7794_CLK_SCU_SRC9>, >> + <&mstp10_clks R8A7794_CLK_SCU_SRC8>, >> + <&mstp10_clks R8A7794_CLK_SCU_SRC7>, >> + <&mstp10_clks R8A7794_CLK_SCU_SRC6>, >> + <&mstp10_clks R8A7794_CLK_SCU_SRC5>, >> + <&mstp10_clks R8A7794_CLK_SCU_SRC4>, >> + <&mstp10_clks R8A7794_CLK_SCU_SRC3>, >> + <&mstp10_clks R8A7794_CLK_SCU_SRC2>, >> + <&mstp10_clks R8A7794_CLK_SCU_SRC1>, >> + <&mstp10_clks R8A7794_CLK_SCU_SRC0>, >> + <&mstp10_clks R8A7794_CLK_SCU_CTU0_MIX0>, >> + <&mstp10_clks R8A7794_CLK_SCU_CTU1_MIX1>, >> + <&mstp10_clks R8A7794_CLK_SCU_CTU0_MIX0>, >> + <&mstp10_clks R8A7794_CLK_SCU_CTU1_MIX1>, >> + <&mstp10_clks R8A7794_CLK_SCU_DVC0>, >> + <&mstp10_clks R8A7794_CLK_SCU_DVC1>, >> + <&audio_clka>, <&audio_clkb>, <&audio_clkc>, >> + <&m2_clk>; >> + 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", >> + "clk_a", "clk_b", "clk_c", "clk_i"; >> + power-domains = <&cpg_clocks>; >> + >> + status = "disabled"; >> + rcar_sound,src { >> + src0: src@0 { >> + interrupts = <GIC_SPI 352 IRQ_TYPE_LEVEL_HIGH>; >> + dmas = <&audma0 0x85>, <&audma0 0x9a>; >> + dma-names = "rx", "tx"; >> + }; >> + src1: src@1 { >> + interrupts = <GIC_SPI 353 IRQ_TYPE_LEVEL_HIGH>; >> + dmas = <&audma0 0x87>, <&audma0 0x9c>; >> + dma-names = "rx", "tx"; >> + }; >> + src2: src@2 { >> + interrupts = <GIC_SPI 354 IRQ_TYPE_LEVEL_HIGH>; >> + dmas = <&audma0 0x89>, <&audma0 0x9e>; >> + dma-names = "rx", "tx"; >> + }; >> + src3: src@3 { >> + interrupts = <GIC_SPI 355 IRQ_TYPE_LEVEL_HIGH>; >> + dmas = <&audma0 0x8b>, <&audma0 0xa0>; >> + dma-names = "rx", "tx"; >> + }; >> + src4: src@4 { >> + interrupts = <GIC_SPI 356 IRQ_TYPE_LEVEL_HIGH>; >> + dmas = <&audma0 0x8d>, <&audma0 0xb0>; >> + dma-names = "rx", "tx"; >> + }; >> + src5: src@5 { >> + interrupts = <GIC_SPI 357 IRQ_TYPE_LEVEL_HIGH>; >> + dmas = <&audma0 0x8f>, <&audma0 0xb2>; >> + dma-names = "rx", "tx"; >> + }; >> + src6: src@6 { >> + interrupts = <GIC_SPI 358 IRQ_TYPE_LEVEL_HIGH>; >> + dmas = <&audma0 0x91>, <&audma0 0xb4>; >> + dma-names = "rx", "tx"; >> + }; >> + src7: src@7 { >> + interrupts = <GIC_SPI 359 IRQ_TYPE_LEVEL_HIGH>; >> + dmas = <&audma0 0x93>, <&audma0 0xb6>; >> + dma-names = "rx", "tx"; >> + }; >> + src8: src@8 { >> + interrupts = <GIC_SPI 360 IRQ_TYPE_LEVEL_HIGH>; >> + dmas = <&audma0 0x95>, <&audma0 0xb8>; >> + dma-names = "rx", "tx"; >> + }; >> + src9: src@9 { >> + interrupts = <GIC_SPI 361 IRQ_TYPE_LEVEL_HIGH>; >> + dmas = <&audma0 0x97>, <&audma0 0xba>; >> + dma-names = "rx", "tx"; >> + }; >> + }; > My reading of the documentation is that src0, 7, 8 and 9 are not > present on the r8a7794. I am referring to Figure 38.1b or r1.02 of > the R-Car Gen2 User's Manual. Indeed, thank you for the timely comment (I'm working on the series respin)! However, table 7A.12 still lists the SRC0/7/8/9 clocks for R8A7794, table 11.1 still lists SRC0/7/8/9 interrupts for R8A7794, and table 43.4 still lists SRC0/7/8/9 MID+RID for R8A7794 -- go figure... > [snip] MBR, Sergei ^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH 5/5] ARM: dts: r8a7794 add sound support 2016-02-09 20:25 ` Sergei Shtylyov @ 2016-02-10 0:32 ` Kuninori Morimoto 0 siblings, 0 replies; 11+ messages in thread From: Kuninori Morimoto @ 2016-02-10 0:32 UTC (permalink / raw) To: Sergei Shtylyov Cc: Simon Horman, linux-renesas-soc, robh+dt, pawel.moll, mark.rutland, ijc+devicetree, galak, devicetree, magnus.damm, linux, linux-arm-kernel Hi > >> Define the generic R8A7794 part of the sound device node. > >> This sound device is a complex one and comprises the Audio Clock Generator > >> (ADG), Sampling Rate Converter Unit (SCU), Serial Sound Interface [Unit] > >> (SSI[U]), and Audio DMAC-Peripheral-Peripheral. > >> It is up to the board file to enable the device. > >> > >> This patch is based on the R8A7791 sound work by Kuninori Morimoto. > >> > >> Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com> > >> > >> --- (snip) > > My reading of the documentation is that src0, 7, 8 and 9 are not > > present on the r8a7794. I am referring to Figure 38.1b or r1.02 of > > the R-Car Gen2 User's Manual. > > Indeed, thank you for the timely comment (I'm working on the series > respin)! However, table 7A.12 still lists the SRC0/7/8/9 clocks for > R8A7794, table 11.1 still lists SRC0/7/8/9 interrupts for R8A7794, and > table 43.4 still lists SRC0/7/8/9 MID+RID for R8A7794 -- go figure... Oops, current rsnd driver is assuming that DT has all channels. This means it doesn't check src number itself. Can you add src0, 7, 8, 9 with "non exist" comment ? Otherwise, we need to modify driver, but I'm not sure how this assumption is deep. Best regards --- Kuninori Morimoto ^ permalink raw reply [flat|nested] 11+ messages in thread
end of thread, other threads:[~2016-02-10 0:32 UTC | newest] Thread overview: 11+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2016-02-08 22:55 [PATCH 0/5] Add R8A7794 sound DT support Sergei Shtylyov 2016-02-08 22:57 ` [PATCH 1/5] ARM: dts: r8a7794: add audio clocks Sergei Shtylyov 2016-02-08 22:58 ` [PATCH 2/5] ARM: dts: r8a7794: add MSTP5 clocks Sergei Shtylyov 2016-02-08 22:59 ` [PATCH 3/5] ARM: dts: r8a7794: add MSTP10 clocks Sergei Shtylyov 2016-02-08 23:03 ` [PATCH 4/5] ARM: dts: r8a7794: add Audio-DMAC support Sergei Shtylyov 2016-02-08 23:04 ` [PATCH 5/5] ARM: dts: r8a7794 add sound support Sergei Shtylyov 2016-02-09 0:08 ` Kuninori Morimoto 2016-02-09 10:52 ` Sergei Shtylyov 2016-02-09 19:50 ` Simon Horman 2016-02-09 20:25 ` Sergei Shtylyov 2016-02-10 0:32 ` Kuninori Morimoto
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).