sync am65x device tree with Linux v6.7-rc1
v2 cover sync am65x device tree with Linux v6.7-rc1
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/[email protected]/
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
Signature · 1 line
2.43.0
PATCH v2 1/26 configs: am65x_evm_r5: enable driver for fixed regulators
Some of the regulators we need to successfully boot are fixed regulators. Enable the driver to properly probe them.
--- configs/am65x_evm_r5_defconfig | 2 ++ 1 file changed, 2 insertions(+)
configs/am65x_evm_r5_defconfig +2 -0
@@ -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
Signature · 1 line
2.43.0
Re: [PATCH v2 01/26] configs: am65x_evm_r5: enable driver for fixed regulators
Quoted 9 lines · 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 <[email protected]>Signed-off-by Bryan Brattlof <[email protected]>--- configs/am65x_evm_r5_defconfig | 2 ++ 1 file changed, 2 insertions(+)
Signature · 3 lines
Regards, Nishanth Menon Key (0xDDB5849D1736249D) / Fingerprint: F8A2 8693 54EB 8232 17A3 1A34 DDB5 849D 1736 249D
PATCH v2 2/26 configs: am65x_evm_a53: disable CONSOLE_MUX
In reply to Bryan BrattlofWe 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
--- configs/am65x_evm_a53_defconfig | 1 - 1 file changed, 1 deletion(-)
configs/am65x_evm_a53_defconfig +0 -1
@@ -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
Signature · 1 line
2.43.0
Re: [PATCH v2 02/26] configs: am65x_evm_a53: disable CONSOLE_MUX
Quoted 10 lines · 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_MUXTested-by Tom Rini <[email protected]>Signed-off-by Bryan Brattlof <[email protected]>--- configs/am65x_evm_a53_defconfig | 1 - 1 file changed, 1 deletion(-)
Signature · 3 lines
Regards, Nishanth Menon Key (0xDDB5849D1736249D) / Fingerprint: F8A2 8693 54EB 8232 17A3 1A34 DDB5 849D 1736 249D
PATCH v2 3/26 arm: dts: k3-am654-r5: Merge board file and U-Boot overlay
In reply to Bryan BrattlofThe 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.
--- 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
arch/arm/dts/k3-am654-base-board-u-boot.dtsi +0 -1
@@ -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 {
arch/arm/dts/k3-am654-r5-base-board-u-boot.dtsi deleted +0 -208
208 lines not on this page · raw message
arch/arm/dts/k3-am654-r5-base-board.dts +119 -5
231 lines not on this page · raw message
Signature · 1 line
2.43.0
Re: [PATCH v2 03/26] arm: dts: k3-am654-r5: Merge board file and U-Boot overlay
Quoted 9 lines · 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 <[email protected]>Signed-off-by Bryan Brattlof <[email protected]>---
Signature · 3 lines
Regards, Nishanth Menon Key (0xDDB5849D1736249D) / Fingerprint: F8A2 8693 54EB 8232 17A3 1A34 DDB5 849D 1736 249D
PATCH v2 4/26 arm: dts: k3-am654: pull in dtb update from Linux
In reply to Bryan BrattlofPull in dtb updates for the am654 base board from v6.7-rc1 of Linux
--- 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(-)
arch/arm/dts/k3-am65-main.dtsi +284 -58
@@ -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"; }; }; };
arch/arm/dts/k3-am65-mcu.dtsi +139 -17
249 lines not on this page · raw message
arch/arm/dts/k3-am65-wakeup.dtsi +4 -6
@@ -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" - }; };
arch/arm/dts/k3-am65.dtsi +3 -16
@@ -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>;
arch/arm/dts/k3-am654-base-board.dts +189 -112
558 lines not on this page · raw message
arch/arm/dts/k3-am654.dtsi +7 -0
@@ -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" }; };
Signature · 1 line
2.43.0
Re: [PATCH v2 04/26] arm: dts: k3-am654: pull in dtb update from Linux
Quoted 4 lines · Bryan Brattlof
Pull in dtb updates for the am654 base board from v6.7-rc1 of Linux
Tested-by Tom Rini <[email protected]>Signed-off-by Bryan Brattlof <[email protected]>
Quoted 9 lines
--- 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(-)
Signature · 3 lines
Regards, Nishanth Menon Key (0xDDB5849D1736249D) / Fingerprint: F8A2 8693 54EB 8232 17A3 1A34 DDB5 849D 1736 249D
PATCH v2 5/26 arm: dts: k3-am654: copy bootph properties to a53 dts
In reply to Bryan BrattlofIn 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.
--- 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(-)
arch/arm/dts/k3-am654-base-board-u-boot.dtsi +160 -0
@@ -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"; };
arch/arm/dts/k3-am654-r5-base-board.dts +2 -83
288 lines not on this page · raw message
Signature · 1 line
2.43.0
Re: [PATCH v2 05/26] arm: dts: k3-am654: copy bootph properties to a53 dts
Quoted 16 lines · 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 <[email protected]>Signed-off-by Bryan Brattlof <[email protected]>--- 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(-)arch/arm/dts/k3-am654-base-board-u-boot.dtsi +0
-0
arch/arm/dts/k3-am654-base-board-u-boot.dtsi line 14
Quoted 10 lines
arch/arm/dts/k3-am654-base-board-u-boot.dtsi +7
-0@@ -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,
Signature · 3 lines
Regards, Nishanth Menon Key (0xDDB5849D1736249D) / Fingerprint: F8A2 8693 54EB 8232 17A3 1A34 DDB5 849D 1736 249D
PATCH v2 6/26 arm: dts: k3-am654: include a53 board dtb for r5 build
In reply to Bryan BrattlofTo 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.
--- arch/arm/dts/k3-am654-r5-base-board.dts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
arch/arm/dts/k3-am654-r5-base-board.dts +2 -1
@@ -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"
Signature · 1 line
2.43.0
Re: [PATCH v2 06/26] arm: dts: k3-am654: include a53 board dtb for r5 build
Quoted 19 lines · 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 <[email protected]>Signed-off-by Bryan Brattlof <[email protected]>--- arch/arm/dts/k3-am654-r5-base-board.dts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)arch/arm/dts/k3-am654-r5-base-board.dts +0
-0
arch/arm/dts/k3-am654-r5-base-board.dts line 11
Quoted 8 lines
arch/arm/dts/k3-am654-r5-base-board.dts +2
-1@@ -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"
Signature · 3 lines
Regards, Nishanth Menon Key (0xDDB5849D1736249D) / Fingerprint: F8A2 8693 54EB 8232 17A3 1A34 DDB5 849D 1736 249D
PATCH v2 7/26 arm: dts: k3-am654: remove duplicate vtt_supply
In reply to Bryan BrattlofWith the Linux and U-Boot board dtb files unified we now have a duplicate vtt_supply node. Remove it
--- arch/arm/dts/k3-am654-r5-base-board.dts | 9 --------- 1 file changed, 9 deletions(-)
arch/arm/dts/k3-am654-r5-base-board.dts +0 -9
@@ -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 {
Signature · 1 line
2.43.0
Re: [PATCH v2 07/26] arm: dts: k3-am654: remove duplicate vtt_supply
Quoted 8 lines · Bryan Brattlof
With the Linux and U-Boot board dtb files unified we now have a duplicate
vtt_supplynode. Remove itTested-by Tom Rini <[email protected]>Signed-off-by Bryan Brattlof <[email protected]>--- arch/arm/dts/k3-am654-r5-base-board.dts | 9 --------- 1 file changed, 9 deletions(-)
Signature · 3 lines
Regards, Nishanth Menon Key (0xDDB5849D1736249D) / Fingerprint: F8A2 8693 54EB 8232 17A3 1A34 DDB5 849D 1736 249D
PATCH v2 8/26 arm: dts: k3-am654: remove duplicate wkup_uart0
In reply to Bryan BrattlofWith the Linux and U-Boot board files unified, we now have a duplicate wkup_uart0 node. Remove it
--- arch/arm/dts/k3-am654-r5-base-board.dts | 12 ------------ 1 file changed, 12 deletions(-)
arch/arm/dts/k3-am654-r5-base-board.dts +0 -12
@@ -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 */
Signature · 1 line
2.43.0
Re: [PATCH v2 08/26] arm: dts: k3-am654: remove duplicate wkup_uart0
Quoted 8 lines · Bryan Brattlof
With the Linux and U-Boot board files unified, we now have a duplicate
wkup_uart0node. Remove itTested-by Tom Rini <[email protected]>Signed-off-by Bryan Brattlof <[email protected]>--- arch/arm/dts/k3-am654-r5-base-board.dts | 12 ------------ 1 file changed, 12 deletions(-)
Signature · 3 lines
Regards, Nishanth Menon Key (0xDDB5849D1736249D) / Fingerprint: F8A2 8693 54EB 8232 17A3 1A34 DDB5 849D 1736 249D
PATCH v2 9/26 arm: dts: k3-am654: remove duplicate timer
In reply to Bryan Brattloftimer1 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.
--- 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(-)
arch/arm/dts/k3-am654-base-board-u-boot.dtsi +12 -0
@@ -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; };
arch/arm/dts/k3-am654-r5-base-board.dts +15 -15
@@ -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";
Signature · 1 line
2.43.0
Re: [PATCH v2 09/26] arm: dts: k3-am654: remove duplicate timer
Quoted 7 lines · Bryan Brattlof
timer1 is really just the
mcu_timer0node redefined for the WKUP SPL. Remove the timer1 and replace it with themcu_timer0from the Linux device tree we imported into U-Boot.Tested-by Tom Rini <[email protected]>Signed-off-by Bryan Brattlof <[email protected]>---
Signature · 3 lines
Regards, Nishanth Menon Key (0xDDB5849D1736249D) / Fingerprint: F8A2 8693 54EB 8232 17A3 1A34 DDB5 849D 1736 249D
PATCH v2 10/26 arm: dts: k3-am654: remove duplicate mcu_ringacc
In reply to Bryan BrattlofWith the Linux and U-Boot board dtb files unified, we now have a duplicate mcu_ringacc node. Remove it
--- arch/arm/dts/k3-am654-r5-base-board.dts | 10 ---------- 1 file changed, 10 deletions(-)
arch/arm/dts/k3-am654-r5-base-board.dts +0 -10
@@ -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>,
Signature · 1 line
2.43.0
Re: [PATCH v2 10/26] arm: dts: k3-am654: remove duplicate mcu_ringacc
Quoted 9 lines · Bryan Brattlof
With the Linux and U-Boot board dtb files unified, we now have a duplicate
mcu_ringaccnode. Remove itTested-by Tom Rini <[email protected]>Signed-off-by Bryan Brattlof <[email protected]>--- arch/arm/dts/k3-am654-r5-base-board.dts | 10 ---------- 1 file changed, 10 deletions(-)
Signature · 3 lines
Regards, Nishanth Menon Key (0xDDB5849D1736249D) / Fingerprint: F8A2 8693 54EB 8232 17A3 1A34 DDB5 849D 1736 249D
PATCH v2 11/26 arm: dts: k3-am654: remove duplicate mcu_udmap
In reply to Bryan BrattlofWith the Linux and U-Boot board dtb files unified, we now have a duplicate mcu_udmap node. Remove it
--- arch/arm/dts/k3-am654-r5-base-board.dts | 13 ------------- 1 file changed, 13 deletions(-)
arch/arm/dts/k3-am654-r5-base-board.dts +0 -13
@@ -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 {
Signature · 1 line
2.43.0
Re: [PATCH v2 11/26] arm: dts: k3-am654: remove duplicate mcu_udmap
Quoted 9 lines · Bryan Brattlof
With the Linux and U-Boot board dtb files unified, we now have a duplicate
mcu_udmapnode. Remove itTested-by Tom Rini <[email protected]>Signed-off-by Bryan Brattlof <[email protected]>--- arch/arm/dts/k3-am654-r5-base-board.dts | 13 ------------- 1 file changed, 13 deletions(-)
Signature · 3 lines
Regards, Nishanth Menon Key (0xDDB5849D1736249D) / Fingerprint: F8A2 8693 54EB 8232 17A3 1A34 DDB5 849D 1736 249D
PATCH v2 12/26 arm: dts: k3-am654: add needed regs to udmap nodes
In reply to Bryan BrattlofEthernet 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/[email protected]
--- arch/arm/dts/k3-am654-base-board-u-boot.dtsi | 34 ++++++++++++++++++++ 1 file changed, 34 insertions(+)
arch/arm/dts/k3-am654-base-board-u-boot.dtsi +34 -0
@@ -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"; +};
Signature · 1 line
2.43.0
Re: [PATCH v2 12/26] arm: dts: k3-am654: add needed regs to udmap nodes
Quoted 49 lines · 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/[email protected]
Tested-by Tom Rini <[email protected]>Signed-off-by Bryan Brattlof <[email protected]>--- arch/arm/dts/k3-am654-base-board-u-boot.dtsi | 34 ++++++++++++++++++++ 1 file changed, 34 insertions(+)arch/arm/dts/k3-am654-base-board-u-boot.dtsi +24
-0@@ -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 + */
arch/arm/dts/k3-am654-base-board-u-boot.dtsi line 288
Quoted 10 lines
arch/arm/dts/k3-am654-base-board-u-boot.dtsi +10
-0+&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.
Signature · 3 lines
Regards, Nishanth Menon Key (0xDDB5849D1736249D) / Fingerprint: F8A2 8693 54EB 8232 17A3 1A34 DDB5 849D 1736 249D
PATCH v2 13/26 arm: dts: k3-am654: remove duplicate mcu_uart0 node
In reply to Bryan BrattlofWith the Linux and U-Boot board dtb files unified we now have a duplicate mcu_uart0 node. Remove it
--- arch/arm/dts/k3-am654-r5-base-board.dts | 12 ------------ 1 file changed, 12 deletions(-)
arch/arm/dts/k3-am654-r5-base-board.dts +0 -12
@@ -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 */
Signature · 1 line
2.43.0
Re: [PATCH v2 13/26] arm: dts: k3-am654: remove duplicate mcu_uart0 node
Quoted 6 lines · Bryan Brattlof
With the Linux and U-Boot board dtb files unified we now have a duplicate
mcu_uart0node. Remove itTested-by Tom Rini <[email protected]>Signed-off-by Bryan Brattlof <[email protected]>---
Signature · 3 lines
Regards, Nishanth Menon Key (0xDDB5849D1736249D) / Fingerprint: F8A2 8693 54EB 8232 17A3 1A34 DDB5 849D 1736 249D
PATCH v2 14/26 arm: dts: k3-am654: remove duplicate main_uart0
In reply to Bryan BrattlofWith the Linux and U-Boot board dtb files unified, we now have a duplicate main_uart0 node. Remove it
--- arch/arm/dts/k3-am654-r5-base-board.dts | 17 ----------------- 1 file changed, 17 deletions(-)
arch/arm/dts/k3-am654-r5-base-board.dts +0 -17
@@ -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 */
Signature · 1 line
2.43.0
Re: [PATCH v2 14/26] arm: dts: k3-am654: remove duplicate main_uart0
Quoted 6 lines · Bryan Brattlof
With the Linux and U-Boot board dtb files unified, we now have a duplicate
main_uart0node. Remove itTested-by Tom Rini <[email protected]>Signed-off-by Bryan Brattlof <[email protected]>---
Signature · 3 lines
Regards, Nishanth Menon Key (0xDDB5849D1736249D) / Fingerprint: F8A2 8693 54EB 8232 17A3 1A34 DDB5 849D 1736 249D
PATCH v2 15/26 arm: dts: k3-am654: remove duplicate sdhci0 pinmux node
In reply to Bryan BrattlofWith the Linux and U-Boot board dtb files unified, we now have a duplicate sdhci0 pinmux node. Remove it
--- arch/arm/dts/k3-am654-r5-base-board.dts | 26 ++++++++----------------- 1 file changed, 8 insertions(+), 18 deletions(-)
arch/arm/dts/k3-am654-r5-base-board.dts +8 -18
@@ -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 {
Signature · 1 line
2.43.0
Re: [PATCH v2 15/26] arm: dts: k3-am654: remove duplicate sdhci0 pinmux node
Quoted 6 lines · 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 <[email protected]>Signed-off-by Bryan Brattlof <[email protected]>---
Signature · 3 lines
Regards, Nishanth Menon Key (0xDDB5849D1736249D) / Fingerprint: F8A2 8693 54EB 8232 17A3 1A34 DDB5 849D 1736 249D
PATCH v2 16/26 arm: dts: k3-am654: remove duplicate sdhci1 pinmux node
In reply to Bryan BrattlofWith the Linux and U-Boot board dtb files unified, we now have a duplicate sdhci1 pinmux node. Remove it
--- arch/arm/dts/k3-am654-r5-base-board.dts | 23 ++++++++--------------- 1 file changed, 8 insertions(+), 15 deletions(-)
arch/arm/dts/k3-am654-r5-base-board.dts +8 -15
@@ -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 {
Signature · 1 line
2.43.0
Re: [PATCH v2 16/26] arm: dts: k3-am654: remove duplicate sdhci1 pinmux node
Quoted 6 lines · 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 <[email protected]>Signed-off-by Bryan Brattlof <[email protected]>---
Signature · 3 lines
Regards, Nishanth Menon Key (0xDDB5849D1736249D) / Fingerprint: F8A2 8693 54EB 8232 17A3 1A34 DDB5 849D 1736 249D
PATCH v2 17/26 arm: dts: k3-am654: remove duplicate wkup_i2c0
In reply to Bryan BrattlofWith the Linux and U-Boot board dtb files unified, we now have a duplicate wkup_i2c0 node. Remove it
--- arch/arm/dts/k3-am654-r5-base-board.dts | 25 ------------------------- 1 file changed, 25 deletions(-)
arch/arm/dts/k3-am654-r5-base-board.dts +0 -25
@@ -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>;
Signature · 1 line
2.43.0
Re: [PATCH v2 17/26] arm: dts: k3-am654: remove duplicate wkup_i2c0
Quoted 6 lines · Bryan Brattlof
With the Linux and U-Boot board dtb files unified, we now have a duplicate
wkup_i2c0node. Remove itTested-by Tom Rini <[email protected]>Signed-off-by Bryan Brattlof <[email protected]>---
Signature · 3 lines
Regards, Nishanth Menon Key (0xDDB5849D1736249D) / Fingerprint: F8A2 8693 54EB 8232 17A3 1A34 DDB5 849D 1736 249D
PATCH v2 18/26 arm: dts: k3-am654: remove duplicate ospi0 node
In reply to Bryan BrattlofWith the Linux and U-Boot board dtb files unified, we now have a duplicate ospi0 node. Remove it
--- arch/arm/dts/k3-am654-r5-base-board.dts | 37 ------------------------- 1 file changed, 37 deletions(-)
arch/arm/dts/k3-am654-r5-base-board.dts +0 -37
@@ -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 {
Signature · 1 line
2.43.0
Re: [PATCH v2 18/26] arm: dts: k3-am654: remove duplicate ospi0 node
Quoted 6 lines · 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 <[email protected]>Signed-off-by Bryan Brattlof <[email protected]>---
Signature · 3 lines
Regards, Nishanth Menon Key (0xDDB5849D1736249D) / Fingerprint: F8A2 8693 54EB 8232 17A3 1A34 DDB5 849D 1736 249D
PATCH v2 19/26 arm: dts: k3-am654: remove usb0
In reply to Bryan BrattlofThe pinmux for usb0 is missing from the Linux board dtb file. Remove it until we can introduce it in Linux
--- 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(-)
arch/arm/dts/k3-am654-base-board-u-boot.dtsi +0 -12
@@ -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; };
arch/arm/dts/k3-am654-r5-base-board.dts +0 -29
@@ -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>;
Signature · 1 line
2.43.0
Re: [PATCH v2 19/26] arm: dts: k3-am654: remove usb0
Quoted 6 lines · 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 <[email protected]>Signed-off-by Bryan Brattlof <[email protected]>---
Signature · 3 lines
Regards, Nishanth Menon Key (0xDDB5849D1736249D) / Fingerprint: F8A2 8693 54EB 8232 17A3 1A34 DDB5 849D 1736 249D
PATCH v2 20/26 arm: dts: k3-am654: remove duplicate mdio
In reply to Bryan BrattlofWith the Linux and U-Boot board dtb files unified, we now have a duplicate mdio node. Remove it
--- arch/arm/dts/k3-am654-r5-base-board.dts | 9 --------- 1 file changed, 9 deletions(-)
arch/arm/dts/k3-am654-r5-base-board.dts +0 -9
@@ -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>;
Signature · 1 line
2.43.0
Re: [PATCH v2 20/26] arm: dts: k3-am654: remove duplicate mdio
Quoted 5 lines · 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 <[email protected]>Signed-off-by Bryan Brattlof <[email protected]>
Signature · 3 lines
Regards, Nishanth Menon Key (0xDDB5849D1736249D) / Fingerprint: F8A2 8693 54EB 8232 17A3 1A34 DDB5 849D 1736 249D
PATCH v2 21/26 arm: dts: k3-am654: remove duplicate vtt pinmux
In reply to Bryan BrattlofWith the Linux and U-Boot board dtb files unified, we now have a duplicate vtt_pinmux node. Remove it
--- 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(-)
arch/arm/dts/k3-am654-base-board-u-boot.dtsi +1 -1
@@ -93,7 +93,7 @@ bootph-pre-ram; }; -&wkup_vtt_pins_default { +&ddr_vtt_pins_default { bootph-pre-ram; };
arch/arm/dts/k3-am654-r5-base-board.dts +0 -10
@@ -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>; }; /*
Signature · 1 line
2.43.0
Re: [PATCH v2 21/26] arm: dts: k3-am654: remove duplicate vtt pinmux
Quoted 6 lines · Bryan Brattlof
With the Linux and U-Boot board dtb files unified, we now have a duplicate
vtt_pinmuxnode. Remove itTested-by Tom Rini <[email protected]>Signed-off-by Bryan Brattlof <[email protected]>---
Signature · 3 lines
Regards, Nishanth Menon Key (0xDDB5849D1736249D) / Fingerprint: F8A2 8693 54EB 8232 17A3 1A34 DDB5 849D 1736 249D
PATCH v2 22/26 arm: dts: k3-am654: remove duplicate root properties
In reply to Bryan BrattlofWith the Linux and U-Boot board dtb files unified, we have duplicate properties in the root node. Remove them
--- arch/arm/dts/k3-am654-r5-base-board.dts | 3 --- 1 file changed, 3 deletions(-)
arch/arm/dts/k3-am654-r5-base-board.dts +0 -3
@@ -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;
Signature · 1 line
2.43.0
Re: [PATCH v2 22/26] arm: dts: k3-am654: remove duplicate root properties
Quoted 6 lines · 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 <[email protected]>Signed-off-by Bryan Brattlof <[email protected]>---
Signature · 3 lines
Regards, Nishanth Menon Key (0xDDB5849D1736249D) / Fingerprint: F8A2 8693 54EB 8232 17A3 1A34 DDB5 849D 1736 249D
PATCH v2 23/26 arm: dts: k3-am654: remove un-needed aliases
In reply to Bryan BrattlofThese aliases are not needed in U-Boot. Remove them
--- arch/arm/dts/k3-am654-r5-base-board.dts | 1 - 1 file changed, 1 deletion(-)
arch/arm/dts/k3-am654-r5-base-board.dts +0 -1
@@ -12,7 +12,6 @@ / { aliases { - ethernet0 = &cpsw_port1; remoteproc0 = &sysctrler; remoteproc1 = &a53_0; };
Signature · 1 line
2.43.0
Re: [PATCH v2 23/26] arm: dts: k3-am654: remove un-needed aliases
Quoted 5 lines · Bryan Brattlof
These aliases are not needed in U-Boot. Remove them
Tested-by Tom Rini <[email protected]>Signed-off-by Bryan Brattlof <[email protected]>---
Signature · 3 lines
Regards, Nishanth Menon Key (0xDDB5849D1736249D) / Fingerprint: F8A2 8693 54EB 8232 17A3 1A34 DDB5 849D 1736 249D
PATCH v2 24/26 arm: dts: k3-am654: move dummy_clock to root node
In reply to Bryan BrattlofThe 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.
--- arch/arm/dts/k3-am654-r5-base-board.dts | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-)
arch/arm/dts/k3-am654-r5-base-board.dts +7 -7
@@ -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; - }; }; /*
Signature · 1 line
2.43.0
Re: [PATCH v2 24/26] arm: dts: k3-am654: move dummy_clock to root node
Quoted 10 lines · Bryan Brattlof
The
dummy_clocknode is used to help the drivers probe the IO needed to setup consoles and boot media to load firmware into the SoC.This
dummy_clockisn't a device that exists nor does it exist in the mcu domain. So move it fromcbass_mcuto the root node to avoid any confusion.Tested-by Tom Rini <[email protected]>Signed-off-by Bryan Brattlof <[email protected]>---
Signature · 3 lines
Regards, Nishanth Menon Key (0xDDB5849D1736249D) / Fingerprint: F8A2 8693 54EB 8232 17A3 1A34 DDB5 849D 1736 249D
PATCH v2 25/26 arm: dts: k3-am654: remove duplicate mcu secure proxy node
In reply to Bryan BrattlofWith the Linux and U-Boot board dtb files unified, we now have a duplicate mcu secure proxy node. Remove it
--- arch/arm/dts/k3-am654-r5-base-board.dts | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-)
arch/arm/dts/k3-am654-r5-base-board.dts +7 -12
@@ -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;
Signature · 1 line
2.43.0
Re: [PATCH v2 25/26] arm: dts: k3-am654: remove duplicate mcu secure proxy node
Quoted 6 lines · 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 <[email protected]>Signed-off-by Bryan Brattlof <[email protected]>---
Signature · 3 lines
Regards, Nishanth Menon Key (0xDDB5849D1736249D) / Fingerprint: F8A2 8693 54EB 8232 17A3 1A34 DDB5 849D 1736 249D
PATCH v2 26/26 arm: dts: k3-am654: convert bootph-pre-ram to bootph-all
In reply to Bryan BrattlofMany 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.
--- arch/arm/dts/k3-am654-base-board-u-boot.dtsi | 74 ++++++++++---------- 1 file changed, 37 insertions(+), 37 deletions(-)
arch/arm/dts/k3-am654-base-board-u-boot.dtsi +37 -37
@@ -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 {
Signature · 1 line
2.43.0
Re: [PATCH v2 26/26] arm: dts: k3-am654: convert bootph-pre-ram to bootph-all
Quoted 8 lines · 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 <[email protected]>Signed-off-by Bryan Brattlof <[email protected]>---
Signature · 3 lines
Regards, Nishanth Menon Key (0xDDB5849D1736249D) / Fingerprint: F8A2 8693 54EB 8232 17A3 1A34 DDB5 849D 1736 249D
Quoted 9 lines · Bryan Brattlof
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!
Signature · 1 line
Tom
Quoted 69 lines · 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/7df8a645dc548912cd806abd5ecab967ef3287bcChanges from v1: [0]
- fixed multi-line comment format
- movedwkup_uart0andmcu_uart0U-Boot overrides to the r5 board file as they are not needed for a53/main domain U-Boot builds
- corrected a badwkup_i2c0_pins_defaultfixup in PATCH 6/26
- spelling fix (s/Libux/Linux/) in commit body for PATCH 6/26
- added trailers from TomThanks for reviewing and happy holidays
~Bryan[0] https://lore.kernel.org/u-boot/[email protected]/
Bryan Brattlof (26):
configs:am65x_evm_r5: enable driver for fixed regulators
configs:am65x_evm_a53: disableCONSOLE_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 duplicatevtt_supply
arm: dts: k3-am654: remove duplicatewkup_uart0
arm: dts: k3-am654: remove duplicate timer
arm: dts: k3-am654: remove duplicatemcu_ringacc
arm: dts: k3-am654: remove duplicatemcu_udmap
arm: dts: k3-am654: add needed regs to udmap nodes
arm: dts: k3-am654: remove duplicatemcu_uart0node
arm: dts: k3-am654: remove duplicatemain_uart0
arm: dts: k3-am654: remove duplicate sdhci0 pinmux node
arm: dts: k3-am654: remove duplicate sdhci1 pinmux node
arm: dts: k3-am654: remove duplicatewkup_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: movedummy_clockto root node
arm: dts: k3-am654: remove duplicate mcu secure proxy node
arm: dts: k3-am654: convert bootph-pre-ram to bootph-allarch/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
Quoted 1 line
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
Signature · 2 lines
Siemens AG, Technology Linux Expert Center
Quoted 85 lines · Jan Kiszka
Quoted 69 lines · 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/7df8a645dc548912cd806abd5ecab967ef3287bcChanges from v1: [0]
- fixed multi-line comment format
- movedwkup_uart0andmcu_uart0U-Boot overrides to the r5 board file as they are not needed for a53/main domain U-Boot builds
- corrected a badwkup_i2c0_pins_defaultfixup in PATCH 6/26
- spelling fix (s/Libux/Linux/) in commit body for PATCH 6/26
- added trailers from TomThanks for reviewing and happy holidays
~Bryan[0] https://lore.kernel.org/u-boot/[email protected]/
Bryan Brattlof (26):
configs:am65x_evm_r5: enable driver for fixed regulators
configs:am65x_evm_a53: disableCONSOLE_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 duplicatevtt_supply
arm: dts: k3-am654: remove duplicatewkup_uart0
arm: dts: k3-am654: remove duplicate timer
arm: dts: k3-am654: remove duplicatemcu_ringacc
arm: dts: k3-am654: remove duplicatemcu_udmap
arm: dts: k3-am654: add needed regs to udmap nodes
arm: dts: k3-am654: remove duplicatemcu_uart0node
arm: dts: k3-am654: remove duplicatemain_uart0
arm: dts: k3-am654: remove duplicate sdhci0 pinmux node
arm: dts: k3-am654: remove duplicate sdhci1 pinmux node
arm: dts: k3-am654: remove duplicatewkup_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: movedummy_clockto root node
arm: dts: k3-am654: remove duplicate mcu secure proxy node
arm: dts: k3-am654: convert bootph-pre-ram to bootph-allarch/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.dtsiQuoted 1 line
base-commit:
0a0ceea2269b983e736b80104f03cc800d1a5e2aThis 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:
...
DTCarch/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
Quoted 5 lines
Jan
BTW, folks @TI: You have our devices by now.
Jan
Signature · 2 lines
Siemens AG, Technology Linux Expert Center