* [PATCH v2 00/26] sync am65x device tree with Linux v6.7-rc1
@ 2023-12-29 17:46 Bryan Brattlof
2023-12-29 17:46 ` [PATCH v2 01/26] configs: am65x_evm_r5: enable driver for fixed regulators Bryan Brattlof
` (27 more replies)
0 siblings, 28 replies; 56+ messages in thread
From: Bryan Brattlof @ 2023-12-29 17:46 UTC (permalink / raw)
To: Tom Rini
Cc: UBoot Mailing List, Vignesh Raghavendra, Andrew Davis,
Nishanth Menon, Neha Malcom Francis, Manorit Chawdhry,
Martyn Welch, Svyatoslav Ryhel, Marcel Ziswiler, Simon Glass,
Jan Kiszka, Bryan Brattlof
Hello Again Everyone!
This series gets the am65x booting again along with syncing the device
tree files with v6.7-rc1 Linux.
The bulk of these patches unify the WKUP SPL board file with the arm64
files to make future syncs from Linux much easier. In the end the DTBs
should look a lot like what the DTBs look like for the am64x which
is fairly similar to the am65x.
For those interested in what UART boot looks like:
https://paste.sr.ht/~bryanb/7df8a645dc548912cd806abd5ecab967ef3287bc
Changes from v1: [0]
- fixed multi-line comment format
- moved wkup_uart0 and mcu_uart0 U-Boot overrides to the r5 board file
as they are not needed for a53/main domain U-Boot builds
- corrected a bad wkup_i2c0_pins_default fixup in PATCH 6/26
- spelling fix (s/Libux/Linux/) in commit body for PATCH 6/26
- added trailers from Tom
Thanks for reviewing and happy holidays
~Bryan
[0] https://lore.kernel.org/u-boot/20231221174412.210807-1-bb@ti.com/
Bryan Brattlof (26):
configs: am65x_evm_r5: enable driver for fixed regulators
configs: am65x_evm_a53: disable CONSOLE_MUX
arm: dts: k3-am654-r5: Merge board file and U-Boot overlay
arm: dts: k3-am654: pull in dtb update from Linux
arm: dts: k3-am654: copy bootph properties to a53 dts
arm: dts: k3-am654: include a53 board dtb for r5 build
arm: dts: k3-am654: remove duplicate vtt_supply
arm: dts: k3-am654: remove duplicate wkup_uart0
arm: dts: k3-am654: remove duplicate timer
arm: dts: k3-am654: remove duplicate mcu_ringacc
arm: dts: k3-am654: remove duplicate mcu_udmap
arm: dts: k3-am654: add needed regs to udmap nodes
arm: dts: k3-am654: remove duplicate mcu_uart0 node
arm: dts: k3-am654: remove duplicate main_uart0
arm: dts: k3-am654: remove duplicate sdhci0 pinmux node
arm: dts: k3-am654: remove duplicate sdhci1 pinmux node
arm: dts: k3-am654: remove duplicate wkup_i2c0
arm: dts: k3-am654: remove duplicate ospi0 node
arm: dts: k3-am654: remove usb0
arm: dts: k3-am654: remove duplicate mdio
arm: dts: k3-am654: remove duplicate vtt pinmux
arm: dts: k3-am654: remove duplicate root properties
arm: dts: k3-am654: remove un-needed aliases
arm: dts: k3-am654: move dummy_clock to root node
arm: dts: k3-am654: remove duplicate mcu secure proxy node
arm: dts: k3-am654: convert bootph-pre-ram to bootph-all
arch/arm/dts/k3-am65-main.dtsi | 342 +++++++++++++++---
arch/arm/dts/k3-am65-mcu.dtsi | 156 +++++++-
arch/arm/dts/k3-am65-wakeup.dtsi | 10 +-
arch/arm/dts/k3-am65.dtsi | 19 +-
arch/arm/dts/k3-am654-base-board-u-boot.dtsi | 195 +++++++++-
arch/arm/dts/k3-am654-base-board.dts | 301 +++++++++------
.../dts/k3-am654-r5-base-board-u-boot.dtsi | 208 -----------
arch/arm/dts/k3-am654-r5-base-board.dts | 303 ++++------------
arch/arm/dts/k3-am654.dtsi | 7 +
configs/am65x_evm_a53_defconfig | 1 -
configs/am65x_evm_r5_defconfig | 2 +
11 files changed, 886 insertions(+), 658 deletions(-)
delete mode 100644 arch/arm/dts/k3-am654-r5-base-board-u-boot.dtsi
base-commit: 0a0ceea2269b983e736b80104f03cc800d1a5e2a
--
2.43.0
^ permalink raw reply [flat|nested] 56+ messages in thread
* [PATCH v2 01/26] configs: am65x_evm_r5: enable driver for fixed regulators
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 ` 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
` (26 subsequent siblings)
27 siblings, 1 reply; 56+ messages in thread
From: Bryan Brattlof @ 2023-12-29 17:46 UTC (permalink / raw)
To: Tom Rini
Cc: UBoot Mailing List, Vignesh Raghavendra, Andrew Davis,
Nishanth Menon, Neha Malcom Francis, Manorit Chawdhry,
Martyn Welch, Svyatoslav Ryhel, Marcel Ziswiler, Simon Glass,
Jan Kiszka, Bryan Brattlof
Some of the regulators we need to successfully boot are fixed
regulators. Enable the driver to properly probe them.
Tested-by: Tom Rini <trini@konsulko.com>
Signed-off-by: Bryan Brattlof <bb@ti.com>
---
configs/am65x_evm_r5_defconfig | 2 ++
1 file changed, 2 insertions(+)
diff --git a/configs/am65x_evm_r5_defconfig b/configs/am65x_evm_r5_defconfig
index b2f1e721b36d0..b892f2eb8c5f9 100644
--- a/configs/am65x_evm_r5_defconfig
+++ b/configs/am65x_evm_r5_defconfig
@@ -118,6 +118,8 @@ CONFIG_POWER_DOMAIN=y
CONFIG_TI_SCI_POWER_DOMAIN=y
CONFIG_DM_REGULATOR=y
CONFIG_SPL_DM_REGULATOR=y
+CONFIG_DM_REGULATOR_FIXED=y
+CONFIG_SPL_DM_REGULATOR_FIXED=y
CONFIG_DM_REGULATOR_GPIO=y
CONFIG_SPL_DM_REGULATOR_GPIO=y
CONFIG_DM_REGULATOR_TPS62360=y
--
2.43.0
^ permalink raw reply related [flat|nested] 56+ messages in thread
* [PATCH v2 02/26] configs: am65x_evm_a53: disable CONSOLE_MUX
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
@ 2023-12-29 17:46 ` 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
` (25 subsequent siblings)
27 siblings, 1 reply; 56+ messages in thread
From: Bryan Brattlof @ 2023-12-29 17:46 UTC (permalink / raw)
To: Tom Rini
Cc: UBoot Mailing List, Vignesh Raghavendra, Andrew Davis,
Nishanth Menon, Neha Malcom Francis, Manorit Chawdhry,
Martyn Welch, Svyatoslav Ryhel, Marcel Ziswiler, Simon Glass,
Jan Kiszka, Bryan Brattlof
We do not have a need to share a single console with the evaluation
board and disabling this option reduces the complexity of configuring
the consoles. Disable CONSOLE_MUX
Tested-by: Tom Rini <trini@konsulko.com>
Signed-off-by: Bryan Brattlof <bb@ti.com>
---
configs/am65x_evm_a53_defconfig | 1 -
1 file changed, 1 deletion(-)
diff --git a/configs/am65x_evm_a53_defconfig b/configs/am65x_evm_a53_defconfig
index f4369865bf665..4d95e3bd29630 100644
--- a/configs/am65x_evm_a53_defconfig
+++ b/configs/am65x_evm_a53_defconfig
@@ -36,7 +36,6 @@ CONFIG_DISTRO_DEFAULTS=y
CONFIG_OF_SYSTEM_SETUP=y
CONFIG_BOOTCOMMAND="run findfdt; run distro_bootcmd; run init_${boot}; run boot_rprocs; if test ${boot_fit} -eq 1; then run get_fit_${boot}; run get_overlaystring; run run_fit; else; run get_kern_${boot}; run get_fdt_${boot}; run get_overlay_${boot}; run run_kern; fi;"
CONFIG_LOGLEVEL=7
-CONFIG_CONSOLE_MUX=y
CONFIG_SPL_MAX_SIZE=0x58000
CONFIG_SPL_HAS_BSS_LINKER_SECTION=y
CONFIG_SPL_BSS_START_ADDR=0x80a00000
--
2.43.0
^ permalink raw reply related [flat|nested] 56+ messages in thread
* [PATCH v2 03/26] arm: dts: k3-am654-r5: Merge board file and U-Boot overlay
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
2023-12-29 17:46 ` [PATCH v2 02/26] configs: am65x_evm_a53: disable CONSOLE_MUX Bryan Brattlof
@ 2023-12-29 17:47 ` 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
` (24 subsequent siblings)
27 siblings, 1 reply; 56+ messages in thread
From: Bryan Brattlof @ 2023-12-29 17:47 UTC (permalink / raw)
To: Tom Rini
Cc: UBoot Mailing List, Vignesh Raghavendra, Andrew Davis,
Nishanth Menon, Neha Malcom Francis, Manorit Chawdhry,
Martyn Welch, Svyatoslav Ryhel, Marcel Ziswiler, Simon Glass,
Jan Kiszka, Bryan Brattlof
The R5 board file for U-Boot should be the same as the board file copied
from Linux with a few alterations to work with the R5's view of the SoC.
First we need to unify the R5 board file and it's U-Boot overlay before
we can unify the Linux board file with this one.
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 | 1 -
.../dts/k3-am654-r5-base-board-u-boot.dtsi | 208 ------------------
arch/arm/dts/k3-am654-r5-base-board.dts | 124 ++++++++++-
3 files changed, 119 insertions(+), 214 deletions(-)
delete mode 100644 arch/arm/dts/k3-am654-r5-base-board-u-boot.dtsi
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 11d83927ac525..f29cecf870bcd 100644
--- a/arch/arm/dts/k3-am654-base-board-u-boot.dtsi
+++ b/arch/arm/dts/k3-am654-base-board-u-boot.dtsi
@@ -3,7 +3,6 @@
* Copyright (C) 2018-2021 Texas Instruments Incorporated - https://www.ti.com/
*/
-#include "k3-am654-r5-base-board-u-boot.dtsi"
#include "k3-am65x-binman.dtsi"
&pru0_0 {
diff --git a/arch/arm/dts/k3-am654-r5-base-board-u-boot.dtsi b/arch/arm/dts/k3-am654-r5-base-board-u-boot.dtsi
deleted file mode 100644
index 286604576e028..0000000000000
--- a/arch/arm/dts/k3-am654-r5-base-board-u-boot.dtsi
+++ /dev/null
@@ -1,208 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0
-/*
- * Copyright (C) 2018-2021 Texas Instruments Incorporated - https://www.ti.com/
- */
-
-#include <dt-bindings/pinctrl/k3.h>
-#include <dt-bindings/net/ti-dp83867.h>
-#include "k3-am65x-binman.dtsi"
-
-/ {
- chosen {
- stdout-path = "serial2:115200n8";
- };
-
- aliases {
- serial2 = &main_uart0;
- ethernet0 = &cpsw_port1;
- usb0 = &usb0;
- usb1 = &usb1;
- spi0 = &ospi0;
- spi1 = &ospi1;
- };
-};
-
-&cbass_main{
- bootph-pre-ram;
- main_navss: bus@30800000 {
- bootph-pre-ram;
- };
-};
-
-&cbass_mcu {
- bootph-pre-ram;
-
- mcu_navss: bus@28380000 {
- bootph-pre-ram;
-
- ringacc@2b800000 {
- reg = <0x0 0x2b800000 0x0 0x400000>,
- <0x0 0x2b000000 0x0 0x400000>,
- <0x0 0x28590000 0x0 0x100>,
- <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;
- };
-
- dma-controller@285c0000 {
- reg = <0x0 0x285c0000 0x0 0x100>,
- <0x0 0x284c0000 0x0 0x4000>,
- <0x0 0x2a800000 0x0 0x40000>,
- <0x0 0x284a0000 0x0 0x4000>,
- <0x0 0x2aa00000 0x0 0x40000>,
- <0x0 0x28400000 0x0 0x2000>;
- reg-names = "gcfg", "rchan", "rchanrt", "tchan",
- "tchanrt", "rflow";
- bootph-pre-ram;
- };
- };
-};
-
-&cbass_wakeup {
- bootph-pre-ram;
-
- chipid@43000014 {
- bootph-pre-ram;
- };
-};
-
-&secure_proxy_main {
- bootph-pre-ram;
-};
-
-&dmsc {
- bootph-pre-ram;
- k3_sysreset: sysreset-controller {
- compatible = "ti,sci-sysreset";
- bootph-pre-ram;
- };
-};
-
-&k3_pds {
- bootph-pre-ram;
-};
-
-&k3_clks {
- bootph-pre-ram;
-};
-
-&k3_reset {
- bootph-pre-ram;
-};
-
-&wkup_pmx0 {
- bootph-pre-ram;
-
- wkup_i2c0_pins_default {
- 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;
- };
-};
-
-&main_uart0_pins_default {
- bootph-pre-ram;
-};
-
-&main_pmx1 {
- bootph-pre-ram;
-};
-
-&wkup_pmx0 {
- mcu-fss0-ospi0-pins-default {
- bootph-pre-ram;
- };
-};
-
-&main_uart0 {
- bootph-pre-ram;
-};
-
-&main_mmc0_pins_default {
- bootph-pre-ram;
-};
-
-&main_mmc1_pins_default {
- bootph-pre-ram;
-};
-
-&sdhci0 {
- bootph-pre-ram;
-};
-
-&sdhci1 {
- bootph-pre-ram;
-};
-
-&davinci_mdio {
- phy0: ethernet-phy@0 {
- reg = <0>;
- /* TODO: phy reset: TCA9555RTWR(i2c:0x21)[p04].GPIO_MCU_RGMII_RSTN */
- ti,rx-internal-delay = <DP83867_RGMIIDCTL_2_00_NS>;
- ti,fifo-depth = <DP83867_PHYCR_FIFO_DEPTH_4_B_NIB>;
- };
-};
-
-&mcu_cpsw {
- reg = <0x0 0x46000000 0x0 0x200000>,
- <0x0 0x40f00200 0x0 0x2>;
- reg-names = "cpsw_nuss", "mac_efuse";
- /delete-property/ ranges;
-
- cpsw-phy-sel@40f04040 {
- compatible = "ti,am654-cpsw-phy-sel";
- reg= <0x0 0x40f04040 0x0 0x4>;
- reg-names = "gmii-sel";
- };
-};
-
-&wkup_i2c0 {
- bootph-pre-ram;
-};
-
-&usb1 {
- dr_mode = "peripheral";
-};
-
-&fss {
- bootph-pre-ram;
-};
-
-&ospi0 {
- bootph-pre-ram;
-
- flash@0{
- bootph-pre-ram;
- };
-};
-
-&dwc3_0 {
- status = "okay";
- bootph-pre-ram;
-};
-
-&usb0_phy {
- status = "okay";
- bootph-pre-ram;
-};
-
-&usb0 {
- pinctrl-names = "default";
- pinctrl-0 = <&usb0_pins_default>;
- dr_mode = "peripheral";
- bootph-pre-ram;
-};
-
-&scm_conf {
- bootph-pre-ram;
-};
diff --git a/arch/arm/dts/k3-am654-r5-base-board.dts b/arch/arm/dts/k3-am654-r5-base-board.dts
index 637a5cc85e095..d75c7bf3fe662 100644
--- a/arch/arm/dts/k3-am654-r5-base-board.dts
+++ b/arch/arm/dts/k3-am654-r5-base-board.dts
@@ -14,9 +14,16 @@
model = "Texas Instruments AM654 R5 Base Board";
aliases {
+ ethernet0 = &cpsw_port1;
+ remoteproc0 = &sysctrler;
+ remoteproc1 = &a53_0;
serial0 = &wkup_uart0;
serial1 = &mcu_uart0;
serial2 = &main_uart0;
+ spi0 = &ospi0;
+ spi1 = &ospi1;
+ usb0 = &usb0;
+ usb1 = &usb1;
};
chosen {
@@ -24,11 +31,6 @@
tick-timer = &timer1;
};
- aliases {
- remoteproc0 = &sysctrler;
- remoteproc1 = &a53_0;
- };
-
a53_0: a53@0 {
compatible = "ti,am654-rproc";
reg = <0x0 0x00a90000 0x0 0x10>;
@@ -56,6 +58,8 @@
};
&cbass_main {
+ bootph-pre-ram;
+
timer1: timer@40400000 {
compatible = "ti,omap5430-timer";
reg = <0x0 0x40400000 0x0 0x80>;
@@ -63,9 +67,15 @@
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>,
@@ -75,13 +85,58 @@
#mbox-cells = <1>;
bootph-pre-ram;
};
+
+ mcu_navss: bus@28380000 {
+ bootph-pre-ram;
+
+ ringacc@2b800000 {
+ reg = <0x0 0x2b800000 0x0 0x400000>,
+ <0x0 0x2b000000 0x0 0x400000>,
+ <0x0 0x28590000 0x0 0x100>,
+ <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;
+ };
+
+ dma-controller@285c0000 {
+ reg = <0x0 0x285c0000 0x0 0x100>,
+ <0x0 0x284c0000 0x0 0x4000>,
+ <0x0 0x2a800000 0x0 0x40000>,
+ <0x0 0x284a0000 0x0 0x4000>,
+ <0x0 0x2aa00000 0x0 0x40000>,
+ <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>;
@@ -95,13 +150,24 @@
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 {
@@ -125,6 +191,7 @@
pinctrl-0 = <&main_uart0_pins_default>;
power-domains = <&k3_pds 146 TI_SCI_PD_SHARED>;
status = "okay";
+ bootph-pre-ram;
};
&wkup_vtm0 {
@@ -168,6 +235,7 @@
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 {
@@ -184,6 +252,7 @@
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;
};
};
@@ -229,6 +298,17 @@
>;
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 {
@@ -243,6 +323,7 @@
pinctrl-0 = <&main_mmc0_pins_default>;
/delete-property/ power-domains;
ti,driver-strength-ohm = <50>;
+ bootph-pre-ram;
};
&sdhci1 {
@@ -251,6 +332,7 @@
pinctrl-0 = <&main_mmc1_pins_default>;
/delete-property/ power-domains;
ti,driver-strength-ohm = <50>;
+ bootph-pre-ram;
};
&wkup_i2c0 {
@@ -276,6 +358,7 @@
&ospi0 {
pinctrl-names = "default";
pinctrl-0 = <&mcu_fss0_ospi0_pins_default>;
+ bootph-pre-ram;
reg = <0x0 0x47040000 0x0 0x100>,
<0x0 0x50000000 0x0 0x8000000>;
@@ -293,6 +376,7 @@
cdns,read-delay = <0>;
#address-cells = <1>;
#size-cells = <1>;
+ bootph-pre-ram;
};
};
@@ -331,3 +415,33 @@
&scm_conf {
bootph-pre-ram;
};
+
+&davinci_mdio {
+ phy0: ethernet-phy@0 {
+ reg = <0>;
+ /* TODO: phy reset: TCA9555RTWR(i2c:0x21)[p04].GPIO_MCU_RGMII_RSTN */
+ ti,rx-internal-delay = <DP83867_RGMIIDCTL_2_00_NS>;
+ ti,fifo-depth = <DP83867_PHYCR_FIFO_DEPTH_4_B_NIB>;
+ };
+};
+
+&mcu_cpsw {
+ reg = <0x0 0x46000000 0x0 0x200000>,
+ <0x0 0x40f00200 0x0 0x2>;
+ reg-names = "cpsw_nuss", "mac_efuse";
+ /delete-property/ ranges;
+
+ cpsw-phy-sel@40f04040 {
+ compatible = "ti,am654-cpsw-phy-sel";
+ reg= <0x0 0x40f04040 0x0 0x4>;
+ reg-names = "gmii-sel";
+ };
+};
+
+&usb1 {
+ dr_mode = "peripheral";
+};
+
+&fss {
+ bootph-pre-ram;
+};
--
2.43.0
^ permalink raw reply related [flat|nested] 56+ messages in thread
* [PATCH v2 04/26] arm: dts: k3-am654: pull in dtb update from Linux
2023-12-29 17:46 [PATCH v2 00/26] sync am65x device tree with Linux v6.7-rc1 Bryan Brattlof
` (2 preceding siblings ...)
2023-12-29 17:47 ` [PATCH v2 03/26] arm: dts: k3-am654-r5: Merge board file and U-Boot overlay Bryan Brattlof
@ 2023-12-29 17:47 ` Bryan Brattlof
2024-01-02 18:47 ` Nishanth Menon
2023-12-29 17:47 ` [PATCH v2 05/26] arm: dts: k3-am654: copy bootph properties to a53 dts Bryan Brattlof
` (23 subsequent siblings)
27 siblings, 1 reply; 56+ messages in thread
From: Bryan Brattlof @ 2023-12-29 17:47 UTC (permalink / raw)
To: Tom Rini
Cc: UBoot Mailing List, Vignesh Raghavendra, Andrew Davis,
Nishanth Menon, Neha Malcom Francis, Manorit Chawdhry,
Martyn Welch, Svyatoslav Ryhel, Marcel Ziswiler, Simon Glass,
Jan Kiszka, Bryan Brattlof
Pull in dtb updates for the am654 base board from v6.7-rc1 of Linux
Tested-by: Tom Rini <trini@konsulko.com>
Signed-off-by: Bryan Brattlof <bb@ti.com>
---
arch/arm/dts/k3-am65-main.dtsi | 342 ++++++++++++++++++++++-----
arch/arm/dts/k3-am65-mcu.dtsi | 156 ++++++++++--
arch/arm/dts/k3-am65-wakeup.dtsi | 10 +-
arch/arm/dts/k3-am65.dtsi | 19 +-
arch/arm/dts/k3-am654-base-board.dts | 301 ++++++++++++++---------
arch/arm/dts/k3-am654.dtsi | 7 +
6 files changed, 626 insertions(+), 209 deletions(-)
diff --git a/arch/arm/dts/k3-am65-main.dtsi b/arch/arm/dts/k3-am65-main.dtsi
index ba4e5d3e1ed7a..5ebb87f467de5 100644
--- a/arch/arm/dts/k3-am65-main.dtsi
+++ b/arch/arm/dts/k3-am65-main.dtsi
@@ -35,7 +35,10 @@
#interrupt-cells = <3>;
interrupt-controller;
reg = <0x00 0x01800000 0x00 0x10000>, /* GICD */
- <0x00 0x01880000 0x00 0x90000>; /* GICR */
+ <0x00 0x01880000 0x00 0x90000>, /* GICR */
+ <0x00 0x6f000000 0x00 0x2000>, /* GICC */
+ <0x00 0x6f010000 0x00 0x1000>, /* GICH */
+ <0x00 0x6f020000 0x00 0x2000>; /* GICV */
/*
* vcpumntirq:
* virtual CPU interface maintenance interrupt
@@ -88,6 +91,7 @@
clock-frequency = <48000000>;
current-speed = <115200>;
power-domains = <&k3_pds 146 TI_SCI_PD_EXCLUSIVE>;
+ status = "disabled";
};
main_uart1: serial@2810000 {
@@ -96,6 +100,7 @@
interrupts = <GIC_SPI 193 IRQ_TYPE_LEVEL_HIGH>;
clock-frequency = <48000000>;
power-domains = <&k3_pds 147 TI_SCI_PD_EXCLUSIVE>;
+ status = "disabled";
};
main_uart2: serial@2820000 {
@@ -104,29 +109,47 @@
interrupts = <GIC_SPI 194 IRQ_TYPE_LEVEL_HIGH>;
clock-frequency = <48000000>;
power-domains = <&k3_pds 148 TI_SCI_PD_EXCLUSIVE>;
+ status = "disabled";
};
crypto: crypto@4e00000 {
compatible = "ti,am654-sa2ul";
reg = <0x0 0x4e00000 0x0 0x1200>;
- power-domains = <&k3_pds 136 TI_SCI_PD_EXCLUSIVE>;
+ power-domains = <&k3_pds 136 TI_SCI_PD_SHARED>;
#address-cells = <2>;
#size-cells = <2>;
ranges = <0x0 0x04e00000 0x00 0x04e00000 0x0 0x30000>;
- dmas = <&main_udmap 0xc000>, <&main_udmap 0x4000>,
- <&main_udmap 0x4001>;
+ dmas = <&main_udmap 0xc001>, <&main_udmap 0x4002>,
+ <&main_udmap 0x4003>;
dma-names = "tx", "rx1", "rx2";
- dma-coherent;
rng: rng@4e10000 {
compatible = "inside-secure,safexcel-eip76";
reg = <0x0 0x4e10000 0x0 0x7d>;
interrupts = <GIC_SPI 24 IRQ_TYPE_LEVEL_HIGH>;
- clocks = <&k3_clks 136 1>;
+ status = "disabled"; /* Used by OP-TEE */
};
};
+ /* TIMERIO pad input CTRLMMR_TIMER*_CTRL registers */
+ main_timerio_input: pinctrl@104200 {
+ compatible = "pinctrl-single";
+ reg = <0x0 0x104200 0x0 0x30>;
+ #pinctrl-cells = <1>;
+ pinctrl-single,register-width = <32>;
+ pinctrl-single,function-mask = <0x0000001ff>;
+ };
+
+ /* TIMERIO pad output CTCTRLMMR_TIMERIO*_CTRL registers */
+ main_timerio_output: pinctrl@104280 {
+ compatible = "pinctrl-single";
+ reg = <0x0 0x104280 0x0 0x20>;
+ #pinctrl-cells = <1>;
+ pinctrl-single,register-width = <32>;
+ pinctrl-single,function-mask = <0x0000000f>;
+ };
+
main_pmx0: pinctrl@11c000 {
compatible = "pinctrl-single";
reg = <0x0 0x11c000 0x0 0x2e4>;
@@ -152,6 +175,7 @@
clock-names = "fck";
clocks = <&k3_clks 110 1>;
power-domains = <&k3_pds 110 TI_SCI_PD_EXCLUSIVE>;
+ status = "disabled";
};
main_i2c1: i2c@2010000 {
@@ -163,6 +187,7 @@
clock-names = "fck";
clocks = <&k3_clks 111 1>;
power-domains = <&k3_pds 111 TI_SCI_PD_EXCLUSIVE>;
+ status = "disabled";
};
main_i2c2: i2c@2020000 {
@@ -174,6 +199,7 @@
clock-names = "fck";
clocks = <&k3_clks 112 1>;
power-domains = <&k3_pds 112 TI_SCI_PD_EXCLUSIVE>;
+ status = "disabled";
};
main_i2c3: i2c@2030000 {
@@ -185,6 +211,7 @@
clock-names = "fck";
clocks = <&k3_clks 113 1>;
power-domains = <&k3_pds 113 TI_SCI_PD_EXCLUSIVE>;
+ status = "disabled";
};
ecap0: pwm@3100000 {
@@ -194,6 +221,7 @@
power-domains = <&k3_pds 39 TI_SCI_PD_EXCLUSIVE>;
clocks = <&k3_clks 39 0>;
clock-names = "fck";
+ status = "disabled";
};
main_spi0: spi@2100000 {
@@ -206,6 +234,7 @@
#size-cells = <0>;
dmas = <&main_udmap 0xc500>, <&main_udmap 0x4500>;
dma-names = "tx0", "rx0";
+ status = "disabled";
};
main_spi1: spi@2110000 {
@@ -218,6 +247,7 @@
#size-cells = <0>;
assigned-clocks = <&k3_clks 137 1>;
assigned-clock-rates = <48000000>;
+ status = "disabled";
};
main_spi2: spi@2120000 {
@@ -228,6 +258,7 @@
power-domains = <&k3_pds 139 TI_SCI_PD_EXCLUSIVE>;
#address-cells = <1>;
#size-cells = <0>;
+ status = "disabled";
};
main_spi3: spi@2130000 {
@@ -238,6 +269,7 @@
power-domains = <&k3_pds 140 TI_SCI_PD_EXCLUSIVE>;
#address-cells = <1>;
#size-cells = <0>;
+ status = "disabled";
};
main_spi4: spi@2140000 {
@@ -248,6 +280,151 @@
power-domains = <&k3_pds 141 TI_SCI_PD_EXCLUSIVE>;
#address-cells = <1>;
#size-cells = <0>;
+ status = "disabled";
+ };
+
+ main_timer0: timer@2400000 {
+ compatible = "ti,am654-timer";
+ reg = <0x00 0x2400000 0x00 0x400>;
+ interrupts = <GIC_SPI 224 IRQ_TYPE_LEVEL_HIGH>;
+ clocks = <&k3_clks 23 0>;
+ clock-names = "fck";
+ assigned-clocks = <&k3_clks 23 0>;
+ assigned-clock-parents = <&k3_clks 23 1>;
+ power-domains = <&k3_pds 23 TI_SCI_PD_EXCLUSIVE>;
+ ti,timer-pwm;
+ };
+
+ main_timer1: timer@2410000 {
+ compatible = "ti,am654-timer";
+ reg = <0x00 0x2410000 0x00 0x400>;
+ interrupts = <GIC_SPI 225 IRQ_TYPE_LEVEL_HIGH>;
+ clocks = <&k3_clks 24 0>;
+ clock-names = "fck";
+ assigned-clocks = <&k3_clks 24 0>;
+ assigned-clock-parents = <&k3_clks 24 1>;
+ power-domains = <&k3_pds 24 TI_SCI_PD_EXCLUSIVE>;
+ ti,timer-pwm;
+ };
+
+ main_timer2: timer@2420000 {
+ compatible = "ti,am654-timer";
+ reg = <0x00 0x2420000 0x00 0x400>;
+ interrupts = <GIC_SPI 226 IRQ_TYPE_LEVEL_HIGH>;
+ clocks = <&k3_clks 27 0>;
+ clock-names = "fck";
+ assigned-clocks = <&k3_clks 27 0>;
+ assigned-clock-parents = <&k3_clks 27 1>;
+ power-domains = <&k3_pds 27 TI_SCI_PD_EXCLUSIVE>;
+ ti,timer-pwm;
+ };
+
+ main_timer3: timer@2430000 {
+ compatible = "ti,am654-timer";
+ reg = <0x00 0x2430000 0x00 0x400>;
+ interrupts = <GIC_SPI 227 IRQ_TYPE_LEVEL_HIGH>;
+ clocks = <&k3_clks 28 0>;
+ clock-names = "fck";
+ assigned-clocks = <&k3_clks 28 0>;
+ assigned-clock-parents = <&k3_clks 28 1>;
+ power-domains = <&k3_pds 28 TI_SCI_PD_EXCLUSIVE>;
+ ti,timer-pwm;
+ };
+
+ main_timer4: timer@2440000 {
+ compatible = "ti,am654-timer";
+ reg = <0x00 0x2440000 0x00 0x400>;
+ interrupts = <GIC_SPI 228 IRQ_TYPE_LEVEL_HIGH>;
+ clocks = <&k3_clks 29 0>;
+ clock-names = "fck";
+ assigned-clocks = <&k3_clks 29 0>;
+ assigned-clock-parents = <&k3_clks 29 1>;
+ power-domains = <&k3_pds 29 TI_SCI_PD_EXCLUSIVE>;
+ ti,timer-pwm;
+ };
+
+ main_timer5: timer@2450000 {
+ compatible = "ti,am654-timer";
+ reg = <0x00 0x2450000 0x00 0x400>;
+ interrupts = <GIC_SPI 229 IRQ_TYPE_LEVEL_HIGH>;
+ clocks = <&k3_clks 30 0>;
+ clock-names = "fck";
+ assigned-clocks = <&k3_clks 30 0>;
+ assigned-clock-parents = <&k3_clks 30 1>;
+ power-domains = <&k3_pds 30 TI_SCI_PD_EXCLUSIVE>;
+ ti,timer-pwm;
+ };
+
+ main_timer6: timer@2460000 {
+ compatible = "ti,am654-timer";
+ reg = <0x00 0x2460000 0x00 0x400>;
+ interrupts = <GIC_SPI 230 IRQ_TYPE_LEVEL_HIGH>;
+ clocks = <&k3_clks 31 0>;
+ assigned-clocks = <&k3_clks 31 0>;
+ assigned-clock-parents = <&k3_clks 31 1>;
+ clock-names = "fck";
+ power-domains = <&k3_pds 31 TI_SCI_PD_EXCLUSIVE>;
+ ti,timer-pwm;
+ };
+
+ main_timer7: timer@2470000 {
+ compatible = "ti,am654-timer";
+ reg = <0x00 0x2470000 0x00 0x400>;
+ interrupts = <GIC_SPI 231 IRQ_TYPE_LEVEL_HIGH>;
+ clocks = <&k3_clks 32 0>;
+ clock-names = "fck";
+ assigned-clocks = <&k3_clks 32 0>;
+ assigned-clock-parents = <&k3_clks 32 1>;
+ power-domains = <&k3_pds 32 TI_SCI_PD_EXCLUSIVE>;
+ ti,timer-pwm;
+ };
+
+ main_timer8: timer@2480000 {
+ compatible = "ti,am654-timer";
+ reg = <0x00 0x2480000 0x00 0x400>;
+ interrupts = <GIC_SPI 232 IRQ_TYPE_LEVEL_HIGH>;
+ clocks = <&k3_clks 33 0>;
+ clock-names = "fck";
+ assigned-clocks = <&k3_clks 33 0>;
+ assigned-clock-parents = <&k3_clks 33 1>;
+ power-domains = <&k3_pds 33 TI_SCI_PD_EXCLUSIVE>;
+ ti,timer-pwm;
+ };
+
+ main_timer9: timer@2490000 {
+ compatible = "ti,am654-timer";
+ reg = <0x00 0x2490000 0x00 0x400>;
+ interrupts = <GIC_SPI 233 IRQ_TYPE_LEVEL_HIGH>;
+ clocks = <&k3_clks 34 0>;
+ clock-names = "fck";
+ assigned-clocks = <&k3_clks 34 0>;
+ assigned-clock-parents = <&k3_clks 34 1>;
+ power-domains = <&k3_pds 34 TI_SCI_PD_EXCLUSIVE>;
+ ti,timer-pwm;
+ };
+
+ main_timer10: timer@24a0000 {
+ compatible = "ti,am654-timer";
+ reg = <0x00 0x24a0000 0x00 0x400>;
+ interrupts = <GIC_SPI 234 IRQ_TYPE_LEVEL_HIGH>;
+ clocks = <&k3_clks 25 0>;
+ clock-names = "fck";
+ assigned-clocks = <&k3_clks 25 0>;
+ assigned-clock-parents = <&k3_clks 25 1>;
+ power-domains = <&k3_pds 25 TI_SCI_PD_EXCLUSIVE>;
+ ti,timer-pwm;
+ };
+
+ main_timer11: timer@24b0000 {
+ compatible = "ti,am654-timer";
+ reg = <0x00 0x24b0000 0x00 0x400>;
+ interrupts = <GIC_SPI 235 IRQ_TYPE_LEVEL_HIGH>;
+ clocks = <&k3_clks 26 0>;
+ clock-names = "fck";
+ assigned-clocks = <&k3_clks 26 0>;
+ assigned-clock-parents = <&k3_clks 26 1>;
+ power-domains = <&k3_pds 26 TI_SCI_PD_EXCLUSIVE>;
+ ti,timer-pwm;
};
sdhci0: mmc@4f80000 {
@@ -292,7 +469,6 @@
ti,otap-del-sel-ddr52 = <0x4>;
ti,otap-del-sel-hs200 = <0x7>;
ti,clkbuf-sel = <0x7>;
- ti,otap-del-sel = <0x2>;
ti,trm-icp = <0x8>;
dma-coherent;
};
@@ -304,21 +480,6 @@
#size-cells = <1>;
ranges = <0x0 0x0 0x00100000 0x1c000>;
- pcie0_mode: pcie-mode@4060 {
- compatible = "syscon";
- reg = <0x00004060 0x4>;
- };
-
- pcie1_mode: pcie-mode@4070 {
- compatible = "syscon";
- reg = <0x00004070 0x4>;
- };
-
- pcie_devid: pcie-devid@210 {
- compatible = "syscon";
- reg = <0x00000210 0x4>;
- };
-
serdes0_clk: clock@4080 {
compatible = "syscon";
reg = <0x00004080 0x4>;
@@ -338,11 +499,11 @@
dss_oldi_io_ctrl: dss-oldi-io-ctrl@41e0 {
compatible = "syscon";
- reg = <0x0000041e0 0x14>;
+ reg = <0x000041e0 0x14>;
};
- ehrpwm_tbclk: clock@4140 {
- compatible = "ti,am654-ehrpwm-tbclk", "syscon";
+ ehrpwm_tbclk: clock-controller@4140 {
+ compatible = "ti,am654-ehrpwm-tbclk";
reg = <0x4140 0x18>;
#clock-cells = <1>;
};
@@ -439,7 +600,7 @@
};
main_navss: bus@30800000 {
- compatible = "simple-mfd";
+ compatible = "simple-bus";
#address-cells = <2>;
#size-cells = <2>;
ranges = <0x0 0x30800000 0x0 0x30800000 0x0 0xbc00000>;
@@ -497,6 +658,7 @@
ti,mbox-num-users = <4>;
ti,mbox-num-fifos = <16>;
interrupt-parent = <&intr_main_navss>;
+ status = "disabled";
};
mailbox0_cluster1: mailbox@31f81000 {
@@ -506,6 +668,7 @@
ti,mbox-num-users = <4>;
ti,mbox-num-fifos = <16>;
interrupt-parent = <&intr_main_navss>;
+ status = "disabled";
};
mailbox0_cluster2: mailbox@31f82000 {
@@ -515,6 +678,7 @@
ti,mbox-num-users = <4>;
ti,mbox-num-fifos = <16>;
interrupt-parent = <&intr_main_navss>;
+ status = "disabled";
};
mailbox0_cluster3: mailbox@31f83000 {
@@ -524,6 +688,7 @@
ti,mbox-num-users = <4>;
ti,mbox-num-fifos = <16>;
interrupt-parent = <&intr_main_navss>;
+ status = "disabled";
};
mailbox0_cluster4: mailbox@31f84000 {
@@ -533,6 +698,7 @@
ti,mbox-num-users = <4>;
ti,mbox-num-fifos = <16>;
interrupt-parent = <&intr_main_navss>;
+ status = "disabled";
};
mailbox0_cluster5: mailbox@31f85000 {
@@ -542,6 +708,7 @@
ti,mbox-num-users = <4>;
ti,mbox-num-fifos = <16>;
interrupt-parent = <&intr_main_navss>;
+ status = "disabled";
};
mailbox0_cluster6: mailbox@31f86000 {
@@ -551,6 +718,7 @@
ti,mbox-num-users = <4>;
ti,mbox-num-fifos = <16>;
interrupt-parent = <&intr_main_navss>;
+ status = "disabled";
};
mailbox0_cluster7: mailbox@31f87000 {
@@ -560,6 +728,7 @@
ti,mbox-num-users = <4>;
ti,mbox-num-fifos = <16>;
interrupt-parent = <&intr_main_navss>;
+ status = "disabled";
};
mailbox0_cluster8: mailbox@31f88000 {
@@ -569,6 +738,7 @@
ti,mbox-num-users = <4>;
ti,mbox-num-fifos = <16>;
interrupt-parent = <&intr_main_navss>;
+ status = "disabled";
};
mailbox0_cluster9: mailbox@31f89000 {
@@ -578,6 +748,7 @@
ti,mbox-num-users = <4>;
ti,mbox-num-fifos = <16>;
interrupt-parent = <&intr_main_navss>;
+ status = "disabled";
};
mailbox0_cluster10: mailbox@31f8a000 {
@@ -587,6 +758,7 @@
ti,mbox-num-users = <4>;
ti,mbox-num-fifos = <16>;
interrupt-parent = <&intr_main_navss>;
+ status = "disabled";
};
mailbox0_cluster11: mailbox@31f8b000 {
@@ -596,15 +768,17 @@
ti,mbox-num-users = <4>;
ti,mbox-num-fifos = <16>;
interrupt-parent = <&intr_main_navss>;
+ status = "disabled";
};
ringacc: ringacc@3c000000 {
compatible = "ti,am654-navss-ringacc";
- reg = <0x0 0x3c000000 0x0 0x400000>,
- <0x0 0x38000000 0x0 0x400000>,
- <0x0 0x31120000 0x0 0x100>,
- <0x0 0x33000000 0x0 0x40000>;
- reg-names = "rt", "fifos", "proxy_gcfg", "proxy_target";
+ reg = <0x0 0x3c000000 0x0 0x400000>,
+ <0x0 0x38000000 0x0 0x400000>,
+ <0x0 0x31120000 0x0 0x100>,
+ <0x0 0x33000000 0x0 0x40000>,
+ <0x0 0x31080000 0x0 0x40000>;
+ reg-names = "rt", "fifos", "proxy_gcfg", "proxy_target", "cfg";
ti,num-rings = <818>;
ti,sci-rm-range-gp-rings = <0x1>; /* GP ring range */
ti,sci = <&dmsc>;
@@ -614,9 +788,9 @@
main_udmap: dma-controller@31150000 {
compatible = "ti,am654-navss-main-udmap";
- reg = <0x0 0x31150000 0x0 0x100>,
- <0x0 0x34000000 0x0 0x100000>,
- <0x0 0x35000000 0x0 0x100000>;
+ reg = <0x0 0x31150000 0x0 0x100>,
+ <0x0 0x34000000 0x0 0x100000>,
+ <0x0 0x35000000 0x0 0x100000>;
reg-names = "gcfg", "rchanrt", "tchanrt";
msi-parent = <&inta_main_udmass>;
#dma-cells = <1>;
@@ -687,15 +861,15 @@
pcie0_rc: pcie@5500000 {
compatible = "ti,am654-pcie-rc";
- reg = <0x0 0x5500000 0x0 0x1000>, <0x0 0x5501000 0x0 0x1000>, <0x0 0x10000000 0x0 0x2000>, <0x0 0x5506000 0x0 0x1000>;
+ reg = <0x0 0x5500000 0x0 0x1000>, <0x0 0x5501000 0x0 0x1000>, <0x0 0x10000000 0x0 0x2000>, <0x0 0x5506000 0x0 0x1000>;
reg-names = "app", "dbics", "config", "atu";
power-domains = <&k3_pds 120 TI_SCI_PD_EXCLUSIVE>;
#address-cells = <3>;
#size-cells = <2>;
- ranges = <0x81000000 0 0 0x0 0x10020000 0 0x00010000
- 0x82000000 0 0x10030000 0x0 0x10030000 0 0x07FD0000>;
- ti,syscon-pcie-id = <&pcie_devid>;
- ti,syscon-pcie-mode = <&pcie0_mode>;
+ ranges = <0x81000000 0 0 0x0 0x10020000 0 0x00010000>,
+ <0x82000000 0 0x10030000 0x0 0x10030000 0 0x07FD0000>;
+ ti,syscon-pcie-id = <&scm_conf 0x210>;
+ ti,syscon-pcie-mode = <&scm_conf 0x4060>;
bus-range = <0x0 0xff>;
num-viewport = <16>;
max-link-speed = <2>;
@@ -703,32 +877,34 @@
interrupts = <GIC_SPI 340 IRQ_TYPE_EDGE_RISING>;
msi-map = <0x0 &gic_its 0x0 0x10000>;
device_type = "pci";
+ status = "disabled";
};
pcie0_ep: pcie-ep@5500000 {
compatible = "ti,am654-pcie-ep";
- reg = <0x0 0x5500000 0x0 0x1000>, <0x0 0x5501000 0x0 0x1000>, <0x0 0x10000000 0x0 0x8000000>, <0x0 0x5506000 0x0 0x1000>;
+ reg = <0x0 0x5500000 0x0 0x1000>, <0x0 0x5501000 0x0 0x1000>, <0x0 0x10000000 0x0 0x8000000>, <0x0 0x5506000 0x0 0x1000>;
reg-names = "app", "dbics", "addr_space", "atu";
power-domains = <&k3_pds 120 TI_SCI_PD_EXCLUSIVE>;
- ti,syscon-pcie-mode = <&pcie0_mode>;
+ ti,syscon-pcie-mode = <&scm_conf 0x4060>;
num-ib-windows = <16>;
num-ob-windows = <16>;
max-link-speed = <2>;
dma-coherent;
interrupts = <GIC_SPI 340 IRQ_TYPE_EDGE_RISING>;
+ status = "disabled";
};
pcie1_rc: pcie@5600000 {
compatible = "ti,am654-pcie-rc";
- reg = <0x0 0x5600000 0x0 0x1000>, <0x0 0x5601000 0x0 0x1000>, <0x0 0x18000000 0x0 0x2000>, <0x0 0x5606000 0x0 0x1000>;
+ reg = <0x0 0x5600000 0x0 0x1000>, <0x0 0x5601000 0x0 0x1000>, <0x0 0x18000000 0x0 0x2000>, <0x0 0x5606000 0x0 0x1000>;
reg-names = "app", "dbics", "config", "atu";
power-domains = <&k3_pds 121 TI_SCI_PD_EXCLUSIVE>;
#address-cells = <3>;
#size-cells = <2>;
- ranges = <0x81000000 0 0 0x0 0x18020000 0 0x00010000
- 0x82000000 0 0x18030000 0x0 0x18030000 0 0x07FD0000>;
- ti,syscon-pcie-id = <&pcie_devid>;
- ti,syscon-pcie-mode = <&pcie1_mode>;
+ ranges = <0x81000000 0 0 0x0 0x18020000 0 0x00010000>,
+ <0x82000000 0 0x18030000 0x0 0x18030000 0 0x07FD0000>;
+ ti,syscon-pcie-id = <&scm_conf 0x210>;
+ ti,syscon-pcie-mode = <&scm_conf 0x4070>;
bus-range = <0x0 0xff>;
num-viewport = <16>;
max-link-speed = <2>;
@@ -736,19 +912,21 @@
interrupts = <GIC_SPI 355 IRQ_TYPE_EDGE_RISING>;
msi-map = <0x0 &gic_its 0x10000 0x10000>;
device_type = "pci";
+ status = "disabled";
};
pcie1_ep: pcie-ep@5600000 {
compatible = "ti,am654-pcie-ep";
- reg = <0x0 0x5600000 0x0 0x1000>, <0x0 0x5601000 0x0 0x1000>, <0x0 0x18000000 0x0 0x4000000>, <0x0 0x5606000 0x0 0x1000>;
+ reg = <0x0 0x5600000 0x0 0x1000>, <0x0 0x5601000 0x0 0x1000>, <0x0 0x18000000 0x0 0x4000000>, <0x0 0x5606000 0x0 0x1000>;
reg-names = "app", "dbics", "addr_space", "atu";
power-domains = <&k3_pds 121 TI_SCI_PD_EXCLUSIVE>;
- ti,syscon-pcie-mode = <&pcie1_mode>;
+ ti,syscon-pcie-mode = <&scm_conf 0x4070>;
num-ib-windows = <16>;
num-ob-windows = <16>;
max-link-speed = <2>;
dma-coherent;
interrupts = <GIC_SPI 355 IRQ_TYPE_EDGE_RISING>;
+ status = "disabled";
};
mcasp0: mcasp@2b00000 {
@@ -766,6 +944,7 @@
clocks = <&k3_clks 104 0>;
clock-names = "fck";
power-domains = <&k3_pds 104 TI_SCI_PD_EXCLUSIVE>;
+ status = "disabled";
};
mcasp1: mcasp@2b10000 {
@@ -783,6 +962,7 @@
clocks = <&k3_clks 105 0>;
clock-names = "fck";
power-domains = <&k3_pds 105 TI_SCI_PD_EXCLUSIVE>;
+ status = "disabled";
};
mcasp2: mcasp@2b20000 {
@@ -800,6 +980,7 @@
clocks = <&k3_clks 106 0>;
clock-names = "fck";
power-domains = <&k3_pds 106 TI_SCI_PD_EXCLUSIVE>;
+ status = "disabled";
};
cal: cal@6f03000 {
@@ -826,13 +1007,13 @@
dss: dss@4a00000 {
compatible = "ti,am65x-dss";
- reg = <0x0 0x04a00000 0x0 0x1000>, /* common */
- <0x0 0x04a02000 0x0 0x1000>, /* vidl1 */
- <0x0 0x04a06000 0x0 0x1000>, /* vid */
- <0x0 0x04a07000 0x0 0x1000>, /* ovr1 */
- <0x0 0x04a08000 0x0 0x1000>, /* ovr2 */
- <0x0 0x04a0a000 0x0 0x1000>, /* vp1 */
- <0x0 0x04a0b000 0x0 0x1000>; /* vp2 */
+ reg = <0x0 0x04a00000 0x0 0x1000>, /* common */
+ <0x0 0x04a02000 0x0 0x1000>, /* vidl1 */
+ <0x0 0x04a06000 0x0 0x1000>, /* vid */
+ <0x0 0x04a07000 0x0 0x1000>, /* ovr1 */
+ <0x0 0x04a08000 0x0 0x1000>, /* ovr2 */
+ <0x0 0x04a0a000 0x0 0x1000>, /* vp1 */
+ <0x0 0x04a0b000 0x0 0x1000>; /* vp2 */
reg-names = "common", "vidl1", "vid",
"ovr1", "ovr2", "vp1", "vp2";
@@ -840,9 +1021,9 @@
power-domains = <&k3_pds 67 TI_SCI_PD_EXCLUSIVE>;
- clocks = <&k3_clks 67 1>,
- <&k3_clks 216 1>,
- <&k3_clks 67 2>;
+ clocks = <&k3_clks 67 1>,
+ <&k3_clks 216 1>,
+ <&k3_clks 67 2>;
clock-names = "fck", "vp1", "vp2";
/*
@@ -870,6 +1051,7 @@
power-domains = <&k3_pds 40 TI_SCI_PD_EXCLUSIVE>;
clocks = <&ehrpwm_tbclk 0>, <&k3_clks 40 0>;
clock-names = "tbclk", "fck";
+ status = "disabled";
};
ehrpwm1: pwm@3010000 {
@@ -879,6 +1061,7 @@
power-domains = <&k3_pds 41 TI_SCI_PD_EXCLUSIVE>;
clocks = <&ehrpwm_tbclk 1>, <&k3_clks 41 0>;
clock-names = "tbclk", "fck";
+ status = "disabled";
};
ehrpwm2: pwm@3020000 {
@@ -888,6 +1071,7 @@
power-domains = <&k3_pds 42 TI_SCI_PD_EXCLUSIVE>;
clocks = <&ehrpwm_tbclk 2>, <&k3_clks 42 0>;
clock-names = "tbclk", "fck";
+ status = "disabled";
};
ehrpwm3: pwm@3030000 {
@@ -897,6 +1081,7 @@
power-domains = <&k3_pds 43 TI_SCI_PD_EXCLUSIVE>;
clocks = <&ehrpwm_tbclk 3>, <&k3_clks 43 0>;
clock-names = "tbclk", "fck";
+ status = "disabled";
};
ehrpwm4: pwm@3040000 {
@@ -906,6 +1091,7 @@
power-domains = <&k3_pds 44 TI_SCI_PD_EXCLUSIVE>;
clocks = <&ehrpwm_tbclk 4>, <&k3_clks 44 0>;
clock-names = "tbclk", "fck";
+ status = "disabled";
};
ehrpwm5: pwm@3050000 {
@@ -915,6 +1101,7 @@
power-domains = <&k3_pds 45 TI_SCI_PD_EXCLUSIVE>;
clocks = <&ehrpwm_tbclk 5>, <&k3_clks 45 0>;
clock-names = "tbclk", "fck";
+ status = "disabled";
};
icssg0: icssg@b000000 {
@@ -964,6 +1151,18 @@
};
};
+ icssg0_iep0: iep@2e000 {
+ compatible = "ti,am654-icss-iep";
+ reg = <0x2e000 0x1000>;
+ clocks = <&icssg0_iepclk_mux>;
+ };
+
+ icssg0_iep1: iep@2f000 {
+ compatible = "ti,am654-icss-iep";
+ reg = <0x2f000 0x1000>;
+ clocks = <&icssg0_iepclk_mux>;
+ };
+
icssg0_mii_rt: mii-rt@32000 {
compatible = "ti,pruss-mii", "syscon";
reg = <0x32000 0x100>;
@@ -1055,6 +1254,7 @@
#address-cells = <1>;
#size-cells = <0>;
bus_freq = <1000000>;
+ status = "disabled";
};
};
@@ -1105,6 +1305,18 @@
};
};
+ icssg1_iep0: iep@2e000 {
+ compatible = "ti,am654-icss-iep";
+ reg = <0x2e000 0x1000>;
+ clocks = <&icssg1_iepclk_mux>;
+ };
+
+ icssg1_iep1: iep@2f000 {
+ compatible = "ti,am654-icss-iep";
+ reg = <0x2f000 0x1000>;
+ clocks = <&icssg1_iepclk_mux>;
+ };
+
icssg1_mii_rt: mii-rt@32000 {
compatible = "ti,pruss-mii", "syscon";
reg = <0x32000 0x100>;
@@ -1196,6 +1408,7 @@
#address-cells = <1>;
#size-cells = <0>;
bus_freq = <1000000>;
+ status = "disabled";
};
};
@@ -1246,6 +1459,18 @@
};
};
+ icssg2_iep0: iep@2e000 {
+ compatible = "ti,am654-icss-iep";
+ reg = <0x2e000 0x1000>;
+ clocks = <&icssg2_iepclk_mux>;
+ };
+
+ icssg2_iep1: iep@2f000 {
+ compatible = "ti,am654-icss-iep";
+ reg = <0x2f000 0x1000>;
+ clocks = <&icssg2_iepclk_mux>;
+ };
+
icssg2_mii_rt: mii-rt@32000 {
compatible = "ti,pruss-mii", "syscon";
reg = <0x32000 0x100>;
@@ -1337,6 +1562,7 @@
#address-cells = <1>;
#size-cells = <0>;
bus_freq = <1000000>;
+ status = "disabled";
};
};
};
diff --git a/arch/arm/dts/k3-am65-mcu.dtsi b/arch/arm/dts/k3-am65-mcu.dtsi
index c93ff1520a0e2..edd5cfbec40e6 100644
--- a/arch/arm/dts/k3-am65-mcu.dtsi
+++ b/arch/arm/dts/k3-am65-mcu.dtsi
@@ -20,13 +20,32 @@
};
};
+ /* MCU_TIMERIO pad input CTRLMMR_MCU_TIMER*_CTRL registers */
+ mcu_timerio_input: pinctrl@40f04200 {
+ compatible = "pinctrl-single";
+ reg = <0x0 0x40f04200 0x0 0x10>;
+ #pinctrl-cells = <1>;
+ pinctrl-single,register-width = <32>;
+ pinctrl-single,function-mask = <0x00000101>;
+ };
+
+ /* MCU_TIMERIO pad output CTRLMMR_MCU_TIMERIO*_CTRL registers */
+ mcu_timerio_output: pinctrl@40f04280 {
+ compatible = "pinctrl-single";
+ reg = <0x0 0x40f04280 0x0 0x8>;
+ #pinctrl-cells = <1>;
+ pinctrl-single,register-width = <32>;
+ pinctrl-single,function-mask = <0x00000003>;
+ };
+
mcu_uart0: serial@40a00000 {
compatible = "ti,am654-uart";
- reg = <0x00 0x40a00000 0x00 0x100>;
- interrupts = <GIC_SPI 565 IRQ_TYPE_LEVEL_HIGH>;
- clock-frequency = <96000000>;
- current-speed = <115200>;
- power-domains = <&k3_pds 149 TI_SCI_PD_EXCLUSIVE>;
+ reg = <0x00 0x40a00000 0x00 0x100>;
+ interrupts = <GIC_SPI 565 IRQ_TYPE_LEVEL_HIGH>;
+ clock-frequency = <96000000>;
+ current-speed = <115200>;
+ power-domains = <&k3_pds 149 TI_SCI_PD_EXCLUSIVE>;
+ status = "disabled";
};
mcu_ram: sram@41c00000 {
@@ -46,6 +65,7 @@
clock-names = "fck";
clocks = <&k3_clks 114 1>;
power-domains = <&k3_pds 114 TI_SCI_PD_EXCLUSIVE>;
+ status = "disabled";
};
mcu_spi0: spi@40300000 {
@@ -56,6 +76,7 @@
power-domains = <&k3_pds 142 TI_SCI_PD_EXCLUSIVE>;
#address-cells = <1>;
#size-cells = <0>;
+ status = "disabled";
};
mcu_spi1: spi@40310000 {
@@ -66,6 +87,7 @@
power-domains = <&k3_pds 143 TI_SCI_PD_EXCLUSIVE>;
#address-cells = <1>;
#size-cells = <0>;
+ status = "disabled";
};
mcu_spi2: spi@40320000 {
@@ -76,6 +98,7 @@
power-domains = <&k3_pds 144 TI_SCI_PD_EXCLUSIVE>;
#address-cells = <1>;
#size-cells = <0>;
+ status = "disabled";
};
tscadc0: tscadc@40200000 {
@@ -85,10 +108,11 @@
clocks = <&k3_clks 0 2>;
assigned-clocks = <&k3_clks 0 2>;
assigned-clock-rates = <60000000>;
- clock-names = "adc_tsc_fck";
+ clock-names = "fck";
dmas = <&mcu_udmap 0x7100>,
<&mcu_udmap 0x7101 >;
dma-names = "fifo0", "fifo1";
+ status = "disabled";
adc {
#io-channel-cells = <1>;
@@ -103,10 +127,11 @@
clocks = <&k3_clks 1 2>;
assigned-clocks = <&k3_clks 1 2>;
assigned-clock-rates = <60000000>;
- clock-names = "adc_tsc_fck";
+ clock-names = "fck";
dmas = <&mcu_udmap 0x7102>,
<&mcu_udmap 0x7103>;
dma-names = "fifo0", "fifo1";
+ status = "disabled";
adc {
#io-channel-cells = <1>;
@@ -114,8 +139,53 @@
};
};
+ /*
+ * The MCU domain timer interrupts are routed only to the ESM module,
+ * and not currently available for Linux. The MCU domain timers are
+ * of limited use without interrupts, and likely reserved by the ESM.
+ */
+ mcu_timer0: timer@40400000 {
+ compatible = "ti,am654-timer";
+ reg = <0x00 0x40400000 0x00 0x400>;
+ clocks = <&k3_clks 35 0>;
+ clock-names = "fck";
+ power-domains = <&k3_pds 35 TI_SCI_PD_EXCLUSIVE>;
+ ti,timer-pwm;
+ status = "reserved";
+ };
+
+ mcu_timer1: timer@40410000 {
+ compatible = "ti,am654-timer";
+ reg = <0x00 0x40410000 0x00 0x400>;
+ clocks = <&k3_clks 36 0>;
+ clock-names = "fck";
+ power-domains = <&k3_pds 36 TI_SCI_PD_EXCLUSIVE>;
+ ti,timer-pwm;
+ status = "reserved";
+ };
+
+ mcu_timer2: timer@40420000 {
+ compatible = "ti,am654-timer";
+ reg = <0x00 0x40420000 0x00 0x400>;
+ clocks = <&k3_clks 37 0>;
+ clock-names = "fck";
+ power-domains = <&k3_pds 37 TI_SCI_PD_EXCLUSIVE>;
+ ti,timer-pwm;
+ status = "reserved";
+ };
+
+ mcu_timer3: timer@40430000 {
+ compatible = "ti,am654-timer";
+ reg = <0x00 0x40430000 0x00 0x400>;
+ clocks = <&k3_clks 38 0>;
+ clock-names = "fck";
+ power-domains = <&k3_pds 38 TI_SCI_PD_EXCLUSIVE>;
+ ti,timer-pwm;
+ status = "reserved";
+ };
+
mcu_navss: bus@28380000 {
- compatible = "simple-mfd";
+ compatible = "simple-bus";
#address-cells = <2>;
#size-cells = <2>;
ranges = <0x00 0x28380000 0x00 0x28380000 0x00 0x03880000>;
@@ -126,11 +196,13 @@
mcu_ringacc: ringacc@2b800000 {
compatible = "ti,am654-navss-ringacc";
- reg = <0x0 0x2b800000 0x0 0x400000>,
- <0x0 0x2b000000 0x0 0x400000>,
- <0x0 0x28590000 0x0 0x100>,
- <0x0 0x2a500000 0x0 0x40000>;
- reg-names = "rt", "fifos", "proxy_gcfg", "proxy_target";
+ reg = <0x0 0x2b800000 0x0 0x400000>,
+ <0x0 0x2b000000 0x0 0x400000>,
+ <0x0 0x28590000 0x0 0x100>,
+ <0x0 0x2a500000 0x0 0x40000>,
+ <0x0 0x28440000 0x0 0x40000>;
+ reg-names = "rt", "fifos", "proxy_gcfg",
+ "proxy_target", "cfg";
ti,num-rings = <286>;
ti,sci-rm-range-gp-rings = <0x1>; /* GP ring range */
ti,sci = <&dmsc>;
@@ -140,9 +212,9 @@
mcu_udmap: dma-controller@285c0000 {
compatible = "ti,am654-navss-mcu-udmap";
- reg = <0x0 0x285c0000 0x0 0x100>,
- <0x0 0x2a800000 0x0 0x40000>,
- <0x0 0x2aa00000 0x0 0x40000>;
+ reg = <0x0 0x285c0000 0x0 0x100>,
+ <0x0 0x2a800000 0x0 0x40000>,
+ <0x0 0x2aa00000 0x0 0x40000>;
reg-names = "gcfg", "rchanrt", "tchanrt";
msi-parent = <&inta_main_udmass>;
#dma-cells = <1>;
@@ -159,7 +231,54 @@
};
};
- fss: fss@47000000 {
+ secure_proxy_mcu: mailbox@2a480000 {
+ compatible = "ti,am654-secure-proxy";
+ #mbox-cells = <1>;
+ reg-names = "target_data", "rt", "scfg";
+ reg = <0x0 0x2a480000 0x0 0x80000>,
+ <0x0 0x2a380000 0x0 0x80000>,
+ <0x0 0x2a400000 0x0 0x80000>;
+ /*
+ * Marked Disabled:
+ * Node is incomplete as it is meant for bootloaders and
+ * firmware on non-MPU processors
+ */
+ status = "disabled";
+ };
+
+ m_can0: can@40528000 {
+ compatible = "bosch,m_can";
+ reg = <0x0 0x40528000 0x0 0x400>,
+ <0x0 0x40500000 0x0 0x4400>;
+ reg-names = "m_can", "message_ram";
+ power-domains = <&k3_pds 102 TI_SCI_PD_EXCLUSIVE>;
+ clocks = <&k3_clks 102 5>, <&k3_clks 102 0>;
+ clock-names = "hclk", "cclk";
+ interrupt-parent = <&gic500>;
+ interrupts = <GIC_SPI 544 IRQ_TYPE_LEVEL_HIGH>,
+ <GIC_SPI 545 IRQ_TYPE_LEVEL_HIGH>;
+ interrupt-names = "int0", "int1";
+ bosch,mram-cfg = <0x0 128 64 64 64 64 32 32>;
+ status = "disabled";
+ };
+
+ m_can1: can@40568000 {
+ compatible = "bosch,m_can";
+ reg = <0x0 0x40568000 0x0 0x400>,
+ <0x0 0x40540000 0x0 0x4400>;
+ reg-names = "m_can", "message_ram";
+ power-domains = <&k3_pds 103 TI_SCI_PD_EXCLUSIVE>;
+ clocks = <&k3_clks 103 5>, <&k3_clks 103 0>;
+ clock-names = "hclk", "cclk";
+ interrupt-parent = <&gic500>;
+ interrupts = <GIC_SPI 547 IRQ_TYPE_LEVEL_HIGH>,
+ <GIC_SPI 548 IRQ_TYPE_LEVEL_HIGH>;
+ interrupt-names = "int0", "int1";
+ bosch,mram-cfg = <0x0 128 64 64 64 64 32 32>;
+ status = "disabled";
+ };
+
+ fss: bus@47000000 {
compatible = "simple-bus";
#address-cells = <2>;
#size-cells = <2>;
@@ -180,6 +299,7 @@
power-domains = <&k3_pds 248 TI_SCI_PD_EXCLUSIVE>;
#address-cells = <1>;
#size-cells = <0>;
+ status = "disabled";
};
ospi1: spi@47050000 {
@@ -194,6 +314,7 @@
power-domains = <&k3_pds 249 TI_SCI_PD_EXCLUSIVE>;
#address-cells = <1>;
#size-cells = <0>;
+ status = "disabled";
};
};
@@ -243,6 +364,7 @@
clocks = <&k3_clks 5 10>;
clock-names = "fck";
bus_freq = <1000000>;
+ status = "disabled";
};
cpts@3d000 {
diff --git a/arch/arm/dts/k3-am65-wakeup.dtsi b/arch/arm/dts/k3-am65-wakeup.dtsi
index 9d21cdf6fce8f..fd2b998ebddc4 100644
--- a/arch/arm/dts/k3-am65-wakeup.dtsi
+++ b/arch/arm/dts/k3-am65-wakeup.dtsi
@@ -12,8 +12,8 @@
mbox-names = "rx", "tx";
- mboxes= <&secure_proxy_main 11>,
- <&secure_proxy_main 13>;
+ mboxes = <&secure_proxy_main 11>,
+ <&secure_proxy_main 13>;
reg-names = "debug_messages";
reg = <0x44083000 0x1000>;
@@ -54,6 +54,7 @@
clock-frequency = <48000000>;
current-speed = <115200>;
power-domains = <&k3_pds 150 TI_SCI_PD_EXCLUSIVE>;
+ status = "disabled";
};
wkup_i2c0: i2c@42120000 {
@@ -65,6 +66,7 @@
clock-names = "fck";
clocks = <&k3_clks 115 1>;
power-domains = <&k3_pds 115 TI_SCI_PD_EXCLUSIVE>;
+ status = "disabled";
};
intr_wkup_gpio: interrupt-controller@42200000 {
@@ -100,8 +102,4 @@
power-domains = <&k3_pds 80 TI_SCI_PD_EXCLUSIVE>;
#thermal-sensor-cells = <1>;
};
-
- thermal_zones: thermal-zones {
- #include "k3-am654-industrial-thermal.dtsi"
- };
};
diff --git a/arch/arm/dts/k3-am65.dtsi b/arch/arm/dts/k3-am65.dtsi
index a9fc1af03f27f..4d7b6155a76b7 100644
--- a/arch/arm/dts/k3-am65.dtsi
+++ b/arch/arm/dts/k3-am65.dtsi
@@ -8,9 +8,10 @@
#include <dt-bindings/gpio/gpio.h>
#include <dt-bindings/interrupt-controller/irq.h>
#include <dt-bindings/interrupt-controller/arm-gic.h>
-#include <dt-bindings/pinctrl/k3.h>
#include <dt-bindings/soc/ti,sci_pm_domain.h>
+#include "k3-pinctrl.h"
+
/ {
model = "Texas Instruments K3 AM654 SoC";
compatible = "ti,am654";
@@ -18,21 +19,6 @@
#address-cells = <2>;
#size-cells = <2>;
- aliases {
- serial0 = &wkup_uart0;
- serial1 = &mcu_uart0;
- serial2 = &main_uart0;
- serial3 = &main_uart1;
- serial4 = &main_uart2;
- i2c0 = &wkup_i2c0;
- i2c1 = &mcu_i2c0;
- i2c2 = &main_i2c0;
- i2c3 = &main_i2c1;
- i2c4 = &main_i2c2;
- i2c5 = &main_i2c3;
- ethernet0 = &cpsw_port1;
- };
-
chosen { };
firmware {
@@ -84,6 +70,7 @@
<0x00 0x46000000 0x00 0x46000000 0x00 0x00200000>,
<0x00 0x47000000 0x00 0x47000000 0x00 0x00068400>,
<0x00 0x50000000 0x00 0x50000000 0x00 0x8000000>,
+ <0x00 0x6f000000 0x00 0x6f000000 0x00 0x00310000>, /* A53 PERIPHBASE */
<0x00 0x70000000 0x00 0x70000000 0x00 0x200000>,
<0x05 0x00000000 0x05 0x00000000 0x01 0x0000000>,
<0x07 0x00000000 0x07 0x00000000 0x01 0x0000000>;
diff --git a/arch/arm/dts/k3-am654-base-board.dts b/arch/arm/dts/k3-am654-base-board.dts
index cfbcebfa37c1d..1637ec5ab5eda 100644
--- a/arch/arm/dts/k3-am654-base-board.dts
+++ b/arch/arm/dts/k3-am654-base-board.dts
@@ -10,12 +10,25 @@
#include <dt-bindings/net/ti-dp83867.h>
/ {
- compatible = "ti,am654-evm", "ti,am654";
+ compatible = "ti,am654-evm", "ti,am654";
model = "Texas Instruments AM654 Base Board";
+ aliases {
+ serial0 = &wkup_uart0;
+ serial1 = &mcu_uart0;
+ serial2 = &main_uart0;
+ i2c0 = &wkup_i2c0;
+ i2c1 = &mcu_i2c0;
+ i2c2 = &main_i2c0;
+ i2c3 = &main_i2c1;
+ i2c4 = &main_i2c2;
+ ethernet0 = &cpsw_port1;
+ mmc0 = &sdhci0;
+ mmc1 = &sdhci1;
+ };
+
chosen {
stdout-path = "serial2:115200n8";
- bootargs = "earlycon=ns16550a,mmio32,0x02800000";
};
memory@80000000 {
@@ -73,20 +86,20 @@
pinctrl-names = "default";
pinctrl-0 = <&push_button_pins_default>;
- sw5 {
+ switch-5 {
label = "GPIO Key USER1";
linux,code = <BTN_0>;
gpios = <&wkup_gpio0 24 GPIO_ACTIVE_LOW>;
};
- sw6 {
+ switch-6 {
label = "GPIO Key USER2";
linux,code = <BTN_1>;
gpios = <&wkup_gpio0 27 GPIO_ACTIVE_LOW>;
};
};
- evm_12v0: fixedregulator-evm12v0 {
+ evm_12v0: regulator-0 {
/* main supply */
compatible = "regulator-fixed";
regulator-name = "evm_12v0";
@@ -96,7 +109,7 @@
regulator-boot-on;
};
- vcc3v3_io: fixedregulator-vcc3v3io {
+ vcc3v3_io: regulator-1 {
/* Output of TPS54334 */
compatible = "regulator-fixed";
regulator-name = "vcc3v3_io";
@@ -107,7 +120,7 @@
vin-supply = <&evm_12v0>;
};
- vdd_mmc1_sd: fixedregulator-sd {
+ vdd_mmc1_sd: regulator-2 {
compatible = "regulator-fixed";
regulator-name = "vdd_mmc1_sd";
regulator-min-microvolt = <3300000>;
@@ -117,24 +130,53 @@
vin-supply = <&vcc3v3_io>;
gpio = <&pca9554 4 GPIO_ACTIVE_HIGH>;
};
+
+ vtt_supply: regulator-3 {
+ compatible = "regulator-fixed";
+ regulator-name = "vtt";
+ pinctrl-names = "default";
+ pinctrl-0 = <&ddr_vtt_pins_default>;
+ regulator-min-microvolt = <3300000>;
+ regulator-max-microvolt = <3300000>;
+ enable-active-high;
+ regulator-always-on;
+ regulator-boot-on;
+ vin-supply = <&vcc3v3_io>;
+ gpio = <&wkup_gpio0 28 GPIO_ACTIVE_HIGH>;
+ };
};
&wkup_pmx0 {
- wkup_i2c0_pins_default: wkup-i2c0-pins-default {
+ wkup_uart0_pins_default: wkup-uart0-default-pins {
+ pinctrl-single,pins = <
+ AM65X_WKUP_IOPAD(0x00a0, PIN_INPUT, 0) /* (AB1) WKUP_UART0_RXD */
+ AM65X_WKUP_IOPAD(0x00a4, PIN_OUTPUT, 0) /* (AB5) WKUP_UART0_TXD */
+ 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 */
+ >;
+ };
+
+ ddr_vtt_pins_default: ddr-vtt-default-pins {
+ pinctrl-single,pins = <
+ AM65X_WKUP_IOPAD(0x0040, PIN_OUTPUT_PULLUP, 7) /* WKUP_GPIO0_28 */
+ >;
+ };
+
+ wkup_i2c0_pins_default: wkup-i2c0-default-pins {
pinctrl-single,pins = <
AM65X_WKUP_IOPAD(0x00e0, PIN_INPUT, 0) /* (AC7) WKUP_I2C0_SCL */
AM65X_WKUP_IOPAD(0x00e4, PIN_INPUT, 0) /* (AD6) WKUP_I2C0_SDA */
>;
};
- push_button_pins_default: push-button-pins-default {
+ push_button_pins_default: push-button-default-pins {
pinctrl-single,pins = <
AM65X_WKUP_IOPAD(0x0030, PIN_INPUT, 7) /* (R5) WKUP_GPIO0_24 */
AM65X_WKUP_IOPAD(0x003c, PIN_INPUT, 7) /* (P2) WKUP_GPIO0_27 */
>;
};
- mcu_fss0_ospi0_pins_default: mcu-fss0-ospi0-pins-default {
+ mcu_fss0_ospi0_pins_default: mcu-fss0-ospi0-default-pins {
pinctrl-single,pins = <
AM65X_WKUP_IOPAD(0x0000, PIN_OUTPUT, 0) /* (V1) MCU_OSPI0_CLK */
AM65X_WKUP_IOPAD(0x0008, PIN_INPUT, 0) /* (U2) MCU_OSPI0_DQS */
@@ -150,13 +192,22 @@
>;
};
- wkup_pca554_default: wkup-pca554-default {
+ wkup_pca554_default: wkup-pca554-default-pins {
pinctrl-single,pins = <
AM65X_WKUP_IOPAD(0x0034, PIN_INPUT, 7) /* (T1) MCU_OSPI1_CLK.WKUP_GPIO0_25 */
>;
};
- mcu_cpsw_pins_default: mcu-cpsw-pins-default {
+ mcu_uart0_pins_default: mcu-uart0-default-pins {
+ pinctrl-single,pins = <
+ AM65X_WKUP_IOPAD(0x0044, PIN_INPUT, 4) /* (P4) MCU_OSPI1_D1.MCU_UART0_RXD */
+ AM65X_WKUP_IOPAD(0x0048, PIN_OUTPUT, 4) /* (P5) MCU_OSPI1_D2.MCU_UART0_TXD */
+ 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 */
+ >;
+ };
+
+ mcu_cpsw_pins_default: mcu-cpsw-default-pins {
pinctrl-single,pins = <
AM65X_WKUP_IOPAD(0x0058, PIN_OUTPUT, 0) /* (N4) MCU_RGMII1_TX_CTL */
AM65X_WKUP_IOPAD(0x005c, PIN_INPUT, 0) /* (N5) MCU_RGMII1_RX_CTL */
@@ -173,16 +224,23 @@
>;
};
- mcu_mdio_pins_default: mcu-mdio1-pins-default {
+ mcu_mdio_pins_default: mcu-mdio1-default-pins {
pinctrl-single,pins = <
AM65X_WKUP_IOPAD(0x008c, PIN_OUTPUT, 0) /* (L1) MCU_MDIO0_MDC */
AM65X_WKUP_IOPAD(0x0088, PIN_INPUT, 0) /* (L4) MCU_MDIO0_MDIO */
>;
};
+
+ mcu_i2c0_pins_default: mcu-i2c0-default-pins {
+ pinctrl-single,pins = <
+ AM65X_WKUP_IOPAD(0x00e8, PIN_INPUT, 0) /* (AD8) MCU_I2C0_SCL */
+ AM65X_WKUP_IOPAD(0x00ec, PIN_INPUT, 0) /* (AD7) MCU_I2C0_SDA */
+ >;
+ };
};
&main_pmx0 {
- main_uart0_pins_default: main-uart0-pins-default {
+ main_uart0_pins_default: main-uart0-default-pins {
pinctrl-single,pins = <
AM65X_IOPAD(0x01e4, PIN_INPUT, 0) /* (AF11) UART0_RXD */
AM65X_IOPAD(0x01e8, PIN_OUTPUT, 0) /* (AE11) UART0_TXD */
@@ -191,14 +249,14 @@
>;
};
- main_i2c2_pins_default: main-i2c2-pins-default {
+ main_i2c2_pins_default: main-i2c2-default-pins {
pinctrl-single,pins = <
AM65X_IOPAD(0x0074, PIN_INPUT, 5) /* (T27) GPMC0_CSn3.I2C2_SCL */
AM65X_IOPAD(0x0070, PIN_INPUT, 5) /* (R25) GPMC0_CSn2.I2C2_SDA */
>;
};
- main_spi0_pins_default: main-spi0-pins-default {
+ main_spi0_pins_default: main-spi0-default-pins {
pinctrl-single,pins = <
AM65X_IOPAD(0x01c4, PIN_INPUT, 0) /* (AH13) SPI0_CLK */
AM65X_IOPAD(0x01c8, PIN_INPUT, 0) /* (AE13) SPI0_D0 */
@@ -207,7 +265,7 @@
>;
};
- main_mmc0_pins_default: main-mmc0-pins-default {
+ main_mmc0_pins_default: main-mmc0-default-pins {
pinctrl-single,pins = <
AM65X_IOPAD(0x01a8, PIN_INPUT_PULLDOWN, 0) /* (B25) MMC0_CLK */
AM65X_IOPAD(0x01ac, PIN_INPUT_PULLUP, 0) /* (B27) MMC0_CMD */
@@ -224,7 +282,7 @@
>;
};
- main_mmc1_pins_default: main-mmc1-pins-default {
+ main_mmc1_pins_default: main-mmc1-default-pins {
pinctrl-single,pins = <
AM65X_IOPAD(0x02d4, PIN_INPUT_PULLDOWN, 0) /* (C27) MMC1_CLK */
AM65X_IOPAD(0x02d8, PIN_INPUT_PULLUP, 0) /* (C28) MMC1_CMD */
@@ -237,7 +295,7 @@
>;
};
- usb1_pins_default: usb1-pins-default {
+ usb1_pins_default: usb1-default-pins {
pinctrl-single,pins = <
AM65X_IOPAD(0x02c0, PIN_OUTPUT, 0) /* (AC8) USB1_DRVVBUS */
>;
@@ -245,21 +303,21 @@
};
&main_pmx1 {
- main_i2c0_pins_default: main-i2c0-pins-default {
+ main_i2c0_pins_default: main-i2c0-default-pins {
pinctrl-single,pins = <
AM65X_IOPAD(0x0000, PIN_INPUT, 0) /* (D20) I2C0_SCL */
AM65X_IOPAD(0x0004, PIN_INPUT, 0) /* (C21) I2C0_SDA */
>;
};
- main_i2c1_pins_default: main-i2c1-pins-default {
+ main_i2c1_pins_default: main-i2c1-default-pins {
pinctrl-single,pins = <
AM65X_IOPAD(0x0008, PIN_INPUT, 0) /* (B21) I2C1_SCL */
AM65X_IOPAD(0x000c, PIN_INPUT, 0) /* (E21) I2C1_SDA */
>;
};
- ecap0_pins_default: ecap0-pins-default {
+ ecap0_pins_default: ecap0-default-pins {
pinctrl-single,pins = <
AM65X_IOPAD(0x0010, PIN_INPUT, 0) /* (D21) ECAP0_IN_APWM_OUT */
>;
@@ -269,19 +327,55 @@
&wkup_uart0 {
/* Wakeup UART is used by System firmware */
status = "reserved";
+ pinctrl-names = "default";
+ pinctrl-0 = <&wkup_uart0_pins_default>;
+};
+
+&mcu_uart0 {
+ status = "okay";
+ pinctrl-names = "default";
+ pinctrl-0 = <&mcu_uart0_pins_default>;
};
&main_uart0 {
+ status = "okay";
pinctrl-names = "default";
pinctrl-0 = <&main_uart0_pins_default>;
power-domains = <&k3_pds 146 TI_SCI_PD_SHARED>;
};
&wkup_i2c0 {
+ status = "okay";
pinctrl-names = "default";
pinctrl-0 = <&wkup_i2c0_pins_default>;
clock-frequency = <400000>;
+ eeprom@50 {
+ /* AT24CM01 */
+ compatible = "atmel,24c1024";
+ reg = <0x50>;
+ };
+
+ vdd_mpu: regulator@60 {
+ compatible = "ti,tps62363";
+ reg = <0x60>;
+ regulator-name = "VDD_MPU";
+ regulator-min-microvolt = <500000>;
+ regulator-max-microvolt = <1770000>;
+ regulator-always-on;
+ regulator-boot-on;
+ ti,vsel0-state-high;
+ ti,vsel1-state-high;
+ ti,enable-vout-discharge;
+ };
+
+ gpio@38 {
+ compatible = "nxp,pca9554";
+ reg = <0x38>;
+ gpio-controller;
+ #gpio-cells = <2>;
+ };
+
pca9554: gpio@39 {
compatible = "nxp,pca9554";
reg = <0x39>;
@@ -296,7 +390,15 @@
};
};
+&mcu_i2c0 {
+ status = "okay";
+ pinctrl-names = "default";
+ pinctrl-0 = <&mcu_i2c0_pins_default>;
+ clock-frequency = <400000>;
+};
+
&main_i2c0 {
+ status = "okay";
pinctrl-names = "default";
pinctrl-0 = <&main_i2c0_pins_default>;
clock-frequency = <400000>;
@@ -310,37 +412,39 @@
};
&main_i2c1 {
+ status = "okay";
pinctrl-names = "default";
pinctrl-0 = <&main_i2c1_pins_default>;
clock-frequency = <400000>;
};
&main_i2c2 {
+ status = "okay";
pinctrl-names = "default";
pinctrl-0 = <&main_i2c2_pins_default>;
clock-frequency = <400000>;
};
&ecap0 {
+ status = "okay";
pinctrl-names = "default";
pinctrl-0 = <&ecap0_pins_default>;
};
&main_spi0 {
+ status = "okay";
pinctrl-names = "default";
pinctrl-0 = <&main_spi0_pins_default>;
#address-cells = <1>;
- #size-cells= <0>;
+ #size-cells = <0>;
ti,pindir-d0-out-d1-in;
- flash@0{
+ flash@0 {
compatible = "jedec,spi-nor";
reg = <0x0>;
spi-tx-bus-width = <1>;
spi-rx-bus-width = <1>;
spi-max-frequency = <48000000>;
- #address-cells = <1>;
- #size-cells= <1>;
};
};
@@ -381,12 +485,14 @@
};
&tscadc0 {
+ status = "okay";
adc {
ti,adc-channels = <0 1 2 3 4 5 6 7>;
};
};
&tscadc1 {
+ status = "okay";
adc {
ti,adc-channels = <0 1 2 3 4 5 6 7>;
};
@@ -400,23 +506,8 @@
status = "disabled";
};
-&pcie0_rc {
- status = "disabled";
-};
-
-&pcie0_ep {
- status = "disabled";
-};
-
-&pcie1_rc {
- status = "disabled";
-};
-
-&pcie1_ep {
- status = "disabled";
-};
-
&mailbox0_cluster0 {
+ status = "okay";
interrupts = <436>;
mbox_mcu_r5fss0_core0: mbox-mcu-r5fss0-core0 {
@@ -426,6 +517,7 @@
};
&mailbox0_cluster1 {
+ status = "okay";
interrupts = <432>;
mbox_mcu_r5fss0_core1: mbox-mcu-r5fss0-core1 {
@@ -434,63 +526,24 @@
};
};
-&mailbox0_cluster2 {
- status = "disabled";
-};
-
-&mailbox0_cluster3 {
- status = "disabled";
-};
-
-&mailbox0_cluster4 {
- status = "disabled";
-};
-
-&mailbox0_cluster5 {
- status = "disabled";
-};
-
-&mailbox0_cluster6 {
- status = "disabled";
-};
-
-&mailbox0_cluster7 {
- status = "disabled";
-};
-
-&mailbox0_cluster8 {
- status = "disabled";
-};
-
-&mailbox0_cluster9 {
- status = "disabled";
-};
-
-&mailbox0_cluster10 {
- status = "disabled";
-};
-
-&mailbox0_cluster11 {
- status = "disabled";
-};
-
&mcu_r5fss0_core0 {
memory-region = <&mcu_r5fss0_core0_dma_memory_region>,
<&mcu_r5fss0_core0_memory_region>;
- mboxes = <&mailbox0_cluster0 &mbox_mcu_r5fss0_core0>;
+ mboxes = <&mailbox0_cluster0>, <&mbox_mcu_r5fss0_core0>;
};
&mcu_r5fss0_core1 {
memory-region = <&mcu_r5fss0_core1_dma_memory_region>,
<&mcu_r5fss0_core1_memory_region>;
- mboxes = <&mailbox0_cluster1 &mbox_mcu_r5fss0_core1>;
+ mboxes = <&mailbox0_cluster1>, <&mbox_mcu_r5fss0_core1>;
};
&ospi0 {
+ status = "okay";
pinctrl-names = "default";
pinctrl-0 = <&mcu_fss0_ospi0_pins_default>;
- flash@0{
+ flash@0 {
compatible = "jedec,spi-nor";
reg = <0x0>;
spi-tx-bus-width = <8>;
@@ -501,17 +554,65 @@
cdns,tchsh-ns = <60>;
cdns,tslch-ns = <60>;
cdns,read-delay = <0>;
- #address-cells = <1>;
- #size-cells = <1>;
+
+ partitions {
+ compatible = "fixed-partitions";
+ #address-cells = <1>;
+ #size-cells = <1>;
+
+ partition@0 {
+ label = "ospi.tiboot3";
+ reg = <0x0 0x80000>;
+ };
+
+ partition@80000 {
+ label = "ospi.tispl";
+ reg = <0x80000 0x200000>;
+ };
+
+ partition@280000 {
+ label = "ospi.u-boot";
+ reg = <0x280000 0x400000>;
+ };
+
+ partition@680000 {
+ label = "ospi.env";
+ reg = <0x680000 0x20000>;
+ };
+
+ partition@6a0000 {
+ label = "ospi.env.backup";
+ reg = <0x6a0000 0x20000>;
+ };
+
+ partition@6c0000 {
+ label = "ospi.sysfw";
+ reg = <0x6c0000 0x100000>;
+ };
+
+ partition@800000 {
+ label = "ospi.rootfs";
+ reg = <0x800000 0x37c0000>;
+ };
+
+ partition@3fe0000 {
+ label = "ospi.phypattern";
+ reg = <0x3fe0000 0x20000>;
+ };
+ };
};
};
&mcu_cpsw {
pinctrl-names = "default";
- pinctrl-0 = <&mcu_cpsw_pins_default &mcu_mdio_pins_default>;
+ pinctrl-0 = <&mcu_cpsw_pins_default>;
};
&davinci_mdio {
+ status = "okay";
+ pinctrl-names = "default";
+ pinctrl-0 = <&mcu_mdio_pins_default>;
+
phy0: ethernet-phy@0 {
reg = <0>;
ti,rx-internal-delay = <DP83867_RGMIIDCTL_2_00_NS>;
@@ -524,30 +625,6 @@
phy-handle = <&phy0>;
};
-&mcasp0 {
- status = "disabled";
-};
-
-&mcasp1 {
- status = "disabled";
-};
-
-&mcasp2 {
- status = "disabled";
-};
-
&dss {
status = "disabled";
};
-
-&icssg0_mdio {
- status = "disabled";
-};
-
-&icssg1_mdio {
- status = "disabled";
-};
-
-&icssg2_mdio {
- status = "disabled";
-};
diff --git a/arch/arm/dts/k3-am654.dtsi b/arch/arm/dts/k3-am654.dtsi
index f0a6541b80428..888567b921f0a 100644
--- a/arch/arm/dts/k3-am654.dtsi
+++ b/arch/arm/dts/k3-am654.dtsi
@@ -93,6 +93,7 @@
L2_0: l2-cache0 {
compatible = "cache";
cache-level = <2>;
+ cache-unified;
cache-size = <0x80000>;
cache-line-size = <64>;
cache-sets = <512>;
@@ -102,6 +103,7 @@
L2_1: l2-cache1 {
compatible = "cache";
cache-level = <2>;
+ cache-unified;
cache-size = <0x80000>;
cache-line-size = <64>;
cache-sets = <512>;
@@ -111,5 +113,10 @@
msmc_l3: l3-cache0 {
compatible = "cache";
cache-level = <3>;
+ cache-unified;
+ };
+
+ thermal_zones: thermal-zones {
+ #include "k3-am654-industrial-thermal.dtsi"
};
};
--
2.43.0
^ permalink raw reply related [flat|nested] 56+ messages in thread
* [PATCH v2 05/26] arm: dts: k3-am654: copy bootph properties to a53 dts
2023-12-29 17:46 [PATCH v2 00/26] sync am65x device tree with Linux v6.7-rc1 Bryan Brattlof
` (3 preceding siblings ...)
2023-12-29 17:47 ` [PATCH v2 04/26] arm: dts: k3-am654: pull in dtb update from Linux Bryan Brattlof
@ 2023-12-29 17:47 ` Bryan Brattlof
2024-01-02 18:48 ` Nishanth Menon
2023-12-29 17:47 ` [PATCH v2 06/26] arm: dts: k3-am654: include a53 board dtb for r5 build Bryan Brattlof
` (22 subsequent siblings)
27 siblings, 1 reply; 56+ messages in thread
From: Bryan Brattlof @ 2023-12-29 17:47 UTC (permalink / raw)
To: Tom Rini
Cc: UBoot Mailing List, Vignesh Raghavendra, Andrew Davis,
Nishanth Menon, Neha Malcom Francis, Manorit Chawdhry,
Martyn Welch, Svyatoslav Ryhel, Marcel Ziswiler, Simon Glass,
Jan Kiszka, Bryan Brattlof
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
^ permalink raw reply related [flat|nested] 56+ messages in thread
* [PATCH v2 06/26] arm: dts: k3-am654: include a53 board dtb for r5 build
2023-12-29 17:46 [PATCH v2 00/26] sync am65x device tree with Linux v6.7-rc1 Bryan Brattlof
` (4 preceding siblings ...)
2023-12-29 17:47 ` [PATCH v2 05/26] arm: dts: k3-am654: copy bootph properties to a53 dts Bryan Brattlof
@ 2023-12-29 17:47 ` 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
` (21 subsequent siblings)
27 siblings, 1 reply; 56+ messages in thread
From: Bryan Brattlof @ 2023-12-29 17:47 UTC (permalink / raw)
To: Tom Rini
Cc: UBoot Mailing List, Vignesh Raghavendra, Andrew Davis,
Nishanth Menon, Neha Malcom Francis, Manorit Chawdhry,
Martyn Welch, Svyatoslav Ryhel, Marcel Ziswiler, Simon Glass,
Jan Kiszka, Bryan Brattlof
To make things as organized as possible, start from the Linux board dtbs
and apply all properties needed for U-Boot in our *-u-boot.dtsi file for
the MAIN SPL and U-Boot builds.
We can then include these files for the WKUP SPL build making further
edits to the needed properties and nodes for the WKUP SPL bootloader's
view of the am65x.
Tested-by: Tom Rini <trini@konsulko.com>
Signed-off-by: Bryan Brattlof <bb@ti.com>
---
arch/arm/dts/k3-am654-r5-base-board.dts | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/arch/arm/dts/k3-am654-r5-base-board.dts b/arch/arm/dts/k3-am654-r5-base-board.dts
index 8f55dab508ee6..79ca6387c22bb 100644
--- a/arch/arm/dts/k3-am654-r5-base-board.dts
+++ b/arch/arm/dts/k3-am654-r5-base-board.dts
@@ -5,7 +5,8 @@
/dts-v1/;
-#include "k3-am654.dtsi"
+#include "k3-am654-base-board.dts"
+#include "k3-am654-base-board-u-boot.dtsi"
#include "k3-am654-base-board-ddr4-1600MTs.dtsi"
#include "k3-am654-ddr.dtsi"
--
2.43.0
^ permalink raw reply related [flat|nested] 56+ messages in thread
* [PATCH v2 07/26] arm: dts: k3-am654: remove duplicate vtt_supply
2023-12-29 17:46 [PATCH v2 00/26] sync am65x device tree with Linux v6.7-rc1 Bryan Brattlof
` (5 preceding siblings ...)
2023-12-29 17:47 ` [PATCH v2 06/26] arm: dts: k3-am654: include a53 board dtb for r5 build Bryan Brattlof
@ 2023-12-29 17:47 ` 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
` (20 subsequent siblings)
27 siblings, 1 reply; 56+ messages in thread
From: Bryan Brattlof @ 2023-12-29 17:47 UTC (permalink / raw)
To: Tom Rini
Cc: UBoot Mailing List, Vignesh Raghavendra, Andrew Davis,
Nishanth Menon, Neha Malcom Francis, Manorit Chawdhry,
Martyn Welch, Svyatoslav Ryhel, Marcel Ziswiler, Simon Glass,
Jan Kiszka, Bryan Brattlof
With the Linux and U-Boot board dtb files unified we now have a
duplicate vtt_supply node. Remove it
Tested-by: Tom Rini <trini@konsulko.com>
Signed-off-by: Bryan Brattlof <bb@ti.com>
---
arch/arm/dts/k3-am654-r5-base-board.dts | 9 ---------
1 file changed, 9 deletions(-)
diff --git a/arch/arm/dts/k3-am654-r5-base-board.dts b/arch/arm/dts/k3-am654-r5-base-board.dts
index 79ca6387c22bb..50e6be6118294 100644
--- a/arch/arm/dts/k3-am654-r5-base-board.dts
+++ b/arch/arm/dts/k3-am654-r5-base-board.dts
@@ -46,15 +46,6 @@
ti,sci-host-id = <10>;
bootph-pre-ram;
};
-
- vtt_supply: vtt_supply {
- compatible = "regulator-gpio";
- regulator-name = "vtt";
- regulator-min-microvolt = <0>;
- regulator-max-microvolt = <3300000>;
- gpios = <&wkup_gpio0 28 GPIO_ACTIVE_HIGH>;
- states = <0 0x0 3300000 0x1>;
- };
};
&cbass_main {
--
2.43.0
^ permalink raw reply related [flat|nested] 56+ messages in thread
* [PATCH v2 08/26] arm: dts: k3-am654: remove duplicate wkup_uart0
2023-12-29 17:46 [PATCH v2 00/26] sync am65x device tree with Linux v6.7-rc1 Bryan Brattlof
` (6 preceding siblings ...)
2023-12-29 17:47 ` [PATCH v2 07/26] arm: dts: k3-am654: remove duplicate vtt_supply Bryan Brattlof
@ 2023-12-29 17:47 ` 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
` (19 subsequent siblings)
27 siblings, 1 reply; 56+ messages in thread
From: Bryan Brattlof @ 2023-12-29 17:47 UTC (permalink / raw)
To: Tom Rini
Cc: UBoot Mailing List, Vignesh Raghavendra, Andrew Davis,
Nishanth Menon, Neha Malcom Francis, Manorit Chawdhry,
Martyn Welch, Svyatoslav Ryhel, Marcel Ziswiler, Simon Glass,
Jan Kiszka, Bryan Brattlof
With the Linux and U-Boot board files unified, we now have a duplicate
wkup_uart0 node. Remove it
Tested-by: Tom Rini <trini@konsulko.com>
Signed-off-by: Bryan Brattlof <bb@ti.com>
---
arch/arm/dts/k3-am654-r5-base-board.dts | 12 ------------
1 file changed, 12 deletions(-)
diff --git a/arch/arm/dts/k3-am654-r5-base-board.dts b/arch/arm/dts/k3-am654-r5-base-board.dts
index 50e6be6118294..fb13a17b1dc64 100644
--- a/arch/arm/dts/k3-am654-r5-base-board.dts
+++ b/arch/arm/dts/k3-am654-r5-base-board.dts
@@ -18,7 +18,6 @@
ethernet0 = &cpsw_port1;
remoteproc0 = &sysctrler;
remoteproc1 = &a53_0;
- serial0 = &wkup_uart0;
serial1 = &mcu_uart0;
serial2 = &main_uart0;
spi0 = &ospi0;
@@ -117,8 +116,6 @@
};
&wkup_uart0 {
- pinctrl-names = "default";
- pinctrl-0 = <&wkup_uart0_pins_default>;
status = "okay";
bootph-pre-ram;
};
@@ -146,15 +143,6 @@
};
&wkup_pmx0 {
- wkup_uart0_pins_default: wkup_uart0_pins_default {
- pinctrl-single,pins = <
- AM65X_WKUP_IOPAD(0x00a0, PIN_INPUT, 0) /* (AB1) WKUP_UART0_RXD */
- AM65X_WKUP_IOPAD(0x00a4, PIN_OUTPUT, 0) /* (AB5) WKUP_UART0_TXD */
- 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 */
- >;
- };
-
wkup_vtt_pins_default: wkup_vtt_pins_default {
pinctrl-single,pins = <
AM65X_WKUP_IOPAD(0x0040, PIN_OUTPUT_PULLUP, 7) /* WKUP_GPIO0_28 */
--
2.43.0
^ permalink raw reply related [flat|nested] 56+ messages in thread
* [PATCH v2 09/26] arm: dts: k3-am654: remove duplicate timer
2023-12-29 17:46 [PATCH v2 00/26] sync am65x device tree with Linux v6.7-rc1 Bryan Brattlof
` (7 preceding siblings ...)
2023-12-29 17:47 ` [PATCH v2 08/26] arm: dts: k3-am654: remove duplicate wkup_uart0 Bryan Brattlof
@ 2023-12-29 17:47 ` 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
` (18 subsequent siblings)
27 siblings, 1 reply; 56+ messages in thread
From: Bryan Brattlof @ 2023-12-29 17:47 UTC (permalink / raw)
To: Tom Rini
Cc: UBoot Mailing List, Vignesh Raghavendra, Andrew Davis,
Nishanth Menon, Neha Malcom Francis, Manorit Chawdhry,
Martyn Welch, Svyatoslav Ryhel, Marcel Ziswiler, Simon Glass,
Jan Kiszka, Bryan Brattlof
timer1 is really just the mcu_timer0 node redefined for the WKUP SPL.
Remove the timer1 and replace it with the mcu_timer0 from the Linux
device tree we imported into U-Boot.
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 | 12 ++++++++
arch/arm/dts/k3-am654-r5-base-board.dts | 30 ++++++++++----------
2 files changed, 27 insertions(+), 15 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 4b1e8ce2c920c..a008af5b4a047 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,18 @@
#include "k3-am65x-binman.dtsi"
+/ {
+ chosen {
+ tick-timer = &mcu_timer0;
+ };
+};
+
+&mcu_timer0 {
+ ti,timer-alwon;
+ clock-frequency = <25000000>;
+ bootph-all;
+};
+
&vtt_supply {
bootph-pre-ram;
};
diff --git a/arch/arm/dts/k3-am654-r5-base-board.dts b/arch/arm/dts/k3-am654-r5-base-board.dts
index fb13a17b1dc64..f462262b9aaac 100644
--- a/arch/arm/dts/k3-am654-r5-base-board.dts
+++ b/arch/arm/dts/k3-am654-r5-base-board.dts
@@ -26,11 +26,6 @@
usb1 = &usb1;
};
- chosen {
- stdout-path = "serial2:115200n8";
- tick-timer = &timer1;
- };
-
a53_0: a53@0 {
compatible = "ti,am654-rproc";
reg = <0x0 0x00a90000 0x0 0x10>;
@@ -47,16 +42,6 @@
};
};
-&cbass_main {
- timer1: timer@40400000 {
- compatible = "ti,omap5430-timer";
- reg = <0x0 0x40400000 0x0 0x80>;
- ti,timer-alwon;
- clock-frequency = <25000000>;
- bootph-all;
- };
-};
-
&cbass_mcu {
mcu_secproxy: secproxy@28380000 {
compatible = "ti,am654-secure-proxy";
@@ -108,6 +93,21 @@
};
};
+/*
+ * timer init is called as part of rproc_start() while
+ * starting System Firmware, so any clock/power-domain
+ * operations will fail as SYSFW is not yet up and running.
+ * Delete all clock/power-domain properties to avoid
+ * timer init failure.
+ * This is an always on timer at 20MHz.
+ */
+&mcu_timer0 {
+ /delete-property/ clocks;
+ /delete-property/ assigned-clocks;
+ /delete-property/ assigned-clock-parents;
+ /delete-property/ power-domains;
+};
+
&dmsc {
mboxes= <&mcu_secproxy 8>, <&mcu_secproxy 6>, <&mcu_secproxy 5>;
mbox-names = "tx", "rx", "notify";
--
2.43.0
^ permalink raw reply related [flat|nested] 56+ messages in thread
* [PATCH v2 10/26] arm: dts: k3-am654: remove duplicate mcu_ringacc
2023-12-29 17:46 [PATCH v2 00/26] sync am65x device tree with Linux v6.7-rc1 Bryan Brattlof
` (8 preceding siblings ...)
2023-12-29 17:47 ` [PATCH v2 09/26] arm: dts: k3-am654: remove duplicate timer Bryan Brattlof
@ 2023-12-29 17:47 ` 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
` (17 subsequent siblings)
27 siblings, 1 reply; 56+ messages in thread
From: Bryan Brattlof @ 2023-12-29 17:47 UTC (permalink / raw)
To: Tom Rini
Cc: UBoot Mailing List, Vignesh Raghavendra, Andrew Davis,
Nishanth Menon, Neha Malcom Francis, Manorit Chawdhry,
Martyn Welch, Svyatoslav Ryhel, Marcel Ziswiler, Simon Glass,
Jan Kiszka, Bryan Brattlof
With the Linux and U-Boot board dtb files unified, we now have a
duplicate mcu_ringacc node. Remove it
Tested-by: Tom Rini <trini@konsulko.com>
Signed-off-by: Bryan Brattlof <bb@ti.com>
---
arch/arm/dts/k3-am654-r5-base-board.dts | 10 ----------
1 file changed, 10 deletions(-)
diff --git a/arch/arm/dts/k3-am654-r5-base-board.dts b/arch/arm/dts/k3-am654-r5-base-board.dts
index f462262b9aaac..c4fa84a3d0b05 100644
--- a/arch/arm/dts/k3-am654-r5-base-board.dts
+++ b/arch/arm/dts/k3-am654-r5-base-board.dts
@@ -54,16 +54,6 @@
};
mcu_navss: bus@28380000 {
- ringacc@2b800000 {
- reg = <0x0 0x2b800000 0x0 0x400000>,
- <0x0 0x2b000000 0x0 0x400000>,
- <0x0 0x28590000 0x0 0x100>,
- <0x0 0x2a500000 0x0 0x40000>,
- <0x0 0x28440000 0x0 0x40000>;
- reg-names = "rt", "fifos", "proxy_gcfg", "proxy_target", "cfg";
- ti,dma-ring-reset-quirk;
- };
-
dma-controller@285c0000 {
reg = <0x0 0x285c0000 0x0 0x100>,
<0x0 0x284c0000 0x0 0x4000>,
--
2.43.0
^ permalink raw reply related [flat|nested] 56+ messages in thread
* [PATCH v2 11/26] arm: dts: k3-am654: remove duplicate mcu_udmap
2023-12-29 17:46 [PATCH v2 00/26] sync am65x device tree with Linux v6.7-rc1 Bryan Brattlof
` (9 preceding siblings ...)
2023-12-29 17:47 ` [PATCH v2 10/26] arm: dts: k3-am654: remove duplicate mcu_ringacc Bryan Brattlof
@ 2023-12-29 17:47 ` 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
` (16 subsequent siblings)
27 siblings, 1 reply; 56+ messages in thread
From: Bryan Brattlof @ 2023-12-29 17:47 UTC (permalink / raw)
To: Tom Rini
Cc: UBoot Mailing List, Vignesh Raghavendra, Andrew Davis,
Nishanth Menon, Neha Malcom Francis, Manorit Chawdhry,
Martyn Welch, Svyatoslav Ryhel, Marcel Ziswiler, Simon Glass,
Jan Kiszka, Bryan Brattlof
With the Linux and U-Boot board dtb files unified, we now have a
duplicate mcu_udmap node. Remove it
Tested-by: Tom Rini <trini@konsulko.com>
Signed-off-by: Bryan Brattlof <bb@ti.com>
---
arch/arm/dts/k3-am654-r5-base-board.dts | 13 -------------
1 file changed, 13 deletions(-)
diff --git a/arch/arm/dts/k3-am654-r5-base-board.dts b/arch/arm/dts/k3-am654-r5-base-board.dts
index c4fa84a3d0b05..19806ec4e2309 100644
--- a/arch/arm/dts/k3-am654-r5-base-board.dts
+++ b/arch/arm/dts/k3-am654-r5-base-board.dts
@@ -52,19 +52,6 @@
#mbox-cells = <1>;
bootph-pre-ram;
};
-
- mcu_navss: bus@28380000 {
- dma-controller@285c0000 {
- reg = <0x0 0x285c0000 0x0 0x100>,
- <0x0 0x284c0000 0x0 0x4000>,
- <0x0 0x2a800000 0x0 0x40000>,
- <0x0 0x284a0000 0x0 0x4000>,
- <0x0 0x2aa00000 0x0 0x40000>,
- <0x0 0x28400000 0x0 0x2000>;
- reg-names = "gcfg", "rchan", "rchanrt", "tchan",
- "tchanrt", "rflow";
- };
- };
};
&cbass_wakeup {
--
2.43.0
^ permalink raw reply related [flat|nested] 56+ messages in thread
* [PATCH v2 12/26] arm: dts: k3-am654: add needed regs to udmap nodes
2023-12-29 17:46 [PATCH v2 00/26] sync am65x device tree with Linux v6.7-rc1 Bryan Brattlof
` (10 preceding siblings ...)
2023-12-29 17:47 ` [PATCH v2 11/26] arm: dts: k3-am654: remove duplicate mcu_udmap Bryan Brattlof
@ 2023-12-29 17:47 ` 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
` (15 subsequent siblings)
27 siblings, 1 reply; 56+ messages in thread
From: Bryan Brattlof @ 2023-12-29 17:47 UTC (permalink / raw)
To: Tom Rini
Cc: UBoot Mailing List, Vignesh Raghavendra, Andrew Davis,
Nishanth Menon, Neha Malcom Francis, Manorit Chawdhry,
Martyn Welch, Svyatoslav Ryhel, Marcel Ziswiler, Simon Glass,
Jan Kiszka, Bryan Brattlof
Ethernet is one of a few IPs in U-Boot that depend on DMA to operate.
However there are a few missing registers ranges in the udmap nodes
need to properly setup DMA for the am65x.
A fix has been added to the Linux kernel[0] to add these ranges however
they have not made it to a Linux tag. To keep DMA operational until the
next DT sync from Linux, add these ranges to the *-u-boot.dtsi with a
note for our future selves.
[0] https://lore.kernel.org/r/20231213135138.929517-2-vigneshr@ti.com
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 | 34 ++++++++++++++++++++
1 file changed, 34 insertions(+)
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 a008af5b4a047..a24cb895e5578 100644
--- a/arch/arm/dts/k3-am654-base-board-u-boot.dtsi
+++ b/arch/arm/dts/k3-am654-base-board-u-boot.dtsi
@@ -252,3 +252,37 @@
&mcu_r5fss0 {
ti,cluster-mode = <0>;
};
+
+/*
+ * The DMA driver requires a few extra register ranges
+ * which are missing for the am65x. A patch has been
+ * sent and will be synced after the v6.8-rc1 linux
+ * tag is published
+ */
+&main_udmap {
+ reg = <0x0 0x31150000 0x0 0x100>,
+ <0x0 0x34000000 0x0 0x100000>,
+ <0x0 0x35000000 0x0 0x100000>,
+ <0x0 0x30b00000 0x0 0x10000>,
+ <0x0 0x30c00000 0x0 0x10000>,
+ <0x0 0x30d00000 0x0 0x8000>;
+ reg-names = "gcfg", "rchanrt", "tchanrt",
+ "tchan", "rchan", "rflow";
+};
+
+/*
+ * The DMA driver requires a few extra register ranges
+ * which are missing for the am65x. A patch has been
+ * sent and will be synced after the v6.8-rc1 linux
+ * tag is published
+ */
+&mcu_udmap {
+ reg = <0x0 0x285c0000 0x0 0x100>,
+ <0x0 0x2a800000 0x0 0x40000>,
+ <0x0 0x2aa00000 0x0 0x40000>,
+ <0x0 0x284a0000 0x0 0x4000>,
+ <0x0 0x284c0000 0x0 0x4000>,
+ <0x0 0x28400000 0x0 0x2000>;
+ reg-names = "gcfg", "rchanrt", "tchanrt",
+ "tchan", "rchan", "rflow";
+};
--
2.43.0
^ permalink raw reply related [flat|nested] 56+ messages in thread
* [PATCH v2 13/26] arm: dts: k3-am654: remove duplicate mcu_uart0 node
2023-12-29 17:46 [PATCH v2 00/26] sync am65x device tree with Linux v6.7-rc1 Bryan Brattlof
` (11 preceding siblings ...)
2023-12-29 17:47 ` [PATCH v2 12/26] arm: dts: k3-am654: add needed regs to udmap nodes Bryan Brattlof
@ 2023-12-29 17:47 ` 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
` (14 subsequent siblings)
27 siblings, 1 reply; 56+ messages in thread
From: Bryan Brattlof @ 2023-12-29 17:47 UTC (permalink / raw)
To: Tom Rini
Cc: UBoot Mailing List, Vignesh Raghavendra, Andrew Davis,
Nishanth Menon, Neha Malcom Francis, Manorit Chawdhry,
Martyn Welch, Svyatoslav Ryhel, Marcel Ziswiler, Simon Glass,
Jan Kiszka, Bryan Brattlof
With the Linux and U-Boot board dtb files unified we now have a
duplicate mcu_uart0 node. Remove it
Tested-by: Tom Rini <trini@konsulko.com>
Signed-off-by: Bryan Brattlof <bb@ti.com>
---
arch/arm/dts/k3-am654-r5-base-board.dts | 12 ------------
1 file changed, 12 deletions(-)
diff --git a/arch/arm/dts/k3-am654-r5-base-board.dts b/arch/arm/dts/k3-am654-r5-base-board.dts
index 19806ec4e2309..bdee47802b047 100644
--- a/arch/arm/dts/k3-am654-r5-base-board.dts
+++ b/arch/arm/dts/k3-am654-r5-base-board.dts
@@ -18,7 +18,6 @@
ethernet0 = &cpsw_port1;
remoteproc0 = &sysctrler;
remoteproc1 = &a53_0;
- serial1 = &mcu_uart0;
serial2 = &main_uart0;
spi0 = &ospi0;
spi1 = &ospi1;
@@ -98,8 +97,6 @@
};
&mcu_uart0 {
- pinctrl-names = "default";
- pinctrl-0 = <&mcu_uart0_pins_default>;
clock-frequency = <48000000>;
/delete-property/ power-domains;
status = "okay";
@@ -126,15 +123,6 @@
>;
};
- mcu_uart0_pins_default: mcu_uart0_pins_default {
- pinctrl-single,pins = <
- AM65X_WKUP_IOPAD(0x0044, PIN_INPUT, 4) /* (P4) MCU_OSPI1_D1.MCU_UART0_RXD */
- AM65X_WKUP_IOPAD(0x0048, PIN_OUTPUT, 4) /* (P5) MCU_OSPI1_D2.MCU_UART0_TXD */
- 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 */
- >;
- };
-
wkup_i2c0_pins_default: wkup-i2c0-pins-default {
pinctrl-single,pins = <
AM65X_WKUP_IOPAD(0x00e0, PIN_INPUT, 0) /* (AC7) WKUP_I2C0_SCL */
--
2.43.0
^ permalink raw reply related [flat|nested] 56+ messages in thread
* [PATCH v2 14/26] arm: dts: k3-am654: remove duplicate main_uart0
2023-12-29 17:46 [PATCH v2 00/26] sync am65x device tree with Linux v6.7-rc1 Bryan Brattlof
` (12 preceding siblings ...)
2023-12-29 17:47 ` [PATCH v2 13/26] arm: dts: k3-am654: remove duplicate mcu_uart0 node Bryan Brattlof
@ 2023-12-29 17:47 ` 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
` (13 subsequent siblings)
27 siblings, 1 reply; 56+ messages in thread
From: Bryan Brattlof @ 2023-12-29 17:47 UTC (permalink / raw)
To: Tom Rini
Cc: UBoot Mailing List, Vignesh Raghavendra, Andrew Davis,
Nishanth Menon, Neha Malcom Francis, Manorit Chawdhry,
Martyn Welch, Svyatoslav Ryhel, Marcel Ziswiler, Simon Glass,
Jan Kiszka, Bryan Brattlof
With the Linux and U-Boot board dtb files unified, we now have a
duplicate main_uart0 node. Remove it
Tested-by: Tom Rini <trini@konsulko.com>
Signed-off-by: Bryan Brattlof <bb@ti.com>
---
arch/arm/dts/k3-am654-r5-base-board.dts | 17 -----------------
1 file changed, 17 deletions(-)
diff --git a/arch/arm/dts/k3-am654-r5-base-board.dts b/arch/arm/dts/k3-am654-r5-base-board.dts
index bdee47802b047..3d599a5413812 100644
--- a/arch/arm/dts/k3-am654-r5-base-board.dts
+++ b/arch/arm/dts/k3-am654-r5-base-board.dts
@@ -18,7 +18,6 @@
ethernet0 = &cpsw_port1;
remoteproc0 = &sysctrler;
remoteproc1 = &a53_0;
- serial2 = &main_uart0;
spi0 = &ospi0;
spi1 = &ospi1;
usb0 = &usb0;
@@ -103,13 +102,6 @@
bootph-pre-ram;
};
-&main_uart0 {
- pinctrl-names = "default";
- pinctrl-0 = <&main_uart0_pins_default>;
- power-domains = <&k3_pds 146 TI_SCI_PD_SHARED>;
- status = "okay";
-};
-
&wkup_vtm0 {
compatible = "ti,am654-vtm", "ti,am654-avs";
vdd-supply-3 = <&vdd_mpu>;
@@ -148,15 +140,6 @@
};
&main_pmx0 {
- main_uart0_pins_default: main-uart0-pins-default {
- pinctrl-single,pins = <
- AM65X_IOPAD(0x01e4, PIN_INPUT, 0) /* (AF11) UART0_RXD */
- AM65X_IOPAD(0x01e8, PIN_OUTPUT, 0) /* (AE11) UART0_TXD */
- AM65X_IOPAD(0x01ec, PIN_INPUT, 0) /* (AG11) UART0_CTSn */
- AM65X_IOPAD(0x01f0, PIN_OUTPUT, 0) /* (AD11) UART0_RTSn */
- >;
- };
-
main_mmc0_pins_default: main_mmc0_pins_default {
pinctrl-single,pins = <
AM65X_IOPAD(0x01a8, PIN_INPUT_PULLDOWN, 0) /* (B25) MMC0_CLK */
--
2.43.0
^ permalink raw reply related [flat|nested] 56+ messages in thread
* [PATCH v2 15/26] arm: dts: k3-am654: remove duplicate sdhci0 pinmux node
2023-12-29 17:46 [PATCH v2 00/26] sync am65x device tree with Linux v6.7-rc1 Bryan Brattlof
` (13 preceding siblings ...)
2023-12-29 17:47 ` [PATCH v2 14/26] arm: dts: k3-am654: remove duplicate main_uart0 Bryan Brattlof
@ 2023-12-29 17:47 ` 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
` (12 subsequent siblings)
27 siblings, 1 reply; 56+ messages in thread
From: Bryan Brattlof @ 2023-12-29 17:47 UTC (permalink / raw)
To: Tom Rini
Cc: UBoot Mailing List, Vignesh Raghavendra, Andrew Davis,
Nishanth Menon, Neha Malcom Francis, Manorit Chawdhry,
Martyn Welch, Svyatoslav Ryhel, Marcel Ziswiler, Simon Glass,
Jan Kiszka, Bryan Brattlof
With the Linux and U-Boot board dtb files unified, we now have
a duplicate sdhci0 pinmux node. Remove it
Tested-by: Tom Rini <trini@konsulko.com>
Signed-off-by: Bryan Brattlof <bb@ti.com>
---
arch/arm/dts/k3-am654-r5-base-board.dts | 26 ++++++++-----------------
1 file changed, 8 insertions(+), 18 deletions(-)
diff --git a/arch/arm/dts/k3-am654-r5-base-board.dts b/arch/arm/dts/k3-am654-r5-base-board.dts
index 3d599a5413812..f28245b12b6f6 100644
--- a/arch/arm/dts/k3-am654-r5-base-board.dts
+++ b/arch/arm/dts/k3-am654-r5-base-board.dts
@@ -140,22 +140,6 @@
};
&main_pmx0 {
- main_mmc0_pins_default: main_mmc0_pins_default {
- pinctrl-single,pins = <
- AM65X_IOPAD(0x01a8, PIN_INPUT_PULLDOWN, 0) /* (B25) MMC0_CLK */
- AM65X_IOPAD(0x01aC, PIN_INPUT_PULLUP, 0) /* (B27) MMC0_CMD */
- AM65X_IOPAD(0x01a4, PIN_INPUT_PULLUP, 0) /* (A26) MMC0_DAT0 */
- AM65X_IOPAD(0x01a0, PIN_INPUT_PULLUP, 0) /* (E25) MMC0_DAT1 */
- AM65X_IOPAD(0x019c, PIN_INPUT_PULLUP, 0) /* (C26) MMC0_DAT2 */
- AM65X_IOPAD(0x0198, PIN_INPUT_PULLUP, 0) /* (A25) MMC0_DAT3 */
- AM65X_IOPAD(0x0194, PIN_INPUT_PULLUP, 0) /* (E24) MMC0_DAT4 */
- AM65X_IOPAD(0x0190, PIN_INPUT_PULLUP, 0) /* (A24) MMC0_DAT5 */
- AM65X_IOPAD(0x018c, PIN_INPUT_PULLUP, 0) /* (B26) MMC0_DAT6 */
- AM65X_IOPAD(0x0188, PIN_INPUT_PULLUP, 0) /* (D25) MMC0_DAT7 */
- AM65X_IOPAD(0x01b0, PIN_INPUT, 0) /* (C25) MMC0_DS */
- >;
- };
-
main_mmc1_pins_default: main_mmc1_pins_default {
pinctrl-single,pins = <
AM65X_IOPAD(0x02d4, PIN_INPUT_PULLDOWN, 0) /* (C27) MMC1_CLK */
@@ -182,12 +166,18 @@
pinctrl-0 = <&wkup_vtt_pins_default>;
};
+/*
+ * MMC is probed to pull in firmware, so any clock
+ * or power-domain operation will fail as we do not
+ * have the firmware running at this point. Delete the
+ * power-domain properties to avoid making calls to
+ * SYSFW before it is loaded. Public ROM has already
+ * set it up for us anyway.
+ */
&sdhci0 {
clock-names = "clk_xin";
clocks = <&clk_200mhz>;
- pinctrl-0 = <&main_mmc0_pins_default>;
/delete-property/ power-domains;
- ti,driver-strength-ohm = <50>;
};
&sdhci1 {
--
2.43.0
^ permalink raw reply related [flat|nested] 56+ messages in thread
* [PATCH v2 16/26] arm: dts: k3-am654: remove duplicate sdhci1 pinmux node
2023-12-29 17:46 [PATCH v2 00/26] sync am65x device tree with Linux v6.7-rc1 Bryan Brattlof
` (14 preceding siblings ...)
2023-12-29 17:47 ` [PATCH v2 15/26] arm: dts: k3-am654: remove duplicate sdhci0 pinmux node Bryan Brattlof
@ 2023-12-29 17:47 ` 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
` (11 subsequent siblings)
27 siblings, 1 reply; 56+ messages in thread
From: Bryan Brattlof @ 2023-12-29 17:47 UTC (permalink / raw)
To: Tom Rini
Cc: UBoot Mailing List, Vignesh Raghavendra, Andrew Davis,
Nishanth Menon, Neha Malcom Francis, Manorit Chawdhry,
Martyn Welch, Svyatoslav Ryhel, Marcel Ziswiler, Simon Glass,
Jan Kiszka, Bryan Brattlof
With the Linux and U-Boot board dtb files unified, we now have a
duplicate sdhci1 pinmux node. Remove it
Tested-by: Tom Rini <trini@konsulko.com>
Signed-off-by: Bryan Brattlof <bb@ti.com>
---
arch/arm/dts/k3-am654-r5-base-board.dts | 23 ++++++++---------------
1 file changed, 8 insertions(+), 15 deletions(-)
diff --git a/arch/arm/dts/k3-am654-r5-base-board.dts b/arch/arm/dts/k3-am654-r5-base-board.dts
index f28245b12b6f6..9d7467acd30c9 100644
--- a/arch/arm/dts/k3-am654-r5-base-board.dts
+++ b/arch/arm/dts/k3-am654-r5-base-board.dts
@@ -140,19 +140,6 @@
};
&main_pmx0 {
- main_mmc1_pins_default: main_mmc1_pins_default {
- pinctrl-single,pins = <
- AM65X_IOPAD(0x02d4, PIN_INPUT_PULLDOWN, 0) /* (C27) MMC1_CLK */
- AM65X_IOPAD(0x02d8, PIN_INPUT_PULLUP, 0) /* (C28) MMC1_CMD */
- AM65X_IOPAD(0x02d0, PIN_INPUT_PULLUP, 0) /* (D28) MMC1_DAT0 */
- AM65X_IOPAD(0x02cc, PIN_INPUT_PULLUP, 0) /* (E27) MMC1_DAT1 */
- AM65X_IOPAD(0x02c8, PIN_INPUT_PULLUP, 0) /* (D26) MMC1_DAT2 */
- AM65X_IOPAD(0x02c4, PIN_INPUT_PULLUP, 0) /* (D27) MMC1_DAT3 */
- AM65X_IOPAD(0x02dc, PIN_INPUT_PULLUP, 0) /* (B24) MMC1_SDCD */
- AM65X_IOPAD(0x02e0, PIN_INPUT, 0) /* (C24) MMC1_SDWP */
- >;
- };
-
usb0_pins_default: usb0_pins_default {
pinctrl-single,pins = <
AM65X_IOPAD(0x02bc, PIN_OUTPUT, 0) /* (AD9) USB0_DRVVBUS */
@@ -180,12 +167,18 @@
/delete-property/ power-domains;
};
+/*
+ * MMC is probed to pull in firmware, so any clock
+ * or power-domain operation will fail as we do not
+ * have the firmware running at this point. Delete the
+ * power-domain properties to avoid making calls to
+ * SYSFW before it is loaded. Public ROM has already
+ * set it up for us anyway.
+ */
&sdhci1 {
clock-names = "clk_xin";
clocks = <&clk_200mhz>;
- pinctrl-0 = <&main_mmc1_pins_default>;
/delete-property/ power-domains;
- ti,driver-strength-ohm = <50>;
};
&wkup_i2c0 {
--
2.43.0
^ permalink raw reply related [flat|nested] 56+ messages in thread
* [PATCH v2 17/26] arm: dts: k3-am654: remove duplicate wkup_i2c0
2023-12-29 17:46 [PATCH v2 00/26] sync am65x device tree with Linux v6.7-rc1 Bryan Brattlof
` (15 preceding siblings ...)
2023-12-29 17:47 ` [PATCH v2 16/26] arm: dts: k3-am654: remove duplicate sdhci1 " Bryan Brattlof
@ 2023-12-29 17:47 ` 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
` (10 subsequent siblings)
27 siblings, 1 reply; 56+ messages in thread
From: Bryan Brattlof @ 2023-12-29 17:47 UTC (permalink / raw)
To: Tom Rini
Cc: UBoot Mailing List, Vignesh Raghavendra, Andrew Davis,
Nishanth Menon, Neha Malcom Francis, Manorit Chawdhry,
Martyn Welch, Svyatoslav Ryhel, Marcel Ziswiler, Simon Glass,
Jan Kiszka, Bryan Brattlof
With the Linux and U-Boot board dtb files unified, we now have a
duplicate wkup_i2c0 node. Remove it
Tested-by: Tom Rini <trini@konsulko.com>
Signed-off-by: Bryan Brattlof <bb@ti.com>
---
arch/arm/dts/k3-am654-r5-base-board.dts | 25 -------------------------
1 file changed, 25 deletions(-)
diff --git a/arch/arm/dts/k3-am654-r5-base-board.dts b/arch/arm/dts/k3-am654-r5-base-board.dts
index 9d7467acd30c9..8c6cb147c821a 100644
--- a/arch/arm/dts/k3-am654-r5-base-board.dts
+++ b/arch/arm/dts/k3-am654-r5-base-board.dts
@@ -115,13 +115,6 @@
>;
};
- wkup_i2c0_pins_default: wkup-i2c0-pins-default {
- pinctrl-single,pins = <
- AM65X_WKUP_IOPAD(0x00e0, PIN_INPUT, 0) /* (AC7) WKUP_I2C0_SCL */
- AM65X_WKUP_IOPAD(0x00e4, PIN_INPUT, 0) /* (AD6) WKUP_I2C0_SDA */
- >;
- };
-
mcu_fss0_ospi0_pins_default: mcu-fss0-ospi0-pins_default {
pinctrl-single,pins = <
AM65X_WKUP_IOPAD(0x0000, PIN_OUTPUT, 0) /* (V1) MCU_OSPI0_CLK */
@@ -181,24 +174,6 @@
/delete-property/ power-domains;
};
-&wkup_i2c0 {
- pinctrl-names = "default";
- pinctrl-0 = <&wkup_i2c0_pins_default>;
- clock-frequency = <400000>;
-
- vdd_mpu: tps62363@60 {
- compatible = "ti,tps62363";
- reg = <0x60>;
- regulator-name = "VDD_MPU";
- regulator-min-microvolt = <500000>;
- regulator-max-microvolt = <1770000>;
- regulator-always-on;
- regulator-boot-on;
- ti,vsel0-state-high;
- ti,vsel1-state-high;
- };
-};
-
&ospi0 {
pinctrl-names = "default";
pinctrl-0 = <&mcu_fss0_ospi0_pins_default>;
--
2.43.0
^ permalink raw reply related [flat|nested] 56+ messages in thread
* [PATCH v2 18/26] arm: dts: k3-am654: remove duplicate ospi0 node
2023-12-29 17:46 [PATCH v2 00/26] sync am65x device tree with Linux v6.7-rc1 Bryan Brattlof
` (16 preceding siblings ...)
2023-12-29 17:47 ` [PATCH v2 17/26] arm: dts: k3-am654: remove duplicate wkup_i2c0 Bryan Brattlof
@ 2023-12-29 17:47 ` 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
` (9 subsequent siblings)
27 siblings, 1 reply; 56+ messages in thread
From: Bryan Brattlof @ 2023-12-29 17:47 UTC (permalink / raw)
To: Tom Rini
Cc: UBoot Mailing List, Vignesh Raghavendra, Andrew Davis,
Nishanth Menon, Neha Malcom Francis, Manorit Chawdhry,
Martyn Welch, Svyatoslav Ryhel, Marcel Ziswiler, Simon Glass,
Jan Kiszka, Bryan Brattlof
With the Linux and U-Boot board dtb files unified, we now have a
duplicate ospi0 node. Remove it
Tested-by: Tom Rini <trini@konsulko.com>
Signed-off-by: Bryan Brattlof <bb@ti.com>
---
arch/arm/dts/k3-am654-r5-base-board.dts | 37 -------------------------
1 file changed, 37 deletions(-)
diff --git a/arch/arm/dts/k3-am654-r5-base-board.dts b/arch/arm/dts/k3-am654-r5-base-board.dts
index 8c6cb147c821a..da41971a78f81 100644
--- a/arch/arm/dts/k3-am654-r5-base-board.dts
+++ b/arch/arm/dts/k3-am654-r5-base-board.dts
@@ -18,8 +18,6 @@
ethernet0 = &cpsw_port1;
remoteproc0 = &sysctrler;
remoteproc1 = &a53_0;
- spi0 = &ospi0;
- spi1 = &ospi1;
usb0 = &usb0;
usb1 = &usb1;
};
@@ -114,22 +112,6 @@
AM65X_WKUP_IOPAD(0x0040, PIN_OUTPUT_PULLUP, 7) /* WKUP_GPIO0_28 */
>;
};
-
- mcu_fss0_ospi0_pins_default: mcu-fss0-ospi0-pins_default {
- pinctrl-single,pins = <
- AM65X_WKUP_IOPAD(0x0000, PIN_OUTPUT, 0) /* (V1) MCU_OSPI0_CLK */
- AM65X_WKUP_IOPAD(0x0008, PIN_INPUT, 0) /* (U2) MCU_OSPI0_DQS */
- AM65X_WKUP_IOPAD(0x000c, PIN_INPUT, 0) /* (U4) MCU_OSPI0_D0 */
- AM65X_WKUP_IOPAD(0x0010, PIN_INPUT, 0) /* (U5) MCU_OSPI0_D1 */
- AM65X_WKUP_IOPAD(0x0014, PIN_INPUT, 0) /* (T2) MCU_OSPI0_D2 */
- AM65X_WKUP_IOPAD(0x0018, PIN_INPUT, 0) /* (T3) MCU_OSPI0_D3 */
- AM65X_WKUP_IOPAD(0x001c, PIN_INPUT, 0) /* (T4) MCU_OSPI0_D4 */
- AM65X_WKUP_IOPAD(0x0020, PIN_INPUT, 0) /* (T5) MCU_OSPI0_D5 */
- AM65X_WKUP_IOPAD(0x0024, PIN_INPUT, 0) /* (R2) MCU_OSPI0_D6 */
- AM65X_WKUP_IOPAD(0x0028, PIN_INPUT, 0) /* (R3) MCU_OSPI0_D7 */
- AM65X_WKUP_IOPAD(0x002c, PIN_OUTPUT, 0) /* (R4) MCU_OSPI0_CSn0 */
- >;
- };
};
&main_pmx0 {
@@ -175,27 +157,8 @@
};
&ospi0 {
- pinctrl-names = "default";
- pinctrl-0 = <&mcu_fss0_ospi0_pins_default>;
- bootph-pre-ram;
-
reg = <0x0 0x47040000 0x0 0x100>,
<0x0 0x50000000 0x0 0x8000000>;
-
- flash@0{
- compatible = "jedec,spi-nor";
- reg = <0x0>;
- spi-tx-bus-width = <1>;
- spi-rx-bus-width = <8>;
- spi-max-frequency = <50000000>;
- cdns,tshsl-ns = <60>;
- cdns,tsd2d-ns = <60>;
- cdns,tchsh-ns = <60>;
- cdns,tslch-ns = <60>;
- cdns,read-delay = <0>;
- #address-cells = <1>;
- #size-cells = <1>;
- };
};
&main_pmx0 {
--
2.43.0
^ permalink raw reply related [flat|nested] 56+ messages in thread
* [PATCH v2 19/26] arm: dts: k3-am654: remove usb0
2023-12-29 17:46 [PATCH v2 00/26] sync am65x device tree with Linux v6.7-rc1 Bryan Brattlof
` (17 preceding siblings ...)
2023-12-29 17:47 ` [PATCH v2 18/26] arm: dts: k3-am654: remove duplicate ospi0 node Bryan Brattlof
@ 2023-12-29 17:47 ` 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
` (8 subsequent siblings)
27 siblings, 1 reply; 56+ messages in thread
From: Bryan Brattlof @ 2023-12-29 17:47 UTC (permalink / raw)
To: Tom Rini
Cc: UBoot Mailing List, Vignesh Raghavendra, Andrew Davis,
Nishanth Menon, Neha Malcom Francis, Manorit Chawdhry,
Martyn Welch, Svyatoslav Ryhel, Marcel Ziswiler, Simon Glass,
Jan Kiszka, Bryan Brattlof
The pinmux for usb0 is missing from the Linux board dtb file. Remove it
until we can introduce it in Linux
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 | 12 --------
arch/arm/dts/k3-am654-r5-base-board.dts | 29 --------------------
2 files changed, 41 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 a24cb895e5578..3647088c29e4b 100644
--- a/arch/arm/dts/k3-am654-base-board-u-boot.dtsi
+++ b/arch/arm/dts/k3-am654-base-board-u-boot.dtsi
@@ -125,10 +125,6 @@
bootph-pre-ram;
};
-&usb0_pins_default {
- bootph-pre-ram;
-};
-
&main_pmx1 {
bootph-pre-ram;
};
@@ -161,14 +157,6 @@
bootph-pre-ram;
};
-&usb0_phy {
- bootph-pre-ram;
-};
-
-&usb0 {
- bootph-pre-ram;
-};
-
&scm_conf {
bootph-pre-ram;
};
diff --git a/arch/arm/dts/k3-am654-r5-base-board.dts b/arch/arm/dts/k3-am654-r5-base-board.dts
index da41971a78f81..8e57c77cba923 100644
--- a/arch/arm/dts/k3-am654-r5-base-board.dts
+++ b/arch/arm/dts/k3-am654-r5-base-board.dts
@@ -18,8 +18,6 @@
ethernet0 = &cpsw_port1;
remoteproc0 = &sysctrler;
remoteproc1 = &a53_0;
- usb0 = &usb0;
- usb1 = &usb1;
};
a53_0: a53@0 {
@@ -114,14 +112,6 @@
};
};
-&main_pmx0 {
- usb0_pins_default: usb0_pins_default {
- pinctrl-single,pins = <
- AM65X_IOPAD(0x02bc, PIN_OUTPUT, 0) /* (AD9) USB0_DRVVBUS */
- >;
- };
-};
-
&memorycontroller {
vtt-supply = <&vtt_supply>;
pinctrl-names = "default";
@@ -161,14 +151,6 @@
<0x0 0x50000000 0x0 0x8000000>;
};
-&main_pmx0 {
- usb0_pins_default: usb0_pins_default {
- pinctrl-single,pins = <
- AM65X_IOPAD(0x02bc, PIN_OUTPUT, 0) /* (AD9) USB0_DRVVBUS */
- >;
- };
-};
-
&dwc3_0 {
status = "okay";
/delete-property/ clocks;
@@ -177,17 +159,6 @@
/delete-property/ assigned-clock-parents;
};
-&usb0_phy {
- status = "okay";
- /delete-property/ clocks;
-};
-
-&usb0 {
- pinctrl-names = "default";
- pinctrl-0 = <&usb0_pins_default>;
- dr_mode = "peripheral";
-};
-
&davinci_mdio {
phy0: ethernet-phy@0 {
reg = <0>;
--
2.43.0
^ permalink raw reply related [flat|nested] 56+ messages in thread
* [PATCH v2 20/26] arm: dts: k3-am654: remove duplicate mdio
2023-12-29 17:46 [PATCH v2 00/26] sync am65x device tree with Linux v6.7-rc1 Bryan Brattlof
` (18 preceding siblings ...)
2023-12-29 17:47 ` [PATCH v2 19/26] arm: dts: k3-am654: remove usb0 Bryan Brattlof
@ 2023-12-29 17:47 ` 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
` (7 subsequent siblings)
27 siblings, 1 reply; 56+ messages in thread
From: Bryan Brattlof @ 2023-12-29 17:47 UTC (permalink / raw)
To: Tom Rini
Cc: UBoot Mailing List, Vignesh Raghavendra, Andrew Davis,
Nishanth Menon, Neha Malcom Francis, Manorit Chawdhry,
Martyn Welch, Svyatoslav Ryhel, Marcel Ziswiler, Simon Glass,
Jan Kiszka, Bryan Brattlof
With the Linux and U-Boot board dtb files unified, we now have a
duplicate mdio node. Remove it
Tested-by: Tom Rini <trini@konsulko.com>
Signed-off-by: Bryan Brattlof <bb@ti.com>
---
arch/arm/dts/k3-am654-r5-base-board.dts | 9 ---------
1 file changed, 9 deletions(-)
diff --git a/arch/arm/dts/k3-am654-r5-base-board.dts b/arch/arm/dts/k3-am654-r5-base-board.dts
index 8e57c77cba923..14bf1b4c8a462 100644
--- a/arch/arm/dts/k3-am654-r5-base-board.dts
+++ b/arch/arm/dts/k3-am654-r5-base-board.dts
@@ -159,15 +159,6 @@
/delete-property/ assigned-clock-parents;
};
-&davinci_mdio {
- phy0: ethernet-phy@0 {
- reg = <0>;
- /* TODO: phy reset: TCA9555RTWR(i2c:0x21)[p04].GPIO_MCU_RGMII_RSTN */
- ti,rx-internal-delay = <DP83867_RGMIIDCTL_2_00_NS>;
- ti,fifo-depth = <DP83867_PHYCR_FIFO_DEPTH_4_B_NIB>;
- };
-};
-
&mcu_cpsw {
reg = <0x0 0x46000000 0x0 0x200000>,
<0x0 0x40f00200 0x0 0x2>;
--
2.43.0
^ permalink raw reply related [flat|nested] 56+ messages in thread
* [PATCH v2 21/26] arm: dts: k3-am654: remove duplicate vtt pinmux
2023-12-29 17:46 [PATCH v2 00/26] sync am65x device tree with Linux v6.7-rc1 Bryan Brattlof
` (19 preceding siblings ...)
2023-12-29 17:47 ` [PATCH v2 20/26] arm: dts: k3-am654: remove duplicate mdio Bryan Brattlof
@ 2023-12-29 17:47 ` 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
` (6 subsequent siblings)
27 siblings, 1 reply; 56+ messages in thread
From: Bryan Brattlof @ 2023-12-29 17:47 UTC (permalink / raw)
To: Tom Rini
Cc: UBoot Mailing List, Vignesh Raghavendra, Andrew Davis,
Nishanth Menon, Neha Malcom Francis, Manorit Chawdhry,
Martyn Welch, Svyatoslav Ryhel, Marcel Ziswiler, Simon Glass,
Jan Kiszka, Bryan Brattlof
With the Linux and U-Boot board dtb files unified, we now have a
duplicate vtt_pinmux node. Remove it
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 | 2 +-
arch/arm/dts/k3-am654-r5-base-board.dts | 10 ----------
2 files changed, 1 insertion(+), 11 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 3647088c29e4b..da6d4dffbf9d2 100644
--- a/arch/arm/dts/k3-am654-base-board-u-boot.dtsi
+++ b/arch/arm/dts/k3-am654-base-board-u-boot.dtsi
@@ -93,7 +93,7 @@
bootph-pre-ram;
};
-&wkup_vtt_pins_default {
+&ddr_vtt_pins_default {
bootph-pre-ram;
};
diff --git a/arch/arm/dts/k3-am654-r5-base-board.dts b/arch/arm/dts/k3-am654-r5-base-board.dts
index 14bf1b4c8a462..fb238adaea5b2 100644
--- a/arch/arm/dts/k3-am654-r5-base-board.dts
+++ b/arch/arm/dts/k3-am654-r5-base-board.dts
@@ -104,18 +104,8 @@
vdd-supply-4 = <&vdd_mpu>;
};
-&wkup_pmx0 {
- wkup_vtt_pins_default: wkup_vtt_pins_default {
- pinctrl-single,pins = <
- AM65X_WKUP_IOPAD(0x0040, PIN_OUTPUT_PULLUP, 7) /* WKUP_GPIO0_28 */
- >;
- };
-};
-
&memorycontroller {
vtt-supply = <&vtt_supply>;
- pinctrl-names = "default";
- pinctrl-0 = <&wkup_vtt_pins_default>;
};
/*
--
2.43.0
^ permalink raw reply related [flat|nested] 56+ messages in thread
* [PATCH v2 22/26] arm: dts: k3-am654: remove duplicate root properties
2023-12-29 17:46 [PATCH v2 00/26] sync am65x device tree with Linux v6.7-rc1 Bryan Brattlof
` (20 preceding siblings ...)
2023-12-29 17:47 ` [PATCH v2 21/26] arm: dts: k3-am654: remove duplicate vtt pinmux Bryan Brattlof
@ 2023-12-29 17:47 ` 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
` (5 subsequent siblings)
27 siblings, 1 reply; 56+ messages in thread
From: Bryan Brattlof @ 2023-12-29 17:47 UTC (permalink / raw)
To: Tom Rini
Cc: UBoot Mailing List, Vignesh Raghavendra, Andrew Davis,
Nishanth Menon, Neha Malcom Francis, Manorit Chawdhry,
Martyn Welch, Svyatoslav Ryhel, Marcel Ziswiler, Simon Glass,
Jan Kiszka, Bryan Brattlof
With the Linux and U-Boot board dtb files unified, we have duplicate
properties in the root node. Remove them
Tested-by: Tom Rini <trini@konsulko.com>
Signed-off-by: Bryan Brattlof <bb@ti.com>
---
arch/arm/dts/k3-am654-r5-base-board.dts | 3 ---
1 file changed, 3 deletions(-)
diff --git a/arch/arm/dts/k3-am654-r5-base-board.dts b/arch/arm/dts/k3-am654-r5-base-board.dts
index fb238adaea5b2..c039300c3cbb3 100644
--- a/arch/arm/dts/k3-am654-r5-base-board.dts
+++ b/arch/arm/dts/k3-am654-r5-base-board.dts
@@ -11,9 +11,6 @@
#include "k3-am654-ddr.dtsi"
/ {
- compatible = "ti,am654-evm", "ti,am654";
- model = "Texas Instruments AM654 R5 Base Board";
-
aliases {
ethernet0 = &cpsw_port1;
remoteproc0 = &sysctrler;
--
2.43.0
^ permalink raw reply related [flat|nested] 56+ messages in thread
* [PATCH v2 23/26] arm: dts: k3-am654: remove un-needed aliases
2023-12-29 17:46 [PATCH v2 00/26] sync am65x device tree with Linux v6.7-rc1 Bryan Brattlof
` (21 preceding siblings ...)
2023-12-29 17:47 ` [PATCH v2 22/26] arm: dts: k3-am654: remove duplicate root properties Bryan Brattlof
@ 2023-12-29 17:47 ` 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
` (4 subsequent siblings)
27 siblings, 1 reply; 56+ messages in thread
From: Bryan Brattlof @ 2023-12-29 17:47 UTC (permalink / raw)
To: Tom Rini
Cc: UBoot Mailing List, Vignesh Raghavendra, Andrew Davis,
Nishanth Menon, Neha Malcom Francis, Manorit Chawdhry,
Martyn Welch, Svyatoslav Ryhel, Marcel Ziswiler, Simon Glass,
Jan Kiszka, Bryan Brattlof
These aliases are not needed in U-Boot. Remove them
Tested-by: Tom Rini <trini@konsulko.com>
Signed-off-by: Bryan Brattlof <bb@ti.com>
---
arch/arm/dts/k3-am654-r5-base-board.dts | 1 -
1 file changed, 1 deletion(-)
diff --git a/arch/arm/dts/k3-am654-r5-base-board.dts b/arch/arm/dts/k3-am654-r5-base-board.dts
index c039300c3cbb3..9926981c661a0 100644
--- a/arch/arm/dts/k3-am654-r5-base-board.dts
+++ b/arch/arm/dts/k3-am654-r5-base-board.dts
@@ -12,7 +12,6 @@
/ {
aliases {
- ethernet0 = &cpsw_port1;
remoteproc0 = &sysctrler;
remoteproc1 = &a53_0;
};
--
2.43.0
^ permalink raw reply related [flat|nested] 56+ messages in thread
* [PATCH v2 24/26] arm: dts: k3-am654: move dummy_clock to root node
2023-12-29 17:46 [PATCH v2 00/26] sync am65x device tree with Linux v6.7-rc1 Bryan Brattlof
` (22 preceding siblings ...)
2023-12-29 17:47 ` [PATCH v2 23/26] arm: dts: k3-am654: remove un-needed aliases Bryan Brattlof
@ 2023-12-29 17:47 ` 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
` (3 subsequent siblings)
27 siblings, 1 reply; 56+ messages in thread
From: Bryan Brattlof @ 2023-12-29 17:47 UTC (permalink / raw)
To: Tom Rini
Cc: UBoot Mailing List, Vignesh Raghavendra, Andrew Davis,
Nishanth Menon, Neha Malcom Francis, Manorit Chawdhry,
Martyn Welch, Svyatoslav Ryhel, Marcel Ziswiler, Simon Glass,
Jan Kiszka, Bryan Brattlof
The dummy_clock node is used to help the drivers probe the IO needed to
setup consoles and boot media to load firmware into the SoC.
This dummy_clock isn't a device that exists nor does it exist in the
mcu domain. So move it from cbass_mcu to the root node to avoid any
confusion.
Tested-by: Tom Rini <trini@konsulko.com>
Signed-off-by: Bryan Brattlof <bb@ti.com>
---
arch/arm/dts/k3-am654-r5-base-board.dts | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/arch/arm/dts/k3-am654-r5-base-board.dts b/arch/arm/dts/k3-am654-r5-base-board.dts
index 9926981c661a0..b27b2b05ad840 100644
--- a/arch/arm/dts/k3-am654-r5-base-board.dts
+++ b/arch/arm/dts/k3-am654-r5-base-board.dts
@@ -30,6 +30,13 @@
ti,sci-host-id = <10>;
bootph-pre-ram;
};
+
+ clk_200mhz: dummy_clock {
+ compatible = "fixed-clock";
+ #clock-cells = <0>;
+ clock-frequency = <200000000>;
+ bootph-pre-ram;
+ };
};
&cbass_mcu {
@@ -51,13 +58,6 @@
mbox-names = "tx", "rx";
bootph-pre-ram;
};
-
- clk_200mhz: dummy_clock {
- compatible = "fixed-clock";
- #clock-cells = <0>;
- clock-frequency = <200000000>;
- bootph-pre-ram;
- };
};
/*
--
2.43.0
^ permalink raw reply related [flat|nested] 56+ messages in thread
* [PATCH v2 25/26] arm: dts: k3-am654: remove duplicate mcu secure proxy node
2023-12-29 17:46 [PATCH v2 00/26] sync am65x device tree with Linux v6.7-rc1 Bryan Brattlof
` (23 preceding siblings ...)
2023-12-29 17:47 ` [PATCH v2 24/26] arm: dts: k3-am654: move dummy_clock to root node Bryan Brattlof
@ 2023-12-29 17:47 ` 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
` (2 subsequent siblings)
27 siblings, 1 reply; 56+ messages in thread
From: Bryan Brattlof @ 2023-12-29 17:47 UTC (permalink / raw)
To: Tom Rini
Cc: UBoot Mailing List, Vignesh Raghavendra, Andrew Davis,
Nishanth Menon, Neha Malcom Francis, Manorit Chawdhry,
Martyn Welch, Svyatoslav Ryhel, Marcel Ziswiler, Simon Glass,
Jan Kiszka, Bryan Brattlof
With the Linux and U-Boot board dtb files unified, we now have a
duplicate mcu secure proxy node. Remove it
Tested-by: Tom Rini <trini@konsulko.com>
Signed-off-by: Bryan Brattlof <bb@ti.com>
---
arch/arm/dts/k3-am654-r5-base-board.dts | 19 +++++++------------
1 file changed, 7 insertions(+), 12 deletions(-)
diff --git a/arch/arm/dts/k3-am654-r5-base-board.dts b/arch/arm/dts/k3-am654-r5-base-board.dts
index b27b2b05ad840..dea2ba85dcb31 100644
--- a/arch/arm/dts/k3-am654-r5-base-board.dts
+++ b/arch/arm/dts/k3-am654-r5-base-board.dts
@@ -39,22 +39,15 @@
};
};
-&cbass_mcu {
- mcu_secproxy: secproxy@28380000 {
- compatible = "ti,am654-secure-proxy";
- reg = <0x0 0x2a380000 0x0 0x80000>,
- <0x0 0x2a400000 0x0 0x80000>,
- <0x0 0x2a480000 0x0 0x80000>;
- reg-names = "rt", "scfg", "target_data";
- #mbox-cells = <1>;
- bootph-pre-ram;
- };
+&secure_proxy_mcu {
+ status = "okay";
+ bootph-pre-ram;
};
&cbass_wakeup {
sysctrler: sysctrler {
compatible = "ti,am654-system-controller";
- mboxes= <&mcu_secproxy 4>, <&mcu_secproxy 5>;
+ mboxes= <&secure_proxy_mcu 4>, <&secure_proxy_mcu 5>;
mbox-names = "tx", "rx";
bootph-pre-ram;
};
@@ -76,7 +69,9 @@
};
&dmsc {
- mboxes= <&mcu_secproxy 8>, <&mcu_secproxy 6>, <&mcu_secproxy 5>;
+ mboxes = <&secure_proxy_mcu 8>,
+ <&secure_proxy_mcu 6>,
+ <&secure_proxy_mcu 5>;
mbox-names = "tx", "rx", "notify";
ti,host-id = <4>;
ti,secure-host;
--
2.43.0
^ permalink raw reply related [flat|nested] 56+ messages in thread
* [PATCH v2 26/26] arm: dts: k3-am654: convert bootph-pre-ram to bootph-all
2023-12-29 17:46 [PATCH v2 00/26] sync am65x device tree with Linux v6.7-rc1 Bryan Brattlof
` (24 preceding siblings ...)
2023-12-29 17:47 ` [PATCH v2 25/26] arm: dts: k3-am654: remove duplicate mcu secure proxy node Bryan Brattlof
@ 2023-12-29 17:47 ` 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
27 siblings, 1 reply; 56+ messages in thread
From: Bryan Brattlof @ 2023-12-29 17:47 UTC (permalink / raw)
To: Tom Rini
Cc: UBoot Mailing List, Vignesh Raghavendra, Andrew Davis,
Nishanth Menon, Neha Malcom Francis, Manorit Chawdhry,
Martyn Welch, Svyatoslav Ryhel, Marcel Ziswiler, Simon Glass,
Jan Kiszka, Bryan Brattlof
Many nodes are reused between WKUP SPL, MAIN SPL, and U-Boot. Using
bootph-pre-ram is causing these nodes to be present in SPL builds but
pruned away during the U-Boot build. Convert these nodes to bootph-all
so they will remain no matter which dtb build is happening.
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 | 74 ++++++++++----------
1 file changed, 37 insertions(+), 37 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 da6d4dffbf9d2..4fd188fa191b4 100644
--- a/arch/arm/dts/k3-am654-base-board-u-boot.dtsi
+++ b/arch/arm/dts/k3-am654-base-board-u-boot.dtsi
@@ -18,151 +18,151 @@
};
&vtt_supply {
- bootph-pre-ram;
+ bootph-all;
};
&cbass_main {
- bootph-pre-ram;
+ bootph-all;
};
&main_navss {
- bootph-pre-ram;
+ bootph-all;
};
&cbass_mcu {
- bootph-pre-ram;
+ bootph-all;
};
&mcu_navss {
- bootph-pre-ram;
+ bootph-all;
};
&mcu_ringacc {
- bootph-pre-ram;
+ bootph-all;
};
&mcu_udmap {
- bootph-pre-ram;
+ bootph-all;
};
&wkup_gpio0 {
- bootph-pre-ram;
+ bootph-all;
};
&secure_proxy_main {
- bootph-pre-ram;
+ bootph-all;
};
&cbass_wakeup {
- bootph-pre-ram;
+ bootph-all;
chipid@43000014 {
- bootph-pre-ram;
+ bootph-all;
};
};
&dmsc {
- 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;
};
&main_uart0 {
- bootph-pre-ram;
+ bootph-all;
};
&wkup_vtm0 {
- bootph-pre-ram;
+ bootph-all;
};
&wkup_pmx0 {
- bootph-pre-ram;
+ bootph-all;
};
&wkup_uart0_pins_default {
- bootph-pre-ram;
+ bootph-all;
};
&ddr_vtt_pins_default {
- bootph-pre-ram;
+ bootph-all;
};
&mcu_uart0_pins_default {
- bootph-pre-ram;
+ bootph-all;
};
&wkup_i2c0_pins_default {
- bootph-pre-ram;
+ bootph-all;
};
&mcu_fss0_ospi0_pins_default {
- bootph-pre-ram;
+ bootph-all;
};
&main_pmx0 {
- bootph-pre-ram;
+ bootph-all;
};
&main_uart0_pins_default {
- bootph-pre-ram;
+ bootph-all;
};
&main_mmc0_pins_default {
- bootph-pre-ram;
+ bootph-all;
};
&main_mmc1_pins_default {
- bootph-pre-ram;
+ bootph-all;
};
&main_pmx1 {
- bootph-pre-ram;
+ bootph-all;
};
&sdhci0 {
- bootph-pre-ram;
+ bootph-all;
};
&sdhci1 {
- bootph-pre-ram;
+ bootph-all;
};
&wkup_i2c0 {
- bootph-pre-ram;
+ bootph-all;
};
&vdd_mpu {
- bootph-pre-ram;
+ bootph-all;
};
&ospi0 {
- bootph-pre-ram;
+ bootph-all;
flash@0 {
- bootph-pre-ram;
+ bootph-all;
};
};
&dwc3_0 {
- bootph-pre-ram;
+ bootph-all;
};
&scm_conf {
- bootph-pre-ram;
+ bootph-all;
};
&fss {
- bootph-pre-ram;
+ bootph-all;
};
&pru0_0 {
--
2.43.0
^ permalink raw reply related [flat|nested] 56+ messages in thread
* Re: [PATCH v2 01/26] configs: am65x_evm_r5: enable driver for fixed regulators
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
0 siblings, 0 replies; 56+ messages in thread
From: Nishanth Menon @ 2024-01-02 18:46 UTC (permalink / raw)
To: Bryan Brattlof
Cc: Tom Rini, UBoot Mailing List, Vignesh Raghavendra, Andrew Davis,
Neha Malcom Francis, Manorit Chawdhry, Martyn Welch,
Svyatoslav Ryhel, Marcel Ziswiler, Simon Glass, Jan Kiszka
On 11:46-20231229, Bryan Brattlof wrote:
> Some of the regulators we need to successfully boot are fixed
> regulators. Enable the driver to properly probe them.
>
> Tested-by: Tom Rini <trini@konsulko.com>
> Signed-off-by: Bryan Brattlof <bb@ti.com>
> ---
> configs/am65x_evm_r5_defconfig | 2 ++
> 1 file changed, 2 insertions(+)
>
[...]
Reviewed-by: Nishanth Menon <nm@ti.com>
--
Regards,
Nishanth Menon
Key (0xDDB5849D1736249D) / Fingerprint: F8A2 8693 54EB 8232 17A3 1A34 DDB5 849D 1736 249D
^ permalink raw reply [flat|nested] 56+ messages in thread
* Re: [PATCH v2 02/26] configs: am65x_evm_a53: disable CONSOLE_MUX
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
0 siblings, 0 replies; 56+ messages in thread
From: Nishanth Menon @ 2024-01-02 18:47 UTC (permalink / raw)
To: Bryan Brattlof
Cc: Tom Rini, UBoot Mailing List, Vignesh Raghavendra, Andrew Davis,
Neha Malcom Francis, Manorit Chawdhry, Martyn Welch,
Svyatoslav Ryhel, Marcel Ziswiler, Simon Glass, Jan Kiszka
On 11:46-20231229, Bryan Brattlof wrote:
> We do not have a need to share a single console with the evaluation
> board and disabling this option reduces the complexity of configuring
> the consoles. Disable CONSOLE_MUX
>
> Tested-by: Tom Rini <trini@konsulko.com>
> Signed-off-by: Bryan Brattlof <bb@ti.com>
> ---
> configs/am65x_evm_a53_defconfig | 1 -
> 1 file changed, 1 deletion(-)
>
[...]
Reviewed-by: Nishanth Menon <nm@ti.com>
--
Regards,
Nishanth Menon
Key (0xDDB5849D1736249D) / Fingerprint: F8A2 8693 54EB 8232 17A3 1A34 DDB5 849D 1736 249D
^ permalink raw reply [flat|nested] 56+ messages in thread
* Re: [PATCH v2 03/26] arm: dts: k3-am654-r5: Merge board file and U-Boot overlay
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
0 siblings, 0 replies; 56+ messages in thread
From: Nishanth Menon @ 2024-01-02 18:47 UTC (permalink / raw)
To: Bryan Brattlof
Cc: Tom Rini, UBoot Mailing List, Vignesh Raghavendra, Andrew Davis,
Neha Malcom Francis, Manorit Chawdhry, Martyn Welch,
Svyatoslav Ryhel, Marcel Ziswiler, Simon Glass, Jan Kiszka
On 11:47-20231229, Bryan Brattlof wrote:
> The R5 board file for U-Boot should be the same as the board file copied
> from Linux with a few alterations to work with the R5's view of the SoC.
>
> First we need to unify the R5 board file and it's U-Boot overlay before
> we can unify the Linux board file with this one.
>
> Tested-by: Tom Rini <trini@konsulko.com>
> Signed-off-by: Bryan Brattlof <bb@ti.com>
> ---
[...]
Reviewed-by: Nishanth Menon <nm@ti.com>
--
Regards,
Nishanth Menon
Key (0xDDB5849D1736249D) / Fingerprint: F8A2 8693 54EB 8232 17A3 1A34 DDB5 849D 1736 249D
^ permalink raw reply [flat|nested] 56+ messages in thread
* Re: [PATCH v2 04/26] arm: dts: k3-am654: pull in dtb update from Linux
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
0 siblings, 0 replies; 56+ messages in thread
From: Nishanth Menon @ 2024-01-02 18:47 UTC (permalink / raw)
To: Bryan Brattlof
Cc: Tom Rini, UBoot Mailing List, Vignesh Raghavendra, Andrew Davis,
Neha Malcom Francis, Manorit Chawdhry, Martyn Welch,
Svyatoslav Ryhel, Marcel Ziswiler, Simon Glass, Jan Kiszka
On 11:47-20231229, Bryan Brattlof wrote:
> Pull in dtb updates for the am654 base board from v6.7-rc1 of Linux
>
> Tested-by: Tom Rini <trini@konsulko.com>
> Signed-off-by: Bryan Brattlof <bb@ti.com>
> ---
> arch/arm/dts/k3-am65-main.dtsi | 342 ++++++++++++++++++++++-----
> arch/arm/dts/k3-am65-mcu.dtsi | 156 ++++++++++--
> arch/arm/dts/k3-am65-wakeup.dtsi | 10 +-
> arch/arm/dts/k3-am65.dtsi | 19 +-
> arch/arm/dts/k3-am654-base-board.dts | 301 ++++++++++++++---------
> arch/arm/dts/k3-am654.dtsi | 7 +
> 6 files changed, 626 insertions(+), 209 deletions(-)
>
[...]
Reviewed-by: Nishanth Menon <nm@ti.com>
--
Regards,
Nishanth Menon
Key (0xDDB5849D1736249D) / Fingerprint: F8A2 8693 54EB 8232 17A3 1A34 DDB5 849D 1736 249D
^ permalink raw reply [flat|nested] 56+ messages in thread
* Re: [PATCH v2 05/26] arm: dts: k3-am654: copy bootph properties to a53 dts
2023-12-29 17:47 ` [PATCH v2 05/26] arm: dts: k3-am654: copy bootph properties to a53 dts Bryan Brattlof
@ 2024-01-02 18:48 ` Nishanth Menon
0 siblings, 0 replies; 56+ messages in thread
From: Nishanth Menon @ 2024-01-02 18:48 UTC (permalink / raw)
To: Bryan Brattlof
Cc: Tom Rini, UBoot Mailing List, Vignesh Raghavendra, Andrew Davis,
Neha Malcom Francis, Manorit Chawdhry, Martyn Welch,
Svyatoslav Ryhel, Marcel Ziswiler, Simon Glass, Jan Kiszka
On 11:47-20231229, Bryan Brattlof wrote:
> 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;
> +};
I understand this in an intermediate state and the final dts looks fine.
So,
[...]
Reviewed-by: Nishanth Menon <nm@ti.com>
--
Regards,
Nishanth Menon
Key (0xDDB5849D1736249D) / Fingerprint: F8A2 8693 54EB 8232 17A3 1A34 DDB5 849D 1736 249D
^ permalink raw reply [flat|nested] 56+ messages in thread
* Re: [PATCH v2 06/26] arm: dts: k3-am654: include a53 board dtb for r5 build
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
0 siblings, 0 replies; 56+ messages in thread
From: Nishanth Menon @ 2024-01-02 18:48 UTC (permalink / raw)
To: Bryan Brattlof
Cc: Tom Rini, UBoot Mailing List, Vignesh Raghavendra, Andrew Davis,
Neha Malcom Francis, Manorit Chawdhry, Martyn Welch,
Svyatoslav Ryhel, Marcel Ziswiler, Simon Glass, Jan Kiszka
On 11:47-20231229, Bryan Brattlof wrote:
> To make things as organized as possible, start from the Linux board dtbs
> and apply all properties needed for U-Boot in our *-u-boot.dtsi file for
> the MAIN SPL and U-Boot builds.
>
> We can then include these files for the WKUP SPL build making further
> edits to the needed properties and nodes for the WKUP SPL bootloader's
> view of the am65x.
>
> Tested-by: Tom Rini <trini@konsulko.com>
> Signed-off-by: Bryan Brattlof <bb@ti.com>
> ---
> arch/arm/dts/k3-am654-r5-base-board.dts | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/arch/arm/dts/k3-am654-r5-base-board.dts b/arch/arm/dts/k3-am654-r5-base-board.dts
> index 8f55dab508ee6..79ca6387c22bb 100644
> --- a/arch/arm/dts/k3-am654-r5-base-board.dts
> +++ b/arch/arm/dts/k3-am654-r5-base-board.dts
> @@ -5,7 +5,8 @@
>
> /dts-v1/;
>
> -#include "k3-am654.dtsi"
> +#include "k3-am654-base-board.dts"
> +#include "k3-am654-base-board-u-boot.dtsi"
> #include "k3-am654-base-board-ddr4-1600MTs.dtsi"
> #include "k3-am654-ddr.dtsi"
[...]
Reviewed-by: Nishanth Menon <nm@ti.com>
--
Regards,
Nishanth Menon
Key (0xDDB5849D1736249D) / Fingerprint: F8A2 8693 54EB 8232 17A3 1A34 DDB5 849D 1736 249D
^ permalink raw reply [flat|nested] 56+ messages in thread
* Re: [PATCH v2 07/26] arm: dts: k3-am654: remove duplicate vtt_supply
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
0 siblings, 0 replies; 56+ messages in thread
From: Nishanth Menon @ 2024-01-02 18:48 UTC (permalink / raw)
To: Bryan Brattlof
Cc: Tom Rini, UBoot Mailing List, Vignesh Raghavendra, Andrew Davis,
Neha Malcom Francis, Manorit Chawdhry, Martyn Welch,
Svyatoslav Ryhel, Marcel Ziswiler, Simon Glass, Jan Kiszka
On 11:47-20231229, Bryan Brattlof wrote:
> With the Linux and U-Boot board dtb files unified we now have a
> duplicate vtt_supply node. Remove it
>
> Tested-by: Tom Rini <trini@konsulko.com>
> Signed-off-by: Bryan Brattlof <bb@ti.com>
> ---
> arch/arm/dts/k3-am654-r5-base-board.dts | 9 ---------
> 1 file changed, 9 deletions(-)
[...]
Reviewed-by: Nishanth Menon <nm@ti.com>
--
Regards,
Nishanth Menon
Key (0xDDB5849D1736249D) / Fingerprint: F8A2 8693 54EB 8232 17A3 1A34 DDB5 849D 1736 249D
^ permalink raw reply [flat|nested] 56+ messages in thread
* Re: [PATCH v2 08/26] arm: dts: k3-am654: remove duplicate wkup_uart0
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
0 siblings, 0 replies; 56+ messages in thread
From: Nishanth Menon @ 2024-01-02 18:48 UTC (permalink / raw)
To: Bryan Brattlof
Cc: Tom Rini, UBoot Mailing List, Vignesh Raghavendra, Andrew Davis,
Neha Malcom Francis, Manorit Chawdhry, Martyn Welch,
Svyatoslav Ryhel, Marcel Ziswiler, Simon Glass, Jan Kiszka
On 11:47-20231229, Bryan Brattlof wrote:
> With the Linux and U-Boot board files unified, we now have a duplicate
> wkup_uart0 node. Remove it
>
> Tested-by: Tom Rini <trini@konsulko.com>
> Signed-off-by: Bryan Brattlof <bb@ti.com>
> ---
> arch/arm/dts/k3-am654-r5-base-board.dts | 12 ------------
> 1 file changed, 12 deletions(-)
[...]
Reviewed-by: Nishanth Menon <nm@ti.com>
--
Regards,
Nishanth Menon
Key (0xDDB5849D1736249D) / Fingerprint: F8A2 8693 54EB 8232 17A3 1A34 DDB5 849D 1736 249D
^ permalink raw reply [flat|nested] 56+ messages in thread
* Re: [PATCH v2 09/26] arm: dts: k3-am654: remove duplicate timer
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
0 siblings, 0 replies; 56+ messages in thread
From: Nishanth Menon @ 2024-01-02 18:49 UTC (permalink / raw)
To: Bryan Brattlof
Cc: Tom Rini, UBoot Mailing List, Vignesh Raghavendra, Andrew Davis,
Neha Malcom Francis, Manorit Chawdhry, Martyn Welch,
Svyatoslav Ryhel, Marcel Ziswiler, Simon Glass, Jan Kiszka
On 11:47-20231229, Bryan Brattlof wrote:
> timer1 is really just the mcu_timer0 node redefined for the WKUP SPL.
> Remove the timer1 and replace it with the mcu_timer0 from the Linux
> device tree we imported into U-Boot.
>
> Tested-by: Tom Rini <trini@konsulko.com>
> Signed-off-by: Bryan Brattlof <bb@ti.com>
> ---
[...]
Reviewed-by: Nishanth Menon <nm@ti.com>
--
Regards,
Nishanth Menon
Key (0xDDB5849D1736249D) / Fingerprint: F8A2 8693 54EB 8232 17A3 1A34 DDB5 849D 1736 249D
^ permalink raw reply [flat|nested] 56+ messages in thread
* Re: [PATCH v2 10/26] arm: dts: k3-am654: remove duplicate mcu_ringacc
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
0 siblings, 0 replies; 56+ messages in thread
From: Nishanth Menon @ 2024-01-02 18:49 UTC (permalink / raw)
To: Bryan Brattlof
Cc: Tom Rini, UBoot Mailing List, Vignesh Raghavendra, Andrew Davis,
Neha Malcom Francis, Manorit Chawdhry, Martyn Welch,
Svyatoslav Ryhel, Marcel Ziswiler, Simon Glass, Jan Kiszka
On 11:47-20231229, Bryan Brattlof wrote:
> With the Linux and U-Boot board dtb files unified, we now have a
> duplicate mcu_ringacc node. Remove it
>
> Tested-by: Tom Rini <trini@konsulko.com>
> Signed-off-by: Bryan Brattlof <bb@ti.com>
> ---
> arch/arm/dts/k3-am654-r5-base-board.dts | 10 ----------
> 1 file changed, 10 deletions(-)
>
[...]
Reviewed-by: Nishanth Menon <nm@ti.com>
--
Regards,
Nishanth Menon
Key (0xDDB5849D1736249D) / Fingerprint: F8A2 8693 54EB 8232 17A3 1A34 DDB5 849D 1736 249D
^ permalink raw reply [flat|nested] 56+ messages in thread
* Re: [PATCH v2 11/26] arm: dts: k3-am654: remove duplicate mcu_udmap
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
0 siblings, 0 replies; 56+ messages in thread
From: Nishanth Menon @ 2024-01-02 18:49 UTC (permalink / raw)
To: Bryan Brattlof
Cc: Tom Rini, UBoot Mailing List, Vignesh Raghavendra, Andrew Davis,
Neha Malcom Francis, Manorit Chawdhry, Martyn Welch,
Svyatoslav Ryhel, Marcel Ziswiler, Simon Glass, Jan Kiszka
On 11:47-20231229, Bryan Brattlof wrote:
> With the Linux and U-Boot board dtb files unified, we now have a
> duplicate mcu_udmap node. Remove it
>
> Tested-by: Tom Rini <trini@konsulko.com>
> Signed-off-by: Bryan Brattlof <bb@ti.com>
> ---
> arch/arm/dts/k3-am654-r5-base-board.dts | 13 -------------
> 1 file changed, 13 deletions(-)
>
[...]
Reviewed-by: Nishanth Menon <nm@ti.com>
--
Regards,
Nishanth Menon
Key (0xDDB5849D1736249D) / Fingerprint: F8A2 8693 54EB 8232 17A3 1A34 DDB5 849D 1736 249D
^ permalink raw reply [flat|nested] 56+ messages in thread
* Re: [PATCH v2 12/26] arm: dts: k3-am654: add needed regs to udmap nodes
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
0 siblings, 0 replies; 56+ messages in thread
From: Nishanth Menon @ 2024-01-02 18:51 UTC (permalink / raw)
To: Bryan Brattlof
Cc: Tom Rini, UBoot Mailing List, Vignesh Raghavendra, Andrew Davis,
Neha Malcom Francis, Manorit Chawdhry, Martyn Welch,
Svyatoslav Ryhel, Marcel Ziswiler, Simon Glass, Jan Kiszka
On 11:47-20231229, Bryan Brattlof wrote:
> Ethernet is one of a few IPs in U-Boot that depend on DMA to operate.
> However there are a few missing registers ranges in the udmap nodes
> need to properly setup DMA for the am65x.
>
> A fix has been added to the Linux kernel[0] to add these ranges however
> they have not made it to a Linux tag. To keep DMA operational until the
> next DT sync from Linux, add these ranges to the *-u-boot.dtsi with a
> note for our future selves.
>
> [0] https://lore.kernel.org/r/20231213135138.929517-2-vigneshr@ti.com
>
> 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 | 34 ++++++++++++++++++++
> 1 file changed, 34 insertions(+)
>
> 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 a008af5b4a047..a24cb895e5578 100644
> --- a/arch/arm/dts/k3-am654-base-board-u-boot.dtsi
> +++ b/arch/arm/dts/k3-am654-base-board-u-boot.dtsi
> @@ -252,3 +252,37 @@
> &mcu_r5fss0 {
> ti,cluster-mode = <0>;
> };
> +
> +/*
> + * The DMA driver requires a few extra register ranges
> + * which are missing for the am65x. A patch has been
> + * sent and will be synced after the v6.8-rc1 linux
> + * tag is published
> + */
> +&main_udmap {
> + reg = <0x0 0x31150000 0x0 0x100>,
> + <0x0 0x34000000 0x0 0x100000>,
> + <0x0 0x35000000 0x0 0x100000>,
> + <0x0 0x30b00000 0x0 0x10000>,
> + <0x0 0x30c00000 0x0 0x10000>,
> + <0x0 0x30d00000 0x0 0x8000>;
> + reg-names = "gcfg", "rchanrt", "tchanrt",
> + "tchan", "rchan", "rflow";
> +};
> +
> +/*
> + * The DMA driver requires a few extra register ranges
> + * which are missing for the am65x. A patch has been
> + * sent and will be synced after the v6.8-rc1 linux
> + * tag is published
> + */
> +&mcu_udmap {
> + reg = <0x0 0x285c0000 0x0 0x100>,
> + <0x0 0x2a800000 0x0 0x40000>,
> + <0x0 0x2aa00000 0x0 0x40000>,
> + <0x0 0x284a0000 0x0 0x4000>,
> + <0x0 0x284c0000 0x0 0x4000>,
> + <0x0 0x28400000 0x0 0x2000>;
> + reg-names = "gcfg", "rchanrt", "tchanrt",
> + "tchan", "rchan", "rflow";
> +};
Hopefully we can get rid of this in 6.8-rc1 sync.
[...]
Reviewed-by: Nishanth Menon <nm@ti.com>
--
Regards,
Nishanth Menon
Key (0xDDB5849D1736249D) / Fingerprint: F8A2 8693 54EB 8232 17A3 1A34 DDB5 849D 1736 249D
^ permalink raw reply [flat|nested] 56+ messages in thread
* Re: [PATCH v2 13/26] arm: dts: k3-am654: remove duplicate mcu_uart0 node
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
0 siblings, 0 replies; 56+ messages in thread
From: Nishanth Menon @ 2024-01-02 18:51 UTC (permalink / raw)
To: Bryan Brattlof
Cc: Tom Rini, UBoot Mailing List, Vignesh Raghavendra, Andrew Davis,
Neha Malcom Francis, Manorit Chawdhry, Martyn Welch,
Svyatoslav Ryhel, Marcel Ziswiler, Simon Glass, Jan Kiszka
On 11:47-20231229, Bryan Brattlof wrote:
> With the Linux and U-Boot board dtb files unified we now have a
> duplicate mcu_uart0 node. Remove it
>
> Tested-by: Tom Rini <trini@konsulko.com>
> Signed-off-by: Bryan Brattlof <bb@ti.com>
> ---
[...]
Reviewed-by: Nishanth Menon <nm@ti.com>
--
Regards,
Nishanth Menon
Key (0xDDB5849D1736249D) / Fingerprint: F8A2 8693 54EB 8232 17A3 1A34 DDB5 849D 1736 249D
^ permalink raw reply [flat|nested] 56+ messages in thread
* Re: [PATCH v2 14/26] arm: dts: k3-am654: remove duplicate main_uart0
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
0 siblings, 0 replies; 56+ messages in thread
From: Nishanth Menon @ 2024-01-02 18:51 UTC (permalink / raw)
To: Bryan Brattlof
Cc: Tom Rini, UBoot Mailing List, Vignesh Raghavendra, Andrew Davis,
Neha Malcom Francis, Manorit Chawdhry, Martyn Welch,
Svyatoslav Ryhel, Marcel Ziswiler, Simon Glass, Jan Kiszka
On 11:47-20231229, Bryan Brattlof wrote:
> With the Linux and U-Boot board dtb files unified, we now have a
> duplicate main_uart0 node. Remove it
>
> Tested-by: Tom Rini <trini@konsulko.com>
> Signed-off-by: Bryan Brattlof <bb@ti.com>
> ---
[...]
Reviewed-by: Nishanth Menon <nm@ti.com>
--
Regards,
Nishanth Menon
Key (0xDDB5849D1736249D) / Fingerprint: F8A2 8693 54EB 8232 17A3 1A34 DDB5 849D 1736 249D
^ permalink raw reply [flat|nested] 56+ messages in thread
* Re: [PATCH v2 15/26] arm: dts: k3-am654: remove duplicate sdhci0 pinmux node
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
0 siblings, 0 replies; 56+ messages in thread
From: Nishanth Menon @ 2024-01-02 18:51 UTC (permalink / raw)
To: Bryan Brattlof
Cc: Tom Rini, UBoot Mailing List, Vignesh Raghavendra, Andrew Davis,
Neha Malcom Francis, Manorit Chawdhry, Martyn Welch,
Svyatoslav Ryhel, Marcel Ziswiler, Simon Glass, Jan Kiszka
On 11:47-20231229, Bryan Brattlof wrote:
> With the Linux and U-Boot board dtb files unified, we now have
> a duplicate sdhci0 pinmux node. Remove it
>
> Tested-by: Tom Rini <trini@konsulko.com>
> Signed-off-by: Bryan Brattlof <bb@ti.com>
> ---
[...]
Reviewed-by: Nishanth Menon <nm@ti.com>
--
Regards,
Nishanth Menon
Key (0xDDB5849D1736249D) / Fingerprint: F8A2 8693 54EB 8232 17A3 1A34 DDB5 849D 1736 249D
^ permalink raw reply [flat|nested] 56+ messages in thread
* Re: [PATCH v2 16/26] arm: dts: k3-am654: remove duplicate sdhci1 pinmux node
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
0 siblings, 0 replies; 56+ messages in thread
From: Nishanth Menon @ 2024-01-02 18:51 UTC (permalink / raw)
To: Bryan Brattlof
Cc: Tom Rini, UBoot Mailing List, Vignesh Raghavendra, Andrew Davis,
Neha Malcom Francis, Manorit Chawdhry, Martyn Welch,
Svyatoslav Ryhel, Marcel Ziswiler, Simon Glass, Jan Kiszka
On 11:47-20231229, Bryan Brattlof wrote:
> With the Linux and U-Boot board dtb files unified, we now have a
> duplicate sdhci1 pinmux node. Remove it
>
> Tested-by: Tom Rini <trini@konsulko.com>
> Signed-off-by: Bryan Brattlof <bb@ti.com>
> ---
[...]
Reviewed-by: Nishanth Menon <nm@ti.com>
--
Regards,
Nishanth Menon
Key (0xDDB5849D1736249D) / Fingerprint: F8A2 8693 54EB 8232 17A3 1A34 DDB5 849D 1736 249D
^ permalink raw reply [flat|nested] 56+ messages in thread
* Re: [PATCH v2 17/26] arm: dts: k3-am654: remove duplicate wkup_i2c0
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
0 siblings, 0 replies; 56+ messages in thread
From: Nishanth Menon @ 2024-01-02 18:52 UTC (permalink / raw)
To: Bryan Brattlof
Cc: Tom Rini, UBoot Mailing List, Vignesh Raghavendra, Andrew Davis,
Neha Malcom Francis, Manorit Chawdhry, Martyn Welch,
Svyatoslav Ryhel, Marcel Ziswiler, Simon Glass, Jan Kiszka
On 11:47-20231229, Bryan Brattlof wrote:
> With the Linux and U-Boot board dtb files unified, we now have a
> duplicate wkup_i2c0 node. Remove it
>
> Tested-by: Tom Rini <trini@konsulko.com>
> Signed-off-by: Bryan Brattlof <bb@ti.com>
> ---
[...]
Reviewed-by: Nishanth Menon <nm@ti.com>
--
Regards,
Nishanth Menon
Key (0xDDB5849D1736249D) / Fingerprint: F8A2 8693 54EB 8232 17A3 1A34 DDB5 849D 1736 249D
^ permalink raw reply [flat|nested] 56+ messages in thread
* Re: [PATCH v2 18/26] arm: dts: k3-am654: remove duplicate ospi0 node
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
0 siblings, 0 replies; 56+ messages in thread
From: Nishanth Menon @ 2024-01-02 18:52 UTC (permalink / raw)
To: Bryan Brattlof
Cc: Tom Rini, UBoot Mailing List, Vignesh Raghavendra, Andrew Davis,
Neha Malcom Francis, Manorit Chawdhry, Martyn Welch,
Svyatoslav Ryhel, Marcel Ziswiler, Simon Glass, Jan Kiszka
On 11:47-20231229, Bryan Brattlof wrote:
> With the Linux and U-Boot board dtb files unified, we now have a
> duplicate ospi0 node. Remove it
>
> Tested-by: Tom Rini <trini@konsulko.com>
> Signed-off-by: Bryan Brattlof <bb@ti.com>
> ---
[...]
Reviewed-by: Nishanth Menon <nm@ti.com>
--
Regards,
Nishanth Menon
Key (0xDDB5849D1736249D) / Fingerprint: F8A2 8693 54EB 8232 17A3 1A34 DDB5 849D 1736 249D
^ permalink raw reply [flat|nested] 56+ messages in thread
* Re: [PATCH v2 19/26] arm: dts: k3-am654: remove usb0
2023-12-29 17:47 ` [PATCH v2 19/26] arm: dts: k3-am654: remove usb0 Bryan Brattlof
@ 2024-01-02 18:52 ` Nishanth Menon
0 siblings, 0 replies; 56+ messages in thread
From: Nishanth Menon @ 2024-01-02 18:52 UTC (permalink / raw)
To: Bryan Brattlof
Cc: Tom Rini, UBoot Mailing List, Vignesh Raghavendra, Andrew Davis,
Neha Malcom Francis, Manorit Chawdhry, Martyn Welch,
Svyatoslav Ryhel, Marcel Ziswiler, Simon Glass, Jan Kiszka
On 11:47-20231229, Bryan Brattlof wrote:
> The pinmux for usb0 is missing from the Linux board dtb file. Remove it
> until we can introduce it in Linux
>
> Tested-by: Tom Rini <trini@konsulko.com>
> Signed-off-by: Bryan Brattlof <bb@ti.com>
> ---
[...]
Reviewed-by: Nishanth Menon <nm@ti.com>
--
Regards,
Nishanth Menon
Key (0xDDB5849D1736249D) / Fingerprint: F8A2 8693 54EB 8232 17A3 1A34 DDB5 849D 1736 249D
^ permalink raw reply [flat|nested] 56+ messages in thread
* Re: [PATCH v2 20/26] arm: dts: k3-am654: remove duplicate mdio
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
0 siblings, 0 replies; 56+ messages in thread
From: Nishanth Menon @ 2024-01-02 18:52 UTC (permalink / raw)
To: Bryan Brattlof
Cc: Tom Rini, UBoot Mailing List, Vignesh Raghavendra, Andrew Davis,
Neha Malcom Francis, Manorit Chawdhry, Martyn Welch,
Svyatoslav Ryhel, Marcel Ziswiler, Simon Glass, Jan Kiszka
On 11:47-20231229, Bryan Brattlof wrote:
> With the Linux and U-Boot board dtb files unified, we now have a
> duplicate mdio node. Remove it
>
> Tested-by: Tom Rini <trini@konsulko.com>
> Signed-off-by: Bryan Brattlof <bb@ti.com>
[...]
Reviewed-by: Nishanth Menon <nm@ti.com>
--
Regards,
Nishanth Menon
Key (0xDDB5849D1736249D) / Fingerprint: F8A2 8693 54EB 8232 17A3 1A34 DDB5 849D 1736 249D
^ permalink raw reply [flat|nested] 56+ messages in thread
* Re: [PATCH v2 21/26] arm: dts: k3-am654: remove duplicate vtt pinmux
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
0 siblings, 0 replies; 56+ messages in thread
From: Nishanth Menon @ 2024-01-02 18:52 UTC (permalink / raw)
To: Bryan Brattlof
Cc: Tom Rini, UBoot Mailing List, Vignesh Raghavendra, Andrew Davis,
Neha Malcom Francis, Manorit Chawdhry, Martyn Welch,
Svyatoslav Ryhel, Marcel Ziswiler, Simon Glass, Jan Kiszka
On 11:47-20231229, Bryan Brattlof wrote:
> With the Linux and U-Boot board dtb files unified, we now have a
> duplicate vtt_pinmux node. Remove it
>
> Tested-by: Tom Rini <trini@konsulko.com>
> Signed-off-by: Bryan Brattlof <bb@ti.com>
> ---
[...]
Reviewed-by: Nishanth Menon <nm@ti.com>
--
Regards,
Nishanth Menon
Key (0xDDB5849D1736249D) / Fingerprint: F8A2 8693 54EB 8232 17A3 1A34 DDB5 849D 1736 249D
^ permalink raw reply [flat|nested] 56+ messages in thread
* Re: [PATCH v2 22/26] arm: dts: k3-am654: remove duplicate root properties
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
0 siblings, 0 replies; 56+ messages in thread
From: Nishanth Menon @ 2024-01-02 18:53 UTC (permalink / raw)
To: Bryan Brattlof
Cc: Tom Rini, UBoot Mailing List, Vignesh Raghavendra, Andrew Davis,
Neha Malcom Francis, Manorit Chawdhry, Martyn Welch,
Svyatoslav Ryhel, Marcel Ziswiler, Simon Glass, Jan Kiszka
On 11:47-20231229, Bryan Brattlof wrote:
> With the Linux and U-Boot board dtb files unified, we have duplicate
> properties in the root node. Remove them
>
> Tested-by: Tom Rini <trini@konsulko.com>
> Signed-off-by: Bryan Brattlof <bb@ti.com>
> ---
[...]
Reviewed-by: Nishanth Menon <nm@ti.com>
--
Regards,
Nishanth Menon
Key (0xDDB5849D1736249D) / Fingerprint: F8A2 8693 54EB 8232 17A3 1A34 DDB5 849D 1736 249D
^ permalink raw reply [flat|nested] 56+ messages in thread
* Re: [PATCH v2 23/26] arm: dts: k3-am654: remove un-needed aliases
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
0 siblings, 0 replies; 56+ messages in thread
From: Nishanth Menon @ 2024-01-02 18:53 UTC (permalink / raw)
To: Bryan Brattlof
Cc: Tom Rini, UBoot Mailing List, Vignesh Raghavendra, Andrew Davis,
Neha Malcom Francis, Manorit Chawdhry, Martyn Welch,
Svyatoslav Ryhel, Marcel Ziswiler, Simon Glass, Jan Kiszka
On 11:47-20231229, Bryan Brattlof wrote:
> These aliases are not needed in U-Boot. Remove them
>
> Tested-by: Tom Rini <trini@konsulko.com>
> Signed-off-by: Bryan Brattlof <bb@ti.com>
> ---
[...]
Reviewed-by: Nishanth Menon <nm@ti.com>
--
Regards,
Nishanth Menon
Key (0xDDB5849D1736249D) / Fingerprint: F8A2 8693 54EB 8232 17A3 1A34 DDB5 849D 1736 249D
^ permalink raw reply [flat|nested] 56+ messages in thread
* Re: [PATCH v2 24/26] arm: dts: k3-am654: move dummy_clock to root node
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
0 siblings, 0 replies; 56+ messages in thread
From: Nishanth Menon @ 2024-01-02 18:53 UTC (permalink / raw)
To: Bryan Brattlof
Cc: Tom Rini, UBoot Mailing List, Vignesh Raghavendra, Andrew Davis,
Neha Malcom Francis, Manorit Chawdhry, Martyn Welch,
Svyatoslav Ryhel, Marcel Ziswiler, Simon Glass, Jan Kiszka
On 11:47-20231229, Bryan Brattlof wrote:
> The dummy_clock node is used to help the drivers probe the IO needed to
> setup consoles and boot media to load firmware into the SoC.
>
> This dummy_clock isn't a device that exists nor does it exist in the
> mcu domain. So move it from cbass_mcu to the root node to avoid any
> confusion.
>
> Tested-by: Tom Rini <trini@konsulko.com>
> Signed-off-by: Bryan Brattlof <bb@ti.com>
> ---
[...]
Reviewed-by: Nishanth Menon <nm@ti.com>
--
Regards,
Nishanth Menon
Key (0xDDB5849D1736249D) / Fingerprint: F8A2 8693 54EB 8232 17A3 1A34 DDB5 849D 1736 249D
^ permalink raw reply [flat|nested] 56+ messages in thread
* Re: [PATCH v2 25/26] arm: dts: k3-am654: remove duplicate mcu secure proxy node
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
0 siblings, 0 replies; 56+ messages in thread
From: Nishanth Menon @ 2024-01-02 18:53 UTC (permalink / raw)
To: Bryan Brattlof
Cc: Tom Rini, UBoot Mailing List, Vignesh Raghavendra, Andrew Davis,
Neha Malcom Francis, Manorit Chawdhry, Martyn Welch,
Svyatoslav Ryhel, Marcel Ziswiler, Simon Glass, Jan Kiszka
On 11:47-20231229, Bryan Brattlof wrote:
> With the Linux and U-Boot board dtb files unified, we now have a
> duplicate mcu secure proxy node. Remove it
>
> Tested-by: Tom Rini <trini@konsulko.com>
> Signed-off-by: Bryan Brattlof <bb@ti.com>
> ---
[...]
Reviewed-by: Nishanth Menon <nm@ti.com>
--
Regards,
Nishanth Menon
Key (0xDDB5849D1736249D) / Fingerprint: F8A2 8693 54EB 8232 17A3 1A34 DDB5 849D 1736 249D
^ permalink raw reply [flat|nested] 56+ messages in thread
* Re: [PATCH v2 26/26] arm: dts: k3-am654: convert bootph-pre-ram to bootph-all
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
0 siblings, 0 replies; 56+ messages in thread
From: Nishanth Menon @ 2024-01-02 18:55 UTC (permalink / raw)
To: Bryan Brattlof
Cc: Tom Rini, UBoot Mailing List, Vignesh Raghavendra, Andrew Davis,
Neha Malcom Francis, Manorit Chawdhry, Martyn Welch,
Svyatoslav Ryhel, Marcel Ziswiler, Simon Glass, Jan Kiszka
On 11:47-20231229, Bryan Brattlof wrote:
> Many nodes are reused between WKUP SPL, MAIN SPL, and U-Boot. Using
> bootph-pre-ram is causing these nodes to be present in SPL builds but
> pruned away during the U-Boot build. Convert these nodes to bootph-all
> so they will remain no matter which dtb build is happening.
>
> Tested-by: Tom Rini <trini@konsulko.com>
> Signed-off-by: Bryan Brattlof <bb@ti.com>
> ---
[...]
Reviewed-by: Nishanth Menon <nm@ti.com>
--
Regards,
Nishanth Menon
Key (0xDDB5849D1736249D) / Fingerprint: F8A2 8693 54EB 8232 17A3 1A34 DDB5 849D 1736 249D
^ permalink raw reply [flat|nested] 56+ messages in thread
* Re: [PATCH v2 00/26] sync am65x device tree with Linux v6.7-rc1
2023-12-29 17:46 [PATCH v2 00/26] sync am65x device tree with Linux v6.7-rc1 Bryan Brattlof
` (25 preceding siblings ...)
2023-12-29 17:47 ` [PATCH v2 26/26] arm: dts: k3-am654: convert bootph-pre-ram to bootph-all Bryan Brattlof
@ 2024-01-03 13:54 ` Tom Rini
2024-01-06 11:57 ` Jan Kiszka
27 siblings, 0 replies; 56+ messages in thread
From: Tom Rini @ 2024-01-03 13:54 UTC (permalink / raw)
To: Bryan Brattlof
Cc: UBoot Mailing List, Vignesh Raghavendra, Andrew Davis,
Nishanth Menon, Neha Malcom Francis, Manorit Chawdhry,
Martyn Welch, Svyatoslav Ryhel, Marcel Ziswiler, Simon Glass,
Jan Kiszka
On Fri, 29 Dec 2023 11:46:57 -0600, Bryan Brattlof wrote:
> This series gets the am65x booting again along with syncing the device
> tree files with v6.7-rc1 Linux.
>
> The bulk of these patches unify the WKUP SPL board file with the arm64
> files to make future syncs from Linux much easier. In the end the DTBs
> should look a lot like what the DTBs look like for the am64x which
> is fairly similar to the am65x.
>
> [...]
Applied to u-boot/master, thanks!
--
Tom
^ permalink raw reply [flat|nested] 56+ messages in thread
* Re: [PATCH v2 00/26] sync am65x device tree with Linux v6.7-rc1
2023-12-29 17:46 [PATCH v2 00/26] sync am65x device tree with Linux v6.7-rc1 Bryan Brattlof
` (26 preceding siblings ...)
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
27 siblings, 1 reply; 56+ messages in thread
From: Jan Kiszka @ 2024-01-06 11:57 UTC (permalink / raw)
To: Bryan Brattlof, Tom Rini
Cc: UBoot Mailing List, Vignesh Raghavendra, Andrew Davis,
Nishanth Menon, Neha Malcom Francis, Manorit Chawdhry,
Martyn Welch, Svyatoslav Ryhel, Marcel Ziswiler, Simon Glass
On 29.12.23 18:46, Bryan Brattlof wrote:
> Hello Again Everyone!
>
> This series gets the am65x booting again along with syncing the device
> tree files with v6.7-rc1 Linux.
>
> The bulk of these patches unify the WKUP SPL board file with the arm64
> files to make future syncs from Linux much easier. In the end the DTBs
> should look a lot like what the DTBs look like for the am64x which
> is fairly similar to the am65x.
>
> For those interested in what UART boot looks like:
> https://paste.sr.ht/~bryanb/7df8a645dc548912cd806abd5ecab967ef3287bc
>
> Changes from v1: [0]
> - fixed multi-line comment format
> - moved wkup_uart0 and mcu_uart0 U-Boot overrides to the r5 board file
> as they are not needed for a53/main domain U-Boot builds
> - corrected a bad wkup_i2c0_pins_default fixup in PATCH 6/26
> - spelling fix (s/Libux/Linux/) in commit body for PATCH 6/26
> - added trailers from Tom
>
> Thanks for reviewing and happy holidays
> ~Bryan
>
> [0] https://lore.kernel.org/u-boot/20231221174412.210807-1-bb@ti.com/
>
> Bryan Brattlof (26):
> configs: am65x_evm_r5: enable driver for fixed regulators
> configs: am65x_evm_a53: disable CONSOLE_MUX
> arm: dts: k3-am654-r5: Merge board file and U-Boot overlay
> arm: dts: k3-am654: pull in dtb update from Linux
> arm: dts: k3-am654: copy bootph properties to a53 dts
> arm: dts: k3-am654: include a53 board dtb for r5 build
> arm: dts: k3-am654: remove duplicate vtt_supply
> arm: dts: k3-am654: remove duplicate wkup_uart0
> arm: dts: k3-am654: remove duplicate timer
> arm: dts: k3-am654: remove duplicate mcu_ringacc
> arm: dts: k3-am654: remove duplicate mcu_udmap
> arm: dts: k3-am654: add needed regs to udmap nodes
> arm: dts: k3-am654: remove duplicate mcu_uart0 node
> arm: dts: k3-am654: remove duplicate main_uart0
> arm: dts: k3-am654: remove duplicate sdhci0 pinmux node
> arm: dts: k3-am654: remove duplicate sdhci1 pinmux node
> arm: dts: k3-am654: remove duplicate wkup_i2c0
> arm: dts: k3-am654: remove duplicate ospi0 node
> arm: dts: k3-am654: remove usb0
> arm: dts: k3-am654: remove duplicate mdio
> arm: dts: k3-am654: remove duplicate vtt pinmux
> arm: dts: k3-am654: remove duplicate root properties
> arm: dts: k3-am654: remove un-needed aliases
> arm: dts: k3-am654: move dummy_clock to root node
> arm: dts: k3-am654: remove duplicate mcu secure proxy node
> arm: dts: k3-am654: convert bootph-pre-ram to bootph-all
>
> arch/arm/dts/k3-am65-main.dtsi | 342 +++++++++++++++---
> arch/arm/dts/k3-am65-mcu.dtsi | 156 +++++++-
> arch/arm/dts/k3-am65-wakeup.dtsi | 10 +-
> arch/arm/dts/k3-am65.dtsi | 19 +-
> arch/arm/dts/k3-am654-base-board-u-boot.dtsi | 195 +++++++++-
> arch/arm/dts/k3-am654-base-board.dts | 301 +++++++++------
> .../dts/k3-am654-r5-base-board-u-boot.dtsi | 208 -----------
> arch/arm/dts/k3-am654-r5-base-board.dts | 303 ++++------------
> arch/arm/dts/k3-am654.dtsi | 7 +
> configs/am65x_evm_a53_defconfig | 1 -
> configs/am65x_evm_r5_defconfig | 2 +
> 11 files changed, 886 insertions(+), 658 deletions(-)
> delete mode 100644 arch/arm/dts/k3-am654-r5-base-board-u-boot.dtsi
>
>
> base-commit: 0a0ceea2269b983e736b80104f03cc800d1a5e2a
This breaks the IOT2050 boards, probably because it did in incomplete
sync, changing the core dtsi file without updating all affected boards.
But also [1] is missing in upstream already and seem to have an impact.
Bad timing for a sync.
And the series is not bisectable - already the 3rd patch breaks the build:
...
DTC arch/arm/dts/k3-am654-r5-base-board.dtb
Error: arch/arm/dts/.k3-am654-r5-base-board.dtb.pre.tmp:423.27-28 syntax
error
FATAL ERROR: Unable to parse input tree
Jan
[1]
https://lore.kernel.org/lkml/1edbc1b56ed4ff2256d7afb7db3cab4b3a423692.1699087938.git.jan.kiszka@siemens.com/
--
Siemens AG, Technology
Linux Expert Center
^ permalink raw reply [flat|nested] 56+ messages in thread
* Re: [PATCH v2 00/26] sync am65x device tree with Linux v6.7-rc1
2024-01-06 11:57 ` Jan Kiszka
@ 2024-01-06 11:58 ` Jan Kiszka
0 siblings, 0 replies; 56+ messages in thread
From: Jan Kiszka @ 2024-01-06 11:58 UTC (permalink / raw)
To: Bryan Brattlof, Tom Rini
Cc: UBoot Mailing List, Vignesh Raghavendra, Andrew Davis,
Nishanth Menon, Neha Malcom Francis, Manorit Chawdhry,
Martyn Welch, Svyatoslav Ryhel, Marcel Ziswiler, Simon Glass
On 06.01.24 12:57, Jan Kiszka wrote:
> On 29.12.23 18:46, Bryan Brattlof wrote:
>> Hello Again Everyone!
>>
>> This series gets the am65x booting again along with syncing the device
>> tree files with v6.7-rc1 Linux.
>>
>> The bulk of these patches unify the WKUP SPL board file with the arm64
>> files to make future syncs from Linux much easier. In the end the DTBs
>> should look a lot like what the DTBs look like for the am64x which
>> is fairly similar to the am65x.
>>
>> For those interested in what UART boot looks like:
>> https://paste.sr.ht/~bryanb/7df8a645dc548912cd806abd5ecab967ef3287bc
>>
>> Changes from v1: [0]
>> - fixed multi-line comment format
>> - moved wkup_uart0 and mcu_uart0 U-Boot overrides to the r5 board file
>> as they are not needed for a53/main domain U-Boot builds
>> - corrected a bad wkup_i2c0_pins_default fixup in PATCH 6/26
>> - spelling fix (s/Libux/Linux/) in commit body for PATCH 6/26
>> - added trailers from Tom
>>
>> Thanks for reviewing and happy holidays
>> ~Bryan
>>
>> [0] https://lore.kernel.org/u-boot/20231221174412.210807-1-bb@ti.com/
>>
>> Bryan Brattlof (26):
>> configs: am65x_evm_r5: enable driver for fixed regulators
>> configs: am65x_evm_a53: disable CONSOLE_MUX
>> arm: dts: k3-am654-r5: Merge board file and U-Boot overlay
>> arm: dts: k3-am654: pull in dtb update from Linux
>> arm: dts: k3-am654: copy bootph properties to a53 dts
>> arm: dts: k3-am654: include a53 board dtb for r5 build
>> arm: dts: k3-am654: remove duplicate vtt_supply
>> arm: dts: k3-am654: remove duplicate wkup_uart0
>> arm: dts: k3-am654: remove duplicate timer
>> arm: dts: k3-am654: remove duplicate mcu_ringacc
>> arm: dts: k3-am654: remove duplicate mcu_udmap
>> arm: dts: k3-am654: add needed regs to udmap nodes
>> arm: dts: k3-am654: remove duplicate mcu_uart0 node
>> arm: dts: k3-am654: remove duplicate main_uart0
>> arm: dts: k3-am654: remove duplicate sdhci0 pinmux node
>> arm: dts: k3-am654: remove duplicate sdhci1 pinmux node
>> arm: dts: k3-am654: remove duplicate wkup_i2c0
>> arm: dts: k3-am654: remove duplicate ospi0 node
>> arm: dts: k3-am654: remove usb0
>> arm: dts: k3-am654: remove duplicate mdio
>> arm: dts: k3-am654: remove duplicate vtt pinmux
>> arm: dts: k3-am654: remove duplicate root properties
>> arm: dts: k3-am654: remove un-needed aliases
>> arm: dts: k3-am654: move dummy_clock to root node
>> arm: dts: k3-am654: remove duplicate mcu secure proxy node
>> arm: dts: k3-am654: convert bootph-pre-ram to bootph-all
>>
>> arch/arm/dts/k3-am65-main.dtsi | 342 +++++++++++++++---
>> arch/arm/dts/k3-am65-mcu.dtsi | 156 +++++++-
>> arch/arm/dts/k3-am65-wakeup.dtsi | 10 +-
>> arch/arm/dts/k3-am65.dtsi | 19 +-
>> arch/arm/dts/k3-am654-base-board-u-boot.dtsi | 195 +++++++++-
>> arch/arm/dts/k3-am654-base-board.dts | 301 +++++++++------
>> .../dts/k3-am654-r5-base-board-u-boot.dtsi | 208 -----------
>> arch/arm/dts/k3-am654-r5-base-board.dts | 303 ++++------------
>> arch/arm/dts/k3-am654.dtsi | 7 +
>> configs/am65x_evm_a53_defconfig | 1 -
>> configs/am65x_evm_r5_defconfig | 2 +
>> 11 files changed, 886 insertions(+), 658 deletions(-)
>> delete mode 100644 arch/arm/dts/k3-am654-r5-base-board-u-boot.dtsi
>>
>>
>> base-commit: 0a0ceea2269b983e736b80104f03cc800d1a5e2a
>
> This breaks the IOT2050 boards, probably because it did in incomplete
> sync, changing the core dtsi file without updating all affected boards.
> But also [1] is missing in upstream already and seem to have an impact.
> Bad timing for a sync.
>
> And the series is not bisectable - already the 3rd patch breaks the build:
>
> ...
> DTC arch/arm/dts/k3-am654-r5-base-board.dtb
> Error: arch/arm/dts/.k3-am654-r5-base-board.dtb.pre.tmp:423.27-28 syntax
> error
> FATAL ERROR: Unable to parse input tree
>
> Jan
>
> [1]
> https://lore.kernel.org/lkml/1edbc1b56ed4ff2256d7afb7db3cab4b3a423692.1699087938.git.jan.kiszka@siemens.com/
>
BTW, folks @TI: You have our devices by now.
Jan
--
Siemens AG, Technology
Linux Expert Center
^ permalink raw reply [flat|nested] 56+ messages in thread
end of thread, other threads:[~2024-01-06 11:58 UTC | newest]
Thread overview: 56+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
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 ` [PATCH v2 05/26] arm: dts: k3-am654: copy bootph properties to a53 dts Bryan Brattlof
2024-01-02 18:48 ` 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
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.