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

Merge tag 'renesas-dt2-for-v3.19' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/dt

Pull "Second Round of Renesas ARM Based SoC DT Updates for v3.19" from Simon Horman:

* Add labels for LEDs on kzm9g-reference and koelsch
* Add Sound support to r8a7790/lager and r8a7791/koelsch
* Add IIC DMA nodes to r8a7790 and r8a7791
* Use SoC-specific IIC compatible properties on sh73a0 and r8a73a4
* Add SGX, MMP and VSP1 clocks to r8a7794
* Add USBDMAC{0,1} clocks to r8a7790 and r8a7791

* tag 'renesas-dt2-for-v3.19' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas: (29 commits)
ARM: shmobile: r8a7791: add USBDMAC{0,1} clocks to device tree
ARM: shmobile: r8a7790: add USBDMAC{0,1} clocks to device tree
ARM: shmobile: r8a7794: Add MMP and VSP1 clocks to device tree
ARM: shmobile: r8a7794: Add SGX clock to device tree
ARM: shmobile: koelsch: add Volume Ramp usage on comment
ARM: shmobile: lager: add Volume Ramp usage on comment
ARM: shmobile: r8a7791: add DMA nodes for IIC
ARM: shmobile: r8a7790: add DMA nodes for IIC
ARM: shmobile: kzm9g-reference dts: Add labels for the LEDs
ARM: shmobile: koelsch dts: Add labels for the LEDs
ARM: shmobile: sh73a0 dtsi: Add SoC-specific IIC compatible properties
ARM: shmobile: r8a73a4 dtsi: Add SoC-specific IIC compatible properties
ARM: shmobile: koelsch: Sound DMA support via DVC on DTS
ARM: shmobile: koelsch: Sound DMA support via SRC on DTS
ARM: shmobile: koelsch: Sound DMA support via BUSIF on DTS
ARM: shmobile: koelsch: Sound DMA support on DTS
ARM: shmobile: koelsch: Sound PIO support on DTS
ARM: shmobile: koelsch: fixup I2C2 clock frequency
ARM: shmobile: lager: Sound DMA support via DVC on DTS
ARM: shmobile: lager: Sound DMA support via SRC on DTS
...

Signed-off-by: Arnd Bergmann <arnd@arndb.de>

+370 -34
+9 -9
arch/arm/boot/dts/r8a73a4.dtsi
··· 106 106 i2c5: i2c@e60b0000 { 107 107 #address-cells = <1>; 108 108 #size-cells = <0>; 109 - compatible = "renesas,rmobile-iic"; 109 + compatible = "renesas,iic-r8a73a4", "renesas,rmobile-iic"; 110 110 reg = <0 0xe60b0000 0 0x428>; 111 111 interrupts = <0 179 IRQ_TYPE_LEVEL_HIGH>; 112 112 ··· 205 205 i2c0: i2c@e6500000 { 206 206 #address-cells = <1>; 207 207 #size-cells = <0>; 208 - compatible = "renesas,rmobile-iic"; 208 + compatible = "renesas,iic-r8a73a4", "renesas,rmobile-iic"; 209 209 reg = <0 0xe6500000 0 0x428>; 210 210 interrupts = <0 174 IRQ_TYPE_LEVEL_HIGH>; 211 211 status = "disabled"; ··· 214 214 i2c1: i2c@e6510000 { 215 215 #address-cells = <1>; 216 216 #size-cells = <0>; 217 - compatible = "renesas,rmobile-iic"; 217 + compatible = "renesas,iic-r8a73a4", "renesas,rmobile-iic"; 218 218 reg = <0 0xe6510000 0 0x428>; 219 219 interrupts = <0 175 IRQ_TYPE_LEVEL_HIGH>; 220 220 status = "disabled"; ··· 223 223 i2c2: i2c@e6520000 { 224 224 #address-cells = <1>; 225 225 #size-cells = <0>; 226 - compatible = "renesas,rmobile-iic"; 226 + compatible = "renesas,iic-r8a73a4", "renesas,rmobile-iic"; 227 227 reg = <0 0xe6520000 0 0x428>; 228 228 interrupts = <0 176 IRQ_TYPE_LEVEL_HIGH>; 229 229 status = "disabled"; ··· 232 232 i2c3: i2c@e6530000 { 233 233 #address-cells = <1>; 234 234 #size-cells = <0>; 235 - compatible = "renesas,rmobile-iic"; 235 + compatible = "renesas,iic-r8a73a4", "renesas,rmobile-iic"; 236 236 reg = <0 0xe6530000 0 0x428>; 237 237 interrupts = <0 177 IRQ_TYPE_LEVEL_HIGH>; 238 238 status = "disabled"; ··· 241 241 i2c4: i2c@e6540000 { 242 242 #address-cells = <1>; 243 243 #size-cells = <0>; 244 - compatible = "renesas,rmobile-iic"; 244 + compatible = "renesas,iic-r8a73a4", "renesas,rmobile-iic"; 245 245 reg = <0 0xe6540000 0 0x428>; 246 246 interrupts = <0 178 IRQ_TYPE_LEVEL_HIGH>; 247 247 status = "disabled"; ··· 250 250 i2c6: i2c@e6550000 { 251 251 #address-cells = <1>; 252 252 #size-cells = <0>; 253 - compatible = "renesas,rmobile-iic"; 253 + compatible = "renesas,iic-r8a73a4", "renesas,rmobile-iic"; 254 254 reg = <0 0xe6550000 0 0x428>; 255 255 interrupts = <0 184 IRQ_TYPE_LEVEL_HIGH>; 256 256 status = "disabled"; ··· 259 259 i2c7: i2c@e6560000 { 260 260 #address-cells = <1>; 261 261 #size-cells = <0>; 262 - compatible = "renesas,rmobile-iic"; 262 + compatible = "renesas,iic-r8a73a4", "renesas,rmobile-iic"; 263 263 reg = <0 0xe6560000 0 0x428>; 264 264 interrupts = <0 185 IRQ_TYPE_LEVEL_HIGH>; 265 265 status = "disabled"; ··· 268 268 i2c8: i2c@e6570000 { 269 269 #address-cells = <1>; 270 270 #size-cells = <0>; 271 - compatible = "renesas,rmobile-iic"; 271 + compatible = "renesas,iic-r8a73a4", "renesas,rmobile-iic"; 272 272 reg = <0 0xe6570000 0 0x428>; 273 273 interrupts = <0 173 IRQ_TYPE_LEVEL_HIGH>; 274 274 status = "disabled";
+83
arch/arm/boot/dts/r8a7790-lager.dts
··· 9 9 * kind, whether express or implied. 10 10 */ 11 11 12 + /* 13 + * SSI-AK4643 14 + * 15 + * SW1: 1: AK4643 16 + * 2: CN22 17 + * 3: ADV7511 18 + * 19 + * This command is required when Playback/Capture 20 + * 21 + * amixer set "LINEOUT Mixer DACL" on 22 + * amixer set "DVC Out" 100% 23 + * amixer set "DVC In" 100% 24 + * 25 + * You can use Mute 26 + * 27 + * amixer set "DVC Out Mute" on 28 + * amixer set "DVC In Mute" on 29 + * 30 + * You can use Volume Ramp 31 + * 32 + * amixer set "DVC Out Ramp Up Rate" "0.125 dB/64 steps" 33 + * amixer set "DVC Out Ramp Down Rate" "0.125 dB/512 steps" 34 + * amixer set "DVC Out Ramp" on 35 + * aplay xxx.wav & 36 + * amixer set "DVC Out" 80% // Volume Down 37 + * amixer set "DVC Out" 100% // Volume Up 38 + */ 39 + 12 40 /dts-v1/; 13 41 #include "r8a7790.dtsi" 14 42 #include <dt-bindings/gpio/gpio.h> ··· 172 144 gpios-states = <1>; 173 145 states = <3300000 1 174 146 1800000 0>; 147 + }; 148 + 149 + sound { 150 + compatible = "simple-audio-card"; 151 + 152 + simple-audio-card,format = "left_j"; 153 + simple-audio-card,bitclock-master = <&sndcodec>; 154 + simple-audio-card,frame-master = <&sndcodec>; 155 + 156 + sndcpu: simple-audio-card,cpu { 157 + sound-dai = <&rcar_sound>; 158 + }; 159 + 160 + sndcodec: simple-audio-card,codec { 161 + sound-dai = <&ak4643>; 162 + system-clock-frequency = <11289600>; 163 + }; 175 164 }; 176 165 177 166 vga-encoder { ··· 337 292 renesas,groups = "vin1_data8", "vin1_clk"; 338 293 renesas,function = "vin1"; 339 294 }; 295 + 296 + sound_pins: sound { 297 + renesas,groups = "ssi0129_ctrl", "ssi0_data", "ssi1_data"; 298 + renesas,function = "ssi"; 299 + }; 300 + 301 + sound_clk_pins: sound_clk { 302 + renesas,groups = "audio_clk_a"; 303 + renesas,function = "audio_clk"; 304 + }; 340 305 }; 341 306 342 307 &ether { ··· 484 429 pinctrl-0 = <&iic2_pins>; 485 430 pinctrl-names = "default"; 486 431 432 + clock-frequency = <100000>; 433 + 434 + ak4643: sound-codec@12 { 435 + compatible = "asahi-kasei,ak4643"; 436 + #sound-dai-cells = <0>; 437 + reg = <0x12>; 438 + }; 439 + 487 440 composite-in@20 { 488 441 compatible = "adi,adv7180"; 489 442 reg = <0x20>; ··· 573 510 bus-width = <8>; 574 511 }; 575 512 }; 513 + }; 514 + 515 + &rcar_sound { 516 + pinctrl-0 = <&sound_pins &sound_clk_pins>; 517 + pinctrl-names = "default"; 518 + 519 + #sound-dai-cells = <0>; 520 + 521 + status = "okay"; 522 + 523 + rcar_sound,dai { 524 + dai0 { 525 + playback = <&ssi0 &src2 &dvc0>; 526 + capture = <&ssi1 &src3 &dvc1>; 527 + }; 528 + }; 529 + }; 530 + 531 + &ssi1 { 532 + shared-pin; 576 533 };
+81 -5
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 + 372 + audmapp: dma-controller@ec740000 { 373 + compatible = "renesas,rcar-audmapp"; 374 + #dma-cells = <1>; 375 + 376 + reg = <0 0xec740000 0 0x200>; 377 + }; 378 + 315 379 i2c0: i2c@e6508000 { 316 380 #address-cells = <1>; 317 381 #size-cells = <0>; ··· 423 359 reg = <0 0xe6500000 0 0x425>; 424 360 interrupts = <0 174 IRQ_TYPE_LEVEL_HIGH>; 425 361 clocks = <&mstp3_clks R8A7790_CLK_IIC0>; 362 + dmas = <&dmac0 0x61>, <&dmac0 0x62>; 363 + dma-names = "tx", "rx"; 426 364 status = "disabled"; 427 365 }; 428 366 ··· 435 369 reg = <0 0xe6510000 0 0x425>; 436 370 interrupts = <0 175 IRQ_TYPE_LEVEL_HIGH>; 437 371 clocks = <&mstp3_clks R8A7790_CLK_IIC1>; 372 + dmas = <&dmac0 0x65>, <&dmac0 0x66>; 373 + dma-names = "tx", "rx"; 438 374 status = "disabled"; 439 375 }; 440 376 ··· 447 379 reg = <0 0xe6520000 0 0x425>; 448 380 interrupts = <0 176 IRQ_TYPE_LEVEL_HIGH>; 449 381 clocks = <&mstp3_clks R8A7790_CLK_IIC2>; 382 + dmas = <&dmac0 0x69>, <&dmac0 0x6a>; 383 + dma-names = "tx", "rx"; 450 384 status = "disabled"; 451 385 }; 452 386 ··· 459 389 reg = <0 0xe60b0000 0 0x425>; 460 390 interrupts = <0 173 IRQ_TYPE_LEVEL_HIGH>; 461 391 clocks = <&mstp9_clks R8A7790_CLK_IICDVFS>; 392 + dmas = <&dmac0 0x77>, <&dmac0 0x78>; 393 + dma-names = "tx", "rx"; 462 394 status = "disabled"; 463 395 }; 464 396 ··· 1103 1031 reg = <0 0xe615013c 0 4>, <0 0xe6150048 0 4>; 1104 1032 clocks = <&hp_clk>, <&cp_clk>, <&mmc1_clk>, <&sd3_clk>, 1105 1033 <&sd2_clk>, <&cpg_clocks R8A7790_CLK_SD1>, <&cpg_clocks R8A7790_CLK_SD0>, <&mmc0_clk>, 1106 - <&hp_clk>, <&mp_clk>, <&hp_clk>, <&mp_clk>, <&rclk_clk>; 1034 + <&hp_clk>, <&mp_clk>, <&hp_clk>, <&mp_clk>, <&rclk_clk>, 1035 + <&hp_clk>, <&hp_clk>; 1107 1036 #clock-cells = <1>; 1108 1037 renesas,clock-indices = < 1109 1038 R8A7790_CLK_IIC2 R8A7790_CLK_TPU0 R8A7790_CLK_MMCIF1 R8A7790_CLK_SDHI3 1110 1039 R8A7790_CLK_SDHI2 R8A7790_CLK_SDHI1 R8A7790_CLK_SDHI0 R8A7790_CLK_MMCIF0 1111 1040 R8A7790_CLK_IIC0 R8A7790_CLK_PCIEC R8A7790_CLK_IIC1 R8A7790_CLK_SSUSB R8A7790_CLK_CMT1 1041 + R8A7790_CLK_USBDMAC0 R8A7790_CLK_USBDMAC1 1112 1042 >; 1113 1043 clock-output-names = 1114 1044 "iic2", "tpu0", "mmcif1", "sdhi3", 1115 1045 "sdhi2", "sdhi1", "sdhi0", "mmcif0", 1116 - "iic0", "pciec", "iic1", "ssusb", "cmt1"; 1046 + "iic0", "pciec", "iic1", "ssusb", "cmt1", 1047 + "usbdmac0", "usbdmac1"; 1117 1048 }; 1118 1049 mstp5_clks: mstp5_clks@e6150144 { 1119 1050 compatible = "renesas,r8a7790-mstp-clocks", "renesas,cpg-mstp-clocks"; 1120 1051 reg = <0 0xe6150144 0 4>, <0 0xe615003c 0 4>; 1121 - clocks = <&extal_clk>, <&p_clk>; 1052 + clocks = <&hp_clk>, <&hp_clk>, <&extal_clk>, <&p_clk>; 1122 1053 #clock-cells = <1>; 1123 - renesas,clock-indices = <R8A7790_CLK_THERMAL R8A7790_CLK_PWM>; 1124 - clock-output-names = "thermal", "pwm"; 1054 + renesas,clock-indices = <R8A7790_CLK_AUDIO_DMAC0 R8A7790_CLK_AUDIO_DMAC1 1055 + R8A7790_CLK_THERMAL R8A7790_CLK_PWM>; 1056 + clock-output-names = "audmac0", "audmac1", "thermal", "pwm"; 1125 1057 }; 1126 1058 mstp7_clks: mstp7_clks@e615014c { 1127 1059 compatible = "renesas,r8a7790-mstp-clocks", "renesas,cpg-mstp-clocks";
+85 -1
arch/arm/boot/dts/r8a7791-koelsch.dts
··· 10 10 * kind, whether express or implied. 11 11 */ 12 12 13 + /* 14 + * SSI-AK4643 15 + * 16 + * SW1: 1: AK4643 17 + * 2: CN22 18 + * 3: ADV7511 19 + * 20 + * This command is required when Playback/Capture 21 + * 22 + * amixer set "LINEOUT Mixer DACL" on 23 + * amixer set "DVC Out" 100% 24 + * amixer set "DVC In" 100% 25 + * 26 + * You can use Mute 27 + * 28 + * amixer set "DVC Out Mute" on 29 + * amixer set "DVC In Mute" on 30 + * 31 + * You can use Volume Ramp 32 + * 33 + * amixer set "DVC Out Ramp Up Rate" "0.125 dB/64 steps" 34 + * amixer set "DVC Out Ramp Down Rate" "0.125 dB/512 steps" 35 + * amixer set "DVC Out Ramp" on 36 + * aplay xxx.wav & 37 + * amixer set "DVC Out" 80% // Volume Down 38 + * amixer set "DVC Out" 100% // Volume Up 39 + */ 40 + 13 41 /dts-v1/; 14 42 #include "r8a7791.dtsi" 15 43 #include <dt-bindings/gpio/gpio.h> ··· 158 130 compatible = "gpio-leds"; 159 131 led6 { 160 132 gpios = <&gpio2 19 GPIO_ACTIVE_HIGH>; 133 + label = "LED6"; 161 134 }; 162 135 led7 { 163 136 gpios = <&gpio2 20 GPIO_ACTIVE_HIGH>; 137 + label = "LED7"; 164 138 }; 165 139 led8 { 166 140 gpios = <&gpio2 21 GPIO_ACTIVE_HIGH>; 141 + label = "LED8"; 167 142 }; 168 143 }; 169 144 ··· 240 209 gpios-states = <1>; 241 210 states = <3300000 1 242 211 1800000 0>; 212 + }; 213 + 214 + sound { 215 + compatible = "simple-audio-card"; 216 + 217 + simple-audio-card,format = "left_j"; 218 + simple-audio-card,bitclock-master = <&sndcodec>; 219 + simple-audio-card,frame-master = <&sndcodec>; 220 + 221 + sndcpu: simple-audio-card,cpu { 222 + sound-dai = <&rcar_sound>; 223 + }; 224 + 225 + sndcodec: simple-audio-card,codec { 226 + sound-dai = <&ak4643>; 227 + system-clock-frequency = <11289600>; 228 + }; 243 229 }; 244 230 }; 245 231 ··· 347 299 vin1_pins: vin1 { 348 300 renesas,groups = "vin1_data8", "vin1_clk"; 349 301 renesas,function = "vin1"; 302 + }; 303 + 304 + sound_pins: sound { 305 + renesas,groups = "ssi0129_ctrl", "ssi0_data", "ssi1_data"; 306 + renesas,function = "ssi"; 307 + }; 308 + 309 + sound_clk_pins: sound_clk { 310 + renesas,groups = "audio_clk_a"; 311 + renesas,function = "audio_clk"; 350 312 }; 351 313 }; 352 314 ··· 483 425 pinctrl-names = "default"; 484 426 485 427 status = "okay"; 486 - clock-frequency = <400000>; 428 + clock-frequency = <100000>; 429 + 430 + ak4643: sound-codec@12 { 431 + compatible = "asahi-kasei,ak4643"; 432 + #sound-dai-cells = <0>; 433 + reg = <0x12>; 434 + }; 487 435 488 436 composite-in@20 { 489 437 compatible = "adi,adv7180"; ··· 576 512 bus-width = <8>; 577 513 }; 578 514 }; 515 + }; 516 + 517 + &rcar_sound { 518 + pinctrl-0 = <&sound_pins &sound_clk_pins>; 519 + pinctrl-names = "default"; 520 + 521 + #sound-dai-cells = <0>; 522 + 523 + status = "okay"; 524 + 525 + rcar_sound,dai { 526 + dai0 { 527 + playback = <&ssi0 &src2 &dvc0>; 528 + capture = <&ssi1 &src3 &dvc1>; 529 + }; 530 + }; 531 + }; 532 + 533 + &ssi1 { 534 + shared-pin; 579 535 };
+78 -5
arch/arm/boot/dts/r8a7791.dtsi
··· 301 301 dma-channels = <15>; 302 302 }; 303 303 304 + audma0: dma-controller@ec700000 { 305 + compatible = "renesas,rcar-dmac"; 306 + reg = <0 0xec700000 0 0x10000>; 307 + interrupts = <0 346 IRQ_TYPE_LEVEL_HIGH 308 + 0 320 IRQ_TYPE_LEVEL_HIGH 309 + 0 321 IRQ_TYPE_LEVEL_HIGH 310 + 0 322 IRQ_TYPE_LEVEL_HIGH 311 + 0 323 IRQ_TYPE_LEVEL_HIGH 312 + 0 324 IRQ_TYPE_LEVEL_HIGH 313 + 0 325 IRQ_TYPE_LEVEL_HIGH 314 + 0 326 IRQ_TYPE_LEVEL_HIGH 315 + 0 327 IRQ_TYPE_LEVEL_HIGH 316 + 0 328 IRQ_TYPE_LEVEL_HIGH 317 + 0 329 IRQ_TYPE_LEVEL_HIGH 318 + 0 330 IRQ_TYPE_LEVEL_HIGH 319 + 0 331 IRQ_TYPE_LEVEL_HIGH 320 + 0 332 IRQ_TYPE_LEVEL_HIGH>; 321 + interrupt-names = "error", 322 + "ch0", "ch1", "ch2", "ch3", 323 + "ch4", "ch5", "ch6", "ch7", 324 + "ch8", "ch9", "ch10", "ch11", 325 + "ch12"; 326 + clocks = <&mstp5_clks R8A7791_CLK_AUDIO_DMAC0>; 327 + clock-names = "fck"; 328 + #dma-cells = <1>; 329 + dma-channels = <13>; 330 + }; 331 + 332 + audma1: dma-controller@ec720000 { 333 + compatible = "renesas,rcar-dmac"; 334 + reg = <0 0xec720000 0 0x10000>; 335 + interrupts = <0 347 IRQ_TYPE_LEVEL_HIGH 336 + 0 333 IRQ_TYPE_LEVEL_HIGH 337 + 0 334 IRQ_TYPE_LEVEL_HIGH 338 + 0 335 IRQ_TYPE_LEVEL_HIGH 339 + 0 336 IRQ_TYPE_LEVEL_HIGH 340 + 0 337 IRQ_TYPE_LEVEL_HIGH 341 + 0 338 IRQ_TYPE_LEVEL_HIGH 342 + 0 339 IRQ_TYPE_LEVEL_HIGH 343 + 0 340 IRQ_TYPE_LEVEL_HIGH 344 + 0 341 IRQ_TYPE_LEVEL_HIGH 345 + 0 342 IRQ_TYPE_LEVEL_HIGH 346 + 0 343 IRQ_TYPE_LEVEL_HIGH 347 + 0 344 IRQ_TYPE_LEVEL_HIGH 348 + 0 345 IRQ_TYPE_LEVEL_HIGH>; 349 + interrupt-names = "error", 350 + "ch0", "ch1", "ch2", "ch3", 351 + "ch4", "ch5", "ch6", "ch7", 352 + "ch8", "ch9", "ch10", "ch11", 353 + "ch12"; 354 + clocks = <&mstp5_clks R8A7791_CLK_AUDIO_DMAC1>; 355 + clock-names = "fck"; 356 + #dma-cells = <1>; 357 + dma-channels = <13>; 358 + }; 359 + 360 + audmapp: dma-controller@ec740000 { 361 + compatible = "renesas,rcar-audmapp"; 362 + #dma-cells = <1>; 363 + 364 + reg = <0 0xec740000 0 0x200>; 365 + }; 366 + 304 367 /* The memory map in the User's Manual maps the cores to bus numbers */ 305 368 i2c0: i2c@e6508000 { 306 369 #address-cells = <1>; ··· 434 371 reg = <0 0xe60b0000 0 0x425>; 435 372 interrupts = <0 173 IRQ_TYPE_LEVEL_HIGH>; 436 373 clocks = <&mstp9_clks R8A7791_CLK_IICDVFS>; 374 + dmas = <&dmac0 0x77>, <&dmac0 0x78>; 375 + dma-names = "tx", "rx"; 437 376 status = "disabled"; 438 377 }; 439 378 ··· 446 381 reg = <0 0xe6500000 0 0x425>; 447 382 interrupts = <0 174 IRQ_TYPE_LEVEL_HIGH>; 448 383 clocks = <&mstp3_clks R8A7791_CLK_IIC0>; 384 + dmas = <&dmac0 0x61>, <&dmac0 0x62>; 385 + dma-names = "tx", "rx"; 449 386 status = "disabled"; 450 387 }; 451 388 ··· 458 391 reg = <0 0xe6510000 0 0x425>; 459 392 interrupts = <0 175 IRQ_TYPE_LEVEL_HIGH>; 460 393 clocks = <&mstp3_clks R8A7791_CLK_IIC1>; 394 + dmas = <&dmac0 0x65>, <&dmac0 0x66>; 395 + dma-names = "tx", "rx"; 461 396 status = "disabled"; 462 397 }; 463 398 ··· 1108 1039 compatible = "renesas,r8a7791-mstp-clocks", "renesas,cpg-mstp-clocks"; 1109 1040 reg = <0 0xe615013c 0 4>, <0 0xe6150048 0 4>; 1110 1041 clocks = <&cp_clk>, <&sd2_clk>, <&sd1_clk>, <&cpg_clocks R8A7791_CLK_SD0>, 1111 - <&mmc0_clk>, <&hp_clk>, <&mp_clk>, <&hp_clk>, <&mp_clk>, <&rclk_clk>; 1042 + <&mmc0_clk>, <&hp_clk>, <&mp_clk>, <&hp_clk>, <&mp_clk>, <&rclk_clk>, 1043 + <&hp_clk>, <&hp_clk>; 1112 1044 #clock-cells = <1>; 1113 1045 renesas,clock-indices = < 1114 1046 R8A7791_CLK_TPU0 R8A7791_CLK_SDHI2 R8A7791_CLK_SDHI1 R8A7791_CLK_SDHI0 1115 1047 R8A7791_CLK_MMCIF0 R8A7791_CLK_IIC0 R8A7791_CLK_PCIEC R8A7791_CLK_IIC1 1116 1048 R8A7791_CLK_SSUSB R8A7791_CLK_CMT1 1049 + R8A7791_CLK_USBDMAC0 R8A7791_CLK_USBDMAC1 1117 1050 >; 1118 1051 clock-output-names = 1119 1052 "tpu0", "sdhi2", "sdhi1", "sdhi0", 1120 - "mmcif0", "i2c7", "pciec", "i2c8", "ssusb", "cmt1"; 1053 + "mmcif0", "i2c7", "pciec", "i2c8", "ssusb", "cmt1", 1054 + "usbdmac0", "usbdmac1"; 1121 1055 }; 1122 1056 mstp5_clks: mstp5_clks@e6150144 { 1123 1057 compatible = "renesas,r8a7791-mstp-clocks", "renesas,cpg-mstp-clocks"; 1124 1058 reg = <0 0xe6150144 0 4>, <0 0xe615003c 0 4>; 1125 - clocks = <&extal_clk>, <&p_clk>; 1059 + clocks = <&hp_clk>, <&hp_clk>, <&extal_clk>, <&p_clk>; 1126 1060 #clock-cells = <1>; 1127 - renesas,clock-indices = <R8A7791_CLK_THERMAL R8A7791_CLK_PWM>; 1128 - clock-output-names = "thermal", "pwm"; 1061 + renesas,clock-indices = <R8A7791_CLK_AUDIO_DMAC0 R8A7791_CLK_AUDIO_DMAC1 1062 + R8A7791_CLK_THERMAL R8A7791_CLK_PWM>; 1063 + clock-output-names = "audmac0", "audmac1", "thermal", "pwm"; 1129 1064 }; 1130 1065 mstp7_clks: mstp7_clks@e615014c { 1131 1066 compatible = "renesas,r8a7791-mstp-clocks", "renesas,cpg-mstp-clocks";
+12 -9
arch/arm/boot/dts/r8a7794.dtsi
··· 461 461 mstp1_clks: mstp1_clks@e6150134 { 462 462 compatible = "renesas,r8a7794-mstp-clocks", "renesas,cpg-mstp-clocks"; 463 463 reg = <0 0xe6150134 0 4>, <0 0xe6150038 0 4>; 464 - clocks = <&p_clk>, <&p_clk>, <&p_clk>, <&rclk_clk>, 465 - <&cp_clk>, 466 - <&zs_clk>, <&zs_clk>, <&zs_clk>; 464 + clocks = <&zs_clk>, <&zs_clk>, <&p_clk>, <&zg_clk>, <&zs_clk>, 465 + <&zs_clk>, <&p_clk>, <&p_clk>, <&rclk_clk>, <&cp_clk>, 466 + <&zs_clk>, <&zs_clk>; 467 467 #clock-cells = <1>; 468 468 renesas,clock-indices = < 469 - R8A7794_CLK_TMU1 R8A7794_CLK_TMU3 R8A7794_CLK_TMU2 470 - R8A7794_CLK_CMT0 R8A7794_CLK_TMU0 469 + R8A7794_CLK_VCP0 R8A7794_CLK_VPC0 R8A7794_CLK_TMU1 470 + R8A7794_CLK_3DG R8A7794_CLK_2DDMAC R8A7794_CLK_FDP1_0 471 + R8A7794_CLK_TMU3 R8A7794_CLK_TMU2 R8A7794_CLK_CMT0 472 + R8A7794_CLK_TMU0 R8A7794_CLK_VSP1_DU0 R8A7794_CLK_VSP1_S 471 473 >; 472 474 clock-output-names = 473 - "tmu1", "tmu3", "tmu2", "cmt0", "tmu0"; 475 + "vcp0", "vpc0", "tmu1", "3dg", "2ddmac", "fdp1-0", 476 + "tmu3", "tmu2", "cmt0", "tmu0", "vsp1-du0", "vsps"; 474 477 }; 475 478 mstp2_clks: mstp2_clks@e6150138 { 476 479 compatible = "renesas,r8a7794-mstp-clocks", "renesas,cpg-mstp-clocks"; ··· 520 517 mstp8_clks: mstp8_clks@e6150990 { 521 518 compatible = "renesas,r8a7794-mstp-clocks", "renesas,cpg-mstp-clocks"; 522 519 reg = <0 0xe6150990 0 4>, <0 0xe61509a0 0 4>; 523 - clocks = <&p_clk>; 520 + clocks = <&zg_clk>, <&zg_clk>, <&p_clk>; 524 521 #clock-cells = <1>; 525 522 renesas,clock-indices = < 526 - R8A7794_CLK_ETHER 523 + R8A7794_CLK_VIN1 R8A7794_CLK_VIN0 R8A7794_CLK_ETHER 527 524 >; 528 525 clock-output-names = 529 - "ether"; 526 + "vin1", "vin0", "ether"; 530 527 }; 531 528 mstp11_clks: mstp11_clks@e615099c { 532 529 compatible = "renesas,r8a7794-mstp-clocks", "renesas,cpg-mstp-clocks";
+4
arch/arm/boot/dts/sh73a0-kzm9g-reference.dts
··· 101 101 compatible = "gpio-leds"; 102 102 led1 { 103 103 gpios = <&pfc 20 GPIO_ACTIVE_LOW>; 104 + label = "LED1"; 104 105 }; 105 106 led2 { 106 107 gpios = <&pfc 21 GPIO_ACTIVE_LOW>; 108 + label = "LED2"; 107 109 }; 108 110 led3 { 109 111 gpios = <&pfc 22 GPIO_ACTIVE_LOW>; 112 + label = "LED3"; 110 113 }; 111 114 led4 { 112 115 gpios = <&pfc 23 GPIO_ACTIVE_LOW>; 116 + label = "LED4"; 113 117 }; 114 118 }; 115 119
+5 -5
arch/arm/boot/dts/sh73a0.dtsi
··· 138 138 i2c0: i2c@e6820000 { 139 139 #address-cells = <1>; 140 140 #size-cells = <0>; 141 - compatible = "renesas,rmobile-iic"; 141 + compatible = "renesas,iic-sh73a0", "renesas,rmobile-iic"; 142 142 reg = <0xe6820000 0x425>; 143 143 interrupts = <0 167 IRQ_TYPE_LEVEL_HIGH 144 144 0 168 IRQ_TYPE_LEVEL_HIGH ··· 150 150 i2c1: i2c@e6822000 { 151 151 #address-cells = <1>; 152 152 #size-cells = <0>; 153 - compatible = "renesas,rmobile-iic"; 153 + compatible = "renesas,iic-sh73a0", "renesas,rmobile-iic"; 154 154 reg = <0xe6822000 0x425>; 155 155 interrupts = <0 51 IRQ_TYPE_LEVEL_HIGH 156 156 0 52 IRQ_TYPE_LEVEL_HIGH ··· 162 162 i2c2: i2c@e6824000 { 163 163 #address-cells = <1>; 164 164 #size-cells = <0>; 165 - compatible = "renesas,rmobile-iic"; 165 + compatible = "renesas,iic-sh73a0", "renesas,rmobile-iic"; 166 166 reg = <0xe6824000 0x425>; 167 167 interrupts = <0 171 IRQ_TYPE_LEVEL_HIGH 168 168 0 172 IRQ_TYPE_LEVEL_HIGH ··· 174 174 i2c3: i2c@e6826000 { 175 175 #address-cells = <1>; 176 176 #size-cells = <0>; 177 - compatible = "renesas,rmobile-iic"; 177 + compatible = "renesas,iic-sh73a0", "renesas,rmobile-iic"; 178 178 reg = <0xe6826000 0x425>; 179 179 interrupts = <0 183 IRQ_TYPE_LEVEL_HIGH 180 180 0 184 IRQ_TYPE_LEVEL_HIGH ··· 186 186 i2c4: i2c@e6828000 { 187 187 #address-cells = <1>; 188 188 #size-cells = <0>; 189 - compatible = "renesas,rmobile-iic"; 189 + compatible = "renesas,iic-sh73a0", "renesas,rmobile-iic"; 190 190 reg = <0xe6828000 0x425>; 191 191 interrupts = <0 187 IRQ_TYPE_LEVEL_HIGH 192 192 0 188 IRQ_TYPE_LEVEL_HIGH
+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
+2
include/dt-bindings/clock/r8a7791-clock.h
··· 69 69 #define R8A7791_CLK_USBDMAC1 31 70 70 71 71 /* MSTP5 */ 72 + #define R8A7791_CLK_AUDIO_DMAC1 1 73 + #define R8A7791_CLK_AUDIO_DMAC0 2 72 74 #define R8A7791_CLK_THERMAL 22 73 75 #define R8A7791_CLK_PWM 23 74 76
+9
include/dt-bindings/clock/r8a7794-clock.h
··· 26 26 #define R8A7794_CLK_MSIOF0 0 27 27 28 28 /* MSTP1 */ 29 + #define R8A7794_CLK_VCP0 1 30 + #define R8A7794_CLK_VPC0 3 29 31 #define R8A7794_CLK_TMU1 11 32 + #define R8A7794_CLK_3DG 12 33 + #define R8A7794_CLK_2DDMAC 15 34 + #define R8A7794_CLK_FDP1_0 19 30 35 #define R8A7794_CLK_TMU3 21 31 36 #define R8A7794_CLK_TMU2 22 32 37 #define R8A7794_CLK_CMT0 24 33 38 #define R8A7794_CLK_TMU0 25 39 + #define R8A7794_CLK_VSP1_DU0 28 40 + #define R8A7794_CLK_VSP1_S 31 34 41 35 42 /* MSTP2 */ 36 43 #define R8A7794_CLK_SCIFA2 2 ··· 68 61 #define R8A7794_CLK_SCIF0 21 69 62 70 63 /* MSTP8 */ 64 + #define R8A7794_CLK_VIN1 10 65 + #define R8A7794_CLK_VIN0 11 71 66 #define R8A7794_CLK_ETHER 13 72 67 73 68 /* MSTP9 */