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

Merge tag 'renesas-arm64-dt2-for-v4.6' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/dt64

Merge "Second Round of Renesas ARM64 Based SoC DT Updates for v4.6"
from Simon Horman:

Updates for r8a7795/salvator-x
* Enable USB2.0, and SDHI0 & 3
* Add GIC-400 virtual interfaces
* Add INTC-EX and L2 cache-controller nodes
* Use fallback etheravb compatibility string
* Use GIC_* defines where appropriate

* tag 'renesas-arm64-dt2-for-v4.6' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
arm64: dts: salvator-x: enable USB 2.0 Host of channel 1 and 2
arm64: dts: salvator-x: enable usb2_phy of channel 1 and 2
arm64: dts: r8a7795: add USB2.0 Host (EHCI/OHCI) device nodes
arm64: dts: r8a7795: add usb2_phy device nodes
arm64: dts: r8a7795: use fallback etheravb compatibility string
arm64: dts: r8a7795: salvator-x: enable SDHI0 & 3
arm64: dts: r8a7795: Add SDHI support to dtsi
arm64: dts: r8a7795: Add GIC-400 virtual interfaces
arm64: dts: r8a7795: Add INTC-EX device node
arm64: dts: r8a7795: Add CA53 L2 cache-controller node
arm64: dts: r8a7795: Add missing properties to CA57 L2 cache node
arm64: dts: r8a7795: use GIC_* defines
arm64: dts: r8a7795: pmu: switch to Cortex specific device nodes
arm64: dts: r8a7795: Add L2 cache-controller nodes

Arnd Bergmann 9b1c124d 55da9c08

+347 -58
+123
arch/arm64/boot/dts/renesas/r8a7795-salvator-x.dts
··· 33 33 34 34 /dts-v1/; 35 35 #include "r8a7795.dtsi" 36 + #include <dt-bindings/gpio/gpio.h> 36 37 37 38 / { 38 39 model = "Renesas Salvator-X board based on r8a7795"; ··· 60 59 compatible = "fixed-clock"; 61 60 #clock-cells = <0>; 62 61 clock-frequency = <24576000>; 62 + }; 63 + 64 + vcc_sdhi0: regulator@1 { 65 + compatible = "regulator-fixed"; 66 + 67 + regulator-name = "SDHI0 Vcc"; 68 + regulator-min-microvolt = <3300000>; 69 + regulator-max-microvolt = <3300000>; 70 + 71 + gpio = <&gpio5 2 GPIO_ACTIVE_HIGH>; 72 + enable-active-high; 73 + }; 74 + 75 + vccq_sdhi0: regulator@2 { 76 + compatible = "regulator-gpio"; 77 + 78 + regulator-name = "SDHI0 VccQ"; 79 + regulator-min-microvolt = <1800000>; 80 + regulator-max-microvolt = <3300000>; 81 + 82 + gpios = <&gpio5 1 GPIO_ACTIVE_HIGH>; 83 + gpios-states = <1>; 84 + states = <3300000 1 85 + 1800000 0>; 86 + }; 87 + 88 + vcc_sdhi3: regulator@3 { 89 + compatible = "regulator-fixed"; 90 + 91 + regulator-name = "SDHI3 Vcc"; 92 + regulator-min-microvolt = <3300000>; 93 + regulator-max-microvolt = <3300000>; 94 + 95 + gpio = <&gpio3 15 GPIO_ACTIVE_HIGH>; 96 + enable-active-high; 97 + }; 98 + 99 + vccq_sdhi3: regulator@4 { 100 + compatible = "regulator-gpio"; 101 + 102 + regulator-name = "SDHI3 VccQ"; 103 + regulator-min-microvolt = <1800000>; 104 + regulator-max-microvolt = <3300000>; 105 + 106 + gpios = <&gpio3 14 GPIO_ACTIVE_HIGH>; 107 + gpios-states = <1>; 108 + states = <3300000 1 109 + 1800000 0>; 63 110 }; 64 111 65 112 audio_clkout: audio_clkout { ··· 168 119 renesas,function = "avb"; 169 120 }; 170 121 122 + sdhi0_pins: sd0 { 123 + renesas,groups = "sdhi0_data4", "sdhi0_ctrl"; 124 + renesas,function = "sdhi0"; 125 + }; 126 + 127 + sdhi3_pins: sd3 { 128 + renesas,groups = "sdhi3_data4", "sdhi3_ctrl"; 129 + renesas,function = "sdhi3"; 130 + }; 131 + 171 132 sound_pins: sound { 172 133 renesas,groups = "ssi01239_ctrl", "ssi0_data", "ssi1_data_a"; 173 134 renesas,function = "ssi"; ··· 187 128 renesas,groups = "audio_clk_a_a", "audio_clk_b_a", "audio_clk_c_a", 188 129 "audio_clkout_a", "audio_clkout3_a"; 189 130 renesas,function = "audio_clk"; 131 + }; 132 + 133 + usb1_pins: usb1 { 134 + renesas,groups = "usb1"; 135 + renesas,function = "usb1"; 136 + }; 137 + 138 + usb2_pins: usb2 { 139 + renesas,groups = "usb2"; 140 + renesas,function = "usb2"; 190 141 }; 191 142 }; 192 143 ··· 297 228 status = "okay"; 298 229 }; 299 230 231 + &sdhi0 { 232 + pinctrl-0 = <&sdhi0_pins>; 233 + pinctrl-names = "default"; 234 + 235 + vmmc-supply = <&vcc_sdhi0>; 236 + vqmmc-supply = <&vccq_sdhi0>; 237 + cd-gpios = <&gpio3 12 GPIO_ACTIVE_LOW>; 238 + wp-gpios = <&gpio3 13 GPIO_ACTIVE_HIGH>; 239 + bus-width = <4>; 240 + status = "okay"; 241 + }; 242 + 243 + &sdhi3 { 244 + pinctrl-0 = <&sdhi3_pins>; 245 + pinctrl-names = "default"; 246 + 247 + vmmc-supply = <&vcc_sdhi3>; 248 + vqmmc-supply = <&vccq_sdhi3>; 249 + cd-gpios = <&gpio4 15 GPIO_ACTIVE_LOW>; 250 + wp-gpios = <&gpio4 16 GPIO_ACTIVE_HIGH>; 251 + bus-width = <4>; 252 + status = "okay"; 253 + }; 254 + 300 255 &ssi1 { 301 256 shared-pin; 302 257 }; ··· 356 263 }; 357 264 358 265 &xhci0 { 266 + status = "okay"; 267 + }; 268 + 269 + &usb2_phy1 { 270 + pinctrl-0 = <&usb1_pins>; 271 + pinctrl-names = "default"; 272 + 273 + status = "okay"; 274 + }; 275 + 276 + &usb2_phy2 { 277 + pinctrl-0 = <&usb2_pins>; 278 + pinctrl-names = "default"; 279 + 280 + status = "okay"; 281 + }; 282 + 283 + &ehci1 { 284 + status = "okay"; 285 + }; 286 + 287 + &ehci2 { 288 + status = "okay"; 289 + }; 290 + 291 + &ohci1 { 292 + status = "okay"; 293 + }; 294 + 295 + &ohci2 { 359 296 status = "okay"; 360 297 };
+224 -58
arch/arm64/boot/dts/renesas/r8a7795.dtsi
··· 39 39 compatible = "arm,cortex-a57", "arm,armv8"; 40 40 reg = <0x0>; 41 41 device_type = "cpu"; 42 + next-level-cache = <&L2_CA57>; 42 43 enable-method = "psci"; 43 44 }; 44 45 ··· 47 46 compatible = "arm,cortex-a57","arm,armv8"; 48 47 reg = <0x1>; 49 48 device_type = "cpu"; 49 + next-level-cache = <&L2_CA57>; 50 50 enable-method = "psci"; 51 51 }; 52 52 a57_2: cpu@2 { 53 53 compatible = "arm,cortex-a57","arm,armv8"; 54 54 reg = <0x2>; 55 55 device_type = "cpu"; 56 + next-level-cache = <&L2_CA57>; 56 57 enable-method = "psci"; 57 58 }; 58 59 a57_3: cpu@3 { 59 60 compatible = "arm,cortex-a57","arm,armv8"; 60 61 reg = <0x3>; 61 62 device_type = "cpu"; 63 + next-level-cache = <&L2_CA57>; 62 64 enable-method = "psci"; 63 65 }; 66 + }; 67 + 68 + L2_CA57: cache-controller@0 { 69 + compatible = "cache"; 70 + cache-unified; 71 + cache-level = <2>; 72 + }; 73 + 74 + L2_CA53: cache-controller@1 { 75 + compatible = "cache"; 76 + cache-unified; 77 + cache-level = <2>; 64 78 }; 65 79 66 80 extal_clk: extal { ··· 137 121 #address-cells = <0>; 138 122 interrupt-controller; 139 123 reg = <0x0 0xf1010000 0 0x1000>, 140 - <0x0 0xf1020000 0 0x2000>; 124 + <0x0 0xf1020000 0 0x2000>, 125 + <0x0 0xf1040000 0 0x20000>, 126 + <0x0 0xf1060000 0 0x2000>; 141 127 interrupts = <GIC_PPI 9 142 128 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_HIGH)>; 143 129 }; ··· 256 238 power-domains = <&cpg>; 257 239 }; 258 240 259 - pmu { 260 - compatible = "arm,armv8-pmuv3"; 241 + pmu_a57 { 242 + compatible = "arm,cortex-a57-pmu"; 261 243 interrupts = <GIC_SPI 72 IRQ_TYPE_LEVEL_HIGH>, 262 244 <GIC_SPI 73 IRQ_TYPE_LEVEL_HIGH>, 263 245 <GIC_SPI 74 IRQ_TYPE_LEVEL_HIGH>, ··· 292 274 audma0: dma-controller@ec700000 { 293 275 compatible = "renesas,rcar-dmac"; 294 276 reg = <0 0xec700000 0 0x10000>; 295 - interrupts = <0 350 IRQ_TYPE_LEVEL_HIGH 296 - 0 320 IRQ_TYPE_LEVEL_HIGH 297 - 0 321 IRQ_TYPE_LEVEL_HIGH 298 - 0 322 IRQ_TYPE_LEVEL_HIGH 299 - 0 323 IRQ_TYPE_LEVEL_HIGH 300 - 0 324 IRQ_TYPE_LEVEL_HIGH 301 - 0 325 IRQ_TYPE_LEVEL_HIGH 302 - 0 326 IRQ_TYPE_LEVEL_HIGH 303 - 0 327 IRQ_TYPE_LEVEL_HIGH 304 - 0 328 IRQ_TYPE_LEVEL_HIGH 305 - 0 329 IRQ_TYPE_LEVEL_HIGH 306 - 0 330 IRQ_TYPE_LEVEL_HIGH 307 - 0 331 IRQ_TYPE_LEVEL_HIGH 308 - 0 332 IRQ_TYPE_LEVEL_HIGH 309 - 0 333 IRQ_TYPE_LEVEL_HIGH 310 - 0 334 IRQ_TYPE_LEVEL_HIGH 311 - 0 335 IRQ_TYPE_LEVEL_HIGH>; 277 + interrupts = <GIC_SPI 350 IRQ_TYPE_LEVEL_HIGH 278 + GIC_SPI 320 IRQ_TYPE_LEVEL_HIGH 279 + GIC_SPI 321 IRQ_TYPE_LEVEL_HIGH 280 + GIC_SPI 322 IRQ_TYPE_LEVEL_HIGH 281 + GIC_SPI 323 IRQ_TYPE_LEVEL_HIGH 282 + GIC_SPI 324 IRQ_TYPE_LEVEL_HIGH 283 + GIC_SPI 325 IRQ_TYPE_LEVEL_HIGH 284 + GIC_SPI 326 IRQ_TYPE_LEVEL_HIGH 285 + GIC_SPI 327 IRQ_TYPE_LEVEL_HIGH 286 + GIC_SPI 328 IRQ_TYPE_LEVEL_HIGH 287 + GIC_SPI 329 IRQ_TYPE_LEVEL_HIGH 288 + GIC_SPI 330 IRQ_TYPE_LEVEL_HIGH 289 + GIC_SPI 331 IRQ_TYPE_LEVEL_HIGH 290 + GIC_SPI 332 IRQ_TYPE_LEVEL_HIGH 291 + GIC_SPI 333 IRQ_TYPE_LEVEL_HIGH 292 + GIC_SPI 334 IRQ_TYPE_LEVEL_HIGH 293 + GIC_SPI 335 IRQ_TYPE_LEVEL_HIGH>; 312 294 interrupt-names = "error", 313 295 "ch0", "ch1", "ch2", "ch3", 314 296 "ch4", "ch5", "ch6", "ch7", ··· 324 306 audma1: dma-controller@ec720000 { 325 307 compatible = "renesas,rcar-dmac"; 326 308 reg = <0 0xec720000 0 0x10000>; 327 - interrupts = <0 351 IRQ_TYPE_LEVEL_HIGH 328 - 0 336 IRQ_TYPE_LEVEL_HIGH 329 - 0 337 IRQ_TYPE_LEVEL_HIGH 330 - 0 338 IRQ_TYPE_LEVEL_HIGH 331 - 0 339 IRQ_TYPE_LEVEL_HIGH 332 - 0 340 IRQ_TYPE_LEVEL_HIGH 333 - 0 341 IRQ_TYPE_LEVEL_HIGH 334 - 0 342 IRQ_TYPE_LEVEL_HIGH 335 - 0 343 IRQ_TYPE_LEVEL_HIGH 336 - 0 344 IRQ_TYPE_LEVEL_HIGH 337 - 0 345 IRQ_TYPE_LEVEL_HIGH 338 - 0 346 IRQ_TYPE_LEVEL_HIGH 339 - 0 347 IRQ_TYPE_LEVEL_HIGH 340 - 0 348 IRQ_TYPE_LEVEL_HIGH 341 - 0 349 IRQ_TYPE_LEVEL_HIGH 342 - 0 382 IRQ_TYPE_LEVEL_HIGH 343 - 0 383 IRQ_TYPE_LEVEL_HIGH>; 309 + interrupts = <GIC_SPI 351 IRQ_TYPE_LEVEL_HIGH 310 + GIC_SPI 336 IRQ_TYPE_LEVEL_HIGH 311 + GIC_SPI 337 IRQ_TYPE_LEVEL_HIGH 312 + GIC_SPI 338 IRQ_TYPE_LEVEL_HIGH 313 + GIC_SPI 339 IRQ_TYPE_LEVEL_HIGH 314 + GIC_SPI 340 IRQ_TYPE_LEVEL_HIGH 315 + GIC_SPI 341 IRQ_TYPE_LEVEL_HIGH 316 + GIC_SPI 342 IRQ_TYPE_LEVEL_HIGH 317 + GIC_SPI 343 IRQ_TYPE_LEVEL_HIGH 318 + GIC_SPI 344 IRQ_TYPE_LEVEL_HIGH 319 + GIC_SPI 345 IRQ_TYPE_LEVEL_HIGH 320 + GIC_SPI 346 IRQ_TYPE_LEVEL_HIGH 321 + GIC_SPI 347 IRQ_TYPE_LEVEL_HIGH 322 + GIC_SPI 348 IRQ_TYPE_LEVEL_HIGH 323 + GIC_SPI 349 IRQ_TYPE_LEVEL_HIGH 324 + GIC_SPI 382 IRQ_TYPE_LEVEL_HIGH 325 + GIC_SPI 383 IRQ_TYPE_LEVEL_HIGH>; 344 326 interrupt-names = "error", 345 327 "ch0", "ch1", "ch2", "ch3", 346 328 "ch4", "ch5", "ch6", "ch7", ··· 356 338 pfc: pfc@e6060000 { 357 339 compatible = "renesas,pfc-r8a7795"; 358 340 reg = <0 0xe6060000 0 0x50c>; 341 + }; 342 + 343 + intc_ex: interrupt-controller@e61c0000 { 344 + compatible = "renesas,intc-ex-r8a7795", "renesas,irqc"; 345 + #interrupt-cells = <2>; 346 + interrupt-controller; 347 + reg = <0 0xe61c0000 0 0x200>; 348 + interrupts = <GIC_SPI 0 IRQ_TYPE_LEVEL_HIGH 349 + GIC_SPI 1 IRQ_TYPE_LEVEL_HIGH 350 + GIC_SPI 2 IRQ_TYPE_LEVEL_HIGH 351 + GIC_SPI 3 IRQ_TYPE_LEVEL_HIGH 352 + GIC_SPI 18 IRQ_TYPE_LEVEL_HIGH 353 + GIC_SPI 161 IRQ_TYPE_LEVEL_HIGH>; 354 + clocks = <&cpg CPG_MOD 407>; 355 + power-domains = <&cpg>; 359 356 }; 360 357 361 358 dmac0: dma-controller@e6700000 { ··· 473 440 }; 474 441 475 442 avb: ethernet@e6800000 { 476 - compatible = "renesas,etheravb-r8a7795"; 443 + compatible = "renesas,etheravb-r8a7795", 444 + "renesas,etheravb-rcar-gen3"; 477 445 reg = <0 0xe6800000 0 0x800>, <0 0xe6a00000 0 0x10000>; 478 446 interrupts = <GIC_SPI 39 IRQ_TYPE_LEVEL_HIGH>, 479 447 <GIC_SPI 40 IRQ_TYPE_LEVEL_HIGH>, ··· 830 796 831 797 rcar_sound,src { 832 798 src0: src@0 { 833 - interrupts = <0 352 IRQ_TYPE_LEVEL_HIGH>; 799 + interrupts = <GIC_SPI 352 IRQ_TYPE_LEVEL_HIGH>; 834 800 dmas = <&audma0 0x85>, <&audma1 0x9a>; 835 801 dma-names = "rx", "tx"; 836 802 }; 837 803 src1: src@1 { 838 - interrupts = <0 353 IRQ_TYPE_LEVEL_HIGH>; 804 + interrupts = <GIC_SPI 353 IRQ_TYPE_LEVEL_HIGH>; 839 805 dmas = <&audma0 0x87>, <&audma1 0x9c>; 840 806 dma-names = "rx", "tx"; 841 807 }; 842 808 src2: src@2 { 843 - interrupts = <0 354 IRQ_TYPE_LEVEL_HIGH>; 809 + interrupts = <GIC_SPI 354 IRQ_TYPE_LEVEL_HIGH>; 844 810 dmas = <&audma0 0x89>, <&audma1 0x9e>; 845 811 dma-names = "rx", "tx"; 846 812 }; 847 813 src3: src@3 { 848 - interrupts = <0 355 IRQ_TYPE_LEVEL_HIGH>; 814 + interrupts = <GIC_SPI 355 IRQ_TYPE_LEVEL_HIGH>; 849 815 dmas = <&audma0 0x8b>, <&audma1 0xa0>; 850 816 dma-names = "rx", "tx"; 851 817 }; 852 818 src4: src@4 { 853 - interrupts = <0 356 IRQ_TYPE_LEVEL_HIGH>; 819 + interrupts = <GIC_SPI 356 IRQ_TYPE_LEVEL_HIGH>; 854 820 dmas = <&audma0 0x8d>, <&audma1 0xb0>; 855 821 dma-names = "rx", "tx"; 856 822 }; 857 823 src5: src@5 { 858 - interrupts = <0 357 IRQ_TYPE_LEVEL_HIGH>; 824 + interrupts = <GIC_SPI 357 IRQ_TYPE_LEVEL_HIGH>; 859 825 dmas = <&audma0 0x8f>, <&audma1 0xb2>; 860 826 dma-names = "rx", "tx"; 861 827 }; 862 828 src6: src@6 { 863 - interrupts = <0 358 IRQ_TYPE_LEVEL_HIGH>; 829 + interrupts = <GIC_SPI 358 IRQ_TYPE_LEVEL_HIGH>; 864 830 dmas = <&audma0 0x91>, <&audma1 0xb4>; 865 831 dma-names = "rx", "tx"; 866 832 }; 867 833 src7: src@7 { 868 - interrupts = <0 359 IRQ_TYPE_LEVEL_HIGH>; 834 + interrupts = <GIC_SPI 359 IRQ_TYPE_LEVEL_HIGH>; 869 835 dmas = <&audma0 0x93>, <&audma1 0xb6>; 870 836 dma-names = "rx", "tx"; 871 837 }; 872 838 src8: src@8 { 873 - interrupts = <0 360 IRQ_TYPE_LEVEL_HIGH>; 839 + interrupts = <GIC_SPI 360 IRQ_TYPE_LEVEL_HIGH>; 874 840 dmas = <&audma0 0x95>, <&audma1 0xb8>; 875 841 dma-names = "rx", "tx"; 876 842 }; 877 843 src9: src@9 { 878 - interrupts = <0 361 IRQ_TYPE_LEVEL_HIGH>; 844 + interrupts = <GIC_SPI 361 IRQ_TYPE_LEVEL_HIGH>; 879 845 dmas = <&audma0 0x97>, <&audma1 0xba>; 880 846 dma-names = "rx", "tx"; 881 847 }; ··· 883 849 884 850 rcar_sound,ssi { 885 851 ssi0: ssi@0 { 886 - interrupts = <0 370 IRQ_TYPE_LEVEL_HIGH>; 852 + interrupts = <GIC_SPI 370 IRQ_TYPE_LEVEL_HIGH>; 887 853 dmas = <&audma0 0x01>, <&audma1 0x02>, <&audma0 0x15>, <&audma1 0x16>; 888 854 dma-names = "rx", "tx", "rxu", "txu"; 889 855 }; 890 856 ssi1: ssi@1 { 891 - interrupts = <0 371 IRQ_TYPE_LEVEL_HIGH>; 857 + interrupts = <GIC_SPI 371 IRQ_TYPE_LEVEL_HIGH>; 892 858 dmas = <&audma0 0x03>, <&audma1 0x04>, <&audma0 0x49>, <&audma1 0x4a>; 893 859 dma-names = "rx", "tx", "rxu", "txu"; 894 860 }; 895 861 ssi2: ssi@2 { 896 - interrupts = <0 372 IRQ_TYPE_LEVEL_HIGH>; 862 + interrupts = <GIC_SPI 372 IRQ_TYPE_LEVEL_HIGH>; 897 863 dmas = <&audma0 0x05>, <&audma1 0x06>, <&audma0 0x63>, <&audma1 0x64>; 898 864 dma-names = "rx", "tx", "rxu", "txu"; 899 865 }; 900 866 ssi3: ssi@3 { 901 - interrupts = <0 373 IRQ_TYPE_LEVEL_HIGH>; 867 + interrupts = <GIC_SPI 373 IRQ_TYPE_LEVEL_HIGH>; 902 868 dmas = <&audma0 0x07>, <&audma1 0x08>, <&audma0 0x6f>, <&audma1 0x70>; 903 869 dma-names = "rx", "tx", "rxu", "txu"; 904 870 }; 905 871 ssi4: ssi@4 { 906 - interrupts = <0 374 IRQ_TYPE_LEVEL_HIGH>; 872 + interrupts = <GIC_SPI 374 IRQ_TYPE_LEVEL_HIGH>; 907 873 dmas = <&audma0 0x09>, <&audma1 0x0a>, <&audma0 0x71>, <&audma1 0x72>; 908 874 dma-names = "rx", "tx", "rxu", "txu"; 909 875 }; 910 876 ssi5: ssi@5 { 911 - interrupts = <0 375 IRQ_TYPE_LEVEL_HIGH>; 877 + interrupts = <GIC_SPI 375 IRQ_TYPE_LEVEL_HIGH>; 912 878 dmas = <&audma0 0x0b>, <&audma1 0x0c>, <&audma0 0x73>, <&audma1 0x74>; 913 879 dma-names = "rx", "tx", "rxu", "txu"; 914 880 }; 915 881 ssi6: ssi@6 { 916 - interrupts = <0 376 IRQ_TYPE_LEVEL_HIGH>; 882 + interrupts = <GIC_SPI 376 IRQ_TYPE_LEVEL_HIGH>; 917 883 dmas = <&audma0 0x0d>, <&audma1 0x0e>, <&audma0 0x75>, <&audma1 0x76>; 918 884 dma-names = "rx", "tx", "rxu", "txu"; 919 885 }; 920 886 ssi7: ssi@7 { 921 - interrupts = <0 377 IRQ_TYPE_LEVEL_HIGH>; 887 + interrupts = <GIC_SPI 377 IRQ_TYPE_LEVEL_HIGH>; 922 888 dmas = <&audma0 0x0f>, <&audma1 0x10>, <&audma0 0x79>, <&audma1 0x7a>; 923 889 dma-names = "rx", "tx", "rxu", "txu"; 924 890 }; 925 891 ssi8: ssi@8 { 926 - interrupts = <0 378 IRQ_TYPE_LEVEL_HIGH>; 892 + interrupts = <GIC_SPI 378 IRQ_TYPE_LEVEL_HIGH>; 927 893 dmas = <&audma0 0x11>, <&audma1 0x12>, <&audma0 0x7b>, <&audma1 0x7c>; 928 894 dma-names = "rx", "tx", "rxu", "txu"; 929 895 }; 930 896 ssi9: ssi@9 { 931 - interrupts = <0 379 IRQ_TYPE_LEVEL_HIGH>; 897 + interrupts = <GIC_SPI 379 IRQ_TYPE_LEVEL_HIGH>; 932 898 dmas = <&audma0 0x13>, <&audma1 0x14>, <&audma0 0x7d>, <&audma1 0x7e>; 933 899 dma-names = "rx", "tx", "rxu", "txu"; 934 900 }; ··· 985 951 power-domains = <&cpg>; 986 952 #dma-cells = <1>; 987 953 dma-channels = <2>; 954 + }; 955 + 956 + sdhi0: sd@ee100000 { 957 + compatible = "renesas,sdhi-r8a7795"; 958 + reg = <0 0xee100000 0 0x2000>; 959 + interrupts = <GIC_SPI 165 IRQ_TYPE_LEVEL_HIGH>; 960 + clocks = <&cpg CPG_MOD 314>; 961 + power-domains = <&cpg>; 962 + status = "disabled"; 963 + }; 964 + 965 + sdhi1: sd@ee120000 { 966 + compatible = "renesas,sdhi-r8a7795"; 967 + reg = <0 0xee120000 0 0x2000>; 968 + interrupts = <GIC_SPI 166 IRQ_TYPE_LEVEL_HIGH>; 969 + clocks = <&cpg CPG_MOD 313>; 970 + power-domains = <&cpg>; 971 + status = "disabled"; 972 + }; 973 + 974 + sdhi2: sd@ee140000 { 975 + compatible = "renesas,sdhi-r8a7795"; 976 + reg = <0 0xee140000 0 0x2000>; 977 + interrupts = <GIC_SPI 167 IRQ_TYPE_LEVEL_HIGH>; 978 + clocks = <&cpg CPG_MOD 312>; 979 + power-domains = <&cpg>; 980 + cap-mmc-highspeed; 981 + status = "disabled"; 982 + }; 983 + 984 + sdhi3: sd@ee160000 { 985 + compatible = "renesas,sdhi-r8a7795"; 986 + reg = <0 0xee160000 0 0x2000>; 987 + interrupts = <GIC_SPI 168 IRQ_TYPE_LEVEL_HIGH>; 988 + clocks = <&cpg CPG_MOD 311>; 989 + power-domains = <&cpg>; 990 + cap-mmc-highspeed; 991 + status = "disabled"; 992 + }; 993 + 994 + usb2_phy0: usb-phy@ee080200 { 995 + compatible = "renesas,usb2-phy-r8a7795"; 996 + reg = <0 0xee080200 0 0x700>; 997 + interrupts = <GIC_SPI 108 IRQ_TYPE_LEVEL_HIGH>; 998 + clocks = <&cpg CPG_MOD 703>; 999 + power-domains = <&cpg>; 1000 + #phy-cells = <0>; 1001 + status = "disabled"; 1002 + }; 1003 + 1004 + usb2_phy1: usb-phy@ee0a0200 { 1005 + compatible = "renesas,usb2-phy-r8a7795"; 1006 + reg = <0 0xee0a0200 0 0x700>; 1007 + clocks = <&cpg CPG_MOD 702>; 1008 + power-domains = <&cpg>; 1009 + #phy-cells = <0>; 1010 + status = "disabled"; 1011 + }; 1012 + 1013 + usb2_phy2: usb-phy@ee0c0200 { 1014 + compatible = "renesas,usb2-phy-r8a7795"; 1015 + reg = <0 0xee0c0200 0 0x700>; 1016 + clocks = <&cpg CPG_MOD 701>; 1017 + power-domains = <&cpg>; 1018 + #phy-cells = <0>; 1019 + status = "disabled"; 1020 + }; 1021 + 1022 + ehci0: usb@ee080100 { 1023 + compatible = "generic-ehci"; 1024 + reg = <0 0xee080100 0 0x100>; 1025 + interrupts = <GIC_SPI 108 IRQ_TYPE_LEVEL_HIGH>; 1026 + clocks = <&cpg CPG_MOD 703>; 1027 + phys = <&usb2_phy0>; 1028 + phy-names = "usb"; 1029 + power-domains = <&cpg>; 1030 + status = "disabled"; 1031 + }; 1032 + 1033 + ehci1: usb@ee0a0100 { 1034 + compatible = "generic-ehci"; 1035 + reg = <0 0xee0a0100 0 0x100>; 1036 + interrupts = <GIC_SPI 112 IRQ_TYPE_LEVEL_HIGH>; 1037 + clocks = <&cpg CPG_MOD 702>; 1038 + phys = <&usb2_phy1>; 1039 + phy-names = "usb"; 1040 + power-domains = <&cpg>; 1041 + status = "disabled"; 1042 + }; 1043 + 1044 + ehci2: usb@ee0c0100 { 1045 + compatible = "generic-ehci"; 1046 + reg = <0 0xee0c0100 0 0x100>; 1047 + interrupts = <GIC_SPI 113 IRQ_TYPE_LEVEL_HIGH>; 1048 + clocks = <&cpg CPG_MOD 701>; 1049 + phys = <&usb2_phy2>; 1050 + phy-names = "usb"; 1051 + power-domains = <&cpg>; 1052 + status = "disabled"; 1053 + }; 1054 + 1055 + ohci0: usb@ee080000 { 1056 + compatible = "generic-ohci"; 1057 + reg = <0 0xee080000 0 0x100>; 1058 + interrupts = <GIC_SPI 108 IRQ_TYPE_LEVEL_HIGH>; 1059 + clocks = <&cpg CPG_MOD 703>; 1060 + phys = <&usb2_phy0>; 1061 + phy-names = "usb"; 1062 + power-domains = <&cpg>; 1063 + status = "disabled"; 1064 + }; 1065 + 1066 + ohci1: usb@ee0a0000 { 1067 + compatible = "generic-ohci"; 1068 + reg = <0 0xee0a0000 0 0x100>; 1069 + interrupts = <GIC_SPI 112 IRQ_TYPE_LEVEL_HIGH>; 1070 + clocks = <&cpg CPG_MOD 702>; 1071 + phys = <&usb2_phy1>; 1072 + phy-names = "usb"; 1073 + power-domains = <&cpg>; 1074 + status = "disabled"; 1075 + }; 1076 + 1077 + ohci2: usb@ee0c0000 { 1078 + compatible = "generic-ohci"; 1079 + reg = <0 0xee0c0000 0 0x100>; 1080 + interrupts = <GIC_SPI 113 IRQ_TYPE_LEVEL_HIGH>; 1081 + clocks = <&cpg CPG_MOD 701>; 1082 + phys = <&usb2_phy2>; 1083 + phy-names = "usb"; 1084 + power-domains = <&cpg>; 1085 + status = "disabled"; 988 1086 }; 989 1087 }; 990 1088 };