Skip to content

Commit b9c112f

Browse files
olofjolofj
committed
Merge tag 'ti-k3-dt-fixes-for-v5.13' of git://git.kernel.org/pub/scm/linux/kernel/git/nmenon/linux into arm/fixes
Devicetree fixes for TI K3 platforms for v5.13 merge window: These minor fixes include: * Fixups for device tree discovered during yaml conversion * Fixups for missing dma-coherent property in j7200 * Removal of camera sensor node from am65 evm dts to overlay as camera sensor boards are variable. * tag 'ti-k3-dt-fixes-for-v5.13' of git://git.kernel.org/pub/scm/linux/kernel/git/nmenon/linux: arm64: dts: ti: k3*: Introduce reg definition for interrupt routers arm64: dts: ti: k3-am65|j721e|am64: Map the dma / navigator subsystem via explicit ranges arm64: dts: ti: k3-*: Rename the TI-SCI node arm64: dts: ti: k3-am65-wakeup: Drop un-necessary properties from dmsc node arm64: dts: ti: k3-am65-wakeup: Add debug region to TI-SCI node arm64: dts: ti: k3-*: Rename the TI-SCI clocks node name arm64: dts: ti: j7200-main: Mark Main NAVSS as dma-coherent arm64: dts: ti: k3-am654-base-board: remove ov5640 Link: https://lore.kernel.org/r/20210518115634.467vgpbzplal5kou@obituary Signed-off-by: Olof Johansson <olof@lixom.net>
2 parents 7468bed + cab12ba commit b9c112f

10 files changed

+45
-63
lines changed

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

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -42,12 +42,12 @@
4242
};
4343
};
4444

45-
dmss: dmss {
45+
dmss: bus@48000000 {
4646
compatible = "simple-mfd";
4747
#address-cells = <2>;
4848
#size-cells = <2>;
4949
dma-ranges;
50-
ranges;
50+
ranges = <0x00 0x48000000 0x00 0x48000000 0x00 0x06400000>;
5151

5252
ti,sci-dev-id = <25>;
5353

@@ -134,7 +134,7 @@
134134
};
135135
};
136136

137-
dmsc: dmsc@44043000 {
137+
dmsc: system-controller@44043000 {
138138
compatible = "ti,k2g-sci";
139139
ti,host-id = <12>;
140140
mbox-names = "rx", "tx";
@@ -148,7 +148,7 @@
148148
#power-domain-cells = <2>;
149149
};
150150

151-
k3_clks: clocks {
151+
k3_clks: clock-controller {
152152
compatible = "ti,k2g-sci-clk";
153153
#clock-cells = <2>;
154154
};
@@ -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: 6 additions & 4 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>;
@@ -444,18 +445,19 @@
444445
ti,interrupt-ranges = <0 392 32>;
445446
};
446447

447-
main-navss {
448+
main_navss: bus@30800000 {
448449
compatible = "simple-mfd";
449450
#address-cells = <2>;
450451
#size-cells = <2>;
451-
ranges;
452+
ranges = <0x0 0x30800000 0x0 0x30800000 0x0 0xbc00000>;
452453
dma-coherent;
453454
dma-ranges;
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-mcu.dtsi

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -116,11 +116,11 @@
116116
};
117117
};
118118

119-
mcu-navss {
119+
mcu_navss: bus@28380000 {
120120
compatible = "simple-mfd";
121121
#address-cells = <2>;
122122
#size-cells = <2>;
123-
ranges;
123+
ranges = <0x00 0x28380000 0x00 0x28380000 0x00 0x03880000>;
124124
dma-coherent;
125125
dma-ranges;
126126

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

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,24 +6,24 @@
66
*/
77

88
&cbass_wakeup {
9-
dmsc: dmsc {
9+
dmsc: system-controller@44083000 {
1010
compatible = "ti,am654-sci";
1111
ti,host-id = <12>;
12-
#address-cells = <1>;
13-
#size-cells = <1>;
14-
ranges;
1512

1613
mbox-names = "rx", "tx";
1714

1815
mboxes= <&secure_proxy_main 11>,
1916
<&secure_proxy_main 13>;
2017

18+
reg-names = "debug_messages";
19+
reg = <0x44083000 0x1000>;
20+
2121
k3_pds: power-controller {
2222
compatible = "ti,sci-pm-domain";
2323
#power-domain-cells = <2>;
2424
};
2525

26-
k3_clks: clocks {
26+
k3_clks: clock-controller {
2727
compatible = "ti,k2g-sci-clk";
2828
#clock-cells = <2>;
2929
};
@@ -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-am654-base-board.dts

Lines changed: 0 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -85,12 +85,6 @@
8585
gpios = <&wkup_gpio0 27 GPIO_ACTIVE_LOW>;
8686
};
8787
};
88-
89-
clk_ov5640_fixed: clock {
90-
compatible = "fixed-clock";
91-
#clock-cells = <0>;
92-
clock-frequency = <24000000>;
93-
};
9488
};
9589

9690
&wkup_pmx0 {
@@ -287,23 +281,6 @@
287281
pinctrl-names = "default";
288282
pinctrl-0 = <&main_i2c1_pins_default>;
289283
clock-frequency = <400000>;
290-
291-
ov5640: camera@3c {
292-
compatible = "ovti,ov5640";
293-
reg = <0x3c>;
294-
295-
clocks = <&clk_ov5640_fixed>;
296-
clock-names = "xclk";
297-
298-
port {
299-
csi2_cam0: endpoint {
300-
remote-endpoint = <&csi2_phy0>;
301-
clock-lanes = <0>;
302-
data-lanes = <1 2>;
303-
};
304-
};
305-
};
306-
307284
};
308285

309286
&main_i2c2 {
@@ -496,14 +473,6 @@
496473
};
497474
};
498475

499-
&csi2_0 {
500-
csi2_phy0: endpoint {
501-
remote-endpoint = <&csi2_cam0>;
502-
clock-lanes = <0>;
503-
data-lanes = <1 2>;
504-
};
505-
};
506-
507476
&mcu_cpsw {
508477
pinctrl-names = "default";
509478
pinctrl-0 = <&mcu_cpsw_pins_default &mcu_mdio_pins_default>;

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

Lines changed: 6 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>;
@@ -85,9 +86,12 @@
8586
#size-cells = <2>;
8687
ranges = <0x00 0x30000000 0x00 0x30000000 0x00 0x0c400000>;
8788
ti,sci-dev-id = <199>;
89+
dma-coherent;
90+
dma-ranges;
8891

89-
main_navss_intr: interrupt-controller1 {
92+
main_navss_intr: interrupt-controller@310e0000 {
9093
compatible = "ti,sci-intr";
94+
reg = <0x00 0x310e0000 0x00 0x4000>;
9195
ti,intr-trigger-type = <4>;
9296
interrupt-controller;
9397
interrupt-parent = <&gic500>;

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

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
*/
77

88
&cbass_mcu_wakeup {
9-
dmsc: dmsc@44083000 {
9+
dmsc: system-controller@44083000 {
1010
compatible = "ti,k2g-sci";
1111
ti,host-id = <12>;
1212

@@ -23,7 +23,7 @@
2323
#power-domain-cells = <2>;
2424
};
2525

26-
k3_clks: clocks {
26+
k3_clks: clock-controller {
2727
compatible = "ti,k2g-sci-clk";
2828
#clock-cells = <2>;
2929
};
@@ -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: 6 additions & 4 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>;
@@ -87,18 +88,19 @@
8788
ti,interrupt-ranges = <8 392 56>;
8889
};
8990

90-
main-navss {
91+
main_navss: bus@30000000 {
9192
compatible = "simple-mfd";
9293
#address-cells = <2>;
9394
#size-cells = <2>;
94-
ranges;
95+
ranges = <0x00 0x30000000 0x00 0x30000000 0x00 0x0c400000>;
9596
dma-coherent;
9697
dma-ranges;
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: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
*/
77

88
&cbass_mcu_wakeup {
9-
dmsc: dmsc@44083000 {
9+
dmsc: system-controller@44083000 {
1010
compatible = "ti,k2g-sci";
1111
ti,host-id = <12>;
1212

@@ -23,7 +23,7 @@
2323
#power-domain-cells = <2>;
2424
};
2525

26-
k3_clks: clocks {
26+
k3_clks: clock-controller {
2727
compatible = "ti,k2g-sci-clk";
2828
#clock-cells = <2>;
2929
};
@@ -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>;
@@ -249,11 +250,11 @@
249250
};
250251
};
251252

252-
mcu-navss {
253+
mcu_navss: bus@28380000 {
253254
compatible = "simple-mfd";
254255
#address-cells = <2>;
255256
#size-cells = <2>;
256-
ranges;
257+
ranges = <0x00 0x28380000 0x00 0x28380000 0x00 0x03880000>;
257258
dma-coherent;
258259
dma-ranges;
259260

0 commit comments

Comments
 (0)