Skip to content

Commit

Permalink
arm64: dts: ti: k3-am64: Add phase tags marking
Browse files Browse the repository at this point in the history
bootph-all as phase tag was added to dt-schema
(dtschema/schemas/bootph.yaml) to describe various node usage during
boot phases with DT.

On TI K3 AM642 SoC, only esm nodes are exclusively used by R5
bootloader, rest of the dts nodes with bootph-* are used by later boot
stages also.

Add bootph-all for all other nodes that are used in the bootloader on
K3 AM642 SoC, and bootph-pre-ram is not needed specifically for any
other node in kernel dts.

Signed-off-by: Nishanth Menon <[email protected]>
Link: https://lore.kernel.org/r/[email protected]
Signed-off-by: Vignesh Raghavendra <[email protected]>
  • Loading branch information
nmenon authored and r-vignesh committed Oct 2, 2023
1 parent c412c2f commit 8d5bfa6
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 0 deletions.
11 changes: 11 additions & 0 deletions arch/arm64/boot/dts/ti/k3-am64-main.dtsi
Original file line number Diff line number Diff line change
Expand Up @@ -38,13 +38,15 @@
};

main_conf: syscon@43000000 {
bootph-all;
compatible = "ti,j721e-system-controller", "syscon", "simple-mfd";
reg = <0x0 0x43000000 0x0 0x20000>;
#address-cells = <1>;
#size-cells = <1>;
ranges = <0x0 0x0 0x43000000 0x20000>;

chipid@14 {
bootph-all;
compatible = "ti,am654-chipid";
reg = <0x00000014 0x4>;
};
Expand Down Expand Up @@ -96,6 +98,7 @@
};

dmss: bus@48000000 {
bootph-all;
compatible = "simple-mfd";
#address-cells = <2>;
#size-cells = <2>;
Expand All @@ -105,6 +108,7 @@
ti,sci-dev-id = <25>;

secure_proxy_main: mailbox@4d000000 {
bootph-all;
compatible = "ti,am654-secure-proxy";
#mbox-cells = <1>;
reg-names = "target_data", "rt", "scfg";
Expand Down Expand Up @@ -188,6 +192,7 @@
};

dmsc: system-controller@44043000 {
bootph-all;
compatible = "ti,k2g-sci";
ti,host-id = <12>;
mbox-names = "rx", "tx";
Expand All @@ -197,22 +202,26 @@
reg = <0x00 0x44043000 0x00 0xfe0>;

k3_pds: power-controller {
bootph-all;
compatible = "ti,sci-pm-domain";
#power-domain-cells = <2>;
};

k3_clks: clock-controller {
bootph-all;
compatible = "ti,k2g-sci-clk";
#clock-cells = <2>;
};

k3_reset: reset-controller {
bootph-all;
compatible = "ti,sci-reset";
#reset-cells = <2>;
};
};

main_pmx0: pinctrl@f4000 {
bootph-all;
compatible = "pinctrl-single";
reg = <0x00 0xf4000 0x00 0x2d0>;
#pinctrl-cells = <1>;
Expand All @@ -221,6 +230,7 @@
};

main_timer0: timer@2400000 {
bootph-all;
compatible = "ti,am654-timer";
reg = <0x00 0x2400000 0x00 0x400>;
interrupts = <GIC_SPI 120 IRQ_TYPE_LEVEL_HIGH>;
Expand Down Expand Up @@ -365,6 +375,7 @@
};

main_esm: esm@420000 {
bootph-pre-ram;
compatible = "ti,j721e-esm";
reg = <0x00 0x420000 0x00 0x1000>;
ti,esm-pins = <160>, <161>;
Expand Down
2 changes: 2 additions & 0 deletions arch/arm64/boot/dts/ti/k3-am64-mcu.dtsi
Original file line number Diff line number Diff line change
Expand Up @@ -146,6 +146,7 @@
};

mcu_pmx0: pinctrl@4084000 {
bootph-all;
compatible = "pinctrl-single";
reg = <0x00 0x4084000 0x00 0x84>;
#pinctrl-cells = <1>;
Expand All @@ -154,6 +155,7 @@
};

mcu_esm: esm@4100000 {
bootph-pre-ram;
compatible = "ti,j721e-esm";
reg = <0x00 0x4100000 0x00 0x1000>;
ti,esm-pins = <0>, <1>;
Expand Down
2 changes: 2 additions & 0 deletions arch/arm64/boot/dts/ti/k3-am64.dtsi
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@
};

cbass_main: bus@f4000 {
bootph-all;
compatible = "simple-bus";
#address-cells = <2>;
#size-cells = <2>;
Expand Down Expand Up @@ -85,6 +86,7 @@
<0x00 0x04000000 0x00 0x04000000 0x00 0x01ff1400>;

cbass_mcu: bus@4000000 {
bootph-all;
compatible = "simple-bus";
#address-cells = <2>;
#size-cells = <2>;
Expand Down

0 comments on commit 8d5bfa6

Please sign in to comment.