From: Bryan Brattlof <bb@ti.com>
To: Tom Rini <trini@konsulko.com>
Cc: UBoot Mailing List <u-boot@lists.denx.de>,
Vignesh Raghavendra <vigneshr@ti.com>, Andrew Davis <afd@ti.com>,
Nishanth Menon <nm@ti.com>,
Neha Malcom Francis <n-francis@ti.com>,
Manorit Chawdhry <m-chawdhry@ti.com>,
Martyn Welch <martyn.welch@collabora.com>,
Svyatoslav Ryhel <clamor95@gmail.com>,
Marcel Ziswiler <marcel.ziswiler@toradex.com>,
Simon Glass <sjg@chromium.org>,
Jan Kiszka <jan.kiszka@siemens.com>, Bryan Brattlof <bb@ti.com>
Subject: [PATCH v2 05/26] arm: dts: k3-am654: copy bootph properties to a53 dts
Date: Fri, 29 Dec 2023 11:47:02 -0600 [thread overview]
Message-ID: <20231229174656.634065-33-bb@ti.com> (raw)
In-Reply-To: <20231229174656.634065-28-bb@ti.com>
In order to unify the R5 board dtb file with the Linux board dtb file,
we will need to copy all bootph-pre-ram properties to the *-u-boot.dtsi
overlay.
Tested-by: Tom Rini <trini@konsulko.com>
Signed-off-by: Bryan Brattlof <bb@ti.com>
---
arch/arm/dts/k3-am654-base-board-u-boot.dtsi | 160 +++++++++++++++++++
arch/arm/dts/k3-am654-r5-base-board.dts | 85 +---------
2 files changed, 162 insertions(+), 83 deletions(-)
diff --git a/arch/arm/dts/k3-am654-base-board-u-boot.dtsi b/arch/arm/dts/k3-am654-base-board-u-boot.dtsi
index f29cecf870bcd..4b1e8ce2c920c 100644
--- a/arch/arm/dts/k3-am654-base-board-u-boot.dtsi
+++ b/arch/arm/dts/k3-am654-base-board-u-boot.dtsi
@@ -5,6 +5,166 @@
#include "k3-am65x-binman.dtsi"
+&vtt_supply {
+ bootph-pre-ram;
+};
+
+&cbass_main {
+ bootph-pre-ram;
+};
+
+&main_navss {
+ bootph-pre-ram;
+};
+
+&cbass_mcu {
+ bootph-pre-ram;
+};
+
+&mcu_navss {
+ bootph-pre-ram;
+};
+
+&mcu_ringacc {
+ bootph-pre-ram;
+};
+
+&mcu_udmap {
+ bootph-pre-ram;
+};
+
+&wkup_gpio0 {
+ bootph-pre-ram;
+};
+
+&secure_proxy_main {
+ bootph-pre-ram;
+};
+
+&cbass_wakeup {
+ bootph-pre-ram;
+
+ chipid@43000014 {
+ bootph-pre-ram;
+ };
+};
+
+&dmsc {
+ bootph-pre-ram;
+};
+
+&k3_pds {
+ bootph-pre-ram;
+};
+
+&k3_clks {
+ bootph-pre-ram;
+};
+
+&k3_reset {
+ bootph-pre-ram;
+};
+
+&main_uart0 {
+ bootph-pre-ram;
+};
+
+&wkup_vtm0 {
+ bootph-pre-ram;
+};
+
+&wkup_pmx0 {
+ bootph-pre-ram;
+};
+
+&wkup_uart0_pins_default {
+ bootph-pre-ram;
+};
+
+&wkup_vtt_pins_default {
+ bootph-pre-ram;
+};
+
+&mcu_uart0_pins_default {
+ bootph-pre-ram;
+};
+
+&wkup_i2c0_pins_default {
+ bootph-pre-ram;
+};
+
+&mcu_fss0_ospi0_pins_default {
+ bootph-pre-ram;
+};
+
+&main_pmx0 {
+ bootph-pre-ram;
+};
+
+&main_uart0_pins_default {
+ bootph-pre-ram;
+};
+
+&main_mmc0_pins_default {
+ bootph-pre-ram;
+};
+
+&main_mmc1_pins_default {
+ bootph-pre-ram;
+};
+
+&usb0_pins_default {
+ bootph-pre-ram;
+};
+
+&main_pmx1 {
+ bootph-pre-ram;
+};
+
+&sdhci0 {
+ bootph-pre-ram;
+};
+
+&sdhci1 {
+ bootph-pre-ram;
+};
+
+&wkup_i2c0 {
+ bootph-pre-ram;
+};
+
+&vdd_mpu {
+ bootph-pre-ram;
+};
+
+&ospi0 {
+ bootph-pre-ram;
+
+ flash@0 {
+ bootph-pre-ram;
+ };
+};
+
+&dwc3_0 {
+ bootph-pre-ram;
+};
+
+&usb0_phy {
+ bootph-pre-ram;
+};
+
+&usb0 {
+ bootph-pre-ram;
+};
+
+&scm_conf {
+ bootph-pre-ram;
+};
+
+&fss {
+ bootph-pre-ram;
+};
+
&pru0_0 {
remoteproc-name = "pru0_0";
};
diff --git a/arch/arm/dts/k3-am654-r5-base-board.dts b/arch/arm/dts/k3-am654-r5-base-board.dts
index d75c7bf3fe662..8f55dab508ee6 100644
--- a/arch/arm/dts/k3-am654-r5-base-board.dts
+++ b/arch/arm/dts/k3-am654-r5-base-board.dts
@@ -53,13 +53,10 @@
regulator-max-microvolt = <3300000>;
gpios = <&wkup_gpio0 28 GPIO_ACTIVE_HIGH>;
states = <0 0x0 3300000 0x1>;
- bootph-pre-ram;
};
};
&cbass_main {
- bootph-pre-ram;
-
timer1: timer@40400000 {
compatible = "ti,omap5430-timer";
reg = <0x0 0x40400000 0x0 0x80>;
@@ -67,15 +64,9 @@
clock-frequency = <25000000>;
bootph-all;
};
-
- main_navss: bus@30800000 {
- bootph-pre-ram;
- };
};
&cbass_mcu {
- bootph-pre-ram;
-
mcu_secproxy: secproxy@28380000 {
compatible = "ti,am654-secure-proxy";
reg = <0x0 0x2a380000 0x0 0x80000>,
@@ -87,8 +78,6 @@
};
mcu_navss: bus@28380000 {
- bootph-pre-ram;
-
ringacc@2b800000 {
reg = <0x0 0x2b800000 0x0 0x400000>,
<0x0 0x2b000000 0x0 0x400000>,
@@ -96,7 +85,6 @@
<0x0 0x2a500000 0x0 0x40000>,
<0x0 0x28440000 0x0 0x40000>;
reg-names = "rt", "fifos", "proxy_gcfg", "proxy_target", "cfg";
- bootph-pre-ram;
ti,dma-ring-reset-quirk;
};
@@ -109,34 +97,11 @@
<0x0 0x28400000 0x0 0x2000>;
reg-names = "gcfg", "rchan", "rchanrt", "tchan",
"tchanrt", "rflow";
- bootph-pre-ram;
};
};
};
-&k3_pds {
- bootph-pre-ram;
-};
-
-&k3_clks {
- bootph-pre-ram;
-};
-
-&k3_reset {
- bootph-pre-ram;
-};
-
-&wkup_gpio0 {
- bootph-pre-ram;
-};
-
-&secure_proxy_main {
- bootph-pre-ram;
-};
-
&cbass_wakeup {
- bootph-pre-ram;
-
sysctrler: sysctrler {
compatible = "ti,am654-system-controller";
mboxes= <&mcu_secproxy 4>, <&mcu_secproxy 5>;
@@ -150,40 +115,29 @@
clock-frequency = <200000000>;
bootph-pre-ram;
};
-
- chipid@43000014 {
- bootph-pre-ram;
- };
};
&dmsc {
- bootph-pre-ram;
-
mboxes= <&mcu_secproxy 8>, <&mcu_secproxy 6>, <&mcu_secproxy 5>;
mbox-names = "tx", "rx", "notify";
ti,host-id = <4>;
ti,secure-host;
-
- k3_sysreset: sysreset-controller {
- compatible = "ti,sci-sysreset";
- bootph-pre-ram;
- };
};
&wkup_uart0 {
- bootph-pre-ram;
pinctrl-names = "default";
pinctrl-0 = <&wkup_uart0_pins_default>;
status = "okay";
+ bootph-pre-ram;
};
&mcu_uart0 {
- bootph-pre-ram;
pinctrl-names = "default";
pinctrl-0 = <&mcu_uart0_pins_default>;
clock-frequency = <48000000>;
/delete-property/ power-domains;
status = "okay";
+ bootph-pre-ram;
};
&main_uart0 {
@@ -191,18 +145,15 @@
pinctrl-0 = <&main_uart0_pins_default>;
power-domains = <&k3_pds 146 TI_SCI_PD_SHARED>;
status = "okay";
- bootph-pre-ram;
};
&wkup_vtm0 {
compatible = "ti,am654-vtm", "ti,am654-avs";
vdd-supply-3 = <&vdd_mpu>;
vdd-supply-4 = <&vdd_mpu>;
- bootph-pre-ram;
};
&wkup_pmx0 {
- bootph-pre-ram;
wkup_uart0_pins_default: wkup_uart0_pins_default {
pinctrl-single,pins = <
AM65X_WKUP_IOPAD(0x00a0, PIN_INPUT, 0) /* (AB1) WKUP_UART0_RXD */
@@ -210,14 +161,12 @@
AM65X_WKUP_IOPAD(0x00c8, PIN_INPUT, 1) /* (AC2) WKUP_GPIO0_6.WKUP_UART0_CTSn */
AM65X_WKUP_IOPAD(0x00cc, PIN_OUTPUT, 1) /* (AC1) WKUP_GPIO0_7.WKUP_UART0_RTSn */
>;
- bootph-pre-ram;
};
wkup_vtt_pins_default: wkup_vtt_pins_default {
pinctrl-single,pins = <
AM65X_WKUP_IOPAD(0x0040, PIN_OUTPUT_PULLUP, 7) /* WKUP_GPIO0_28 */
>;
- bootph-pre-ram;
};
mcu_uart0_pins_default: mcu_uart0_pins_default {
@@ -227,7 +176,6 @@
AM65X_WKUP_IOPAD(0x004C, PIN_INPUT, 4) /* (P1) MCU_OSPI1_D3.MCU_UART0_CTSn */
AM65X_WKUP_IOPAD(0x0054, PIN_OUTPUT, 4) /* (N3) MCU_OSPI1_CSn1.MCU_UART0_RTSn */
>;
- bootph-pre-ram;
};
wkup_i2c0_pins_default: wkup-i2c0-pins-default {
@@ -235,7 +183,6 @@
AM65X_WKUP_IOPAD(0x00e0, PIN_INPUT, 0) /* (AC7) WKUP_I2C0_SCL */
AM65X_WKUP_IOPAD(0x00e4, PIN_INPUT, 0) /* (AD6) WKUP_I2C0_SDA */
>;
- bootph-pre-ram;
};
mcu_fss0_ospi0_pins_default: mcu-fss0-ospi0-pins_default {
@@ -252,12 +199,10 @@
AM65X_WKUP_IOPAD(0x0028, PIN_INPUT, 0) /* (R3) MCU_OSPI0_D7 */
AM65X_WKUP_IOPAD(0x002c, PIN_OUTPUT, 0) /* (R4) MCU_OSPI0_CSn0 */
>;
- bootph-pre-ram;
};
};
&main_pmx0 {
- bootph-pre-ram;
main_uart0_pins_default: main-uart0-pins-default {
pinctrl-single,pins = <
AM65X_IOPAD(0x01e4, PIN_INPUT, 0) /* (AF11) UART0_RXD */
@@ -265,7 +210,6 @@
AM65X_IOPAD(0x01ec, PIN_INPUT, 0) /* (AG11) UART0_CTSn */
AM65X_IOPAD(0x01f0, PIN_OUTPUT, 0) /* (AD11) UART0_RTSn */
>;
- bootph-pre-ram;
};
main_mmc0_pins_default: main_mmc0_pins_default {
@@ -282,7 +226,6 @@
AM65X_IOPAD(0x0188, PIN_INPUT_PULLUP, 0) /* (D25) MMC0_DAT7 */
AM65X_IOPAD(0x01b0, PIN_INPUT, 0) /* (C25) MMC0_DS */
>;
- bootph-pre-ram;
};
main_mmc1_pins_default: main_mmc1_pins_default {
@@ -296,21 +239,15 @@
AM65X_IOPAD(0x02dc, PIN_INPUT_PULLUP, 0) /* (B24) MMC1_SDCD */
AM65X_IOPAD(0x02e0, PIN_INPUT, 0) /* (C24) MMC1_SDWP */
>;
- bootph-pre-ram;
};
usb0_pins_default: usb0_pins_default {
pinctrl-single,pins = <
AM65X_IOPAD(0x02bc, PIN_OUTPUT, 0) /* (AD9) USB0_DRVVBUS */
>;
- bootph-pre-ram;
};
};
-&main_pmx1 {
- bootph-pre-ram;
-};
-
&memorycontroller {
vtt-supply = <&vtt_supply>;
pinctrl-names = "default";
@@ -323,7 +260,6 @@
pinctrl-0 = <&main_mmc0_pins_default>;
/delete-property/ power-domains;
ti,driver-strength-ohm = <50>;
- bootph-pre-ram;
};
&sdhci1 {
@@ -332,14 +268,12 @@
pinctrl-0 = <&main_mmc1_pins_default>;
/delete-property/ power-domains;
ti,driver-strength-ohm = <50>;
- bootph-pre-ram;
};
&wkup_i2c0 {
pinctrl-names = "default";
pinctrl-0 = <&wkup_i2c0_pins_default>;
clock-frequency = <400000>;
- bootph-pre-ram;
vdd_mpu: tps62363@60 {
compatible = "ti,tps62363";
@@ -351,7 +285,6 @@
regulator-boot-on;
ti,vsel0-state-high;
ti,vsel1-state-high;
- bootph-pre-ram;
};
};
@@ -376,23 +309,19 @@
cdns,read-delay = <0>;
#address-cells = <1>;
#size-cells = <1>;
- bootph-pre-ram;
};
};
&main_pmx0 {
- bootph-pre-ram;
usb0_pins_default: usb0_pins_default {
pinctrl-single,pins = <
AM65X_IOPAD(0x02bc, PIN_OUTPUT, 0) /* (AD9) USB0_DRVVBUS */
>;
- bootph-pre-ram;
};
};
&dwc3_0 {
status = "okay";
- bootph-pre-ram;
/delete-property/ clocks;
/delete-property/ power-domains;
/delete-property/ assigned-clocks;
@@ -401,7 +330,6 @@
&usb0_phy {
status = "okay";
- bootph-pre-ram;
/delete-property/ clocks;
};
@@ -409,11 +337,6 @@
pinctrl-names = "default";
pinctrl-0 = <&usb0_pins_default>;
dr_mode = "peripheral";
- bootph-pre-ram;
-};
-
-&scm_conf {
- bootph-pre-ram;
};
&davinci_mdio {
@@ -441,7 +364,3 @@
&usb1 {
dr_mode = "peripheral";
};
-
-&fss {
- bootph-pre-ram;
-};
--
2.43.0
next prev parent reply other threads:[~2023-12-29 17:51 UTC|newest]
Thread overview: 56+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-12-29 17:46 [PATCH v2 00/26] sync am65x device tree with Linux v6.7-rc1 Bryan Brattlof
2023-12-29 17:46 ` [PATCH v2 01/26] configs: am65x_evm_r5: enable driver for fixed regulators Bryan Brattlof
2024-01-02 18:46 ` Nishanth Menon
2023-12-29 17:46 ` [PATCH v2 02/26] configs: am65x_evm_a53: disable CONSOLE_MUX Bryan Brattlof
2024-01-02 18:47 ` Nishanth Menon
2023-12-29 17:47 ` [PATCH v2 03/26] arm: dts: k3-am654-r5: Merge board file and U-Boot overlay Bryan Brattlof
2024-01-02 18:47 ` Nishanth Menon
2023-12-29 17:47 ` [PATCH v2 04/26] arm: dts: k3-am654: pull in dtb update from Linux Bryan Brattlof
2024-01-02 18:47 ` Nishanth Menon
2023-12-29 17:47 ` Bryan Brattlof [this message]
2024-01-02 18:48 ` [PATCH v2 05/26] arm: dts: k3-am654: copy bootph properties to a53 dts Nishanth Menon
2023-12-29 17:47 ` [PATCH v2 06/26] arm: dts: k3-am654: include a53 board dtb for r5 build Bryan Brattlof
2024-01-02 18:48 ` Nishanth Menon
2023-12-29 17:47 ` [PATCH v2 07/26] arm: dts: k3-am654: remove duplicate vtt_supply Bryan Brattlof
2024-01-02 18:48 ` Nishanth Menon
2023-12-29 17:47 ` [PATCH v2 08/26] arm: dts: k3-am654: remove duplicate wkup_uart0 Bryan Brattlof
2024-01-02 18:48 ` Nishanth Menon
2023-12-29 17:47 ` [PATCH v2 09/26] arm: dts: k3-am654: remove duplicate timer Bryan Brattlof
2024-01-02 18:49 ` Nishanth Menon
2023-12-29 17:47 ` [PATCH v2 10/26] arm: dts: k3-am654: remove duplicate mcu_ringacc Bryan Brattlof
2024-01-02 18:49 ` Nishanth Menon
2023-12-29 17:47 ` [PATCH v2 11/26] arm: dts: k3-am654: remove duplicate mcu_udmap Bryan Brattlof
2024-01-02 18:49 ` Nishanth Menon
2023-12-29 17:47 ` [PATCH v2 12/26] arm: dts: k3-am654: add needed regs to udmap nodes Bryan Brattlof
2024-01-02 18:51 ` Nishanth Menon
2023-12-29 17:47 ` [PATCH v2 13/26] arm: dts: k3-am654: remove duplicate mcu_uart0 node Bryan Brattlof
2024-01-02 18:51 ` Nishanth Menon
2023-12-29 17:47 ` [PATCH v2 14/26] arm: dts: k3-am654: remove duplicate main_uart0 Bryan Brattlof
2024-01-02 18:51 ` Nishanth Menon
2023-12-29 17:47 ` [PATCH v2 15/26] arm: dts: k3-am654: remove duplicate sdhci0 pinmux node Bryan Brattlof
2024-01-02 18:51 ` Nishanth Menon
2023-12-29 17:47 ` [PATCH v2 16/26] arm: dts: k3-am654: remove duplicate sdhci1 " Bryan Brattlof
2024-01-02 18:51 ` Nishanth Menon
2023-12-29 17:47 ` [PATCH v2 17/26] arm: dts: k3-am654: remove duplicate wkup_i2c0 Bryan Brattlof
2024-01-02 18:52 ` Nishanth Menon
2023-12-29 17:47 ` [PATCH v2 18/26] arm: dts: k3-am654: remove duplicate ospi0 node Bryan Brattlof
2024-01-02 18:52 ` Nishanth Menon
2023-12-29 17:47 ` [PATCH v2 19/26] arm: dts: k3-am654: remove usb0 Bryan Brattlof
2024-01-02 18:52 ` Nishanth Menon
2023-12-29 17:47 ` [PATCH v2 20/26] arm: dts: k3-am654: remove duplicate mdio Bryan Brattlof
2024-01-02 18:52 ` Nishanth Menon
2023-12-29 17:47 ` [PATCH v2 21/26] arm: dts: k3-am654: remove duplicate vtt pinmux Bryan Brattlof
2024-01-02 18:52 ` Nishanth Menon
2023-12-29 17:47 ` [PATCH v2 22/26] arm: dts: k3-am654: remove duplicate root properties Bryan Brattlof
2024-01-02 18:53 ` Nishanth Menon
2023-12-29 17:47 ` [PATCH v2 23/26] arm: dts: k3-am654: remove un-needed aliases Bryan Brattlof
2024-01-02 18:53 ` Nishanth Menon
2023-12-29 17:47 ` [PATCH v2 24/26] arm: dts: k3-am654: move dummy_clock to root node Bryan Brattlof
2024-01-02 18:53 ` Nishanth Menon
2023-12-29 17:47 ` [PATCH v2 25/26] arm: dts: k3-am654: remove duplicate mcu secure proxy node Bryan Brattlof
2024-01-02 18:53 ` Nishanth Menon
2023-12-29 17:47 ` [PATCH v2 26/26] arm: dts: k3-am654: convert bootph-pre-ram to bootph-all Bryan Brattlof
2024-01-02 18:55 ` Nishanth Menon
2024-01-03 13:54 ` [PATCH v2 00/26] sync am65x device tree with Linux v6.7-rc1 Tom Rini
2024-01-06 11:57 ` Jan Kiszka
2024-01-06 11:58 ` Jan Kiszka
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=20231229174656.634065-33-bb@ti.com \
--to=bb@ti.com \
--cc=afd@ti.com \
--cc=clamor95@gmail.com \
--cc=jan.kiszka@siemens.com \
--cc=m-chawdhry@ti.com \
--cc=marcel.ziswiler@toradex.com \
--cc=martyn.welch@collabora.com \
--cc=n-francis@ti.com \
--cc=nm@ti.com \
--cc=sjg@chromium.org \
--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