Hi Nishanth,
On 03/08/2023 00:37, Nishanth Menon wrote:
On 20:18-20230802, Roger Quadros wrote:
Sync all am642-evm/am642-sk related DT files with Linux v6.5-rc1.
- drop timer1 in favor of main_timer0 in am64-main.dtsi.
Need to delete clock & power domain properties of main_timer1 in -r5.dts else won't boot. This is because timer_init is done during rproc_start to start System Firmware, but we can't do any clock/power-domain operations before System Firmware starts.
if that is the argument for main_uart0 and main_i2c0 main_gpio0 etc.
- please document in the r5.dts as well as to why we are
/delete-property/ power-domains. I think we feed in boardconfig etc by the time we get around to this, correct? if not, we might need to state that information - that without boardconfig being fed to the sysfw pm functions are'nt active.
Otherwise, this is coming along just right.
- drop cpsw3g custom DT property 'mac_efuse' and custom
DT node cpsw-phy-sel as driver picks these from standard property/node.
- include board dts file in -r5 dts file to avoid duplication
of nodes. Include -u-boot.dtsi on top.
- drop duplicate nodes in -r5 dts and -u-boot.dtsi
Signed-off-by: Roger Quadros rogerq@kernel.org
arch/arm/dts/k3-am64-main.dtsi | 171 ++++++++++++++++++++- arch/arm/dts/k3-am64-mcu.dtsi | 53 ++++++- arch/arm/dts/k3-am64-thermal.dtsi | 33 ++++ arch/arm/dts/k3-am64.dtsi | 22 +-- arch/arm/dts/k3-am642-evm-u-boot.dtsi | 67 +++++---- arch/arm/dts/k3-am642-evm.dts | 173 ++++++++++++++++----- arch/arm/dts/k3-am642-r5-evm.dts | 202 +++---------------------- arch/arm/dts/k3-am642-r5-sk.dts | 209 +++----------------------- arch/arm/dts/k3-am642-sk-u-boot.dtsi | 59 ++++---- arch/arm/dts/k3-am642-sk.dts | 166 ++++++++++++++------ arch/arm/dts/k3-am642.dtsi | 1 + 11 files changed, 613 insertions(+), 543 deletions(-) create mode 100644 arch/arm/dts/k3-am64-thermal.dtsi
diff --git a/arch/arm/dts/k3-am64-main.dtsi b/arch/arm/dts/k3-am64-main.dtsi
<snip>
diff --git a/arch/arm/dts/k3-am642-r5-evm.dts b/arch/arm/dts/k3-am642-r5-evm.dts index b49064181a..240278dd53 100644 --- a/arch/arm/dts/k3-am642-r5-evm.dts +++ b/arch/arm/dts/k3-am642-r5-evm.dts @@ -1,19 +1,17 @@ // SPDX-License-Identifier: GPL-2.0 /*
- Copyright (C) 2020-2021 Texas Instruments Incorporated - https://www.ti.com/
*/
- Copyright (C) 2020-2023 Texas Instruments Incorporated - https://www.ti.com/
-/dts-v1/;
-#include "k3-am642.dtsi" +#include "k3-am642-evm.dts" #include "k3-am64-evm-ddr4-1600MTs.dtsi" #include "k3-am64-ddr.dtsi" -#include "k3-am64x-binman.dtsi"
+#include "k3-am642-evm-u-boot.dtsi"
/ { chosen { stdout-path = "serial2:115200n8";
tick-timer = &timer1;Drop the entire chosen - comes in from u-boot.dtsi
aliases { @@ -21,14 +19,6 @@ remoteproc1 = &a53_0; };
- memory@80000000 {
device_type = "memory";/* 2G RAM */reg = <0x00000000 0x80000000 0x00000000 0x80000000>;bootph-pre-ram;- };
- a53_0: a53@0 { compatible = "ti,am654-rproc"; reg = <0x00 0x00a90000 0x00 0x10>;
@@ -46,34 +36,12 @@ bootph-pre-ram; };
Can you also look at the &memory_controller { } node?
I think vtt_supply already points to the DDR vtt pinmux? so, a bit confused why we would point the pinctrl-0 to the same pinmux again?
Right. Also vtt_supply is always-on fixed regulator. So will drop vtt-supply property from memory_controller node.
<snip>
-#include "k3-am642-evm-u-boot.dtsi" diff --git a/arch/arm/dts/k3-am642-r5-sk.dts b/arch/arm/dts/k3-am642-r5-sk.dts index 32d4c31728..9dbd444d6d 100644 --- a/arch/arm/dts/k3-am642-r5-sk.dts +++ b/arch/arm/dts/k3-am642-r5-sk.dts @@ -3,19 +3,15 @@
- Copyright (C) 2021 Texas Instruments Incorporated - https://www.ti.com/
*/
-/dts-v1/;
-#include <dt-bindings/mux/ti-serdes.h> -#include <dt-bindings/phy/phy.h> -#include <dt-bindings/net/ti-dp83867.h> -#include "k3-am642.dtsi" +#include "k3-am642-sk.dts" #include "k3-am64-sk-lp4-1600MTs.dtsi" #include "k3-am64-ddr.dtsi"
+#include "k3-am642-sk-u-boot.dtsi"
/ { chosen { stdout-path = "serial2:115200n8";
tick-timer = &timer1;Drop entire chosen?
OK.
aliases { @@ -23,13 +19,6 @@ remoteproc1 = &a53_0; };
- memory@80000000 {
device_type = "memory";/* 2G RAM */reg = <0x00000000 0x80000000 0x00000000 0x80000000>;bootph-pre-ram;- };
- a53_0: a53@0 { compatible = "ti,am654-rproc"; reg = <0x00 0x00a90000 0x00 0x10>;
@@ -47,18 +36,6 @@ bootph-pre-ram; };
- reserved-memory {
#address-cells = <2>;#size-cells = <2>;ranges;secure_ddr: optee@9e800000 {reg = <0x00 0x9e800000 0x00 0x01800000>; /* for OP-TEE */alignment = <0x1000>;no-map;};- };
- clk_200mhz: dummy-clock-200mhz { compatible = "fixed-clock"; #clock-cells = <0>;
@@ -76,110 +53,6 @@ }; };
-&cbass_main {
- main_esm: esm@420000 {
compatible = "ti,j721e-esm";reg = <0x0 0x420000 0x0 0x1000>;ti,esm-pins = <160>, <161>;bootph-pre-ram;- };
-};
please add for r5-sk: &main_esm { bootph-pre-ram; };
&mcu_esm { bootph-pre-ram; };
I added them in -u-boot.dtsi along with cbass_main and cbass_mcu. Should I move them to -r5-sk instead?
<snip>