Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

ARM: shmobile: r8a7790: Add Audio DMAC devices to DT

Instantiate the two Audio DMA controllers in the r8a7790 device tree.

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
[geert: corrected spelling of audmac1]
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>

authored by

Kuninori Morimoto and committed by
Simon Horman
ba3240be 148ebf47

+63 -3
+61 -3
arch/arm/boot/dts/r8a7790.dtsi
··· 312 312 #dma-cells = <1>; 313 313 dma-channels = <15>; 314 314 }; 315 + 316 + audma0: dma-controller@ec700000 { 317 + compatible = "renesas,rcar-dmac"; 318 + reg = <0 0xec700000 0 0x10000>; 319 + interrupts = <0 346 IRQ_TYPE_LEVEL_HIGH 320 + 0 320 IRQ_TYPE_LEVEL_HIGH 321 + 0 321 IRQ_TYPE_LEVEL_HIGH 322 + 0 322 IRQ_TYPE_LEVEL_HIGH 323 + 0 323 IRQ_TYPE_LEVEL_HIGH 324 + 0 324 IRQ_TYPE_LEVEL_HIGH 325 + 0 325 IRQ_TYPE_LEVEL_HIGH 326 + 0 326 IRQ_TYPE_LEVEL_HIGH 327 + 0 327 IRQ_TYPE_LEVEL_HIGH 328 + 0 328 IRQ_TYPE_LEVEL_HIGH 329 + 0 329 IRQ_TYPE_LEVEL_HIGH 330 + 0 330 IRQ_TYPE_LEVEL_HIGH 331 + 0 331 IRQ_TYPE_LEVEL_HIGH 332 + 0 332 IRQ_TYPE_LEVEL_HIGH>; 333 + interrupt-names = "error", 334 + "ch0", "ch1", "ch2", "ch3", 335 + "ch4", "ch5", "ch6", "ch7", 336 + "ch8", "ch9", "ch10", "ch11", 337 + "ch12"; 338 + clocks = <&mstp5_clks R8A7790_CLK_AUDIO_DMAC0>; 339 + clock-names = "fck"; 340 + #dma-cells = <1>; 341 + dma-channels = <13>; 342 + }; 343 + 344 + audma1: dma-controller@ec720000 { 345 + compatible = "renesas,rcar-dmac"; 346 + reg = <0 0xec720000 0 0x10000>; 347 + interrupts = <0 347 IRQ_TYPE_LEVEL_HIGH 348 + 0 333 IRQ_TYPE_LEVEL_HIGH 349 + 0 334 IRQ_TYPE_LEVEL_HIGH 350 + 0 335 IRQ_TYPE_LEVEL_HIGH 351 + 0 336 IRQ_TYPE_LEVEL_HIGH 352 + 0 337 IRQ_TYPE_LEVEL_HIGH 353 + 0 338 IRQ_TYPE_LEVEL_HIGH 354 + 0 339 IRQ_TYPE_LEVEL_HIGH 355 + 0 340 IRQ_TYPE_LEVEL_HIGH 356 + 0 341 IRQ_TYPE_LEVEL_HIGH 357 + 0 342 IRQ_TYPE_LEVEL_HIGH 358 + 0 343 IRQ_TYPE_LEVEL_HIGH 359 + 0 344 IRQ_TYPE_LEVEL_HIGH 360 + 0 345 IRQ_TYPE_LEVEL_HIGH>; 361 + interrupt-names = "error", 362 + "ch0", "ch1", "ch2", "ch3", 363 + "ch4", "ch5", "ch6", "ch7", 364 + "ch8", "ch9", "ch10", "ch11", 365 + "ch12"; 366 + clocks = <&mstp5_clks R8A7790_CLK_AUDIO_DMAC1>; 367 + clock-names = "fck"; 368 + #dma-cells = <1>; 369 + dma-channels = <13>; 370 + }; 371 + 315 372 i2c0: i2c@e6508000 { 316 373 #address-cells = <1>; 317 374 #size-cells = <0>; ··· 1107 1050 mstp5_clks: mstp5_clks@e6150144 { 1108 1051 compatible = "renesas,r8a7790-mstp-clocks", "renesas,cpg-mstp-clocks"; 1109 1052 reg = <0 0xe6150144 0 4>, <0 0xe615003c 0 4>; 1110 - clocks = <&extal_clk>, <&p_clk>; 1053 + clocks = <&hp_clk>, <&hp_clk>, <&extal_clk>, <&p_clk>; 1111 1054 #clock-cells = <1>; 1112 - renesas,clock-indices = <R8A7790_CLK_THERMAL R8A7790_CLK_PWM>; 1113 - clock-output-names = "thermal", "pwm"; 1055 + renesas,clock-indices = <R8A7790_CLK_AUDIO_DMAC0 R8A7790_CLK_AUDIO_DMAC1 1056 + R8A7790_CLK_THERMAL R8A7790_CLK_PWM>; 1057 + clock-output-names = "audmac0", "audmac1", "thermal", "pwm"; 1114 1058 }; 1115 1059 mstp7_clks: mstp7_clks@e615014c { 1116 1060 compatible = "renesas,r8a7790-mstp-clocks", "renesas,cpg-mstp-clocks";
+2
include/dt-bindings/clock/r8a7790-clock.h
··· 78 78 #define R8A7790_CLK_USBDMAC1 31 79 79 80 80 /* MSTP5 */ 81 + #define R8A7790_CLK_AUDIO_DMAC1 1 82 + #define R8A7790_CLK_AUDIO_DMAC0 2 81 83 #define R8A7790_CLK_THERMAL 22 82 84 #define R8A7790_CLK_PWM 23 83 85