Skip to content

Commit 18fb2b7

Browse files
Siddharth-Vadapalli-at-TIr-vignesh
Siddharth-Vadapalli-at-TI
authored and
r-vignesh
committed
arm64: dts: ti: k3-j722s: Switch to k3-am62p-j722s-common-{}.dtsi includes
Update "k3-j722s.dtsi" to include "k3-am62p-j722s-common-{}".dtsi files in order to reuse the nodes shared with AM62P. Also include the J722S specific "k3-j722s-main.dtsi". Since the J7 family of SoCs has the k3-{soc}.dtsi file organized as: k3-{soc}.dtsi = CPU + Cache + CBASS-Ranges + "Peripheral-Includes" switch the "k3-j722s.dtsi" file to the same convention. Signed-off-by: Siddharth Vadapalli <s-vadapalli@ti.com> Acked-by: Roger Quadros <rogerq@kernel.org> Link: https://lore.kernel.org/r/20240615081600.3602462-5-s-vadapalli@ti.com Signed-off-by: Vignesh Raghavendra <vigneshr@ti.com>
1 parent 731626c commit 18fb2b7

File tree

1 file changed

+157
-1
lines changed

1 file changed

+157
-1
lines changed

‎arch/arm64/boot/dts/ti/k3-j722s.dtsi‎

Lines changed: 157 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,133 @@
1010
#include <dt-bindings/interrupt-controller/arm-gic.h>
1111
#include <dt-bindings/soc/ti,sci_pm_domain.h>
1212

13-
#include "k3-am62p5.dtsi"
13+
#include "k3-pinctrl.h"
1414

1515
/ {
1616
model = "Texas Instruments K3 J722S SoC";
1717
compatible = "ti,j722s";
18+
interrupt-parent = <&gic500>;
19+
#address-cells = <2>;
20+
#size-cells = <2>;
21+
22+
cpus {
23+
#address-cells = <1>;
24+
#size-cells = <0>;
25+
26+
cpu-map {
27+
cluster0: cluster0 {
28+
core0 {
29+
cpu = <&cpu0>;
30+
};
31+
32+
core1 {
33+
cpu = <&cpu1>;
34+
};
35+
36+
core2 {
37+
cpu = <&cpu2>;
38+
};
39+
40+
core3 {
41+
cpu = <&cpu3>;
42+
};
43+
};
44+
};
45+
46+
cpu0: cpu@0 {
47+
compatible = "arm,cortex-a53";
48+
reg = <0x000>;
49+
device_type = "cpu";
50+
enable-method = "psci";
51+
i-cache-size = <0x8000>;
52+
i-cache-line-size = <64>;
53+
i-cache-sets = <256>;
54+
d-cache-size = <0x8000>;
55+
d-cache-line-size = <64>;
56+
d-cache-sets = <128>;
57+
next-level-cache = <&l2_0>;
58+
clocks = <&k3_clks 135 0>;
59+
};
60+
61+
cpu1: cpu@1 {
62+
compatible = "arm,cortex-a53";
63+
reg = <0x001>;
64+
device_type = "cpu";
65+
enable-method = "psci";
66+
i-cache-size = <0x8000>;
67+
i-cache-line-size = <64>;
68+
i-cache-sets = <256>;
69+
d-cache-size = <0x8000>;
70+
d-cache-line-size = <64>;
71+
d-cache-sets = <128>;
72+
next-level-cache = <&l2_0>;
73+
clocks = <&k3_clks 136 0>;
74+
};
75+
76+
cpu2: cpu@2 {
77+
compatible = "arm,cortex-a53";
78+
reg = <0x002>;
79+
device_type = "cpu";
80+
enable-method = "psci";
81+
i-cache-size = <0x8000>;
82+
i-cache-line-size = <64>;
83+
i-cache-sets = <256>;
84+
d-cache-size = <0x8000>;
85+
d-cache-line-size = <64>;
86+
d-cache-sets = <128>;
87+
next-level-cache = <&l2_0>;
88+
clocks = <&k3_clks 137 0>;
89+
};
90+
91+
cpu3: cpu@3 {
92+
compatible = "arm,cortex-a53";
93+
reg = <0x003>;
94+
device_type = "cpu";
95+
enable-method = "psci";
96+
i-cache-size = <0x8000>;
97+
i-cache-line-size = <64>;
98+
i-cache-sets = <256>;
99+
d-cache-size = <0x8000>;
100+
d-cache-line-size = <64>;
101+
d-cache-sets = <128>;
102+
next-level-cache = <&l2_0>;
103+
clocks = <&k3_clks 138 0>;
104+
};
105+
};
106+
107+
l2_0: l2-cache0 {
108+
compatible = "cache";
109+
cache-unified;
110+
cache-level = <2>;
111+
cache-size = <0x80000>;
112+
cache-line-size = <64>;
113+
cache-sets = <512>;
114+
};
115+
116+
firmware {
117+
optee {
118+
compatible = "linaro,optee-tz";
119+
method = "smc";
120+
};
121+
122+
psci: psci {
123+
compatible = "arm,psci-1.0";
124+
method = "smc";
125+
};
126+
};
127+
128+
a53_timer0: timer-cl0-cpu0 {
129+
compatible = "arm,armv8-timer";
130+
interrupts = <GIC_PPI 13 IRQ_TYPE_LEVEL_LOW>, /* cntpsirq */
131+
<GIC_PPI 14 IRQ_TYPE_LEVEL_LOW>, /* cntpnsirq */
132+
<GIC_PPI 11 IRQ_TYPE_LEVEL_LOW>, /* cntvirq */
133+
<GIC_PPI 10 IRQ_TYPE_LEVEL_LOW>; /* cnthpirq */
134+
};
135+
136+
pmu: pmu {
137+
compatible = "arm,cortex-a53-pmu";
138+
interrupts = <GIC_PPI 7 IRQ_TYPE_LEVEL_HIGH>;
139+
};
18140

19141
cbass_main: bus@f0000 {
20142
compatible = "simple-bus";
@@ -74,9 +196,43 @@
74196
<0x00 0x43000000 0x00 0x43000000 0x00 0x00020000>,
75197
<0x00 0x78000000 0x00 0x78000000 0x00 0x00008000>,
76198
<0x00 0x78100000 0x00 0x78100000 0x00 0x00008000>;
199+
200+
cbass_mcu: bus@4000000 {
201+
compatible = "simple-bus";
202+
#address-cells = <2>;
203+
#size-cells = <2>;
204+
ranges = <0x00 0x04000000 0x00 0x04000000 0x00 0x01ff1400>, /* Peripheral window */
205+
<0x00 0x79000000 0x00 0x79000000 0x00 0x00008000>, /* MCU R5 ATCM */
206+
<0x00 0x79020000 0x00 0x79020000 0x00 0x00008000>, /* MCU R5 BTCM */
207+
<0x00 0x79100000 0x00 0x79100000 0x00 0x00040000>, /* MCU IRAM0 */
208+
<0x00 0x79140000 0x00 0x79140000 0x00 0x00040000>; /* MCU IRAM1 */
209+
bootph-all;
210+
};
211+
212+
cbass_wakeup: bus@b00000 {
213+
compatible = "simple-bus";
214+
#address-cells = <2>;
215+
#size-cells = <2>;
216+
ranges = <0x00 0x00b00000 0x00 0x00b00000 0x00 0x00002400>, /* VTM */
217+
<0x00 0x2b000000 0x00 0x2b000000 0x00 0x00300400>, /* Peripheral Window */
218+
<0x00 0x43000000 0x00 0x43000000 0x00 0x00020000>, /* WKUP CTRL MMR */
219+
<0x00 0x78000000 0x00 0x78000000 0x00 0x00008000>, /* DM R5 ATCM*/
220+
<0x00 0x78100000 0x00 0x78100000 0x00 0x00008000>; /* DM R5 BTCM*/
221+
bootph-all;
222+
};
77223
};
224+
225+
#include "k3-am62p-j722s-common-thermal.dtsi"
78226
};
79227

228+
/* Include peripherals shared with AM62P */
229+
#include "k3-am62p-j722s-common-main.dtsi"
230+
#include "k3-am62p-j722s-common-mcu.dtsi"
231+
#include "k3-am62p-j722s-common-wakeup.dtsi"
232+
233+
/* Include J722S specific peripherals */
234+
#include "k3-j722s-main.dtsi"
235+
80236
/* Main domain overrides */
81237

82238
&inta_main_dmss {

0 commit comments

Comments
 (0)