Skip to content

L
linux
Commit 8b004f12 authored by Olof Johansson's avatar Olof Johansson
Browse files
Options

Merge tag 'renesas-arm64-dt-for-v5.6-tag1' of... 

Merge tag 'renesas-arm64-dt-for-v5.6-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel into arm/dt

Renesas ARM64 DT updates for v5.6

  - Remove now unused ARCH_R8A7796 config symbol,
  - Rename R-Car H3 and M3-W SoC, and ULCB board DTS files to increase
    naming consistency,
  - Miscellaneous fixes for issues detected by "make dtbs_check",
  - Enhance support for R-Car M3-W+,
  - Display support for the EK874 board,
  - Prepare for split of R-Car H3 ES1.x and ES2.0+ config symbols,
  - Minor fixes and improvements.

* tag 'renesas-arm64-dt-for-v5.6-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel:
  arm64: dts: renesas: Prepare for split of ARCH_R8A7795 into ARCH_R8A7795[01]
  arm64: dts: renesas: Sort DTBs in Makefile
  arm64: dts: renesas: Drop redundant SoC prefixes from ULCB DTS file names
  arm64: dts: renesas: Rename r8a7795{-es1,}* to r8a7795[01]*
  arm64: dts: renesas: Add EK874 board with idk-2121wr display support
  arm64: dts: renesas: r8a77961: Add SDHI nodes
  arm64: dts: renesas: r8a77961: Add I2C nodes
  arm64: dts: renesas: r8a77961: Add SYS-DMAC nodes
  arm64: dts: renesas: r8a77961: Add RAVB node
  arm64: dts: renesas: r8a77961: Add GPIO nodes
  arm64: dts: renesas: r8a77961: Add RWDT node
  arm64: dts: renesas: r8a77990: ebisu: Remove clkout-lr-synchronous from sound
  arm64: dts: renesas: r8a77970: Group tuples in thermal reg property
  arm64: dts: renesas: Group tuples in pci ranges and dma-ranges properties
  arm64: dts: renesas: Group tuples in interrupt properties
  arm64: dts: renesas: Group tuples in regulator-gpio states properties
  arm64: dts: renesas: Rename r8a7796* to r8a77960*
  arm64: dts: renesas: Remove use of ARCH_R8A7796

Link: https://lore.kernel.org/r/20200106104857.8361-4-geert+renesas@glider.beSigned-off-by: default avatarOlof Johansson <olof@lixom.net>
parents ec671085 7ba33c33
Show whitespace changes
Inline Side-by-side
Showing with 1333 additions and 866 deletions
arch/arm64/boot/dts/renesas/Makefile
View file @ 8b004f12
...@@ -3,22 +3,21 @@ dtb-$(CONFIG_ARCH_R8A774A1) += r8a774a1-hihope-rzg2m.dtb ...@@ -3,22 +3,21 @@ dtb-$(CONFIG_ARCH_R8A774A1) += r8a774a1-hihope-rzg2m.dtb
dtb-$(CONFIG_ARCH_R8A774A1) += r8a774a1-hihope-rzg2m-ex.dtb dtb-$(CONFIG_ARCH_R8A774A1) += r8a774a1-hihope-rzg2m-ex.dtb
dtb-$(CONFIG_ARCH_R8A774B1) += r8a774b1-hihope-rzg2n.dtb dtb-$(CONFIG_ARCH_R8A774B1) += r8a774b1-hihope-rzg2n.dtb
dtb-$(CONFIG_ARCH_R8A774B1) += r8a774b1-hihope-rzg2n-ex.dtb dtb-$(CONFIG_ARCH_R8A774B1) += r8a774b1-hihope-rzg2n-ex.dtb
dtb-$(CONFIG_ARCH_R8A774C0) += r8a774c0-cat874.dtb r8a774c0-ek874.dtb dtb-$(CONFIG_ARCH_R8A774C0) += r8a774c0-cat874.dtb r8a774c0-ek874.dtb \
dtb-$(CONFIG_ARCH_R8A7795) += r8a7795-salvator-x.dtb r8a7795-h3ulcb.dtb r8a774c0-ek874-idk-2121wr.dtb
dtb-$(CONFIG_ARCH_R8A7795) += r8a7795-h3ulcb-kf.dtb dtb-$(CONFIG_ARCH_R8A7795) += r8a77950-salvator-x.dtb
dtb-$(CONFIG_ARCH_R8A7795) += r8a7795-salvator-xs.dtb dtb-$(CONFIG_ARCH_R8A7795) += r8a77950-ulcb.dtb r8a77950-ulcb-kf.dtb
dtb-$(CONFIG_ARCH_R8A7795) += r8a7795-es1-salvator-x.dtb r8a7795-es1-h3ulcb.dtb dtb-$(CONFIG_ARCH_R8A7795) += r8a77951-salvator-x.dtb r8a77951-salvator-xs.dtb
dtb-$(CONFIG_ARCH_R8A7795) += r8a7795-es1-h3ulcb-kf.dtb dtb-$(CONFIG_ARCH_R8A7795) += r8a77951-ulcb.dtb r8a77951-ulcb-kf.dtb
dtb-$(CONFIG_ARCH_R8A7796) += r8a7796-salvator-x.dtb r8a7796-m3ulcb.dtb dtb-$(CONFIG_ARCH_R8A77950) += r8a77950-salvator-x.dtb
dtb-$(CONFIG_ARCH_R8A7796) += r8a7796-m3ulcb-kf.dtb dtb-$(CONFIG_ARCH_R8A77950) += r8a77950-ulcb.dtb r8a77950-ulcb-kf.dtb
dtb-$(CONFIG_ARCH_R8A7796) += r8a7796-salvator-xs.dtb dtb-$(CONFIG_ARCH_R8A77951) += r8a77951-salvator-x.dtb r8a77951-salvator-xs.dtb
dtb-$(CONFIG_ARCH_R8A77960) += r8a7796-salvator-x.dtb r8a7796-m3ulcb.dtb dtb-$(CONFIG_ARCH_R8A77951) += r8a77951-ulcb.dtb r8a77951-ulcb-kf.dtb
dtb-$(CONFIG_ARCH_R8A77960) += r8a7796-m3ulcb-kf.dtb dtb-$(CONFIG_ARCH_R8A77960) += r8a77960-salvator-x.dtb r8a77960-salvator-xs.dtb
dtb-$(CONFIG_ARCH_R8A77960) += r8a7796-salvator-xs.dtb dtb-$(CONFIG_ARCH_R8A77960) += r8a77960-ulcb.dtb r8a77960-ulcb-kf.dtb
dtb-$(CONFIG_ARCH_R8A77961) += r8a77961-salvator-xs.dtb dtb-$(CONFIG_ARCH_R8A77961) += r8a77961-salvator-xs.dtb
dtb-$(CONFIG_ARCH_R8A77965) += r8a77965-salvator-x.dtb r8a77965-salvator-xs.dtb dtb-$(CONFIG_ARCH_R8A77965) += r8a77965-salvator-x.dtb r8a77965-salvator-xs.dtb
dtb-$(CONFIG_ARCH_R8A77965) += r8a77965-m3nulcb.dtb dtb-$(CONFIG_ARCH_R8A77965) += r8a77965-ulcb.dtb r8a77965-ulcb-kf.dtb
dtb-$(CONFIG_ARCH_R8A77965) += r8a77965-m3nulcb-kf.dtb
dtb-$(CONFIG_ARCH_R8A77970) += r8a77970-eagle.dtb r8a77970-v3msk.dtb dtb-$(CONFIG_ARCH_R8A77970) += r8a77970-eagle.dtb r8a77970-v3msk.dtb
dtb-$(CONFIG_ARCH_R8A77980) += r8a77980-condor.dtb r8a77980-v3hsk.dtb dtb-$(CONFIG_ARCH_R8A77980) += r8a77980-condor.dtb r8a77980-v3hsk.dtb
dtb-$(CONFIG_ARCH_R8A77990) += r8a77990-ebisu.dtb dtb-$(CONFIG_ARCH_R8A77990) += r8a77990-ebisu.dtb
......
arch/arm64/boot/dts/renesas/hihope-common.dtsi
View file @ 8b004f12
...@@ -109,8 +109,7 @@ vccq_sdhi0: regulator-vccq-sdhi0 { ...@@ -109,8 +109,7 @@ vccq_sdhi0: regulator-vccq-sdhi0 {
gpios = <&gpio6 30 GPIO_ACTIVE_HIGH>; gpios = <&gpio6 30 GPIO_ACTIVE_HIGH>;
gpios-states = <1>; gpios-states = <1>;
states = <3300000 1 states = <3300000 1>, <1800000 0>;
1800000 0>;
}; };
wlan_en_reg: regulator-wlan_en { wlan_en_reg: regulator-wlan_en {
......
arch/arm64/boot/dts/renesas/r8a774a1.dtsi
View file @ 8b004f12
...@@ -521,12 +521,12 @@ intc_ex: interrupt-controller@e61c0000 { ...@@ -521,12 +521,12 @@ intc_ex: interrupt-controller@e61c0000 {
#interrupt-cells = <2>; #interrupt-cells = <2>;
interrupt-controller; interrupt-controller;
reg = <0 0xe61c0000 0 0x200>; reg = <0 0xe61c0000 0 0x200>;
interrupts = <GIC_SPI 0 IRQ_TYPE_LEVEL_HIGH interrupts = <GIC_SPI 0 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 1 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 1 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 2 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 2 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 3 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 3 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 18 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 18 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 161 IRQ_TYPE_LEVEL_HIGH>; <GIC_SPI 161 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&cpg CPG_MOD 407>; clocks = <&cpg CPG_MOD 407>;
power-domains = <&sysc R8A774A1_PD_ALWAYS_ON>; power-domains = <&sysc R8A774A1_PD_ALWAYS_ON>;
resets = <&cpg 407>; resets = <&cpg 407>;
...@@ -837,8 +837,8 @@ usb_dmac0: dma-controller@e65a0000 { ...@@ -837,8 +837,8 @@ usb_dmac0: dma-controller@e65a0000 {
compatible = "renesas,r8a774a1-usb-dmac", compatible = "renesas,r8a774a1-usb-dmac",
"renesas,usb-dmac"; "renesas,usb-dmac";
reg = <0 0xe65a0000 0 0x100>; reg = <0 0xe65a0000 0 0x100>;
interrupts = <GIC_SPI 109 IRQ_TYPE_LEVEL_HIGH interrupts = <GIC_SPI 109 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 109 IRQ_TYPE_LEVEL_HIGH>; <GIC_SPI 109 IRQ_TYPE_LEVEL_HIGH>;
interrupt-names = "ch0", "ch1"; interrupt-names = "ch0", "ch1";
clocks = <&cpg CPG_MOD 330>; clocks = <&cpg CPG_MOD 330>;
power-domains = <&sysc R8A774A1_PD_ALWAYS_ON>; power-domains = <&sysc R8A774A1_PD_ALWAYS_ON>;
...@@ -851,8 +851,8 @@ usb_dmac1: dma-controller@e65b0000 { ...@@ -851,8 +851,8 @@ usb_dmac1: dma-controller@e65b0000 {
compatible = "renesas,r8a774a1-usb-dmac", compatible = "renesas,r8a774a1-usb-dmac",
"renesas,usb-dmac"; "renesas,usb-dmac";
reg = <0 0xe65b0000 0 0x100>; reg = <0 0xe65b0000 0 0x100>;
interrupts = <GIC_SPI 110 IRQ_TYPE_LEVEL_HIGH interrupts = <GIC_SPI 110 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 110 IRQ_TYPE_LEVEL_HIGH>; <GIC_SPI 110 IRQ_TYPE_LEVEL_HIGH>;
interrupt-names = "ch0", "ch1"; interrupt-names = "ch0", "ch1";
clocks = <&cpg CPG_MOD 331>; clocks = <&cpg CPG_MOD 331>;
power-domains = <&sysc R8A774A1_PD_ALWAYS_ON>; power-domains = <&sysc R8A774A1_PD_ALWAYS_ON>;
...@@ -878,23 +878,23 @@ dmac0: dma-controller@e6700000 { ...@@ -878,23 +878,23 @@ dmac0: dma-controller@e6700000 {
compatible = "renesas,dmac-r8a774a1", compatible = "renesas,dmac-r8a774a1",
"renesas,rcar-dmac"; "renesas,rcar-dmac";
reg = <0 0xe6700000 0 0x10000>; reg = <0 0xe6700000 0 0x10000>;
interrupts = <GIC_SPI 199 IRQ_TYPE_LEVEL_HIGH interrupts = <GIC_SPI 199 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 200 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 200 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 201 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 201 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 202 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 202 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 203 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 203 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 204 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 204 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 205 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 205 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 206 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 206 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 207 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 207 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 208 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 208 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 209 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 209 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 210 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 210 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 211 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 211 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 212 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 212 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 213 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 213 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 214 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 214 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 215 IRQ_TYPE_LEVEL_HIGH>; <GIC_SPI 215 IRQ_TYPE_LEVEL_HIGH>;
interrupt-names = "error", interrupt-names = "error",
"ch0", "ch1", "ch2", "ch3", "ch0", "ch1", "ch2", "ch3",
"ch4", "ch5", "ch6", "ch7", "ch4", "ch5", "ch6", "ch7",
...@@ -920,23 +920,23 @@ dmac1: dma-controller@e7300000 { ...@@ -920,23 +920,23 @@ dmac1: dma-controller@e7300000 {
compatible = "renesas,dmac-r8a774a1", compatible = "renesas,dmac-r8a774a1",
"renesas,rcar-dmac"; "renesas,rcar-dmac";
reg = <0 0xe7300000 0 0x10000>; reg = <0 0xe7300000 0 0x10000>;
interrupts = <GIC_SPI 220 IRQ_TYPE_LEVEL_HIGH interrupts = <GIC_SPI 220 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 216 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 216 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 217 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 217 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 218 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 218 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 219 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 219 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 308 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 308 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 309 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 309 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 310 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 310 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 311 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 311 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 312 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 312 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 313 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 313 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 314 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 314 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 315 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 315 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 316 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 316 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 317 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 317 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 318 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 318 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 319 IRQ_TYPE_LEVEL_HIGH>; <GIC_SPI 319 IRQ_TYPE_LEVEL_HIGH>;
interrupt-names = "error", interrupt-names = "error",
"ch0", "ch1", "ch2", "ch3", "ch0", "ch1", "ch2", "ch3",
"ch4", "ch5", "ch6", "ch7", "ch4", "ch5", "ch6", "ch7",
...@@ -962,23 +962,23 @@ dmac2: dma-controller@e7310000 { ...@@ -962,23 +962,23 @@ dmac2: dma-controller@e7310000 {
compatible = "renesas,dmac-r8a774a1", compatible = "renesas,dmac-r8a774a1",
"renesas,rcar-dmac"; "renesas,rcar-dmac";
reg = <0 0xe7310000 0 0x10000>; reg = <0 0xe7310000 0 0x10000>;
interrupts = <GIC_SPI 416 IRQ_TYPE_LEVEL_HIGH interrupts = <GIC_SPI 416 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 417 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 417 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 418 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 418 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 419 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 419 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 420 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 420 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 421 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 421 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 422 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 422 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 423 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 423 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 424 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 424 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 425 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 425 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 426 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 426 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 427 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 427 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 428 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 428 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 429 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 429 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 430 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 430 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 431 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 431 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 397 IRQ_TYPE_LEVEL_HIGH>; <GIC_SPI 397 IRQ_TYPE_LEVEL_HIGH>;
interrupt-names = "error", interrupt-names = "error",
"ch0", "ch1", "ch2", "ch3", "ch0", "ch1", "ch2", "ch3",
"ch4", "ch5", "ch6", "ch7", "ch4", "ch5", "ch6", "ch7",
...@@ -2075,23 +2075,23 @@ audma0: dma-controller@ec700000 { ...@@ -2075,23 +2075,23 @@ audma0: dma-controller@ec700000 {
compatible = "renesas,dmac-r8a774a1", compatible = "renesas,dmac-r8a774a1",
"renesas,rcar-dmac"; "renesas,rcar-dmac";
reg = <0 0xec700000 0 0x10000>; reg = <0 0xec700000 0 0x10000>;
interrupts = <GIC_SPI 350 IRQ_TYPE_LEVEL_HIGH interrupts = <GIC_SPI 350 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 320 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 320 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 321 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 321 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 322 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 322 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 323 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 323 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 324 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 324 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 325 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 325 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 326 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 326 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 327 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 327 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 328 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 328 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 329 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 329 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 330 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 330 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 331 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 331 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 332 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 332 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 333 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 333 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 334 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 334 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 335 IRQ_TYPE_LEVEL_HIGH>; <GIC_SPI 335 IRQ_TYPE_LEVEL_HIGH>;
interrupt-names = "error", interrupt-names = "error",
"ch0", "ch1", "ch2", "ch3", "ch0", "ch1", "ch2", "ch3",
"ch4", "ch5", "ch6", "ch7", "ch4", "ch5", "ch6", "ch7",
...@@ -2117,23 +2117,23 @@ audma1: dma-controller@ec720000 { ...@@ -2117,23 +2117,23 @@ audma1: dma-controller@ec720000 {
compatible = "renesas,dmac-r8a774a1", compatible = "renesas,dmac-r8a774a1",
"renesas,rcar-dmac"; "renesas,rcar-dmac";
reg = <0 0xec720000 0 0x10000>; reg = <0 0xec720000 0 0x10000>;
interrupts = <GIC_SPI 351 IRQ_TYPE_LEVEL_HIGH interrupts = <GIC_SPI 351 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 336 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 336 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 337 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 337 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 338 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 338 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 339 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 339 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 340 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 340 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 341 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 341 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 342 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 342 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 343 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 343 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 344 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 344 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 345 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 345 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 346 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 346 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 347 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 347 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 348 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 348 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 349 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 349 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 382 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 382 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 383 IRQ_TYPE_LEVEL_HIGH>; <GIC_SPI 383 IRQ_TYPE_LEVEL_HIGH>;
interrupt-names = "error", interrupt-names = "error",
"ch0", "ch1", "ch2", "ch3", "ch0", "ch1", "ch2", "ch3",
"ch4", "ch5", "ch6", "ch7", "ch4", "ch5", "ch6", "ch7",
...@@ -2323,10 +2323,10 @@ pciec0: pcie@fe000000 { ...@@ -2323,10 +2323,10 @@ pciec0: pcie@fe000000 {
#size-cells = <2>; #size-cells = <2>;
bus-range = <0x00 0xff>; bus-range = <0x00 0xff>;
device_type = "pci"; device_type = "pci";
ranges = <0x01000000 0 0x00000000 0 0xfe100000 0 0x00100000 ranges = <0x01000000 0 0x00000000 0 0xfe100000 0 0x00100000>,
0x02000000 0 0xfe200000 0 0xfe200000 0 0x00200000 <0x02000000 0 0xfe200000 0 0xfe200000 0 0x00200000>,
0x02000000 0 0x30000000 0 0x30000000 0 0x08000000 <0x02000000 0 0x30000000 0 0x30000000 0 0x08000000>,
0x42000000 0 0x38000000 0 0x38000000 0 0x08000000>; <0x42000000 0 0x38000000 0 0x38000000 0 0x08000000>;
/* Map all possible DDR as inbound ranges */ /* Map all possible DDR as inbound ranges */
dma-ranges = <0x42000000 0 0x40000000 0 0x40000000 0 0x80000000>; dma-ranges = <0x42000000 0 0x40000000 0 0x40000000 0 0x80000000>;
interrupts = <GIC_SPI 116 IRQ_TYPE_LEVEL_HIGH>, interrupts = <GIC_SPI 116 IRQ_TYPE_LEVEL_HIGH>,
...@@ -2350,10 +2350,10 @@ pciec1: pcie@ee800000 { ...@@ -2350,10 +2350,10 @@ pciec1: pcie@ee800000 {
#size-cells = <2>; #size-cells = <2>;
bus-range = <0x00 0xff>; bus-range = <0x00 0xff>;
device_type = "pci"; device_type = "pci";
ranges = <0x01000000 0 0x00000000 0 0xee900000 0 0x00100000 ranges = <0x01000000 0 0x00000000 0 0xee900000 0 0x00100000>,
0x02000000 0 0xeea00000 0 0xeea00000 0 0x00200000 <0x02000000 0 0xeea00000 0 0xeea00000 0 0x00200000>,
0x02000000 0 0xc0000000 0 0xc0000000 0 0x08000000 <0x02000000 0 0xc0000000 0 0xc0000000 0 0x08000000>,
0x42000000 0 0xc8000000 0 0xc8000000 0 0x08000000>; <0x42000000 0 0xc8000000 0 0xc8000000 0 0x08000000>;
/* Map all possible DDR as inbound ranges */ /* Map all possible DDR as inbound ranges */
dma-ranges = <0x42000000 0 0x40000000 0 0x40000000 0 0x80000000>; dma-ranges = <0x42000000 0 0x40000000 0 0x40000000 0 0x80000000>;
interrupts = <GIC_SPI 148 IRQ_TYPE_LEVEL_HIGH>, interrupts = <GIC_SPI 148 IRQ_TYPE_LEVEL_HIGH>,
......
arch/arm64/boot/dts/renesas/r8a774b1.dtsi
View file @ 8b004f12
...@@ -395,12 +395,12 @@ intc_ex: interrupt-controller@e61c0000 { ...@@ -395,12 +395,12 @@ intc_ex: interrupt-controller@e61c0000 {
#interrupt-cells = <2>; #interrupt-cells = <2>;
interrupt-controller; interrupt-controller;
reg = <0 0xe61c0000 0 0x200>; reg = <0 0xe61c0000 0 0x200>;
interrupts = <GIC_SPI 0 IRQ_TYPE_LEVEL_HIGH interrupts = <GIC_SPI 0 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 1 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 1 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 2 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 2 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 3 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 3 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 18 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 18 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 161 IRQ_TYPE_LEVEL_HIGH>; <GIC_SPI 161 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&cpg CPG_MOD 407>; clocks = <&cpg CPG_MOD 407>;
power-domains = <&sysc R8A774B1_PD_ALWAYS_ON>; power-domains = <&sysc R8A774B1_PD_ALWAYS_ON>;
resets = <&cpg 407>; resets = <&cpg 407>;
...@@ -711,8 +711,8 @@ usb_dmac0: dma-controller@e65a0000 { ...@@ -711,8 +711,8 @@ usb_dmac0: dma-controller@e65a0000 {
compatible = "renesas,r8a774b1-usb-dmac", compatible = "renesas,r8a774b1-usb-dmac",
"renesas,usb-dmac"; "renesas,usb-dmac";
reg = <0 0xe65a0000 0 0x100>; reg = <0 0xe65a0000 0 0x100>;
interrupts = <GIC_SPI 109 IRQ_TYPE_LEVEL_HIGH interrupts = <GIC_SPI 109 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 109 IRQ_TYPE_LEVEL_HIGH>; <GIC_SPI 109 IRQ_TYPE_LEVEL_HIGH>;
interrupt-names = "ch0", "ch1"; interrupt-names = "ch0", "ch1";
clocks = <&cpg CPG_MOD 330>; clocks = <&cpg CPG_MOD 330>;
power-domains = <&sysc R8A774B1_PD_ALWAYS_ON>; power-domains = <&sysc R8A774B1_PD_ALWAYS_ON>;
...@@ -725,8 +725,8 @@ usb_dmac1: dma-controller@e65b0000 { ...@@ -725,8 +725,8 @@ usb_dmac1: dma-controller@e65b0000 {
compatible = "renesas,r8a774b1-usb-dmac", compatible = "renesas,r8a774b1-usb-dmac",
"renesas,usb-dmac"; "renesas,usb-dmac";
reg = <0 0xe65b0000 0 0x100>; reg = <0 0xe65b0000 0 0x100>;
interrupts = <GIC_SPI 110 IRQ_TYPE_LEVEL_HIGH interrupts = <GIC_SPI 110 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 110 IRQ_TYPE_LEVEL_HIGH>; <GIC_SPI 110 IRQ_TYPE_LEVEL_HIGH>;
interrupt-names = "ch0", "ch1"; interrupt-names = "ch0", "ch1";
clocks = <&cpg CPG_MOD 331>; clocks = <&cpg CPG_MOD 331>;
power-domains = <&sysc R8A774B1_PD_ALWAYS_ON>; power-domains = <&sysc R8A774B1_PD_ALWAYS_ON>;
...@@ -752,23 +752,23 @@ dmac0: dma-controller@e6700000 { ...@@ -752,23 +752,23 @@ dmac0: dma-controller@e6700000 {
compatible = "renesas,dmac-r8a774b1", compatible = "renesas,dmac-r8a774b1",
"renesas,rcar-dmac"; "renesas,rcar-dmac";
reg = <0 0xe6700000 0 0x10000>; reg = <0 0xe6700000 0 0x10000>;
interrupts = <GIC_SPI 199 IRQ_TYPE_LEVEL_HIGH interrupts = <GIC_SPI 199 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 200 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 200 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 201 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 201 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 202 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 202 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 203 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 203 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 204 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 204 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 205 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 205 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 206 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 206 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 207 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 207 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 208 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 208 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 209 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 209 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 210 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 210 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 211 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 211 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 212 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 212 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 213 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 213 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 214 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 214 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 215 IRQ_TYPE_LEVEL_HIGH>; <GIC_SPI 215 IRQ_TYPE_LEVEL_HIGH>;
interrupt-names = "error", interrupt-names = "error",
"ch0", "ch1", "ch2", "ch3", "ch0", "ch1", "ch2", "ch3",
"ch4", "ch5", "ch6", "ch7", "ch4", "ch5", "ch6", "ch7",
...@@ -794,23 +794,23 @@ dmac1: dma-controller@e7300000 { ...@@ -794,23 +794,23 @@ dmac1: dma-controller@e7300000 {
compatible = "renesas,dmac-r8a774b1", compatible = "renesas,dmac-r8a774b1",
"renesas,rcar-dmac"; "renesas,rcar-dmac";
reg = <0 0xe7300000 0 0x10000>; reg = <0 0xe7300000 0 0x10000>;
interrupts = <GIC_SPI 220 IRQ_TYPE_LEVEL_HIGH interrupts = <GIC_SPI 220 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 216 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 216 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 217 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 217 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 218 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 218 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 219 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 219 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 308 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 308 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 309 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 309 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 310 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 310 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 311 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 311 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 312 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 312 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 313 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 313 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 314 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 314 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 315 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 315 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 316 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 316 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 317 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 317 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 318 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 318 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 319 IRQ_TYPE_LEVEL_HIGH>; <GIC_SPI 319 IRQ_TYPE_LEVEL_HIGH>;
interrupt-names = "error", interrupt-names = "error",
"ch0", "ch1", "ch2", "ch3", "ch0", "ch1", "ch2", "ch3",
"ch4", "ch5", "ch6", "ch7", "ch4", "ch5", "ch6", "ch7",
...@@ -836,23 +836,23 @@ dmac2: dma-controller@e7310000 { ...@@ -836,23 +836,23 @@ dmac2: dma-controller@e7310000 {
compatible = "renesas,dmac-r8a774b1", compatible = "renesas,dmac-r8a774b1",
"renesas,rcar-dmac"; "renesas,rcar-dmac";
reg = <0 0xe7310000 0 0x10000>; reg = <0 0xe7310000 0 0x10000>;
interrupts = <GIC_SPI 416 IRQ_TYPE_LEVEL_HIGH interrupts = <GIC_SPI 416 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 417 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 417 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 418 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 418 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 419 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 419 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 420 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 420 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 421 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 421 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 422 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 422 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 423 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 423 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 424 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 424 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 425 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 425 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 426 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 426 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 427 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 427 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 428 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 428 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 429 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 429 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 430 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 430 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 431 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 431 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 397 IRQ_TYPE_LEVEL_HIGH>; <GIC_SPI 397 IRQ_TYPE_LEVEL_HIGH>;
interrupt-names = "error", interrupt-names = "error",
"ch0", "ch1", "ch2", "ch3", "ch0", "ch1", "ch2", "ch3",
"ch4", "ch5", "ch6", "ch7", "ch4", "ch5", "ch6", "ch7",
...@@ -1949,23 +1949,23 @@ audma0: dma-controller@ec700000 { ...@@ -1949,23 +1949,23 @@ audma0: dma-controller@ec700000 {
compatible = "renesas,dmac-r8a774b1", compatible = "renesas,dmac-r8a774b1",
"renesas,rcar-dmac"; "renesas,rcar-dmac";
reg = <0 0xec700000 0 0x10000>; reg = <0 0xec700000 0 0x10000>;
interrupts = <GIC_SPI 350 IRQ_TYPE_LEVEL_HIGH interrupts = <GIC_SPI 350 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 320 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 320 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 321 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 321 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 322 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 322 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 323 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 323 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 324 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 324 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 325 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 325 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 326 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 326 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 327 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 327 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 328 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 328 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 329 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 329 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 330 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 330 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 331 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 331 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 332 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 332 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 333 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 333 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 334 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 334 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 335 IRQ_TYPE_LEVEL_HIGH>; <GIC_SPI 335 IRQ_TYPE_LEVEL_HIGH>;
interrupt-names = "error", interrupt-names = "error",
"ch0", "ch1", "ch2", "ch3", "ch0", "ch1", "ch2", "ch3",
"ch4", "ch5", "ch6", "ch7", "ch4", "ch5", "ch6", "ch7",
...@@ -1983,23 +1983,23 @@ audma1: dma-controller@ec720000 { ...@@ -1983,23 +1983,23 @@ audma1: dma-controller@ec720000 {
compatible = "renesas,dmac-r8a774b1", compatible = "renesas,dmac-r8a774b1",
"renesas,rcar-dmac"; "renesas,rcar-dmac";
reg = <0 0xec720000 0 0x10000>; reg = <0 0xec720000 0 0x10000>;
interrupts = <GIC_SPI 351 IRQ_TYPE_LEVEL_HIGH interrupts = <GIC_SPI 351 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 336 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 336 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 337 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 337 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 338 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 338 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 339 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 339 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 340 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 340 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 341 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 341 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 342 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 342 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 343 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 343 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 344 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 344 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 345 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 345 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 346 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 346 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 347 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 347 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 348 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 348 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 349 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 349 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 382 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 382 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 383 IRQ_TYPE_LEVEL_HIGH>; <GIC_SPI 383 IRQ_TYPE_LEVEL_HIGH>;
interrupt-names = "error", interrupt-names = "error",
"ch0", "ch1", "ch2", "ch3", "ch0", "ch1", "ch2", "ch3",
"ch4", "ch5", "ch6", "ch7", "ch4", "ch5", "ch6", "ch7",
...@@ -2192,10 +2192,10 @@ pciec0: pcie@fe000000 { ...@@ -2192,10 +2192,10 @@ pciec0: pcie@fe000000 {
#size-cells = <2>; #size-cells = <2>;
bus-range = <0x00 0xff>; bus-range = <0x00 0xff>;
device_type = "pci"; device_type = "pci";
ranges = <0x01000000 0 0x00000000 0 0xfe100000 0 0x00100000 ranges = <0x01000000 0 0x00000000 0 0xfe100000 0 0x00100000>,
0x02000000 0 0xfe200000 0 0xfe200000 0 0x00200000 <0x02000000 0 0xfe200000 0 0xfe200000 0 0x00200000>,
0x02000000 0 0x30000000 0 0x30000000 0 0x08000000 <0x02000000 0 0x30000000 0 0x30000000 0 0x08000000>,
0x42000000 0 0x38000000 0 0x38000000 0 0x08000000>; <0x42000000 0 0x38000000 0 0x38000000 0 0x08000000>;
/* Map all possible DDR as inbound ranges */ /* Map all possible DDR as inbound ranges */
dma-ranges = <0x42000000 0 0x40000000 0 0x40000000 0 0x80000000>; dma-ranges = <0x42000000 0 0x40000000 0 0x40000000 0 0x80000000>;
interrupts = <GIC_SPI 116 IRQ_TYPE_LEVEL_HIGH>, interrupts = <GIC_SPI 116 IRQ_TYPE_LEVEL_HIGH>,
...@@ -2219,10 +2219,10 @@ pciec1: pcie@ee800000 { ...@@ -2219,10 +2219,10 @@ pciec1: pcie@ee800000 {
#size-cells = <2>; #size-cells = <2>;
bus-range = <0x00 0xff>; bus-range = <0x00 0xff>;
device_type = "pci"; device_type = "pci";
ranges = <0x01000000 0 0x00000000 0 0xee900000 0 0x00100000 ranges = <0x01000000 0 0x00000000 0 0xee900000 0 0x00100000>,
0x02000000 0 0xeea00000 0 0xeea00000 0 0x00200000 <0x02000000 0 0xeea00000 0 0xeea00000 0 0x00200000>,
0x02000000 0 0xc0000000 0 0xc0000000 0 0x08000000 <0x02000000 0 0xc0000000 0 0xc0000000 0 0x08000000>,
0x42000000 0 0xc8000000 0 0xc8000000 0 0x08000000>; <0x42000000 0 0xc8000000 0 0xc8000000 0 0x08000000>;
/* Map all possible DDR as inbound ranges */ /* Map all possible DDR as inbound ranges */
dma-ranges = <0x42000000 0 0x40000000 0 0x40000000 0 0x80000000>; dma-ranges = <0x42000000 0 0x40000000 0 0x40000000 0 0x80000000>;
interrupts = <GIC_SPI 148 IRQ_TYPE_LEVEL_HIGH>, interrupts = <GIC_SPI 148 IRQ_TYPE_LEVEL_HIGH>,
......
arch/arm64/boot/dts/renesas/r8a774c0-cat874.dts
View file @ 8b004f12
...@@ -110,8 +110,7 @@ vccq_sdhi0: regulator-vccq-sdhi0 { ...@@ -110,8 +110,7 @@ vccq_sdhi0: regulator-vccq-sdhi0 {
gpios = <&gpio3 13 GPIO_ACTIVE_HIGH>; gpios = <&gpio3 13 GPIO_ACTIVE_HIGH>;
gpios-states = <1>; gpios-states = <1>;
states = <3300000 1 states = <3300000 1>, <1800000 0>;
1800000 0>;
}; };
wlan_en_reg: fixedregulator { wlan_en_reg: fixedregulator {
......
arch/arm64/boot/dts/renesas/r8a774c0-ek874-idk-2121wr.dts 0 → 100644
View file @ 8b004f12
// SPDX-License-Identifier: GPL-2.0
/*
* Device Tree Source for the Silicon Linux RZ/G2E evaluation kit (EK874),
* connected to an Advantech IDK-2121WR 21.5" LVDS panel
*
* Copyright (C) 2019 Renesas Electronics Corp.
*/
#include "r8a774c0-ek874.dts"
/ {
backlight: backlight {
compatible = "pwm-backlight";
pwms = <&pwm5 0 50000>;
brightness-levels = <0 4 8 16 32 64 128 255>;
default-brightness-level = <6>;
power-supply = <&reg_12p0v>;
enable-gpios = <&gpio6 12 GPIO_ACTIVE_HIGH>;
};
panel-lvds {
compatible = "advantech,idk-2121wr", "panel-lvds";
width-mm = <476>;
height-mm = <268>;
data-mapping = "vesa-24";
panel-timing {
clock-frequency = <148500000>;
hactive = <1920>;
vactive = <1080>;
hsync-len = <44>;
hfront-porch = <88>;
hback-porch = <148>;
vfront-porch = <4>;
vback-porch = <36>;
vsync-len = <5>;
};
ports {
#address-cells = <1>;
#size-cells = <0>;
port@0 {
reg = <0>;
dual-lvds-odd-pixels;
panel_in0: endpoint {
remote-endpoint = <&lvds0_out>;
};
};
port@1 {
reg = <1>;
dual-lvds-even-pixels;
panel_in1: endpoint {
remote-endpoint = <&lvds1_out>;
};
};
};
};
};
&gpio0 {
/*
* When GP0_17 is low LVDS[01] are connected to the LVDS connector
* When GP0_17 is high LVDS[01] are connected to the LT8918L
*/
lvds-connector-en-gpio{
gpio-hog;
gpios = <17 GPIO_ACTIVE_HIGH>;
output-low;
line-name = "lvds-connector-en-gpio";
};
};
&lvds0 {
ports {
port@1 {
lvds0_out: endpoint {
remote-endpoint = <&panel_in0>;
};
};
};
};
&lvds1 {
status = "okay";
clocks = <&cpg CPG_MOD 727>, <&x13_clk>, <&extal_clk>;
clock-names = "fck", "dclkin.0", "extal";
ports {
port@1 {
lvds1_out: endpoint {
remote-endpoint = <&panel_in1>;
};
};
};
};
&pfc {
pwm5_pins: pwm5 {
groups = "pwm5_a";
function = "pwm5";
};
};
&pwm5 {
pinctrl-0 = <&pwm5_pins>;
pinctrl-names = "default";
status = "okay";
};
arch/arm64/boot/dts/renesas/r8a774c0.dtsi
View file @ 8b004f12
...@@ -369,12 +369,12 @@ intc_ex: interrupt-controller@e61c0000 { ...@@ -369,12 +369,12 @@ intc_ex: interrupt-controller@e61c0000 {
#interrupt-cells = <2>; #interrupt-cells = <2>;
interrupt-controller; interrupt-controller;
reg = <0 0xe61c0000 0 0x200>; reg = <0 0xe61c0000 0 0x200>;
interrupts = <GIC_SPI 0 IRQ_TYPE_LEVEL_HIGH interrupts = <GIC_SPI 0 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 1 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 1 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 2 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 2 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 3 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 3 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 18 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 18 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 161 IRQ_TYPE_LEVEL_HIGH>; <GIC_SPI 161 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&cpg CPG_MOD 407>; clocks = <&cpg CPG_MOD 407>;
power-domains = <&sysc R8A774C0_PD_ALWAYS_ON>; power-domains = <&sysc R8A774C0_PD_ALWAYS_ON>;
resets = <&cpg 407>; resets = <&cpg 407>;
...@@ -697,8 +697,8 @@ usb_dmac0: dma-controller@e65a0000 { ...@@ -697,8 +697,8 @@ usb_dmac0: dma-controller@e65a0000 {
compatible = "renesas,r8a774c0-usb-dmac", compatible = "renesas,r8a774c0-usb-dmac",
"renesas,usb-dmac"; "renesas,usb-dmac";
reg = <0 0xe65a0000 0 0x100>; reg = <0 0xe65a0000 0 0x100>;
interrupts = <GIC_SPI 109 IRQ_TYPE_LEVEL_HIGH interrupts = <GIC_SPI 109 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 109 IRQ_TYPE_LEVEL_HIGH>; <GIC_SPI 109 IRQ_TYPE_LEVEL_HIGH>;
interrupt-names = "ch0", "ch1"; interrupt-names = "ch0", "ch1";
clocks = <&cpg CPG_MOD 330>; clocks = <&cpg CPG_MOD 330>;
power-domains = <&sysc R8A774C0_PD_ALWAYS_ON>; power-domains = <&sysc R8A774C0_PD_ALWAYS_ON>;
...@@ -711,8 +711,8 @@ usb_dmac1: dma-controller@e65b0000 { ...@@ -711,8 +711,8 @@ usb_dmac1: dma-controller@e65b0000 {
compatible = "renesas,r8a774c0-usb-dmac", compatible = "renesas,r8a774c0-usb-dmac",
"renesas,usb-dmac"; "renesas,usb-dmac";
reg = <0 0xe65b0000 0 0x100>; reg = <0 0xe65b0000 0 0x100>;
interrupts = <GIC_SPI 110 IRQ_TYPE_LEVEL_HIGH interrupts = <GIC_SPI 110 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 110 IRQ_TYPE_LEVEL_HIGH>; <GIC_SPI 110 IRQ_TYPE_LEVEL_HIGH>;
interrupt-names = "ch0", "ch1"; interrupt-names = "ch0", "ch1";
clocks = <&cpg CPG_MOD 331>; clocks = <&cpg CPG_MOD 331>;
power-domains = <&sysc R8A774C0_PD_ALWAYS_ON>; power-domains = <&sysc R8A774C0_PD_ALWAYS_ON>;
...@@ -725,23 +725,23 @@ dmac0: dma-controller@e6700000 { ...@@ -725,23 +725,23 @@ dmac0: dma-controller@e6700000 {
compatible = "renesas,dmac-r8a774c0", compatible = "renesas,dmac-r8a774c0",
"renesas,rcar-dmac"; "renesas,rcar-dmac";
reg = <0 0xe6700000 0 0x10000>; reg = <0 0xe6700000 0 0x10000>;
interrupts = <GIC_SPI 199 IRQ_TYPE_LEVEL_HIGH interrupts = <GIC_SPI 199 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 200 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 200 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 201 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 201 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 202 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 202 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 203 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 203 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 204 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 204 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 205 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 205 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 206 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 206 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 207 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 207 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 208 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 208 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 209 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 209 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 210 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 210 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 211 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 211 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 212 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 212 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 213 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 213 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 214 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 214 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 215 IRQ_TYPE_LEVEL_HIGH>; <GIC_SPI 215 IRQ_TYPE_LEVEL_HIGH>;
interrupt-names = "error", interrupt-names = "error",
"ch0", "ch1", "ch2", "ch3", "ch0", "ch1", "ch2", "ch3",
"ch4", "ch5", "ch6", "ch7", "ch4", "ch5", "ch6", "ch7",
...@@ -767,23 +767,23 @@ dmac1: dma-controller@e7300000 { ...@@ -767,23 +767,23 @@ dmac1: dma-controller@e7300000 {
compatible = "renesas,dmac-r8a774c0", compatible = "renesas,dmac-r8a774c0",
"renesas,rcar-dmac"; "renesas,rcar-dmac";
reg = <0 0xe7300000 0 0x10000>; reg = <0 0xe7300000 0 0x10000>;
interrupts = <GIC_SPI 220 IRQ_TYPE_LEVEL_HIGH interrupts = <GIC_SPI 220 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 216 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 216 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 217 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 217 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 218 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 218 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 219 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 219 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 308 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 308 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 309 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 309 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 310 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 310 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 311 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 311 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 312 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 312 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 313 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 313 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 314 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 314 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 315 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 315 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 316 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 316 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 317 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 317 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 318 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 318 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 319 IRQ_TYPE_LEVEL_HIGH>; <GIC_SPI 319 IRQ_TYPE_LEVEL_HIGH>;
interrupt-names = "error", interrupt-names = "error",
"ch0", "ch1", "ch2", "ch3", "ch0", "ch1", "ch2", "ch3",
"ch4", "ch5", "ch6", "ch7", "ch4", "ch5", "ch6", "ch7",
...@@ -809,23 +809,23 @@ dmac2: dma-controller@e7310000 { ...@@ -809,23 +809,23 @@ dmac2: dma-controller@e7310000 {
compatible = "renesas,dmac-r8a774c0", compatible = "renesas,dmac-r8a774c0",
"renesas,rcar-dmac"; "renesas,rcar-dmac";
reg = <0 0xe7310000 0 0x10000>; reg = <0 0xe7310000 0 0x10000>;
interrupts = <GIC_SPI 416 IRQ_TYPE_LEVEL_HIGH interrupts = <GIC_SPI 416 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 417 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 417 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 418 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 418 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 419 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 419 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 420 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 420 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 421 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 421 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 422 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 422 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 423 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 423 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 424 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 424 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 425 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 425 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 426 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 426 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 427 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 427 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 428 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 428 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 429 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 429 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 430 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 430 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 431 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 431 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 397 IRQ_TYPE_LEVEL_HIGH>; <GIC_SPI 397 IRQ_TYPE_LEVEL_HIGH>;
interrupt-names = "error", interrupt-names = "error",
"ch0", "ch1", "ch2", "ch3", "ch0", "ch1", "ch2", "ch3",
"ch4", "ch5", "ch6", "ch7", "ch4", "ch5", "ch6", "ch7",
...@@ -1521,23 +1521,23 @@ audma0: dma-controller@ec700000 { ...@@ -1521,23 +1521,23 @@ audma0: dma-controller@ec700000 {
compatible = "renesas,dmac-r8a774c0", compatible = "renesas,dmac-r8a774c0",
"renesas,rcar-dmac"; "renesas,rcar-dmac";
reg = <0 0xec700000 0 0x10000>; reg = <0 0xec700000 0 0x10000>;
interrupts = <GIC_SPI 350 IRQ_TYPE_LEVEL_HIGH interrupts = <GIC_SPI 350 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 320 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 320 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 321 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 321 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 322 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 322 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 323 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 323 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 324 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 324 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 325 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 325 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 326 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 326 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 327 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 327 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 328 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 328 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 329 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 329 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 330 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 330 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 331 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 331 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 332 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 332 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 333 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 333 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 334 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 334 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 335 IRQ_TYPE_LEVEL_HIGH>; <GIC_SPI 335 IRQ_TYPE_LEVEL_HIGH>;
interrupt-names = "error", interrupt-names = "error",
"ch0", "ch1", "ch2", "ch3", "ch0", "ch1", "ch2", "ch3",
"ch4", "ch5", "ch6", "ch7", "ch4", "ch5", "ch6", "ch7",
...@@ -1679,10 +1679,10 @@ pciec0: pcie@fe000000 { ...@@ -1679,10 +1679,10 @@ pciec0: pcie@fe000000 {
#size-cells = <2>; #size-cells = <2>;
bus-range = <0x00 0xff>; bus-range = <0x00 0xff>;
device_type = "pci"; device_type = "pci";
ranges = <0x01000000 0 0x00000000 0 0xfe100000 0 0x00100000 ranges = <0x01000000 0 0x00000000 0 0xfe100000 0 0x00100000>,
0x02000000 0 0xfe200000 0 0xfe200000 0 0x00200000 <0x02000000 0 0xfe200000 0 0xfe200000 0 0x00200000>,
0x02000000 0 0x30000000 0 0x30000000 0 0x08000000 <0x02000000 0 0x30000000 0 0x30000000 0 0x08000000>,
0x42000000 0 0x38000000 0 0x38000000 0 0x08000000>; <0x42000000 0 0x38000000 0 0x38000000 0 0x08000000>;
/* Map all possible DDR as inbound ranges */ /* Map all possible DDR as inbound ranges */
dma-ranges = <0x42000000 0 0x40000000 0 0x40000000 0 0x40000000>; dma-ranges = <0x42000000 0 0x40000000 0 0x40000000 0 0x40000000>;
interrupts = <GIC_SPI 116 IRQ_TYPE_LEVEL_HIGH>, interrupts = <GIC_SPI 116 IRQ_TYPE_LEVEL_HIGH>,
......
arch/arm64/boot/dts/renesas/r8a7795-es1-salvator-x.dts → arch/arm64/boot/dts/renesas/r8a77950-salvator-x.dts
View file @ 8b004f12
...@@ -6,11 +6,11 @@ ...@@ -6,11 +6,11 @@
*/ */
/dts-v1/; /dts-v1/;
#include "r8a7795-es1.dtsi" #include "r8a77950.dtsi"
#include "salvator-x.dtsi" #include "salvator-x.dtsi"
/ { / {
model = "Renesas Salvator-X board based on r8a7795 ES1.x"; model = "Renesas Salvator-X board based on r8a77950";
compatible = "renesas,salvator-x", "renesas,r8a7795"; compatible = "renesas,salvator-x", "renesas,r8a7795";
memory@48000000 { memory@48000000 {
......
arch/arm64/boot/dts/renesas/r8a7795-h3ulcb-kf.dts → arch/arm64/boot/dts/renesas/r8a77950-ulcb-kf.dts
View file @ 8b004f12
...@@ -6,11 +6,11 @@ ...@@ -6,11 +6,11 @@
* Copyright (C) 2017 Cogent Embedded, Inc. * Copyright (C) 2017 Cogent Embedded, Inc.
*/ */
#include "r8a7795-h3ulcb.dts" #include "r8a77950-ulcb.dts"
#include "ulcb-kf.dtsi" #include "ulcb-kf.dtsi"
/ { / {
model = "Renesas H3ULCB Kingfisher board based on r8a7795 ES2.0+"; model = "Renesas H3ULCB Kingfisher board based on r8a77950";
compatible = "shimafuji,kingfisher", "renesas,h3ulcb", compatible = "shimafuji,kingfisher", "renesas,h3ulcb",
"renesas,r8a7795"; "renesas,r8a7795";
}; };
arch/arm64/boot/dts/renesas/r8a7795-es1-h3ulcb.dts → arch/arm64/boot/dts/renesas/r8a77950-ulcb.dts
View file @ 8b004f12
...@@ -7,11 +7,11 @@ ...@@ -7,11 +7,11 @@
*/ */
/dts-v1/; /dts-v1/;
#include "r8a7795-es1.dtsi" #include "r8a77950.dtsi"
#include "ulcb.dtsi" #include "ulcb.dtsi"
/ { / {
model = "Renesas H3ULCB board based on r8a7795 ES1.x"; model = "Renesas H3ULCB board based on r8a77950";
compatible = "renesas,h3ulcb", "renesas,r8a7795"; compatible = "renesas,h3ulcb", "renesas,r8a7795";
memory@48000000 { memory@48000000 {
......
arch/arm64/boot/dts/renesas/r8a7795-es1.dtsi → arch/arm64/boot/dts/renesas/r8a77950.dtsi
View file @ 8b004f12
// SPDX-License-Identifier: GPL-2.0 // SPDX-License-Identifier: GPL-2.0
/* /*
* Device Tree Source for the R-Car H3 (R8A77950) ES1.x SoC * Device Tree Source for the R-Car H3 (R8A77950) SoC
* *
* Copyright (C) 2015 Renesas Electronics Corp. * Copyright (C) 2015 Renesas Electronics Corp.
*/ */
#include "r8a7795.dtsi" #include "r8a77951.dtsi"
&audma0 { &audma0 {
iommus = <&ipmmu_mp1 0>, <&ipmmu_mp1 1>, iommus = <&ipmmu_mp1 0>, <&ipmmu_mp1 1>,
......
arch/arm64/boot/dts/renesas/r8a7795-salvator-x.dts → arch/arm64/boot/dts/renesas/r8a77951-salvator-x.dts
View file @ 8b004f12
...@@ -6,11 +6,11 @@ ...@@ -6,11 +6,11 @@
*/ */
/dts-v1/; /dts-v1/;
#include "r8a7795.dtsi" #include "r8a77951.dtsi"
#include "salvator-x.dtsi" #include "salvator-x.dtsi"
/ { / {
model = "Renesas Salvator-X board based on r8a7795 ES2.0+"; model = "Renesas Salvator-X board based on r8a77951";
compatible = "renesas,salvator-x", "renesas,r8a7795"; compatible = "renesas,salvator-x", "renesas,r8a7795";
memory@48000000 { memory@48000000 {
......
arch/arm64/boot/dts/renesas/r8a7795-salvator-xs.dts → arch/arm64/boot/dts/renesas/r8a77951-salvator-xs.dts
View file @ 8b004f12
// SPDX-License-Identifier: GPL-2.0 // SPDX-License-Identifier: GPL-2.0
/* /*
* Device Tree Source for the Salvator-X 2nd version board with R-Car H3 ES2.0 * Device Tree Source for the Salvator-X 2nd version board with R-Car H3 ES2.0+
* *
* Copyright (C) 2015-2017 Renesas Electronics Corp. * Copyright (C) 2015-2017 Renesas Electronics Corp.
*/ */
/dts-v1/; /dts-v1/;
#include "r8a7795.dtsi" #include "r8a77951.dtsi"
#include "salvator-xs.dtsi" #include "salvator-xs.dtsi"
/ { / {
model = "Renesas Salvator-X 2nd version board based on r8a7795 ES2.0+"; model = "Renesas Salvator-X 2nd version board based on r8a77951";
compatible = "renesas,salvator-xs", "renesas,r8a7795"; compatible = "renesas,salvator-xs", "renesas,r8a7795";
memory@48000000 { memory@48000000 {
...@@ -136,7 +136,7 @@ usb2_pins: usb2 { ...@@ -136,7 +136,7 @@ usb2_pins: usb2 {
* - On Salvator-X[S], GP6_3[01] are connected to ADV7482 as irq pins * - On Salvator-X[S], GP6_3[01] are connected to ADV7482 as irq pins
* (when SW31 is the default setting on Salvator-XS). * (when SW31 is the default setting on Salvator-XS).
* - If SW31 is the default setting, you cannot use USB2.0 ch3 on * - If SW31 is the default setting, you cannot use USB2.0 ch3 on
* r8a7795 with Salvator-XS. * r8a77951 with Salvator-XS.
* Hence the SW31 setting must be changed like 2) below. * Hence the SW31 setting must be changed like 2) below.
* 1) Default setting of SW31: ON-ON-OFF-OFF-OFF-OFF: * 1) Default setting of SW31: ON-ON-OFF-OFF-OFF-OFF:
* - Connect GP6_3[01] to ADV7842. * - Connect GP6_3[01] to ADV7842.
......
arch/arm64/boot/dts/renesas/r8a7795-es1-h3ulcb-kf.dts → arch/arm64/boot/dts/renesas/r8a77951-ulcb-kf.dts
View file @ 8b004f12
...@@ -6,11 +6,11 @@ ...@@ -6,11 +6,11 @@
* Copyright (C) 2017 Cogent Embedded, Inc. * Copyright (C) 2017 Cogent Embedded, Inc.
*/ */
#include "r8a7795-es1-h3ulcb.dts" #include "r8a77951-ulcb.dts"
#include "ulcb-kf.dtsi" #include "ulcb-kf.dtsi"
/ { / {
model = "Renesas H3ULCB Kingfisher board based on r8a7795 ES1.x"; model = "Renesas H3ULCB Kingfisher board based on r8a77951";
compatible = "shimafuji,kingfisher", "renesas,h3ulcb", compatible = "shimafuji,kingfisher", "renesas,h3ulcb",
"renesas,r8a7795"; "renesas,r8a7795";
}; };
arch/arm64/boot/dts/renesas/r8a7795-h3ulcb.dts → arch/arm64/boot/dts/renesas/r8a77951-ulcb.dts
View file @ 8b004f12
...@@ -7,11 +7,11 @@ ...@@ -7,11 +7,11 @@
*/ */
/dts-v1/; /dts-v1/;
#include "r8a7795.dtsi" #include "r8a77951.dtsi"
#include "ulcb.dtsi" #include "ulcb.dtsi"
/ { / {
model = "Renesas H3ULCB board based on r8a7795 ES2.0+"; model = "Renesas H3ULCB board based on r8a77951";
compatible = "renesas,h3ulcb", "renesas,r8a7795"; compatible = "renesas,h3ulcb", "renesas,r8a7795";
memory@48000000 { memory@48000000 {
......
arch/arm64/boot/dts/renesas/r8a7795.dtsi → arch/arm64/boot/dts/renesas/r8a77951.dtsi
View file @ 8b004f12
// SPDX-License-Identifier: GPL-2.0 // SPDX-License-Identifier: GPL-2.0
/* /*
* Device Tree Source for the R-Car H3 (R8A77950) SoC * Device Tree Source for the R-Car H3 (R8A77951) SoC
* *
* Copyright (C) 2015 Renesas Electronics Corp. * Copyright (C) 2015 Renesas Electronics Corp.
*/ */
...@@ -605,12 +605,12 @@ intc_ex: interrupt-controller@e61c0000 { ...@@ -605,12 +605,12 @@ intc_ex: interrupt-controller@e61c0000 {
#interrupt-cells = <2>; #interrupt-cells = <2>;
interrupt-controller; interrupt-controller;
reg = <0 0xe61c0000 0 0x200>; reg = <0 0xe61c0000 0 0x200>;
interrupts = <GIC_SPI 0 IRQ_TYPE_LEVEL_HIGH interrupts = <GIC_SPI 0 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 1 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 1 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 2 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 2 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 3 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 3 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 18 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 18 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 161 IRQ_TYPE_LEVEL_HIGH>; <GIC_SPI 161 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&cpg CPG_MOD 407>; clocks = <&cpg CPG_MOD 407>;
power-domains = <&sysc R8A7795_PD_ALWAYS_ON>; power-domains = <&sysc R8A7795_PD_ALWAYS_ON>;
resets = <&cpg 407>; resets = <&cpg 407>;
...@@ -873,8 +873,8 @@ usb_dmac0: dma-controller@e65a0000 { ...@@ -873,8 +873,8 @@ usb_dmac0: dma-controller@e65a0000 {
compatible = "renesas,r8a7795-usb-dmac", compatible = "renesas,r8a7795-usb-dmac",
"renesas,usb-dmac"; "renesas,usb-dmac";
reg = <0 0xe65a0000 0 0x100>; reg = <0 0xe65a0000 0 0x100>;
interrupts = <GIC_SPI 109 IRQ_TYPE_LEVEL_HIGH interrupts = <GIC_SPI 109 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 109 IRQ_TYPE_LEVEL_HIGH>; <GIC_SPI 109 IRQ_TYPE_LEVEL_HIGH>;
interrupt-names = "ch0", "ch1"; interrupt-names = "ch0", "ch1";
clocks = <&cpg CPG_MOD 330>; clocks = <&cpg CPG_MOD 330>;
power-domains = <&sysc R8A7795_PD_ALWAYS_ON>; power-domains = <&sysc R8A7795_PD_ALWAYS_ON>;
...@@ -887,8 +887,8 @@ usb_dmac1: dma-controller@e65b0000 { ...@@ -887,8 +887,8 @@ usb_dmac1: dma-controller@e65b0000 {
compatible = "renesas,r8a7795-usb-dmac", compatible = "renesas,r8a7795-usb-dmac",
"renesas,usb-dmac"; "renesas,usb-dmac";
reg = <0 0xe65b0000 0 0x100>; reg = <0 0xe65b0000 0 0x100>;
interrupts = <GIC_SPI 110 IRQ_TYPE_LEVEL_HIGH interrupts = <GIC_SPI 110 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 110 IRQ_TYPE_LEVEL_HIGH>; <GIC_SPI 110 IRQ_TYPE_LEVEL_HIGH>;
interrupt-names = "ch0", "ch1"; interrupt-names = "ch0", "ch1";
clocks = <&cpg CPG_MOD 331>; clocks = <&cpg CPG_MOD 331>;
power-domains = <&sysc R8A7795_PD_ALWAYS_ON>; power-domains = <&sysc R8A7795_PD_ALWAYS_ON>;
...@@ -901,8 +901,8 @@ usb_dmac2: dma-controller@e6460000 { ...@@ -901,8 +901,8 @@ usb_dmac2: dma-controller@e6460000 {
compatible = "renesas,r8a7795-usb-dmac", compatible = "renesas,r8a7795-usb-dmac",
"renesas,usb-dmac"; "renesas,usb-dmac";
reg = <0 0xe6460000 0 0x100>; reg = <0 0xe6460000 0 0x100>;
interrupts = <GIC_SPI 34 IRQ_TYPE_LEVEL_HIGH interrupts = <GIC_SPI 34 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 34 IRQ_TYPE_LEVEL_HIGH>; <GIC_SPI 34 IRQ_TYPE_LEVEL_HIGH>;
interrupt-names = "ch0", "ch1"; interrupt-names = "ch0", "ch1";
clocks = <&cpg CPG_MOD 326>; clocks = <&cpg CPG_MOD 326>;
power-domains = <&sysc R8A7795_PD_ALWAYS_ON>; power-domains = <&sysc R8A7795_PD_ALWAYS_ON>;
...@@ -915,8 +915,8 @@ usb_dmac3: dma-controller@e6470000 { ...@@ -915,8 +915,8 @@ usb_dmac3: dma-controller@e6470000 {
compatible = "renesas,r8a7795-usb-dmac", compatible = "renesas,r8a7795-usb-dmac",
"renesas,usb-dmac"; "renesas,usb-dmac";
reg = <0 0xe6470000 0 0x100>; reg = <0 0xe6470000 0 0x100>;
interrupts = <GIC_SPI 35 IRQ_TYPE_LEVEL_HIGH interrupts = <GIC_SPI 35 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 35 IRQ_TYPE_LEVEL_HIGH>; <GIC_SPI 35 IRQ_TYPE_LEVEL_HIGH>;
interrupt-names = "ch0", "ch1"; interrupt-names = "ch0", "ch1";
clocks = <&cpg CPG_MOD 329>; clocks = <&cpg CPG_MOD 329>;
power-domains = <&sysc R8A7795_PD_ALWAYS_ON>; power-domains = <&sysc R8A7795_PD_ALWAYS_ON>;
...@@ -951,23 +951,23 @@ dmac0: dma-controller@e6700000 { ...@@ -951,23 +951,23 @@ dmac0: dma-controller@e6700000 {
compatible = "renesas,dmac-r8a7795", compatible = "renesas,dmac-r8a7795",
"renesas,rcar-dmac"; "renesas,rcar-dmac";
reg = <0 0xe6700000 0 0x10000>; reg = <0 0xe6700000 0 0x10000>;
interrupts = <GIC_SPI 199 IRQ_TYPE_LEVEL_HIGH interrupts = <GIC_SPI 199 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 200 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 200 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 201 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 201 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 202 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 202 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 203 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 203 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 204 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 204 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 205 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 205 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 206 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 206 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 207 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 207 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 208 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 208 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 209 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 209 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 210 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 210 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 211 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 211 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 212 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 212 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 213 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 213 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 214 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 214 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 215 IRQ_TYPE_LEVEL_HIGH>; <GIC_SPI 215 IRQ_TYPE_LEVEL_HIGH>;
interrupt-names = "error", interrupt-names = "error",
"ch0", "ch1", "ch2", "ch3", "ch0", "ch1", "ch2", "ch3",
"ch4", "ch5", "ch6", "ch7", "ch4", "ch5", "ch6", "ch7",
...@@ -993,23 +993,23 @@ dmac1: dma-controller@e7300000 { ...@@ -993,23 +993,23 @@ dmac1: dma-controller@e7300000 {
compatible = "renesas,dmac-r8a7795", compatible = "renesas,dmac-r8a7795",
"renesas,rcar-dmac"; "renesas,rcar-dmac";
reg = <0 0xe7300000 0 0x10000>; reg = <0 0xe7300000 0 0x10000>;
interrupts = <GIC_SPI 220 IRQ_TYPE_LEVEL_HIGH interrupts = <GIC_SPI 220 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 216 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 216 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 217 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 217 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 218 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 218 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 219 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 219 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 308 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 308 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 309 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 309 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 310 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 310 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 311 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 311 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 312 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 312 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 313 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 313 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 314 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 314 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 315 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 315 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 316 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 316 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 317 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 317 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 318 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 318 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 319 IRQ_TYPE_LEVEL_HIGH>; <GIC_SPI 319 IRQ_TYPE_LEVEL_HIGH>;
interrupt-names = "error", interrupt-names = "error",
"ch0", "ch1", "ch2", "ch3", "ch0", "ch1", "ch2", "ch3",
"ch4", "ch5", "ch6", "ch7", "ch4", "ch5", "ch6", "ch7",
...@@ -1035,23 +1035,23 @@ dmac2: dma-controller@e7310000 { ...@@ -1035,23 +1035,23 @@ dmac2: dma-controller@e7310000 {
compatible = "renesas,dmac-r8a7795", compatible = "renesas,dmac-r8a7795",
"renesas,rcar-dmac"; "renesas,rcar-dmac";
reg = <0 0xe7310000 0 0x10000>; reg = <0 0xe7310000 0 0x10000>;
interrupts = <GIC_SPI 416 IRQ_TYPE_LEVEL_HIGH interrupts = <GIC_SPI 416 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 417 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 417 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 418 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 418 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 419 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 419 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 420 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 420 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 421 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 421 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 422 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 422 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 423 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 423 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 424 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 424 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 425 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 425 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 426 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 426 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 427 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 427 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 428 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 428 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 429 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 429 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 430 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 430 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 431 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 431 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 397 IRQ_TYPE_LEVEL_HIGH>; <GIC_SPI 397 IRQ_TYPE_LEVEL_HIGH>;
interrupt-names = "error", interrupt-names = "error",
"ch0", "ch1", "ch2", "ch3", "ch0", "ch1", "ch2", "ch3",
"ch4", "ch5", "ch6", "ch7", "ch4", "ch5", "ch6", "ch7",
...@@ -2343,23 +2343,23 @@ audma0: dma-controller@ec700000 { ...@@ -2343,23 +2343,23 @@ audma0: dma-controller@ec700000 {
compatible = "renesas,dmac-r8a7795", compatible = "renesas,dmac-r8a7795",
"renesas,rcar-dmac"; "renesas,rcar-dmac";
reg = <0 0xec700000 0 0x10000>; reg = <0 0xec700000 0 0x10000>;
interrupts = <GIC_SPI 350 IRQ_TYPE_LEVEL_HIGH interrupts = <GIC_SPI 350 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 320 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 320 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 321 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 321 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 322 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 322 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 323 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 323 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 324 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 324 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 325 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 325 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 326 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 326 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 327 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 327 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 328 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 328 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 329 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 329 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 330 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 330 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 331 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 331 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 332 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 332 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 333 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 333 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 334 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 334 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 335 IRQ_TYPE_LEVEL_HIGH>; <GIC_SPI 335 IRQ_TYPE_LEVEL_HIGH>;
interrupt-names = "error", interrupt-names = "error",
"ch0", "ch1", "ch2", "ch3", "ch0", "ch1", "ch2", "ch3",
"ch4", "ch5", "ch6", "ch7", "ch4", "ch5", "ch6", "ch7",
...@@ -2385,23 +2385,23 @@ audma1: dma-controller@ec720000 { ...@@ -2385,23 +2385,23 @@ audma1: dma-controller@ec720000 {
compatible = "renesas,dmac-r8a7795", compatible = "renesas,dmac-r8a7795",
"renesas,rcar-dmac"; "renesas,rcar-dmac";
reg = <0 0xec720000 0 0x10000>; reg = <0 0xec720000 0 0x10000>;
interrupts = <GIC_SPI 351 IRQ_TYPE_LEVEL_HIGH interrupts = <GIC_SPI 351 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 336 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 336 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 337 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 337 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 338 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 338 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 339 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 339 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 340 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 340 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 341 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 341 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 342 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 342 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 343 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 343 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 344 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 344 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 345 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 345 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 346 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 346 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 347 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 347 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 348 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 348 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 349 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 349 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 382 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 382 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 383 IRQ_TYPE_LEVEL_HIGH>; <GIC_SPI 383 IRQ_TYPE_LEVEL_HIGH>;
interrupt-names = "error", interrupt-names = "error",
"ch0", "ch1", "ch2", "ch3", "ch0", "ch1", "ch2", "ch3",
"ch4", "ch5", "ch6", "ch7", "ch4", "ch5", "ch6", "ch7",
...@@ -2679,10 +2679,10 @@ pciec0: pcie@fe000000 { ...@@ -2679,10 +2679,10 @@ pciec0: pcie@fe000000 {
#size-cells = <2>; #size-cells = <2>;
bus-range = <0x00 0xff>; bus-range = <0x00 0xff>;
device_type = "pci"; device_type = "pci";
ranges = <0x01000000 0 0x00000000 0 0xfe100000 0 0x00100000 ranges = <0x01000000 0 0x00000000 0 0xfe100000 0 0x00100000>,
0x02000000 0 0xfe200000 0 0xfe200000 0 0x00200000 <0x02000000 0 0xfe200000 0 0xfe200000 0 0x00200000>,
0x02000000 0 0x30000000 0 0x30000000 0 0x08000000 <0x02000000 0 0x30000000 0 0x30000000 0 0x08000000>,
0x42000000 0 0x38000000 0 0x38000000 0 0x08000000>; <0x42000000 0 0x38000000 0 0x38000000 0 0x08000000>;
/* Map all possible DDR as inbound ranges */ /* Map all possible DDR as inbound ranges */
dma-ranges = <0x42000000 0 0x40000000 0 0x40000000 0 0x40000000>; dma-ranges = <0x42000000 0 0x40000000 0 0x40000000 0 0x40000000>;
interrupts = <GIC_SPI 116 IRQ_TYPE_LEVEL_HIGH>, interrupts = <GIC_SPI 116 IRQ_TYPE_LEVEL_HIGH>,
...@@ -2706,10 +2706,10 @@ pciec1: pcie@ee800000 { ...@@ -2706,10 +2706,10 @@ pciec1: pcie@ee800000 {
#size-cells = <2>; #size-cells = <2>;
bus-range = <0x00 0xff>; bus-range = <0x00 0xff>;
device_type = "pci"; device_type = "pci";
ranges = <0x01000000 0 0x00000000 0 0xee900000 0 0x00100000 ranges = <0x01000000 0 0x00000000 0 0xee900000 0 0x00100000>,
0x02000000 0 0xeea00000 0 0xeea00000 0 0x00200000 <0x02000000 0 0xeea00000 0 0xeea00000 0 0x00200000>,
0x02000000 0 0xc0000000 0 0xc0000000 0 0x08000000 <0x02000000 0 0xc0000000 0 0xc0000000 0 0x08000000>,
0x42000000 0 0xc8000000 0 0xc8000000 0 0x08000000>; <0x42000000 0 0xc8000000 0 0xc8000000 0 0x08000000>;
/* Map all possible DDR as inbound ranges */ /* Map all possible DDR as inbound ranges */
dma-ranges = <0x42000000 0 0x40000000 0 0x40000000 0 0x40000000>; dma-ranges = <0x42000000 0 0x40000000 0 0x40000000 0 0x40000000>;
interrupts = <GIC_SPI 148 IRQ_TYPE_LEVEL_HIGH>, interrupts = <GIC_SPI 148 IRQ_TYPE_LEVEL_HIGH>,
......
arch/arm64/boot/dts/renesas/r8a7796-salvator-x.dts → arch/arm64/boot/dts/renesas/r8a77960-salvator-x.dts
View file @ 8b004f12
...@@ -6,11 +6,11 @@ ...@@ -6,11 +6,11 @@
*/ */
/dts-v1/; /dts-v1/;
#include "r8a7796.dtsi" #include "r8a77960.dtsi"
#include "salvator-x.dtsi" #include "salvator-x.dtsi"
/ { / {
model = "Renesas Salvator-X board based on r8a7796"; model = "Renesas Salvator-X board based on r8a77960";
compatible = "renesas,salvator-x", "renesas,r8a7796"; compatible = "renesas,salvator-x", "renesas,r8a7796";
memory@48000000 { memory@48000000 {
......
arch/arm64/boot/dts/renesas/r8a7796-salvator-xs.dts → arch/arm64/boot/dts/renesas/r8a77960-salvator-xs.dts
View file @ 8b004f12
...@@ -6,11 +6,11 @@ ...@@ -6,11 +6,11 @@
*/ */
/dts-v1/; /dts-v1/;
#include "r8a7796.dtsi" #include "r8a77960.dtsi"
#include "salvator-xs.dtsi" #include "salvator-xs.dtsi"
/ { / {
model = "Renesas Salvator-X 2nd version board based on r8a7796"; model = "Renesas Salvator-X 2nd version board based on r8a77960";
compatible = "renesas,salvator-xs", "renesas,r8a7796"; compatible = "renesas,salvator-xs", "renesas,r8a7796";
memory@48000000 { memory@48000000 {
......
arch/arm64/boot/dts/renesas/r8a7796-m3ulcb-kf.dts → arch/arm64/boot/dts/renesas/r8a77960-ulcb-kf.dts
View file @ 8b004f12
...@@ -6,11 +6,11 @@ ...@@ -6,11 +6,11 @@
* Copyright (C) 2017 Cogent Embedded, Inc. * Copyright (C) 2017 Cogent Embedded, Inc.
*/ */
#include "r8a7796-m3ulcb.dts" #include "r8a77960-ulcb.dts"
#include "ulcb-kf.dtsi" #include "ulcb-kf.dtsi"
/ { / {
model = "Renesas M3ULCB Kingfisher board based on r8a7796"; model = "Renesas M3ULCB Kingfisher board based on r8a77960";
compatible = "shimafuji,kingfisher", "renesas,m3ulcb", compatible = "shimafuji,kingfisher", "renesas,m3ulcb",
"renesas,r8a7796"; "renesas,r8a7796";
}; };
arch/arm64/boot/dts/renesas/r8a7796-m3ulcb.dts → arch/arm64/boot/dts/renesas/r8a77960-ulcb.dts
View file @ 8b004f12
...@@ -7,11 +7,11 @@ ...@@ -7,11 +7,11 @@
*/ */
/dts-v1/; /dts-v1/;
#include "r8a7796.dtsi" #include "r8a77960.dtsi"
#include "ulcb.dtsi" #include "ulcb.dtsi"
/ { / {
model = "Renesas M3ULCB board based on r8a7796"; model = "Renesas M3ULCB board based on r8a77960";
compatible = "renesas,m3ulcb", "renesas,r8a7796"; compatible = "renesas,m3ulcb", "renesas,r8a7796";
memory@48000000 { memory@48000000 {
......
arch/arm64/boot/dts/renesas/r8a7796.dtsi → arch/arm64/boot/dts/renesas/r8a77960.dtsi
View file @ 8b004f12
...@@ -574,12 +574,12 @@ intc_ex: interrupt-controller@e61c0000 { ...@@ -574,12 +574,12 @@ intc_ex: interrupt-controller@e61c0000 {
#interrupt-cells = <2>; #interrupt-cells = <2>;
interrupt-controller; interrupt-controller;
reg = <0 0xe61c0000 0 0x200>; reg = <0 0xe61c0000 0 0x200>;
interrupts = <GIC_SPI 0 IRQ_TYPE_LEVEL_HIGH interrupts = <GIC_SPI 0 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 1 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 1 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 2 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 2 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 3 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 3 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 18 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 18 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 161 IRQ_TYPE_LEVEL_HIGH>; <GIC_SPI 161 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&cpg CPG_MOD 407>; clocks = <&cpg CPG_MOD 407>;
power-domains = <&sysc R8A7796_PD_ALWAYS_ON>; power-domains = <&sysc R8A7796_PD_ALWAYS_ON>;
resets = <&cpg 407>; resets = <&cpg 407>;
...@@ -825,8 +825,8 @@ usb_dmac0: dma-controller@e65a0000 { ...@@ -825,8 +825,8 @@ usb_dmac0: dma-controller@e65a0000 {
compatible = "renesas,r8a7796-usb-dmac", compatible = "renesas,r8a7796-usb-dmac",
"renesas,usb-dmac"; "renesas,usb-dmac";
reg = <0 0xe65a0000 0 0x100>; reg = <0 0xe65a0000 0 0x100>;
interrupts = <GIC_SPI 109 IRQ_TYPE_LEVEL_HIGH interrupts = <GIC_SPI 109 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 109 IRQ_TYPE_LEVEL_HIGH>; <GIC_SPI 109 IRQ_TYPE_LEVEL_HIGH>;
interrupt-names = "ch0", "ch1"; interrupt-names = "ch0", "ch1";
clocks = <&cpg CPG_MOD 330>; clocks = <&cpg CPG_MOD 330>;
power-domains = <&sysc R8A7796_PD_ALWAYS_ON>; power-domains = <&sysc R8A7796_PD_ALWAYS_ON>;
...@@ -839,8 +839,8 @@ usb_dmac1: dma-controller@e65b0000 { ...@@ -839,8 +839,8 @@ usb_dmac1: dma-controller@e65b0000 {
compatible = "renesas,r8a7796-usb-dmac", compatible = "renesas,r8a7796-usb-dmac",
"renesas,usb-dmac"; "renesas,usb-dmac";
reg = <0 0xe65b0000 0 0x100>; reg = <0 0xe65b0000 0 0x100>;
interrupts = <GIC_SPI 110 IRQ_TYPE_LEVEL_HIGH interrupts = <GIC_SPI 110 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 110 IRQ_TYPE_LEVEL_HIGH>; <GIC_SPI 110 IRQ_TYPE_LEVEL_HIGH>;
interrupt-names = "ch0", "ch1"; interrupt-names = "ch0", "ch1";
clocks = <&cpg CPG_MOD 331>; clocks = <&cpg CPG_MOD 331>;
power-domains = <&sysc R8A7796_PD_ALWAYS_ON>; power-domains = <&sysc R8A7796_PD_ALWAYS_ON>;
...@@ -866,23 +866,23 @@ dmac0: dma-controller@e6700000 { ...@@ -866,23 +866,23 @@ dmac0: dma-controller@e6700000 {
compatible = "renesas,dmac-r8a7796", compatible = "renesas,dmac-r8a7796",
"renesas,rcar-dmac"; "renesas,rcar-dmac";
reg = <0 0xe6700000 0 0x10000>; reg = <0 0xe6700000 0 0x10000>;
interrupts = <GIC_SPI 199 IRQ_TYPE_LEVEL_HIGH interrupts = <GIC_SPI 199 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 200 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 200 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 201 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 201 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 202 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 202 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 203 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 203 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 204 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 204 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 205 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 205 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 206 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 206 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 207 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 207 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 208 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 208 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 209 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 209 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 210 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 210 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 211 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 211 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 212 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 212 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 213 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 213 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 214 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 214 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 215 IRQ_TYPE_LEVEL_HIGH>; <GIC_SPI 215 IRQ_TYPE_LEVEL_HIGH>;
interrupt-names = "error", interrupt-names = "error",
"ch0", "ch1", "ch2", "ch3", "ch0", "ch1", "ch2", "ch3",
"ch4", "ch5", "ch6", "ch7", "ch4", "ch5", "ch6", "ch7",
...@@ -908,23 +908,23 @@ dmac1: dma-controller@e7300000 { ...@@ -908,23 +908,23 @@ dmac1: dma-controller@e7300000 {
compatible = "renesas,dmac-r8a7796", compatible = "renesas,dmac-r8a7796",
"renesas,rcar-dmac"; "renesas,rcar-dmac";
reg = <0 0xe7300000 0 0x10000>; reg = <0 0xe7300000 0 0x10000>;
interrupts = <GIC_SPI 220 IRQ_TYPE_LEVEL_HIGH interrupts = <GIC_SPI 220 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 216 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 216 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 217 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 217 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 218 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 218 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 219 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 219 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 308 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 308 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 309 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 309 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 310 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 310 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 311 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 311 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 312 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 312 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 313 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 313 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 314 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 314 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 315 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 315 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 316 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 316 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 317 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 317 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 318 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 318 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 319 IRQ_TYPE_LEVEL_HIGH>; <GIC_SPI 319 IRQ_TYPE_LEVEL_HIGH>;
interrupt-names = "error", interrupt-names = "error",
"ch0", "ch1", "ch2", "ch3", "ch0", "ch1", "ch2", "ch3",
"ch4", "ch5", "ch6", "ch7", "ch4", "ch5", "ch6", "ch7",
...@@ -950,23 +950,23 @@ dmac2: dma-controller@e7310000 { ...@@ -950,23 +950,23 @@ dmac2: dma-controller@e7310000 {
compatible = "renesas,dmac-r8a7796", compatible = "renesas,dmac-r8a7796",
"renesas,rcar-dmac"; "renesas,rcar-dmac";
reg = <0 0xe7310000 0 0x10000>; reg = <0 0xe7310000 0 0x10000>;
interrupts = <GIC_SPI 416 IRQ_TYPE_LEVEL_HIGH interrupts = <GIC_SPI 416 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 417 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 417 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 418 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 418 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 419 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 419 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 420 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 420 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 421 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 421 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 422 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 422 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 423 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 423 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 424 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 424 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 425 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 425 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 426 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 426 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 427 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 427 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 428 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 428 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 429 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 429 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 430 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 430 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 431 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 431 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 397 IRQ_TYPE_LEVEL_HIGH>; <GIC_SPI 397 IRQ_TYPE_LEVEL_HIGH>;
interrupt-names = "error", interrupt-names = "error",
"ch0", "ch1", "ch2", "ch3", "ch0", "ch1", "ch2", "ch3",
"ch4", "ch5", "ch6", "ch7", "ch4", "ch5", "ch6", "ch7",
...@@ -2210,23 +2210,23 @@ audma0: dma-controller@ec700000 { ...@@ -2210,23 +2210,23 @@ audma0: dma-controller@ec700000 {
compatible = "renesas,dmac-r8a7796", compatible = "renesas,dmac-r8a7796",
"renesas,rcar-dmac"; "renesas,rcar-dmac";
reg = <0 0xec700000 0 0x10000>; reg = <0 0xec700000 0 0x10000>;
interrupts = <GIC_SPI 350 IRQ_TYPE_LEVEL_HIGH interrupts = <GIC_SPI 350 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 320 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 320 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 321 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 321 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 322 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 322 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 323 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 323 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 324 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 324 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 325 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 325 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 326 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 326 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 327 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 327 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 328 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 328 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 329 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 329 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 330 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 330 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 331 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 331 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 332 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 332 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 333 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 333 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 334 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 334 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 335 IRQ_TYPE_LEVEL_HIGH>; <GIC_SPI 335 IRQ_TYPE_LEVEL_HIGH>;
interrupt-names = "error", interrupt-names = "error",
"ch0", "ch1", "ch2", "ch3", "ch0", "ch1", "ch2", "ch3",
"ch4", "ch5", "ch6", "ch7", "ch4", "ch5", "ch6", "ch7",
...@@ -2252,23 +2252,23 @@ audma1: dma-controller@ec720000 { ...@@ -2252,23 +2252,23 @@ audma1: dma-controller@ec720000 {
compatible = "renesas,dmac-r8a7796", compatible = "renesas,dmac-r8a7796",
"renesas,rcar-dmac"; "renesas,rcar-dmac";
reg = <0 0xec720000 0 0x10000>; reg = <0 0xec720000 0 0x10000>;
interrupts = <GIC_SPI 351 IRQ_TYPE_LEVEL_HIGH interrupts = <GIC_SPI 351 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 336 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 336 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 337 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 337 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 338 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 338 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 339 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 339 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 340 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 340 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 341 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 341 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 342 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 342 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 343 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 343 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 344 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 344 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 345 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 345 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 346 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 346 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 347 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 347 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 348 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 348 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 349 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 349 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 382 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 382 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 383 IRQ_TYPE_LEVEL_HIGH>; <GIC_SPI 383 IRQ_TYPE_LEVEL_HIGH>;
interrupt-names = "error", interrupt-names = "error",
"ch0", "ch1", "ch2", "ch3", "ch0", "ch1", "ch2", "ch3",
"ch4", "ch5", "ch6", "ch7", "ch4", "ch5", "ch6", "ch7",
...@@ -2462,10 +2462,10 @@ pciec0: pcie@fe000000 { ...@@ -2462,10 +2462,10 @@ pciec0: pcie@fe000000 {
#size-cells = <2>; #size-cells = <2>;
bus-range = <0x00 0xff>; bus-range = <0x00 0xff>;
device_type = "pci"; device_type = "pci";
ranges = <0x01000000 0 0x00000000 0 0xfe100000 0 0x00100000 ranges = <0x01000000 0 0x00000000 0 0xfe100000 0 0x00100000>,
0x02000000 0 0xfe200000 0 0xfe200000 0 0x00200000 <0x02000000 0 0xfe200000 0 0xfe200000 0 0x00200000>,
0x02000000 0 0x30000000 0 0x30000000 0 0x08000000 <0x02000000 0 0x30000000 0 0x30000000 0 0x08000000>,
0x42000000 0 0x38000000 0 0x38000000 0 0x08000000>; <0x42000000 0 0x38000000 0 0x38000000 0 0x08000000>;
/* Map all possible DDR as inbound ranges */ /* Map all possible DDR as inbound ranges */
dma-ranges = <0x42000000 0 0x40000000 0 0x40000000 0 0x80000000>; dma-ranges = <0x42000000 0 0x40000000 0 0x40000000 0 0x80000000>;
interrupts = <GIC_SPI 116 IRQ_TYPE_LEVEL_HIGH>, interrupts = <GIC_SPI 116 IRQ_TYPE_LEVEL_HIGH>,
...@@ -2489,10 +2489,10 @@ pciec1: pcie@ee800000 { ...@@ -2489,10 +2489,10 @@ pciec1: pcie@ee800000 {
#size-cells = <2>; #size-cells = <2>;
bus-range = <0x00 0xff>; bus-range = <0x00 0xff>;
device_type = "pci"; device_type = "pci";
ranges = <0x01000000 0 0x00000000 0 0xee900000 0 0x00100000 ranges = <0x01000000 0 0x00000000 0 0xee900000 0 0x00100000>,
0x02000000 0 0xeea00000 0 0xeea00000 0 0x00200000 <0x02000000 0 0xeea00000 0 0xeea00000 0 0x00200000>,
0x02000000 0 0xc0000000 0 0xc0000000 0 0x08000000 <0x02000000 0 0xc0000000 0 0xc0000000 0 0x08000000>,
0x42000000 0 0xc8000000 0 0xc8000000 0 0x08000000>; <0x42000000 0 0xc8000000 0 0xc8000000 0 0x08000000>;
/* Map all possible DDR as inbound ranges */ /* Map all possible DDR as inbound ranges */
dma-ranges = <0x42000000 0 0x40000000 0 0x40000000 0 0x80000000>; dma-ranges = <0x42000000 0 0x40000000 0 0x40000000 0 0x80000000>;
interrupts = <GIC_SPI 148 IRQ_TYPE_LEVEL_HIGH>, interrupts = <GIC_SPI 148 IRQ_TYPE_LEVEL_HIGH>,
......
arch/arm64/boot/dts/renesas/r8a77961.dtsi
View file @ 8b004f12
...@@ -319,53 +319,133 @@ soc { ...@@ -319,53 +319,133 @@ soc {
ranges; ranges;
rwdt: watchdog@e6020000 { rwdt: watchdog@e6020000 {
compatible = "renesas,r8a77961-wdt",
"renesas,rcar-gen3-wdt";
reg = <0 0xe6020000 0 0x0c>; reg = <0 0xe6020000 0 0x0c>;
/* placeholder */ clocks = <&cpg CPG_MOD 402>;
power-domains = <&sysc R8A77961_PD_ALWAYS_ON>;
resets = <&cpg 402>;
status = "disabled";
};
gpio0: gpio@e6050000 {
compatible = "renesas,gpio-r8a77961",
"renesas,rcar-gen3-gpio";
reg = <0 0xe6050000 0 0x50>;
interrupts = <GIC_SPI 4 IRQ_TYPE_LEVEL_HIGH>;
#gpio-cells = <2>;
gpio-controller;
gpio-ranges = <&pfc 0 0 16>;
#interrupt-cells = <2>;
interrupt-controller;
clocks = <&cpg CPG_MOD 912>;
power-domains = <&sysc R8A77961_PD_ALWAYS_ON>;
resets = <&cpg 912>;
};
gpio1: gpio@e6051000 {
compatible = "renesas,gpio-r8a77961",
"renesas,rcar-gen3-gpio";
reg = <0 0xe6051000 0 0x50>;
interrupts = <GIC_SPI 5 IRQ_TYPE_LEVEL_HIGH>;
#gpio-cells = <2>;
gpio-controller;
gpio-ranges = <&pfc 0 32 29>;
#interrupt-cells = <2>;
interrupt-controller;
clocks = <&cpg CPG_MOD 911>;
power-domains = <&sysc R8A77961_PD_ALWAYS_ON>;
resets = <&cpg 911>;
}; };
gpio2: gpio@e6052000 { gpio2: gpio@e6052000 {
compatible = "renesas,gpio-r8a77961",
"renesas,rcar-gen3-gpio";
reg = <0 0xe6052000 0 0x50>; reg = <0 0xe6052000 0 0x50>;
interrupts = <GIC_SPI 6 IRQ_TYPE_LEVEL_HIGH>;
#gpio-cells = <2>; #gpio-cells = <2>;
gpio-controller; gpio-controller;
gpio-ranges = <&pfc 0 64 15>;
#interrupt-cells = <2>; #interrupt-cells = <2>;
interrupt-controller; interrupt-controller;
/* placeholder */ clocks = <&cpg CPG_MOD 910>;
power-domains = <&sysc R8A77961_PD_ALWAYS_ON>;
resets = <&cpg 910>;
}; };
gpio3: gpio@e6053000 { gpio3: gpio@e6053000 {
compatible = "renesas,gpio-r8a77961",
"renesas,rcar-gen3-gpio";
reg = <0 0xe6053000 0 0x50>; reg = <0 0xe6053000 0 0x50>;
interrupts = <GIC_SPI 7 IRQ_TYPE_LEVEL_HIGH>;
#gpio-cells = <2>; #gpio-cells = <2>;
gpio-controller; gpio-controller;
gpio-ranges = <&pfc 0 96 16>;
#interrupt-cells = <2>; #interrupt-cells = <2>;
interrupt-controller; interrupt-controller;
/* placeholder */ clocks = <&cpg CPG_MOD 909>;
power-domains = <&sysc R8A77961_PD_ALWAYS_ON>;
resets = <&cpg 909>;
}; };
gpio4: gpio@e6054000 { gpio4: gpio@e6054000 {
compatible = "renesas,gpio-r8a77961",
"renesas,rcar-gen3-gpio";
reg = <0 0xe6054000 0 0x50>; reg = <0 0xe6054000 0 0x50>;
interrupts = <GIC_SPI 8 IRQ_TYPE_LEVEL_HIGH>;
#gpio-cells = <2>; #gpio-cells = <2>;
gpio-controller; gpio-controller;
gpio-ranges = <&pfc 0 128 18>;
#interrupt-cells = <2>; #interrupt-cells = <2>;
interrupt-controller; interrupt-controller;
/* placeholder */ clocks = <&cpg CPG_MOD 908>;
power-domains = <&sysc R8A77961_PD_ALWAYS_ON>;
resets = <&cpg 908>;
}; };
gpio5: gpio@e6055000 { gpio5: gpio@e6055000 {
compatible = "renesas,gpio-r8a77961",
"renesas,rcar-gen3-gpio";
reg = <0 0xe6055000 0 0x50>; reg = <0 0xe6055000 0 0x50>;
interrupts = <GIC_SPI 9 IRQ_TYPE_LEVEL_HIGH>;
#gpio-cells = <2>; #gpio-cells = <2>;
gpio-controller; gpio-controller;
gpio-ranges = <&pfc 0 160 26>;
#interrupt-cells = <2>; #interrupt-cells = <2>;
interrupt-controller; interrupt-controller;
/* placeholder */ clocks = <&cpg CPG_MOD 907>;
power-domains = <&sysc R8A77961_PD_ALWAYS_ON>;
resets = <&cpg 907>;
}; };
gpio6: gpio@e6055400 { gpio6: gpio@e6055400 {
compatible = "renesas,gpio-r8a77961",
"renesas,rcar-gen3-gpio";
reg = <0 0xe6055400 0 0x50>; reg = <0 0xe6055400 0 0x50>;
interrupts = <GIC_SPI 10 IRQ_TYPE_LEVEL_HIGH>;
#gpio-cells = <2>; #gpio-cells = <2>;
gpio-controller; gpio-controller;
gpio-ranges = <&pfc 0 192 32>;
#interrupt-cells = <2>; #interrupt-cells = <2>;
interrupt-controller; interrupt-controller;
/* placeholder */ clocks = <&cpg CPG_MOD 906>;
power-domains = <&sysc R8A77961_PD_ALWAYS_ON>;
resets = <&cpg 906>;
};
gpio7: gpio@e6055800 {
compatible = "renesas,gpio-r8a77961",
"renesas,rcar-gen3-gpio";
reg = <0 0xe6055800 0 0x50>;
interrupts = <GIC_SPI 11 IRQ_TYPE_LEVEL_HIGH>;
#gpio-cells = <2>;
gpio-controller;
gpio-ranges = <&pfc 0 224 4>;
#interrupt-cells = <2>;
interrupt-controller;
clocks = <&cpg CPG_MOD 905>;
power-domains = <&sysc R8A77961_PD_ALWAYS_ON>;
resets = <&cpg 905>;
}; };
pfc: pin-controller@e6060000 { pfc: pin-controller@e6060000 {
...@@ -401,27 +481,138 @@ intc_ex: interrupt-controller@e61c0000 { ...@@ -401,27 +481,138 @@ intc_ex: interrupt-controller@e61c0000 {
/* placeholder */ /* placeholder */
}; };
i2c0: i2c@e6500000 {
#address-cells = <1>;
#size-cells = <0>;
compatible = "renesas,i2c-r8a77961",
"renesas,rcar-gen3-i2c";
reg = <0 0xe6500000 0 0x40>;
interrupts = <GIC_SPI 287 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&cpg CPG_MOD 931>;
power-domains = <&sysc R8A77961_PD_ALWAYS_ON>;
resets = <&cpg 931>;
dmas = <&dmac1 0x91>, <&dmac1 0x90>,
<&dmac2 0x91>, <&dmac2 0x90>;
dma-names = "tx", "rx", "tx", "rx";
i2c-scl-internal-delay-ns = <110>;
status = "disabled";
};
i2c1: i2c@e6508000 {
#address-cells = <1>;
#size-cells = <0>;
compatible = "renesas,i2c-r8a77961",
"renesas,rcar-gen3-i2c";
reg = <0 0xe6508000 0 0x40>;
interrupts = <GIC_SPI 288 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&cpg CPG_MOD 930>;
power-domains = <&sysc R8A77961_PD_ALWAYS_ON>;
resets = <&cpg 930>;
dmas = <&dmac1 0x93>, <&dmac1 0x92>,
<&dmac2 0x93>, <&dmac2 0x92>;
dma-names = "tx", "rx", "tx", "rx";
i2c-scl-internal-delay-ns = <6>;
status = "disabled";
};
i2c2: i2c@e6510000 { i2c2: i2c@e6510000 {
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
compatible = "renesas,i2c-r8a77961",
"renesas,rcar-gen3-i2c";
reg = <0 0xe6510000 0 0x40>; reg = <0 0xe6510000 0 0x40>;
/* placeholder */ interrupts = <GIC_SPI 286 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&cpg CPG_MOD 929>;
power-domains = <&sysc R8A77961_PD_ALWAYS_ON>;
resets = <&cpg 929>;
dmas = <&dmac1 0x95>, <&dmac1 0x94>,
<&dmac2 0x95>, <&dmac2 0x94>;
dma-names = "tx", "rx", "tx", "rx";
i2c-scl-internal-delay-ns = <6>;
status = "disabled";
};
i2c3: i2c@e66d0000 {
#address-cells = <1>;
#size-cells = <0>;
compatible = "renesas,i2c-r8a77961",
"renesas,rcar-gen3-i2c";
reg = <0 0xe66d0000 0 0x40>;
interrupts = <GIC_SPI 290 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&cpg CPG_MOD 928>;
power-domains = <&sysc R8A77961_PD_ALWAYS_ON>;
resets = <&cpg 928>;
dmas = <&dmac0 0x97>, <&dmac0 0x96>;
dma-names = "tx", "rx";
i2c-scl-internal-delay-ns = <110>;
status = "disabled";
}; };
i2c4: i2c@e66d8000 { i2c4: i2c@e66d8000 {
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
compatible = "renesas,i2c-r8a77961",
"renesas,rcar-gen3-i2c";
reg = <0 0xe66d8000 0 0x40>; reg = <0 0xe66d8000 0 0x40>;
/* placeholder */ interrupts = <GIC_SPI 19 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&cpg CPG_MOD 927>;
power-domains = <&sysc R8A77961_PD_ALWAYS_ON>;
resets = <&cpg 927>;
dmas = <&dmac0 0x99>, <&dmac0 0x98>;
dma-names = "tx", "rx";
i2c-scl-internal-delay-ns = <110>;
status = "disabled";
};
i2c5: i2c@e66e0000 {
#address-cells = <1>;
#size-cells = <0>;
compatible = "renesas,i2c-r8a77961",
"renesas,rcar-gen3-i2c";
reg = <0 0xe66e0000 0 0x40>;
interrupts = <GIC_SPI 20 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&cpg CPG_MOD 919>;
power-domains = <&sysc R8A77961_PD_ALWAYS_ON>;
resets = <&cpg 919>;
dmas = <&dmac0 0x9b>, <&dmac0 0x9a>;
dma-names = "tx", "rx";
i2c-scl-internal-delay-ns = <110>;
status = "disabled";
};
i2c6: i2c@e66e8000 {
#address-cells = <1>;
#size-cells = <0>;
compatible = "renesas,i2c-r8a77961",
"renesas,rcar-gen3-i2c";
reg = <0 0xe66e8000 0 0x40>;
interrupts = <GIC_SPI 21 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&cpg CPG_MOD 918>;
power-domains = <&sysc R8A77961_PD_ALWAYS_ON>;
resets = <&cpg 918>;
dmas = <&dmac0 0x9d>, <&dmac0 0x9c>;
dma-names = "tx", "rx";
i2c-scl-internal-delay-ns = <6>;
status = "disabled";
}; };
i2c_dvfs: i2c@e60b0000 { i2c_dvfs: i2c@e60b0000 {
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
compatible = "renesas,iic-r8a77961",
"renesas,rcar-gen3-iic",
"renesas,rmobile-iic";
reg = <0 0xe60b0000 0 0x425>; reg = <0 0xe60b0000 0 0x425>;
/* placeholder */ interrupts = <GIC_SPI 173 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&cpg CPG_MOD 926>;
power-domains = <&sysc R8A77961_PD_ALWAYS_ON>;
resets = <&cpg 926>;
dmas = <&dmac0 0x11>, <&dmac0 0x10>;
dma-names = "tx", "rx";
status = "disabled";
}; };
hscif1: serial@e6550000 { hscif1: serial@e6550000 {
reg = <0 0xe6550000 0 0x60>; reg = <0 0xe6550000 0 0x60>;
/* placeholder */ /* placeholder */
...@@ -438,11 +629,151 @@ usb3_phy0: usb-phy@e65ee000 { ...@@ -438,11 +629,151 @@ usb3_phy0: usb-phy@e65ee000 {
/* placeholder */ /* placeholder */
}; };
dmac0: dma-controller@e6700000 {
compatible = "renesas,dmac-r8a77961",
"renesas,rcar-dmac";
reg = <0 0xe6700000 0 0x10000>;
interrupts = <GIC_SPI 199 IRQ_TYPE_LEVEL_HIGH>,
<GIC_SPI 200 IRQ_TYPE_LEVEL_HIGH>,
<GIC_SPI 201 IRQ_TYPE_LEVEL_HIGH>,
<GIC_SPI 202 IRQ_TYPE_LEVEL_HIGH>,
<GIC_SPI 203 IRQ_TYPE_LEVEL_HIGH>,
<GIC_SPI 204 IRQ_TYPE_LEVEL_HIGH>,
<GIC_SPI 205 IRQ_TYPE_LEVEL_HIGH>,
<GIC_SPI 206 IRQ_TYPE_LEVEL_HIGH>,
<GIC_SPI 207 IRQ_TYPE_LEVEL_HIGH>,
<GIC_SPI 208 IRQ_TYPE_LEVEL_HIGH>,
<GIC_SPI 209 IRQ_TYPE_LEVEL_HIGH>,
<GIC_SPI 210 IRQ_TYPE_LEVEL_HIGH>,
<GIC_SPI 211 IRQ_TYPE_LEVEL_HIGH>,
<GIC_SPI 212 IRQ_TYPE_LEVEL_HIGH>,
<GIC_SPI 213 IRQ_TYPE_LEVEL_HIGH>,
<GIC_SPI 214 IRQ_TYPE_LEVEL_HIGH>,
<GIC_SPI 215 IRQ_TYPE_LEVEL_HIGH>;
interrupt-names = "error",
"ch0", "ch1", "ch2", "ch3",
"ch4", "ch5", "ch6", "ch7",
"ch8", "ch9", "ch10", "ch11",
"ch12", "ch13", "ch14", "ch15";
clocks = <&cpg CPG_MOD 219>;
clock-names = "fck";
power-domains = <&sysc R8A77961_PD_ALWAYS_ON>;
resets = <&cpg 219>;
#dma-cells = <1>;
dma-channels = <16>;
};
dmac1: dma-controller@e7300000 {
compatible = "renesas,dmac-r8a77961",
"renesas,rcar-dmac";
reg = <0 0xe7300000 0 0x10000>;
interrupts = <GIC_SPI 220 IRQ_TYPE_LEVEL_HIGH>,
<GIC_SPI 216 IRQ_TYPE_LEVEL_HIGH>,
<GIC_SPI 217 IRQ_TYPE_LEVEL_HIGH>,
<GIC_SPI 218 IRQ_TYPE_LEVEL_HIGH>,
<GIC_SPI 219 IRQ_TYPE_LEVEL_HIGH>,
<GIC_SPI 308 IRQ_TYPE_LEVEL_HIGH>,
<GIC_SPI 309 IRQ_TYPE_LEVEL_HIGH>,
<GIC_SPI 310 IRQ_TYPE_LEVEL_HIGH>,
<GIC_SPI 311 IRQ_TYPE_LEVEL_HIGH>,
<GIC_SPI 312 IRQ_TYPE_LEVEL_HIGH>,
<GIC_SPI 313 IRQ_TYPE_LEVEL_HIGH>,
<GIC_SPI 314 IRQ_TYPE_LEVEL_HIGH>,
<GIC_SPI 315 IRQ_TYPE_LEVEL_HIGH>,
<GIC_SPI 316 IRQ_TYPE_LEVEL_HIGH>,
<GIC_SPI 317 IRQ_TYPE_LEVEL_HIGH>,
<GIC_SPI 318 IRQ_TYPE_LEVEL_HIGH>,
<GIC_SPI 319 IRQ_TYPE_LEVEL_HIGH>;
interrupt-names = "error",
"ch0", "ch1", "ch2", "ch3",
"ch4", "ch5", "ch6", "ch7",
"ch8", "ch9", "ch10", "ch11",
"ch12", "ch13", "ch14", "ch15";
clocks = <&cpg CPG_MOD 218>;
clock-names = "fck";
power-domains = <&sysc R8A77961_PD_ALWAYS_ON>;
resets = <&cpg 218>;
#dma-cells = <1>;
dma-channels = <16>;
};
dmac2: dma-controller@e7310000 {
compatible = "renesas,dmac-r8a77961",
"renesas,rcar-dmac";
reg = <0 0xe7310000 0 0x10000>;
interrupts = <GIC_SPI 416 IRQ_TYPE_LEVEL_HIGH>,
<GIC_SPI 417 IRQ_TYPE_LEVEL_HIGH>,
<GIC_SPI 418 IRQ_TYPE_LEVEL_HIGH>,
<GIC_SPI 419 IRQ_TYPE_LEVEL_HIGH>,
<GIC_SPI 420 IRQ_TYPE_LEVEL_HIGH>,
<GIC_SPI 421 IRQ_TYPE_LEVEL_HIGH>,
<GIC_SPI 422 IRQ_TYPE_LEVEL_HIGH>,
<GIC_SPI 423 IRQ_TYPE_LEVEL_HIGH>,
<GIC_SPI 424 IRQ_TYPE_LEVEL_HIGH>,
<GIC_SPI 425 IRQ_TYPE_LEVEL_HIGH>,
<GIC_SPI 426 IRQ_TYPE_LEVEL_HIGH>,
<GIC_SPI 427 IRQ_TYPE_LEVEL_HIGH>,
<GIC_SPI 428 IRQ_TYPE_LEVEL_HIGH>,
<GIC_SPI 429 IRQ_TYPE_LEVEL_HIGH>,
<GIC_SPI 430 IRQ_TYPE_LEVEL_HIGH>,
<GIC_SPI 431 IRQ_TYPE_LEVEL_HIGH>,
<GIC_SPI 397 IRQ_TYPE_LEVEL_HIGH>;
interrupt-names = "error",
"ch0", "ch1", "ch2", "ch3",
"ch4", "ch5", "ch6", "ch7",
"ch8", "ch9", "ch10", "ch11",
"ch12", "ch13", "ch14", "ch15";
clocks = <&cpg CPG_MOD 217>;
clock-names = "fck";
power-domains = <&sysc R8A77961_PD_ALWAYS_ON>;
resets = <&cpg 217>;
#dma-cells = <1>;
dma-channels = <16>;
};
avb: ethernet@e6800000 { avb: ethernet@e6800000 {
compatible = "renesas,etheravb-r8a77961",
"renesas,etheravb-rcar-gen3";
reg = <0 0xe6800000 0 0x800>, <0 0xe6a00000 0 0x10000>; reg = <0 0xe6800000 0 0x800>, <0 0xe6a00000 0 0x10000>;
interrupts = <GIC_SPI 39 IRQ_TYPE_LEVEL_HIGH>,
<GIC_SPI 40 IRQ_TYPE_LEVEL_HIGH>,
<GIC_SPI 41 IRQ_TYPE_LEVEL_HIGH>,
<GIC_SPI 42 IRQ_TYPE_LEVEL_HIGH>,
<GIC_SPI 43 IRQ_TYPE_LEVEL_HIGH>,
<GIC_SPI 44 IRQ_TYPE_LEVEL_HIGH>,
<GIC_SPI 45 IRQ_TYPE_LEVEL_HIGH>,
<GIC_SPI 46 IRQ_TYPE_LEVEL_HIGH>,
<GIC_SPI 47 IRQ_TYPE_LEVEL_HIGH>,
<GIC_SPI 48 IRQ_TYPE_LEVEL_HIGH>,
<GIC_SPI 49 IRQ_TYPE_LEVEL_HIGH>,
<GIC_SPI 50 IRQ_TYPE_LEVEL_HIGH>,
<GIC_SPI 51 IRQ_TYPE_LEVEL_HIGH>,
<GIC_SPI 52 IRQ_TYPE_LEVEL_HIGH>,
<GIC_SPI 53 IRQ_TYPE_LEVEL_HIGH>,
<GIC_SPI 54 IRQ_TYPE_LEVEL_HIGH>,
<GIC_SPI 55 IRQ_TYPE_LEVEL_HIGH>,
<GIC_SPI 56 IRQ_TYPE_LEVEL_HIGH>,
<GIC_SPI 57 IRQ_TYPE_LEVEL_HIGH>,
<GIC_SPI 58 IRQ_TYPE_LEVEL_HIGH>,
<GIC_SPI 59 IRQ_TYPE_LEVEL_HIGH>,
<GIC_SPI 60 IRQ_TYPE_LEVEL_HIGH>,
<GIC_SPI 61 IRQ_TYPE_LEVEL_HIGH>,
<GIC_SPI 62 IRQ_TYPE_LEVEL_HIGH>,
<GIC_SPI 63 IRQ_TYPE_LEVEL_HIGH>;
interrupt-names = "ch0", "ch1", "ch2", "ch3",
"ch4", "ch5", "ch6", "ch7",
"ch8", "ch9", "ch10", "ch11",
"ch12", "ch13", "ch14", "ch15",
"ch16", "ch17", "ch18", "ch19",
"ch20", "ch21", "ch22", "ch23",
"ch24";
clocks = <&cpg CPG_MOD 812>;
power-domains = <&sysc R8A77961_PD_ALWAYS_ON>;
resets = <&cpg 812>;
phy-mode = "rgmii";
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
/* placeholder */ status = "disabled";
}; };
pwm1: pwm@e6e31000 { pwm1: pwm@e6e31000 {
...@@ -574,18 +905,51 @@ usb2_phy1: usb-phy@ee0a0200 { ...@@ -574,18 +905,51 @@ usb2_phy1: usb-phy@ee0a0200 {
}; };
sdhi0: sd@ee100000 { sdhi0: sd@ee100000 {
compatible = "renesas,sdhi-r8a77961",
"renesas,rcar-gen3-sdhi";
reg = <0 0xee100000 0 0x2000>; reg = <0 0xee100000 0 0x2000>;
/* placeholder */ interrupts = <GIC_SPI 165 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&cpg CPG_MOD 314>;
max-frequency = <200000000>;
power-domains = <&sysc R8A77961_PD_ALWAYS_ON>;
resets = <&cpg 314>;
status = "disabled";
};
sdhi1: sd@ee120000 {
compatible = "renesas,sdhi-r8a77961",
"renesas,rcar-gen3-sdhi";
reg = <0 0xee120000 0 0x2000>;
interrupts = <GIC_SPI 166 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&cpg CPG_MOD 313>;
max-frequency = <200000000>;
power-domains = <&sysc R8A77961_PD_ALWAYS_ON>;
resets = <&cpg 313>;
status = "disabled";
}; };
sdhi2: sd@ee140000 { sdhi2: sd@ee140000 {
compatible = "renesas,sdhi-r8a77961",
"renesas,rcar-gen3-sdhi";
reg = <0 0xee140000 0 0x2000>; reg = <0 0xee140000 0 0x2000>;
/* placeholder */ interrupts = <GIC_SPI 167 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&cpg CPG_MOD 312>;
max-frequency = <200000000>;
power-domains = <&sysc R8A77961_PD_ALWAYS_ON>;
resets = <&cpg 312>;
status = "disabled";
}; };
sdhi3: sd@ee160000 { sdhi3: sd@ee160000 {
compatible = "renesas,sdhi-r8a77961",
"renesas,rcar-gen3-sdhi";
reg = <0 0xee160000 0 0x2000>; reg = <0 0xee160000 0 0x2000>;
/* placeholder */ interrupts = <GIC_SPI 168 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&cpg CPG_MOD 311>;
max-frequency = <200000000>;
power-domains = <&sysc R8A77961_PD_ALWAYS_ON>;
resets = <&cpg 311>;
status = "disabled";
}; };
gic: interrupt-controller@f1010000 { gic: interrupt-controller@f1010000 {
......
arch/arm64/boot/dts/renesas/r8a77965-m3nulcb-kf.dts → arch/arm64/boot/dts/renesas/r8a77965-ulcb-kf.dts
View file @ 8b004f12
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
* Copyright (C) 2018 Cogent Embedded, Inc. * Copyright (C) 2018 Cogent Embedded, Inc.
*/ */
#include "r8a77965-m3nulcb.dts" #include "r8a77965-ulcb.dts"
#include "ulcb-kf.dtsi" #include "ulcb-kf.dtsi"
/ { / {
......
arch/arm64/boot/dts/renesas/r8a77965.dtsi
View file @ 8b004f12
...@@ -429,12 +429,12 @@ intc_ex: interrupt-controller@e61c0000 { ...@@ -429,12 +429,12 @@ intc_ex: interrupt-controller@e61c0000 {
#interrupt-cells = <2>; #interrupt-cells = <2>;
interrupt-controller; interrupt-controller;
reg = <0 0xe61c0000 0 0x200>; reg = <0 0xe61c0000 0 0x200>;
interrupts = <GIC_SPI 0 IRQ_TYPE_LEVEL_HIGH interrupts = <GIC_SPI 0 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 1 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 1 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 2 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 2 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 3 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 3 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 18 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 18 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 161 IRQ_TYPE_LEVEL_HIGH>; <GIC_SPI 161 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&cpg CPG_MOD 407>; clocks = <&cpg CPG_MOD 407>;
power-domains = <&sysc R8A77965_PD_ALWAYS_ON>; power-domains = <&sysc R8A77965_PD_ALWAYS_ON>;
resets = <&cpg 407>; resets = <&cpg 407>;
...@@ -680,8 +680,8 @@ usb_dmac0: dma-controller@e65a0000 { ...@@ -680,8 +680,8 @@ usb_dmac0: dma-controller@e65a0000 {
compatible = "renesas,r8a77965-usb-dmac", compatible = "renesas,r8a77965-usb-dmac",
"renesas,usb-dmac"; "renesas,usb-dmac";
reg = <0 0xe65a0000 0 0x100>; reg = <0 0xe65a0000 0 0x100>;
interrupts = <GIC_SPI 109 IRQ_TYPE_LEVEL_HIGH interrupts = <GIC_SPI 109 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 109 IRQ_TYPE_LEVEL_HIGH>; <GIC_SPI 109 IRQ_TYPE_LEVEL_HIGH>;
interrupt-names = "ch0", "ch1"; interrupt-names = "ch0", "ch1";
clocks = <&cpg CPG_MOD 330>; clocks = <&cpg CPG_MOD 330>;
power-domains = <&sysc R8A77965_PD_ALWAYS_ON>; power-domains = <&sysc R8A77965_PD_ALWAYS_ON>;
...@@ -694,8 +694,8 @@ usb_dmac1: dma-controller@e65b0000 { ...@@ -694,8 +694,8 @@ usb_dmac1: dma-controller@e65b0000 {
compatible = "renesas,r8a77965-usb-dmac", compatible = "renesas,r8a77965-usb-dmac",
"renesas,usb-dmac"; "renesas,usb-dmac";
reg = <0 0xe65b0000 0 0x100>; reg = <0 0xe65b0000 0 0x100>;
interrupts = <GIC_SPI 110 IRQ_TYPE_LEVEL_HIGH interrupts = <GIC_SPI 110 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 110 IRQ_TYPE_LEVEL_HIGH>; <GIC_SPI 110 IRQ_TYPE_LEVEL_HIGH>;
interrupt-names = "ch0", "ch1"; interrupt-names = "ch0", "ch1";
clocks = <&cpg CPG_MOD 331>; clocks = <&cpg CPG_MOD 331>;
power-domains = <&sysc R8A77965_PD_ALWAYS_ON>; power-domains = <&sysc R8A77965_PD_ALWAYS_ON>;
...@@ -721,23 +721,23 @@ dmac0: dma-controller@e6700000 { ...@@ -721,23 +721,23 @@ dmac0: dma-controller@e6700000 {
compatible = "renesas,dmac-r8a77965", compatible = "renesas,dmac-r8a77965",
"renesas,rcar-dmac"; "renesas,rcar-dmac";
reg = <0 0xe6700000 0 0x10000>; reg = <0 0xe6700000 0 0x10000>;
interrupts = <GIC_SPI 199 IRQ_TYPE_LEVEL_HIGH interrupts = <GIC_SPI 199 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 200 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 200 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 201 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 201 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 202 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 202 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 203 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 203 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 204 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 204 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 205 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 205 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 206 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 206 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 207 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 207 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 208 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 208 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 209 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 209 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 210 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 210 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 211 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 211 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 212 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 212 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 213 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 213 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 214 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 214 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 215 IRQ_TYPE_LEVEL_HIGH>; <GIC_SPI 215 IRQ_TYPE_LEVEL_HIGH>;
interrupt-names = "error", interrupt-names = "error",
"ch0", "ch1", "ch2", "ch3", "ch0", "ch1", "ch2", "ch3",
"ch4", "ch5", "ch6", "ch7", "ch4", "ch5", "ch6", "ch7",
...@@ -763,23 +763,23 @@ dmac1: dma-controller@e7300000 { ...@@ -763,23 +763,23 @@ dmac1: dma-controller@e7300000 {
compatible = "renesas,dmac-r8a77965", compatible = "renesas,dmac-r8a77965",
"renesas,rcar-dmac"; "renesas,rcar-dmac";
reg = <0 0xe7300000 0 0x10000>; reg = <0 0xe7300000 0 0x10000>;
interrupts = <GIC_SPI 220 IRQ_TYPE_LEVEL_HIGH interrupts = <GIC_SPI 220 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 216 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 216 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 217 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 217 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 218 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 218 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 219 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 219 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 308 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 308 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 309 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 309 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 310 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 310 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 311 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 311 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 312 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 312 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 313 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 313 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 314 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 314 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 315 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 315 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 316 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 316 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 317 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 317 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 318 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 318 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 319 IRQ_TYPE_LEVEL_HIGH>; <GIC_SPI 319 IRQ_TYPE_LEVEL_HIGH>;
interrupt-names = "error", interrupt-names = "error",
"ch0", "ch1", "ch2", "ch3", "ch0", "ch1", "ch2", "ch3",
"ch4", "ch5", "ch6", "ch7", "ch4", "ch5", "ch6", "ch7",
...@@ -805,23 +805,23 @@ dmac2: dma-controller@e7310000 { ...@@ -805,23 +805,23 @@ dmac2: dma-controller@e7310000 {
compatible = "renesas,dmac-r8a77965", compatible = "renesas,dmac-r8a77965",
"renesas,rcar-dmac"; "renesas,rcar-dmac";
reg = <0 0xe7310000 0 0x10000>; reg = <0 0xe7310000 0 0x10000>;
interrupts = <GIC_SPI 416 IRQ_TYPE_LEVEL_HIGH interrupts = <GIC_SPI 416 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 417 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 417 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 418 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 418 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 419 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 419 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 420 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 420 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 421 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 421 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 422 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 422 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 423 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 423 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 424 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 424 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 425 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 425 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 426 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 426 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 427 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 427 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 428 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 428 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 429 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 429 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 430 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 430 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 431 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 431 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 397 IRQ_TYPE_LEVEL_HIGH>; <GIC_SPI 397 IRQ_TYPE_LEVEL_HIGH>;
interrupt-names = "error", interrupt-names = "error",
"ch0", "ch1", "ch2", "ch3", "ch0", "ch1", "ch2", "ch3",
"ch4", "ch5", "ch6", "ch7", "ch4", "ch5", "ch6", "ch7",
...@@ -1937,23 +1937,23 @@ audma0: dma-controller@ec700000 { ...@@ -1937,23 +1937,23 @@ audma0: dma-controller@ec700000 {
compatible = "renesas,dmac-r8a77965", compatible = "renesas,dmac-r8a77965",
"renesas,rcar-dmac"; "renesas,rcar-dmac";
reg = <0 0xec700000 0 0x10000>; reg = <0 0xec700000 0 0x10000>;
interrupts = <GIC_SPI 350 IRQ_TYPE_LEVEL_HIGH interrupts = <GIC_SPI 350 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 320 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 320 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 321 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 321 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 322 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 322 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 323 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 323 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 324 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 324 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 325 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 325 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 326 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 326 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 327 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 327 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 328 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 328 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 329 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 329 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 330 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 330 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 331 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 331 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 332 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 332 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 333 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 333 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 334 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 334 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 335 IRQ_TYPE_LEVEL_HIGH>; <GIC_SPI 335 IRQ_TYPE_LEVEL_HIGH>;
interrupt-names = "error", interrupt-names = "error",
"ch0", "ch1", "ch2", "ch3", "ch0", "ch1", "ch2", "ch3",
"ch4", "ch5", "ch6", "ch7", "ch4", "ch5", "ch6", "ch7",
...@@ -1971,23 +1971,23 @@ audma1: dma-controller@ec720000 { ...@@ -1971,23 +1971,23 @@ audma1: dma-controller@ec720000 {
compatible = "renesas,dmac-r8a77965", compatible = "renesas,dmac-r8a77965",
"renesas,rcar-dmac"; "renesas,rcar-dmac";
reg = <0 0xec720000 0 0x10000>; reg = <0 0xec720000 0 0x10000>;
interrupts = <GIC_SPI 351 IRQ_TYPE_LEVEL_HIGH interrupts = <GIC_SPI 351 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 336 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 336 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 337 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 337 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 338 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 338 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 339 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 339 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 340 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 340 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 341 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 341 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 342 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 342 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 343 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 343 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 344 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 344 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 345 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 345 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 346 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 346 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 347 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 347 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 348 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 348 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 349 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 349 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 382 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 382 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 383 IRQ_TYPE_LEVEL_HIGH>; <GIC_SPI 383 IRQ_TYPE_LEVEL_HIGH>;
interrupt-names = "error", interrupt-names = "error",
"ch0", "ch1", "ch2", "ch3", "ch0", "ch1", "ch2", "ch3",
"ch4", "ch5", "ch6", "ch7", "ch4", "ch5", "ch6", "ch7",
...@@ -2184,10 +2184,10 @@ pciec0: pcie@fe000000 { ...@@ -2184,10 +2184,10 @@ pciec0: pcie@fe000000 {
#size-cells = <2>; #size-cells = <2>;
bus-range = <0x00 0xff>; bus-range = <0x00 0xff>;
device_type = "pci"; device_type = "pci";
ranges = <0x01000000 0 0x00000000 0 0xfe100000 0 0x00100000 ranges = <0x01000000 0 0x00000000 0 0xfe100000 0 0x00100000>,
0x02000000 0 0xfe200000 0 0xfe200000 0 0x00200000 <0x02000000 0 0xfe200000 0 0xfe200000 0 0x00200000>,
0x02000000 0 0x30000000 0 0x30000000 0 0x08000000 <0x02000000 0 0x30000000 0 0x30000000 0 0x08000000>,
0x42000000 0 0x38000000 0 0x38000000 0 0x08000000>; <0x42000000 0 0x38000000 0 0x38000000 0 0x08000000>;
/* Map all possible DDR as inbound ranges */ /* Map all possible DDR as inbound ranges */
dma-ranges = <0x42000000 0 0x40000000 0 0x40000000 0 0x80000000>; dma-ranges = <0x42000000 0 0x40000000 0 0x40000000 0 0x80000000>;
interrupts = <GIC_SPI 116 IRQ_TYPE_LEVEL_HIGH>, interrupts = <GIC_SPI 116 IRQ_TYPE_LEVEL_HIGH>,
...@@ -2211,10 +2211,10 @@ pciec1: pcie@ee800000 { ...@@ -2211,10 +2211,10 @@ pciec1: pcie@ee800000 {
#size-cells = <2>; #size-cells = <2>;
bus-range = <0x00 0xff>; bus-range = <0x00 0xff>;
device_type = "pci"; device_type = "pci";
ranges = <0x01000000 0 0x00000000 0 0xee900000 0 0x00100000 ranges = <0x01000000 0 0x00000000 0 0xee900000 0 0x00100000>,
0x02000000 0 0xeea00000 0 0xeea00000 0 0x00200000 <0x02000000 0 0xeea00000 0 0xeea00000 0 0x00200000>,
0x02000000 0 0xc0000000 0 0xc0000000 0 0x08000000 <0x02000000 0 0xc0000000 0 0xc0000000 0 0x08000000>,
0x42000000 0 0xc8000000 0 0xc8000000 0 0x08000000>; <0x42000000 0 0xc8000000 0 0xc8000000 0 0x08000000>;
/* Map all possible DDR as inbound ranges */ /* Map all possible DDR as inbound ranges */
dma-ranges = <0x42000000 0 0x40000000 0 0x40000000 0 0x80000000>; dma-ranges = <0x42000000 0 0x40000000 0 0x40000000 0 0x80000000>;
interrupts = <GIC_SPI 148 IRQ_TYPE_LEVEL_HIGH>, interrupts = <GIC_SPI 148 IRQ_TYPE_LEVEL_HIGH>,
......
arch/arm64/boot/dts/renesas/r8a77970.dtsi
View file @ 8b004f12
...@@ -302,8 +302,8 @@ sysc: system-controller@e6180000 { ...@@ -302,8 +302,8 @@ sysc: system-controller@e6180000 {
thermal: thermal@e6190000 { thermal: thermal@e6190000 {
compatible = "renesas,thermal-r8a77970"; compatible = "renesas,thermal-r8a77970";
reg = <0 0xe6190000 0 0x10 reg = <0 0xe6190000 0 0x10>,
0 0xe6190100 0 0x120>; <0 0xe6190100 0 0x120>;
interrupts = <GIC_SPI 67 IRQ_TYPE_LEVEL_HIGH>, interrupts = <GIC_SPI 67 IRQ_TYPE_LEVEL_HIGH>,
<GIC_SPI 68 IRQ_TYPE_LEVEL_HIGH>, <GIC_SPI 68 IRQ_TYPE_LEVEL_HIGH>,
<GIC_SPI 69 IRQ_TYPE_LEVEL_HIGH>; <GIC_SPI 69 IRQ_TYPE_LEVEL_HIGH>;
...@@ -318,12 +318,12 @@ intc_ex: interrupt-controller@e61c0000 { ...@@ -318,12 +318,12 @@ intc_ex: interrupt-controller@e61c0000 {
#interrupt-cells = <2>; #interrupt-cells = <2>;
interrupt-controller; interrupt-controller;
reg = <0 0xe61c0000 0 0x200>; reg = <0 0xe61c0000 0 0x200>;
interrupts = <GIC_SPI 0 IRQ_TYPE_LEVEL_HIGH interrupts = <GIC_SPI 0 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 1 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 1 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 2 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 2 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 3 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 3 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 18 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 18 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 161 IRQ_TYPE_LEVEL_HIGH>; <GIC_SPI 161 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&cpg CPG_MOD 407>; clocks = <&cpg CPG_MOD 407>;
power-domains = <&sysc R8A77970_PD_ALWAYS_ON>; power-domains = <&sysc R8A77970_PD_ALWAYS_ON>;
resets = <&cpg 407>; resets = <&cpg 407>;
...@@ -933,15 +933,15 @@ dmac1: dma-controller@e7300000 { ...@@ -933,15 +933,15 @@ dmac1: dma-controller@e7300000 {
compatible = "renesas,dmac-r8a77970", compatible = "renesas,dmac-r8a77970",
"renesas,rcar-dmac"; "renesas,rcar-dmac";
reg = <0 0xe7300000 0 0x10000>; reg = <0 0xe7300000 0 0x10000>;
interrupts = <GIC_SPI 220 IRQ_TYPE_LEVEL_HIGH interrupts = <GIC_SPI 220 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 216 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 216 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 217 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 217 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 218 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 218 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 219 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 219 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 308 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 308 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 309 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 309 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 310 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 310 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 311 IRQ_TYPE_LEVEL_HIGH>; <GIC_SPI 311 IRQ_TYPE_LEVEL_HIGH>;
interrupt-names = "error", interrupt-names = "error",
"ch0", "ch1", "ch2", "ch3", "ch0", "ch1", "ch2", "ch3",
"ch4", "ch5", "ch6", "ch7"; "ch4", "ch5", "ch6", "ch7";
...@@ -961,15 +961,15 @@ dmac2: dma-controller@e7310000 { ...@@ -961,15 +961,15 @@ dmac2: dma-controller@e7310000 {
compatible = "renesas,dmac-r8a77970", compatible = "renesas,dmac-r8a77970",
"renesas,rcar-dmac"; "renesas,rcar-dmac";
reg = <0 0xe7310000 0 0x10000>; reg = <0 0xe7310000 0 0x10000>;
interrupts = <GIC_SPI 307 IRQ_TYPE_LEVEL_HIGH interrupts = <GIC_SPI 307 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 312 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 312 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 313 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 313 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 314 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 314 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 315 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 315 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 316 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 316 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 317 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 317 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 318 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 318 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 319 IRQ_TYPE_LEVEL_HIGH>; <GIC_SPI 319 IRQ_TYPE_LEVEL_HIGH>;
interrupt-names = "error", interrupt-names = "error",
"ch0", "ch1", "ch2", "ch3", "ch0", "ch1", "ch2", "ch3",
"ch4", "ch5", "ch6", "ch7"; "ch4", "ch5", "ch6", "ch7";
......
arch/arm64/boot/dts/renesas/r8a77980.dtsi
View file @ 8b004f12
...@@ -348,12 +348,12 @@ intc_ex: interrupt-controller@e61c0000 { ...@@ -348,12 +348,12 @@ intc_ex: interrupt-controller@e61c0000 {
#interrupt-cells = <2>; #interrupt-cells = <2>;
interrupt-controller; interrupt-controller;
reg = <0 0xe61c0000 0 0x200>; reg = <0 0xe61c0000 0 0x200>;
interrupts = <GIC_SPI 0 IRQ_TYPE_LEVEL_HIGH interrupts = <GIC_SPI 0 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 1 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 1 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 2 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 2 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 3 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 3 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 18 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 18 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 161 IRQ_TYPE_LEVEL_HIGH>; <GIC_SPI 161 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&cpg CPG_MOD 407>; clocks = <&cpg CPG_MOD 407>;
power-domains = <&sysc R8A77980_PD_ALWAYS_ON>; power-domains = <&sysc R8A77980_PD_ALWAYS_ON>;
resets = <&cpg 407>; resets = <&cpg 407>;
...@@ -1174,23 +1174,23 @@ dmac1: dma-controller@e7300000 { ...@@ -1174,23 +1174,23 @@ dmac1: dma-controller@e7300000 {
compatible = "renesas,dmac-r8a77980", compatible = "renesas,dmac-r8a77980",
"renesas,rcar-dmac"; "renesas,rcar-dmac";
reg = <0 0xe7300000 0 0x10000>; reg = <0 0xe7300000 0 0x10000>;
interrupts = <GIC_SPI 220 IRQ_TYPE_LEVEL_HIGH interrupts = <GIC_SPI 220 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 216 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 216 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 217 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 217 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 218 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 218 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 219 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 219 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 308 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 308 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 309 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 309 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 310 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 310 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 311 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 311 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 353 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 353 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 354 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 354 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 355 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 355 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 356 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 356 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 357 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 357 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 358 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 358 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 359 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 359 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 360 IRQ_TYPE_LEVEL_HIGH>; <GIC_SPI 360 IRQ_TYPE_LEVEL_HIGH>;
interrupt-names = "error", interrupt-names = "error",
"ch0", "ch1", "ch2", "ch3", "ch0", "ch1", "ch2", "ch3",
"ch4", "ch5", "ch6", "ch7", "ch4", "ch5", "ch6", "ch7",
...@@ -1216,23 +1216,23 @@ dmac2: dma-controller@e7310000 { ...@@ -1216,23 +1216,23 @@ dmac2: dma-controller@e7310000 {
compatible = "renesas,dmac-r8a77980", compatible = "renesas,dmac-r8a77980",
"renesas,rcar-dmac"; "renesas,rcar-dmac";
reg = <0 0xe7310000 0 0x10000>; reg = <0 0xe7310000 0 0x10000>;
interrupts = <GIC_SPI 307 IRQ_TYPE_LEVEL_HIGH interrupts = <GIC_SPI 307 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 312 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 312 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 313 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 313 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 314 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 314 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 315 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 315 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 316 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 316 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 317 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 317 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 318 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 318 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 319 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 319 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 361 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 361 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 362 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 362 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 363 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 363 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 364 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 364 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 365 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 365 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 366 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 366 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 367 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 367 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 368 IRQ_TYPE_LEVEL_HIGH>; <GIC_SPI 368 IRQ_TYPE_LEVEL_HIGH>;
interrupt-names = "error", interrupt-names = "error",
"ch0", "ch1", "ch2", "ch3", "ch0", "ch1", "ch2", "ch3",
"ch4", "ch5", "ch6", "ch7", "ch4", "ch5", "ch6", "ch7",
...@@ -1367,21 +1367,17 @@ pciec: pcie@fe000000 { ...@@ -1367,21 +1367,17 @@ pciec: pcie@fe000000 {
#size-cells = <2>; #size-cells = <2>;
bus-range = <0x00 0xff>; bus-range = <0x00 0xff>;
device_type = "pci"; device_type = "pci";
ranges = < ranges = <0x01000000 0 0x00000000 0 0xfe100000 0 0x0100000>,
0x01000000 0 0x00000000 0 0xfe100000 0 0x0100000 <0x02000000 0 0xfe200000 0 0xfe200000 0 0x0200000>,
0x02000000 0 0xfe200000 0 0xfe200000 0 0x0200000 <0x02000000 0 0x30000000 0 0x30000000 0 0x8000000>,
0x02000000 0 0x30000000 0 0x30000000 0 0x8000000 <0x42000000 0 0x38000000 0 0x38000000 0 0x8000000>;
0x42000000 0 0x38000000 0 0x38000000 0 0x8000000 dma-ranges = <0x42000000 0 0x40000000 0 0x40000000 0 0x80000000>;
>;
dma-ranges = <0x42000000 0 0x40000000 0 0x40000000
0 0x80000000>;
interrupts = <GIC_SPI 148 IRQ_TYPE_LEVEL_HIGH>, interrupts = <GIC_SPI 148 IRQ_TYPE_LEVEL_HIGH>,
<GIC_SPI 149 IRQ_TYPE_LEVEL_HIGH>, <GIC_SPI 149 IRQ_TYPE_LEVEL_HIGH>,
<GIC_SPI 150 IRQ_TYPE_LEVEL_HIGH>; <GIC_SPI 150 IRQ_TYPE_LEVEL_HIGH>;
#interrupt-cells = <1>; #interrupt-cells = <1>;
interrupt-map-mask = <0 0 0 0>; interrupt-map-mask = <0 0 0 0>;
interrupt-map = <0 0 0 0 &gic GIC_SPI 148 interrupt-map = <0 0 0 0 &gic GIC_SPI 148 IRQ_TYPE_LEVEL_HIGH>;
IRQ_TYPE_LEVEL_HIGH>;
clocks = <&cpg CPG_MOD 319>, <&pcie_bus_clk>; clocks = <&cpg CPG_MOD 319>, <&pcie_bus_clk>;
clock-names = "pcie", "pcie_bus"; clock-names = "pcie", "pcie_bus";
power-domains = <&sysc R8A77980_PD_ALWAYS_ON>; power-domains = <&sysc R8A77980_PD_ALWAYS_ON>;
......
arch/arm64/boot/dts/renesas/r8a77990-ebisu.dts
View file @ 8b004f12
...@@ -182,8 +182,7 @@ vccq_sdhi0: regulator-vccq-sdhi0 { ...@@ -182,8 +182,7 @@ vccq_sdhi0: regulator-vccq-sdhi0 {
gpios = <&gpio5 18 GPIO_ACTIVE_HIGH>; gpios = <&gpio5 18 GPIO_ACTIVE_HIGH>;
gpios-states = <1>; gpios-states = <1>;
states = <3300000 1 states = <3300000 1>, <1800000 0>;
1800000 0>;
}; };
vcc_sdhi1: regulator-vcc-sdhi1 { vcc_sdhi1: regulator-vcc-sdhi1 {
...@@ -206,8 +205,7 @@ vccq_sdhi1: regulator-vccq-sdhi1 { ...@@ -206,8 +205,7 @@ vccq_sdhi1: regulator-vccq-sdhi1 {
gpios = <&gpio3 15 GPIO_ACTIVE_HIGH>; gpios = <&gpio3 15 GPIO_ACTIVE_HIGH>;
gpios-states = <1>; gpios-states = <1>;
states = <3300000 1 states = <3300000 1>, <1800000 0>;
1800000 0>;
}; };
vga { vga {
...@@ -636,7 +634,6 @@ &rcar_sound { ...@@ -636,7 +634,6 @@ &rcar_sound {
/* audio_clkout0/1/2/3 */ /* audio_clkout0/1/2/3 */
#clock-cells = <1>; #clock-cells = <1>;
clock-frequency = <12288000 11289600>; clock-frequency = <12288000 11289600>;
clkout-lr-synchronous;
status = "okay"; status = "okay";
......
arch/arm64/boot/dts/renesas/r8a77990.dtsi
View file @ 8b004f12
...@@ -394,12 +394,12 @@ intc_ex: interrupt-controller@e61c0000 { ...@@ -394,12 +394,12 @@ intc_ex: interrupt-controller@e61c0000 {
#interrupt-cells = <2>; #interrupt-cells = <2>;
interrupt-controller; interrupt-controller;
reg = <0 0xe61c0000 0 0x200>; reg = <0 0xe61c0000 0 0x200>;
interrupts = <GIC_SPI 0 IRQ_TYPE_LEVEL_HIGH interrupts = <GIC_SPI 0 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 1 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 1 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 2 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 2 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 3 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 3 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 18 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 18 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 161 IRQ_TYPE_LEVEL_HIGH>; <GIC_SPI 161 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&cpg CPG_MOD 407>; clocks = <&cpg CPG_MOD 407>;
power-domains = <&sysc R8A77990_PD_ALWAYS_ON>; power-domains = <&sysc R8A77990_PD_ALWAYS_ON>;
resets = <&cpg 407>; resets = <&cpg 407>;
...@@ -643,8 +643,8 @@ usb_dmac0: dma-controller@e65a0000 { ...@@ -643,8 +643,8 @@ usb_dmac0: dma-controller@e65a0000 {
compatible = "renesas,r8a77990-usb-dmac", compatible = "renesas,r8a77990-usb-dmac",
"renesas,usb-dmac"; "renesas,usb-dmac";
reg = <0 0xe65a0000 0 0x100>; reg = <0 0xe65a0000 0 0x100>;
interrupts = <GIC_SPI 109 IRQ_TYPE_LEVEL_HIGH interrupts = <GIC_SPI 109 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 109 IRQ_TYPE_LEVEL_HIGH>; <GIC_SPI 109 IRQ_TYPE_LEVEL_HIGH>;
interrupt-names = "ch0", "ch1"; interrupt-names = "ch0", "ch1";
clocks = <&cpg CPG_MOD 330>; clocks = <&cpg CPG_MOD 330>;
power-domains = <&sysc R8A77990_PD_ALWAYS_ON>; power-domains = <&sysc R8A77990_PD_ALWAYS_ON>;
...@@ -657,8 +657,8 @@ usb_dmac1: dma-controller@e65b0000 { ...@@ -657,8 +657,8 @@ usb_dmac1: dma-controller@e65b0000 {
compatible = "renesas,r8a77990-usb-dmac", compatible = "renesas,r8a77990-usb-dmac",
"renesas,usb-dmac"; "renesas,usb-dmac";
reg = <0 0xe65b0000 0 0x100>; reg = <0 0xe65b0000 0 0x100>;
interrupts = <GIC_SPI 110 IRQ_TYPE_LEVEL_HIGH interrupts = <GIC_SPI 110 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 110 IRQ_TYPE_LEVEL_HIGH>; <GIC_SPI 110 IRQ_TYPE_LEVEL_HIGH>;
interrupt-names = "ch0", "ch1"; interrupt-names = "ch0", "ch1";
clocks = <&cpg CPG_MOD 331>; clocks = <&cpg CPG_MOD 331>;
power-domains = <&sysc R8A77990_PD_ALWAYS_ON>; power-domains = <&sysc R8A77990_PD_ALWAYS_ON>;
...@@ -671,23 +671,23 @@ dmac0: dma-controller@e6700000 { ...@@ -671,23 +671,23 @@ dmac0: dma-controller@e6700000 {
compatible = "renesas,dmac-r8a77990", compatible = "renesas,dmac-r8a77990",
"renesas,rcar-dmac"; "renesas,rcar-dmac";
reg = <0 0xe6700000 0 0x10000>; reg = <0 0xe6700000 0 0x10000>;
interrupts = <GIC_SPI 199 IRQ_TYPE_LEVEL_HIGH interrupts = <GIC_SPI 199 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 200 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 200 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 201 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 201 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 202 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 202 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 203 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 203 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 204 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 204 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 205 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 205 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 206 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 206 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 207 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 207 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 208 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 208 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 209 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 209 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 210 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 210 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 211 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 211 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 212 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 212 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 213 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 213 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 214 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 214 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 215 IRQ_TYPE_LEVEL_HIGH>; <GIC_SPI 215 IRQ_TYPE_LEVEL_HIGH>;
interrupt-names = "error", interrupt-names = "error",
"ch0", "ch1", "ch2", "ch3", "ch0", "ch1", "ch2", "ch3",
"ch4", "ch5", "ch6", "ch7", "ch4", "ch5", "ch6", "ch7",
...@@ -713,23 +713,23 @@ dmac1: dma-controller@e7300000 { ...@@ -713,23 +713,23 @@ dmac1: dma-controller@e7300000 {
compatible = "renesas,dmac-r8a77990", compatible = "renesas,dmac-r8a77990",
"renesas,rcar-dmac"; "renesas,rcar-dmac";
reg = <0 0xe7300000 0 0x10000>; reg = <0 0xe7300000 0 0x10000>;
interrupts = <GIC_SPI 220 IRQ_TYPE_LEVEL_HIGH interrupts = <GIC_SPI 220 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 216 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 216 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 217 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 217 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 218 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 218 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 219 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 219 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 308 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 308 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 309 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 309 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 310 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 310 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 311 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 311 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 312 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 312 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 313 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 313 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 314 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 314 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 315 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 315 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 316 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 316 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 317 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 317 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 318 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 318 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 319 IRQ_TYPE_LEVEL_HIGH>; <GIC_SPI 319 IRQ_TYPE_LEVEL_HIGH>;
interrupt-names = "error", interrupt-names = "error",
"ch0", "ch1", "ch2", "ch3", "ch0", "ch1", "ch2", "ch3",
"ch4", "ch5", "ch6", "ch7", "ch4", "ch5", "ch6", "ch7",
...@@ -755,23 +755,23 @@ dmac2: dma-controller@e7310000 { ...@@ -755,23 +755,23 @@ dmac2: dma-controller@e7310000 {
compatible = "renesas,dmac-r8a77990", compatible = "renesas,dmac-r8a77990",
"renesas,rcar-dmac"; "renesas,rcar-dmac";
reg = <0 0xe7310000 0 0x10000>; reg = <0 0xe7310000 0 0x10000>;
interrupts = <GIC_SPI 416 IRQ_TYPE_LEVEL_HIGH interrupts = <GIC_SPI 416 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 417 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 417 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 418 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 418 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 419 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 419 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 420 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 420 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 421 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 421 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 422 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 422 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 423 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 423 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 424 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 424 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 425 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 425 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 426 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 426 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 427 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 427 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 428 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 428 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 429 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 429 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 430 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 430 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 431 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 431 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 397 IRQ_TYPE_LEVEL_HIGH>; <GIC_SPI 397 IRQ_TYPE_LEVEL_HIGH>;
interrupt-names = "error", interrupt-names = "error",
"ch0", "ch1", "ch2", "ch3", "ch0", "ch1", "ch2", "ch3",
"ch4", "ch5", "ch6", "ch7", "ch4", "ch5", "ch6", "ch7",
...@@ -1474,23 +1474,23 @@ audma0: dma-controller@ec700000 { ...@@ -1474,23 +1474,23 @@ audma0: dma-controller@ec700000 {
compatible = "renesas,dmac-r8a77990", compatible = "renesas,dmac-r8a77990",
"renesas,rcar-dmac"; "renesas,rcar-dmac";
reg = <0 0xec700000 0 0x10000>; reg = <0 0xec700000 0 0x10000>;
interrupts = <GIC_SPI 350 IRQ_TYPE_LEVEL_HIGH interrupts = <GIC_SPI 350 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 320 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 320 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 321 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 321 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 322 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 322 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 323 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 323 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 324 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 324 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 325 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 325 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 326 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 326 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 327 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 327 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 328 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 328 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 329 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 329 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 330 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 330 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 331 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 331 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 332 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 332 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 333 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 333 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 334 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 334 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 335 IRQ_TYPE_LEVEL_HIGH>; <GIC_SPI 335 IRQ_TYPE_LEVEL_HIGH>;
interrupt-names = "error", interrupt-names = "error",
"ch0", "ch1", "ch2", "ch3", "ch0", "ch1", "ch2", "ch3",
"ch4", "ch5", "ch6", "ch7", "ch4", "ch5", "ch6", "ch7",
...@@ -1635,10 +1635,10 @@ pciec0: pcie@fe000000 { ...@@ -1635,10 +1635,10 @@ pciec0: pcie@fe000000 {
#size-cells = <2>; #size-cells = <2>;
bus-range = <0x00 0xff>; bus-range = <0x00 0xff>;
device_type = "pci"; device_type = "pci";
ranges = <0x01000000 0 0x00000000 0 0xfe100000 0 0x00100000 ranges = <0x01000000 0 0x00000000 0 0xfe100000 0 0x00100000>,
0x02000000 0 0xfe200000 0 0xfe200000 0 0x00200000 <0x02000000 0 0xfe200000 0 0xfe200000 0 0x00200000>,
0x02000000 0 0x30000000 0 0x30000000 0 0x08000000 <0x02000000 0 0x30000000 0 0x30000000 0 0x08000000>,
0x42000000 0 0x38000000 0 0x38000000 0 0x08000000>; <0x42000000 0 0x38000000 0 0x38000000 0 0x08000000>;
/* Map all possible DDR as inbound ranges */ /* Map all possible DDR as inbound ranges */
dma-ranges = <0x42000000 0 0x40000000 0 0x40000000 0 0x40000000>; dma-ranges = <0x42000000 0 0x40000000 0 0x40000000 0 0x40000000>;
interrupts = <GIC_SPI 116 IRQ_TYPE_LEVEL_HIGH>, interrupts = <GIC_SPI 116 IRQ_TYPE_LEVEL_HIGH>,
......
arch/arm64/boot/dts/renesas/r8a77995.dtsi
View file @ 8b004f12
...@@ -231,12 +231,12 @@ intc_ex: interrupt-controller@e61c0000 { ...@@ -231,12 +231,12 @@ intc_ex: interrupt-controller@e61c0000 {
#interrupt-cells = <2>; #interrupt-cells = <2>;
interrupt-controller; interrupt-controller;
reg = <0 0xe61c0000 0 0x200>; reg = <0 0xe61c0000 0 0x200>;
interrupts = <GIC_SPI 0 IRQ_TYPE_LEVEL_HIGH interrupts = <GIC_SPI 0 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 1 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 1 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 2 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 2 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 3 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 3 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 18 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 18 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 161 IRQ_TYPE_LEVEL_HIGH>; <GIC_SPI 161 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&cpg CPG_MOD 407>; clocks = <&cpg CPG_MOD 407>;
power-domains = <&sysc R8A77995_PD_ALWAYS_ON>; power-domains = <&sysc R8A77995_PD_ALWAYS_ON>;
resets = <&cpg 407>; resets = <&cpg 407>;
...@@ -365,8 +365,8 @@ usb_dmac0: dma-controller@e65a0000 { ...@@ -365,8 +365,8 @@ usb_dmac0: dma-controller@e65a0000 {
compatible = "renesas,r8a77995-usb-dmac", compatible = "renesas,r8a77995-usb-dmac",
"renesas,usb-dmac"; "renesas,usb-dmac";
reg = <0 0xe65a0000 0 0x100>; reg = <0 0xe65a0000 0 0x100>;
interrupts = <GIC_SPI 109 IRQ_TYPE_LEVEL_HIGH interrupts = <GIC_SPI 109 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 109 IRQ_TYPE_LEVEL_HIGH>; <GIC_SPI 109 IRQ_TYPE_LEVEL_HIGH>;
interrupt-names = "ch0", "ch1"; interrupt-names = "ch0", "ch1";
clocks = <&cpg CPG_MOD 330>; clocks = <&cpg CPG_MOD 330>;
power-domains = <&sysc R8A77995_PD_ALWAYS_ON>; power-domains = <&sysc R8A77995_PD_ALWAYS_ON>;
...@@ -379,8 +379,8 @@ usb_dmac1: dma-controller@e65b0000 { ...@@ -379,8 +379,8 @@ usb_dmac1: dma-controller@e65b0000 {
compatible = "renesas,r8a77995-usb-dmac", compatible = "renesas,r8a77995-usb-dmac",
"renesas,usb-dmac"; "renesas,usb-dmac";
reg = <0 0xe65b0000 0 0x100>; reg = <0 0xe65b0000 0 0x100>;
interrupts = <GIC_SPI 110 IRQ_TYPE_LEVEL_HIGH interrupts = <GIC_SPI 110 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 110 IRQ_TYPE_LEVEL_HIGH>; <GIC_SPI 110 IRQ_TYPE_LEVEL_HIGH>;
interrupt-names = "ch0", "ch1"; interrupt-names = "ch0", "ch1";
clocks = <&cpg CPG_MOD 331>; clocks = <&cpg CPG_MOD 331>;
power-domains = <&sysc R8A77995_PD_ALWAYS_ON>; power-domains = <&sysc R8A77995_PD_ALWAYS_ON>;
...@@ -418,15 +418,15 @@ dmac0: dma-controller@e6700000 { ...@@ -418,15 +418,15 @@ dmac0: dma-controller@e6700000 {
compatible = "renesas,dmac-r8a77995", compatible = "renesas,dmac-r8a77995",
"renesas,rcar-dmac"; "renesas,rcar-dmac";
reg = <0 0xe6700000 0 0x10000>; reg = <0 0xe6700000 0 0x10000>;
interrupts = <GIC_SPI 199 IRQ_TYPE_LEVEL_HIGH interrupts = <GIC_SPI 199 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 200 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 200 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 201 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 201 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 202 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 202 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 203 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 203 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 204 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 204 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 205 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 205 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 206 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 206 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 207 IRQ_TYPE_LEVEL_HIGH>; <GIC_SPI 207 IRQ_TYPE_LEVEL_HIGH>;
interrupt-names = "error", interrupt-names = "error",
"ch0", "ch1", "ch2", "ch3", "ch0", "ch1", "ch2", "ch3",
"ch4", "ch5", "ch6", "ch7"; "ch4", "ch5", "ch6", "ch7";
...@@ -446,15 +446,15 @@ dmac1: dma-controller@e7300000 { ...@@ -446,15 +446,15 @@ dmac1: dma-controller@e7300000 {
compatible = "renesas,dmac-r8a77995", compatible = "renesas,dmac-r8a77995",
"renesas,rcar-dmac"; "renesas,rcar-dmac";
reg = <0 0xe7300000 0 0x10000>; reg = <0 0xe7300000 0 0x10000>;
interrupts = <GIC_SPI 220 IRQ_TYPE_LEVEL_HIGH interrupts = <GIC_SPI 220 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 216 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 216 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 217 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 217 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 218 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 218 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 219 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 219 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 308 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 308 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 309 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 309 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 310 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 310 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 311 IRQ_TYPE_LEVEL_HIGH>; <GIC_SPI 311 IRQ_TYPE_LEVEL_HIGH>;
interrupt-names = "error", interrupt-names = "error",
"ch0", "ch1", "ch2", "ch3", "ch0", "ch1", "ch2", "ch3",
"ch4", "ch5", "ch6", "ch7"; "ch4", "ch5", "ch6", "ch7";
...@@ -474,15 +474,15 @@ dmac2: dma-controller@e7310000 { ...@@ -474,15 +474,15 @@ dmac2: dma-controller@e7310000 {
compatible = "renesas,dmac-r8a77995", compatible = "renesas,dmac-r8a77995",
"renesas,rcar-dmac"; "renesas,rcar-dmac";
reg = <0 0xe7310000 0 0x10000>; reg = <0 0xe7310000 0 0x10000>;
interrupts = <GIC_SPI 416 IRQ_TYPE_LEVEL_HIGH interrupts = <GIC_SPI 416 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 417 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 417 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 418 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 418 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 419 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 419 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 420 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 420 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 421 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 421 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 422 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 422 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 423 IRQ_TYPE_LEVEL_HIGH <GIC_SPI 423 IRQ_TYPE_LEVEL_HIGH>,
GIC_SPI 424 IRQ_TYPE_LEVEL_HIGH>; <GIC_SPI 424 IRQ_TYPE_LEVEL_HIGH>;
interrupt-names = "error", interrupt-names = "error",
"ch0", "ch1", "ch2", "ch3", "ch0", "ch1", "ch2", "ch3",
"ch4", "ch5", "ch6", "ch7"; "ch4", "ch5", "ch6", "ch7";
......
arch/arm64/boot/dts/renesas/salvator-common.dtsi
View file @ 8b004f12
...@@ -232,8 +232,7 @@ vccq_sdhi0: regulator-vccq-sdhi0 { ...@@ -232,8 +232,7 @@ vccq_sdhi0: regulator-vccq-sdhi0 {
gpios = <&gpio5 1 GPIO_ACTIVE_HIGH>; gpios = <&gpio5 1 GPIO_ACTIVE_HIGH>;
gpios-states = <1>; gpios-states = <1>;
states = <3300000 1 states = <3300000 1>, <1800000 0>;
1800000 0>;
}; };
vcc_sdhi3: regulator-vcc-sdhi3 { vcc_sdhi3: regulator-vcc-sdhi3 {
...@@ -256,8 +255,7 @@ vccq_sdhi3: regulator-vccq-sdhi3 { ...@@ -256,8 +255,7 @@ vccq_sdhi3: regulator-vccq-sdhi3 {
gpios = <&gpio3 14 GPIO_ACTIVE_HIGH>; gpios = <&gpio3 14 GPIO_ACTIVE_HIGH>;
gpios-states = <1>; gpios-states = <1>;
states = <3300000 1 states = <3300000 1>, <1800000 0>;
1800000 0>;
}; };
vga { vga {
......
arch/arm64/boot/dts/renesas/ulcb.dtsi
View file @ 8b004f12
...@@ -120,8 +120,7 @@ vccq_sdhi0: regulator-vccq-sdhi0 { ...@@ -120,8 +120,7 @@ vccq_sdhi0: regulator-vccq-sdhi0 {
gpios = <&gpio5 1 GPIO_ACTIVE_HIGH>; gpios = <&gpio5 1 GPIO_ACTIVE_HIGH>;
gpios-states = <1>; gpios-states = <1>;
states = <3300000 1 states = <3300000 1>, <1800000 0>;
1800000 0>;
}; };
x12_clk: x12 { x12_clk: x12 {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7