Skip to content

Commit cab12ba

Browse files
nmenonnmenon
committed
arm64: dts: ti: k3*: Introduce reg definition for interrupt routers
Interrupt routers are memory mapped peripherals, that are organized in our dts bus hierarchy to closely represents the actual hardware behavior. However, without explicitly calling out the reg property, using 2021.03+ dt-schema package, this exposes the following problem with dtbs_check: /arch/arm64/boot/dts/ti/k3-am654-base-board.dt.yaml: bus@100000: interrupt-controller0: {'type': 'object'} is not allowed for {'compatible': ['ti,sci-intr'], ..... Even though we don't use interrupt router directly via memory mapped registers and have to use it via the system controller, the hardware block is memory mapped, so describe the base address in device tree. This is a valid, comprehensive description of hardware and permitted by the existing ti,sci-intr schema. Reviewed-by: Tero Kristo <kristo@kernel.org> Reviewed-by: Lokesh Vutla <lokeshvutla@ti.com> Signed-off-by: Nishanth Menon <nm@ti.com> Link: https://lore.kernel.org/r/20210511194821.13919-1-nm@ti.com
1 parent 9ecdb6d commit cab12ba

File tree

8 files changed

+22
-11
lines changed

8 files changed

+22
-11
lines changed

‎arch/arm64/boot/dts/ti/k3-am64-main.dtsi

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -373,8 +373,9 @@
373373
clocks = <&k3_clks 145 0>;
374374
};
375375

376-
main_gpio_intr: interrupt-controller0 {
376+
main_gpio_intr: interrupt-controller@a00000 {
377377
compatible = "ti,sci-intr";
378+
reg = <0x00 0x00a00000 0x00 0x800>;
378379
ti,intr-trigger-type = <1>;
379380
interrupt-controller;
380381
interrupt-parent = <&gic500>;

‎arch/arm64/boot/dts/ti/k3-am64-mcu.dtsi

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,8 +74,9 @@
7474
clocks = <&k3_clks 148 0>;
7575
};
7676

77-
mcu_gpio_intr: interrupt-controller1 {
77+
mcu_gpio_intr: interrupt-controller@4210000 {
7878
compatible = "ti,sci-intr";
79+
reg = <0x00 0x04210000 0x00 0x200>;
7980
ti,intr-trigger-type = <1>;
8081
interrupt-controller;
8182
interrupt-parent = <&gic500>;

‎arch/arm64/boot/dts/ti/k3-am65-main.dtsi

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -433,8 +433,9 @@
433433
#phy-cells = <0>;
434434
};
435435

436-
intr_main_gpio: interrupt-controller0 {
436+
intr_main_gpio: interrupt-controller@a00000 {
437437
compatible = "ti,sci-intr";
438+
reg = <0x0 0x00a00000 0x0 0x400>;
438439
ti,intr-trigger-type = <1>;
439440
interrupt-controller;
440441
interrupt-parent = <&gic500>;
@@ -454,8 +455,9 @@
454455

455456
ti,sci-dev-id = <118>;
456457

457-
intr_main_navss: interrupt-controller1 {
458+
intr_main_navss: interrupt-controller@310e0000 {
458459
compatible = "ti,sci-intr";
460+
reg = <0x0 0x310e0000 0x0 0x2000>;
459461
ti,intr-trigger-type = <4>;
460462
interrupt-controller;
461463
interrupt-parent = <&gic500>;

‎arch/arm64/boot/dts/ti/k3-am65-wakeup.dtsi

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,8 +69,9 @@
6969
power-domains = <&k3_pds 115 TI_SCI_PD_EXCLUSIVE>;
7070
};
7171

72-
intr_wkup_gpio: interrupt-controller2 {
72+
intr_wkup_gpio: interrupt-controller@42200000 {
7373
compatible = "ti,sci-intr";
74+
reg = <0x42200000 0x200>;
7475
ti,intr-trigger-type = <1>;
7576
interrupt-controller;
7677
interrupt-parent = <&gic500>;

‎arch/arm64/boot/dts/ti/k3-j7200-main.dtsi

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,8 +68,9 @@
6868
};
6969
};
7070

71-
main_gpio_intr: interrupt-controller0 {
71+
main_gpio_intr: interrupt-controller@a00000 {
7272
compatible = "ti,sci-intr";
73+
reg = <0x00 0x00a00000 0x00 0x800>;
7374
ti,intr-trigger-type = <1>;
7475
interrupt-controller;
7576
interrupt-parent = <&gic500>;
@@ -88,8 +89,9 @@
8889
dma-coherent;
8990
dma-ranges;
9091

91-
main_navss_intr: interrupt-controller1 {
92+
main_navss_intr: interrupt-controller@310e0000 {
9293
compatible = "ti,sci-intr";
94+
reg = <0x00 0x310e0000 0x00 0x4000>;
9395
ti,intr-trigger-type = <4>;
9496
interrupt-controller;
9597
interrupt-parent = <&gic500>;

‎arch/arm64/boot/dts/ti/k3-j7200-mcu-wakeup.dtsi

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,8 +96,9 @@
9696
clock-names = "fclk";
9797
};
9898

99-
wkup_gpio_intr: interrupt-controller2 {
99+
wkup_gpio_intr: interrupt-controller@42200000 {
100100
compatible = "ti,sci-intr";
101+
reg = <0x00 0x42200000 0x00 0x400>;
101102
ti,intr-trigger-type = <1>;
102103
interrupt-controller;
103104
interrupt-parent = <&gic500>;

‎arch/arm64/boot/dts/ti/k3-j721e-main.dtsi

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,8 +76,9 @@
7676
};
7777
};
7878

79-
main_gpio_intr: interrupt-controller0 {
79+
main_gpio_intr: interrupt-controller@a00000 {
8080
compatible = "ti,sci-intr";
81+
reg = <0x00 0x00a00000 0x00 0x800>;
8182
ti,intr-trigger-type = <1>;
8283
interrupt-controller;
8384
interrupt-parent = <&gic500>;
@@ -97,8 +98,9 @@
9798

9899
ti,sci-dev-id = <199>;
99100

100-
main_navss_intr: interrupt-controller1 {
101+
main_navss_intr: interrupt-controller@310e0000 {
101102
compatible = "ti,sci-intr";
103+
reg = <0x0 0x310e0000 0x0 0x4000>;
102104
ti,intr-trigger-type = <4>;
103105
interrupt-controller;
104106
interrupt-parent = <&gic500>;

‎arch/arm64/boot/dts/ti/k3-j721e-mcu-wakeup.dtsi

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,8 +96,9 @@
9696
clock-names = "fclk";
9797
};
9898

99-
wkup_gpio_intr: interrupt-controller2 {
99+
wkup_gpio_intr: interrupt-controller@42200000 {
100100
compatible = "ti,sci-intr";
101+
reg = <0x00 0x42200000 0x00 0x400>;
101102
ti,intr-trigger-type = <1>;
102103
interrupt-controller;
103104
interrupt-parent = <&gic500>;

0 commit comments

Comments
 (0)