From: Roger Quadros <rogerq@kernel.org>
To: trini@konsulko.com, nm@ti.com
Cc: vigneshr@ti.com, m-chawdhry@ti.com, sjg@chromium.org,
jonas@kwiboo.se, srk@ti.com, afd@ti.com, bb@ti.com,
praneeth@ti.com, u-boot@lists.denx.de,
Roger Quadros <rogerq@kernel.org>
Subject: [PATCH 3/6] arm: dts: k3-am642-sk: Fix boot
Date: Fri, 29 Sep 2023 16:46:43 +0300 [thread overview]
Message-ID: <20230929134646.214781-4-rogerq@kernel.org> (raw)
In-Reply-To: <20230929134646.214781-1-rogerq@kernel.org>
Since commit [1] A53 u-boot proper is broken.
This is because nodes marked as 'bootph-pre-ram' are
not available at u-boot proper before relocation.
To fix this we mark all nodes in sk-u-boot.dtsi as
'bootph-all'.
Move cbass_mcu node to -r5-sk.dts as it is only required
for R5 SPL.
[1]
9e644284ab812 ("dm: core: Report bootph-pre-ram/sram node as pre-reloc after relocation")
Signed-off-by: Roger Quadros <rogerq@kernel.org>
---
arch/arm/dts/k3-am642-r5-sk.dts | 4 ++
arch/arm/dts/k3-am642-sk-u-boot.dtsi | 76 +++++++++++++---------------
2 files changed, 40 insertions(+), 40 deletions(-)
diff --git a/arch/arm/dts/k3-am642-r5-sk.dts b/arch/arm/dts/k3-am642-r5-sk.dts
index def4622ff1..daa483a781 100644
--- a/arch/arm/dts/k3-am642-r5-sk.dts
+++ b/arch/arm/dts/k3-am642-r5-sk.dts
@@ -53,6 +53,10 @@
bootph-pre-ram;
};
+&cbass_mcu {
+ bootph-pre-ram;
+};
+
&mcu_esm {
bootph-pre-ram;
};
diff --git a/arch/arm/dts/k3-am642-sk-u-boot.dtsi b/arch/arm/dts/k3-am642-sk-u-boot.dtsi
index c277ef8aba..5599977f6c 100644
--- a/arch/arm/dts/k3-am642-sk-u-boot.dtsi
+++ b/arch/arm/dts/k3-am642-sk-u-boot.dtsi
@@ -11,129 +11,125 @@
};
memory@80000000 {
- bootph-pre-ram;
+ bootph-all;
};
};
&cbass_main{
- bootph-pre-ram;
-};
-
-&cbass_mcu {
- bootph-pre-ram;
+ bootph-all;
};
&main_timer0 {
- bootph-pre-ram;
+ bootph-all;
clock-frequency = <200000000>;
};
&main_conf {
- bootph-pre-ram;
+ bootph-all;
chipid@14 {
- bootph-pre-ram;
+ bootph-all;
};
};
&main_pmx0 {
- bootph-pre-ram;
+ bootph-all;
};
&main_i2c0_pins_default {
- bootph-pre-ram;
+ bootph-all;
};
&main_i2c0 {
- bootph-pre-ram;
+ bootph-all;
};
&main_uart0_pins_default {
- bootph-pre-ram;
+ bootph-all;
};
&main_uart0 {
- bootph-pre-ram;
+ bootph-all;
};
&dmss {
- bootph-pre-ram;
+ bootph-all;
};
&secure_proxy_main {
- bootph-pre-ram;
+ bootph-all;
};
&dmsc {
- bootph-pre-ram;
+ bootph-all;
k3_sysreset: sysreset-controller {
compatible = "ti,sci-sysreset";
- bootph-pre-ram;
+ bootph-all;
};
};
&k3_pds {
- bootph-pre-ram;
+ bootph-all;
};
&k3_clks {
- bootph-pre-ram;
+ bootph-all;
};
&k3_reset {
- bootph-pre-ram;
+ bootph-all;
};
&sdhci0 {
status = "disabled";
- bootph-pre-ram;
+ bootph-all;
};
&sdhci1 {
- bootph-pre-ram;
+ bootph-all;
};
&main_mmc1_pins_default {
- bootph-pre-ram;
+ bootph-all;
};
&cpsw3g {
- bootph-pre-ram;
+ bootph-all;
ethernet-ports {
- bootph-pre-ram;
+ bootph-all;
};
};
&cpsw_port2 {
- bootph-pre-ram;
+ bootph-all;
};
&main_bcdma {
- bootph-pre-ram;
+ bootph-all;
};
&main_pktdma {
- bootph-pre-ram;
+ bootph-all;
};
&rgmii1_pins_default {
- bootph-pre-ram;
+ bootph-all;
};
&rgmii2_pins_default {
- bootph-pre-ram;
+ bootph-all;
};
&mdio1_pins_default {
- bootph-pre-ram;
+ bootph-all;
};
&cpsw3g_phy1 {
- bootph-pre-ram;
+ bootph-all;
};
&main_usb0_pins_default {
- bootph-pre-ram;
+ bootph-all;
};
&serdes_ln_ctrl {
@@ -141,25 +137,25 @@
};
&usbss0 {
- bootph-pre-ram;
+ bootph-all;
};
&usb0 {
- bootph-pre-ram;
+ bootph-all;
};
&serdes_wiz0 {
- bootph-pre-ram;
+ bootph-all;
};
&serdes0_usb_link {
- bootph-pre-ram;
+ bootph-all;
};
&serdes0 {
- bootph-pre-ram;
+ bootph-all;
};
&serdes_refclk {
- bootph-pre-ram;
+ bootph-all;
};
--
2.34.1
next prev parent reply other threads:[~2023-09-29 13:47 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-09-29 13:46 [RESEND PATCH 0/6] arm: dts: k3-am64 / k3-am62: Fix boot Roger Quadros
2023-09-29 13:46 ` [PATCH 1/6] arm: dts: k3-am64-evm: " Roger Quadros
2023-10-02 15:19 ` Nishanth Menon
2023-10-02 16:14 ` Roger Quadros
2023-10-02 16:19 ` Nishanth Menon
2023-10-05 14:49 ` Tom Rini
2023-09-29 13:46 ` [PATCH 2/6] arm: dts: k3-am64-evm: Mark dependent nodes for pre-relocation phase Roger Quadros
2023-10-02 15:20 ` Nishanth Menon
2023-09-29 13:46 ` Roger Quadros [this message]
2023-10-02 15:20 ` [PATCH 3/6] arm: dts: k3-am642-sk: Fix boot Nishanth Menon
2023-09-29 13:46 ` [PATCH 4/6] arm: dts: k3-am642-sk: Mark dependent nodes for pre-relocation phase Roger Quadros
2023-10-02 15:20 ` Nishanth Menon
2023-09-29 13:46 ` [PATCH 5/6] arm: dts: k3-am625-sk: Fix boot Roger Quadros
2023-10-02 15:20 ` Nishanth Menon
2023-09-29 13:46 ` [PATCH 6/6] arm: dts: k3-am625-sk: Mark dependent nodes for pre-relocation phase Roger Quadros
2023-10-02 15:20 ` Nishanth Menon
2023-10-03 20:26 ` [PATCH] arm: dts: k3-am625-beagleplay: Fix boot Jan Kiszka
2023-10-04 10:01 ` Roger Quadros
2023-10-04 12:15 ` Nishanth Menon
2023-10-05 4:18 ` Jan Kiszka
2023-10-05 11:27 ` Nishanth Menon
2023-10-05 14:49 ` Tom Rini
2023-10-05 14:52 ` Tom Rini
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230929134646.214781-4-rogerq@kernel.org \
--to=rogerq@kernel.org \
--cc=afd@ti.com \
--cc=bb@ti.com \
--cc=jonas@kwiboo.se \
--cc=m-chawdhry@ti.com \
--cc=nm@ti.com \
--cc=praneeth@ti.com \
--cc=sjg@chromium.org \
--cc=srk@ti.com \
--cc=trini@konsulko.com \
--cc=u-boot@lists.denx.de \
--cc=vigneshr@ti.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox