Skip to content

Commit 3a40869

Browse files
Apurva Nandannmenon
authored andcommitted
arm64: dts: ti: k3-j784s4: Add phase tags marking
bootph-all as phase tag was added to dt-schema (dtschema/schemas/bootph.yaml) to cover U-Boot challenges with DT. That's why add it also to Linux to be aligned with bootloader requirement. On TI K3 J784S4 SoC, only secure_proxy_mcu and secure_proxy_sa3 nodes are exclusively used by R5 bootloader, rest of the dts nodes with bootph-* are used by later boot stages also. And secure_proxy_mcu and secure_proxy_sa3 are disabled in kernel device tree, and will be only enabled in R5 bootloader device tree. So, bootph-pre-ram for secure_proxy_mcu and secure_proxy_sa3 will be added in R5 bootloader device tree only. Add bootph-all for all other nodes that are used in the bootloader on K3 J784S4 SoC, and bootph-pre-ram is not needed specifically for any node in kernel dts. Signed-off-by: Apurva Nandan <a-nandan@ti.com> Reviewed-by: Udit Kumar <u-kumar1@ti.com> Link: https://lore.kernel.org/r/20230811192030.3480616-2-a-nandan@ti.com Signed-off-by: Nishanth Menon <nm@ti.com>
1 parent 1f7226a commit 3a40869

3 files changed

Lines changed: 13 additions & 0 deletions

File tree

arch/arm64/boot/dts/ti/k3-j784s4-main.dtsi

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -670,6 +670,7 @@
670670
};
671671

672672
main_navss: bus@30000000 {
673+
bootph-all;
673674
compatible = "simple-bus";
674675
#address-cells = <2>;
675676
#size-cells = <2>;
@@ -705,6 +706,7 @@
705706
};
706707

707708
secure_proxy_main: mailbox@32c00000 {
709+
bootph-all;
708710
compatible = "ti,am654-secure-proxy";
709711
#mbox-cells = <1>;
710712
reg-names = "target_data", "rt", "scfg";

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

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77

88
&cbass_mcu_wakeup {
99
sms: system-controller@44083000 {
10+
bootph-all;
1011
compatible = "ti,k2g-sci";
1112
ti,host-id = <12>;
1213

@@ -19,22 +20,26 @@
1920
reg = <0x00 0x44083000 0x00 0x1000>;
2021

2122
k3_pds: power-controller {
23+
bootph-all;
2224
compatible = "ti,sci-pm-domain";
2325
#power-domain-cells = <2>;
2426
};
2527

2628
k3_clks: clock-controller {
29+
bootph-all;
2730
compatible = "ti,k2g-sci-clk";
2831
#clock-cells = <2>;
2932
};
3033

3134
k3_reset: reset-controller {
35+
bootph-all;
3236
compatible = "ti,sci-reset";
3337
#reset-cells = <2>;
3438
};
3539
};
3640

3741
chipid@43000014 {
42+
bootph-all;
3843
compatible = "ti,am654-chipid";
3944
reg = <0x00 0x43000014 0x00 0x4>;
4045
};
@@ -161,6 +166,7 @@
161166
};
162167

163168
mcu_timer1: timer@40410000 {
169+
bootph-all;
164170
compatible = "ti,am654-timer";
165171
reg = <0x00 0x40410000 0x00 0x400>;
166172
interrupts = <GIC_SPI 817 IRQ_TYPE_LEVEL_HIGH>;
@@ -442,6 +448,7 @@
442448
};
443449

444450
mcu_navss: bus@28380000 {
451+
bootph-all;
445452
compatible = "simple-bus";
446453
#address-cells = <2>;
447454
#size-cells = <2>;
@@ -451,6 +458,7 @@
451458
dma-ranges;
452459

453460
mcu_ringacc: ringacc@2b800000 {
461+
bootph-all;
454462
compatible = "ti,am654-navss-ringacc";
455463
reg = <0x00 0x2b800000 0x00 0x400000>,
456464
<0x00 0x2b000000 0x00 0x400000>,
@@ -466,6 +474,7 @@
466474
};
467475

468476
mcu_udmap: dma-controller@285c0000 {
477+
bootph-all;
469478
compatible = "ti,j721e-navss-mcu-udmap";
470479
reg = <0x00 0x285c0000 0x00 0x100>,
471480
<0x00 0x2a800000 0x00 0x40000>,

arch/arm64/boot/dts/ti/k3-j784s4.dtsi

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -228,6 +228,7 @@
228228
};
229229

230230
cbass_main: bus@100000 {
231+
bootph-all;
231232
compatible = "simple-bus";
232233
#address-cells = <2>;
233234
#size-cells = <2>;
@@ -263,6 +264,7 @@
263264
<0x07 0x00000000 0x07 0x00000000 0x01 0x00000000>;
264265

265266
cbass_mcu_wakeup: bus@28380000 {
267+
bootph-all;
266268
compatible = "simple-bus";
267269
#address-cells = <2>;
268270
#size-cells = <2>;

0 commit comments

Comments
 (0)