Re: [PATCH v2 3/6] k3-j721s2: Sync from Linux tag v6.5-rc1
On 16:47-20230825, Manorit Chawdhry wrote:
> The following commit syncs the device tree from Linux tag
> v6.5-rc1 to U-boot and fixes the following to be compatible with
> the future syncs -
[...]
>
> diff --git a/arch/arm/dts/k3-j721s2-common-proc-board-u-boot.dtsi
> b/arch/arm/dts/k3-j721s2-common-proc-board-u-boot.dtsi
> index f940ffee8787..faa01169ebd8 100644
> --- a/arch/arm/dts/k3-j721s2-common-proc-board-u-boot.dtsi
> +++ b/arch/arm/dts/k3-j721s2-common-proc-board-u-boot.dtsi
> @@ -1,28 +1,10 @@
> // SPDX-License-Identifier: GPL-2.0
> /*
>
[...]
> -_sdhci1 {
> + {
> + dr_mode = "peripheral";
There is a bit of a debate going on this one
https://lore.kernel.org/u-boot/20230706-handle-otg-as-periph-v3-0-27e24fa17...@baylibre.com/
But I don't see why we need to hold off for that resolution.
> bootph-pre-ram;
> };
[...]
> diff --git a/arch/arm/dts/k3-j721s2-r5-common-proc-board.dts
> b/arch/arm/dts/k3-j721s2-r5-common-proc-board.dts
> index c74e8e58ae81..022618b37c74 100644
> --- a/arch/arm/dts/k3-j721s2-r5-common-proc-board.dts
> +++ b/arch/arm/dts/k3-j721s2-r5-common-proc-board.dts
> @@ -1,20 +1,19 @@
> // SPDX-License-Identifier: GPL-2.0
> /*
> - * Copyright (C) 2021 Texas Instruments Incorporated - https://www.ti.com/
> + * Copyright (C) 2021-2023 Texas Instruments Incorporated -
> https://www.ti.com/
> */
>
> /dts-v1/;
>
> -#include "k3-j721s2-som-p0.dtsi"
> +#include "k3-j721s2-common-proc-board.dts"
> #include "k3-j721s2-ddr-evm-lp4-4266.dtsi"
> #include "k3-j721s2-ddr.dtsi"
> -#include "k3-j721s2-binman.dtsi"
> +#include "k3-j721s2-common-proc-board-u-boot.dtsi"
>
> / {
> chosen {
> - firmware-loader = _loader0;
> stdout-path = _uart8;
we don't need this either.
[...]
> - clk_19_2mhz: dummy_clock_19_2mhz {
> - compatible = "fixed-clock";
> - #clock-cells = <0>;
> - clock-frequency = <1920>;
> +_timer0 {
> + clock-frequency = <25000>;
> bootph-pre-ram;
Check your tabs for the clock-frequency and bootph property (you have
one extra tab tab).
> - };
> };
>
[...]
--
Regards,
Nishanth Menon
Key (0xDDB5849D1736249D) / Fingerprint: F8A2 8693 54EB 8232 17A3 1A34 DDB5
849D 1736 249D
Re: [PATCH v2 3/6] k3-j721s2: Sync from Linux tag v6.5-rc1
Hi Neha,
On 13:04-20230828, Neha Malcom Francis wrote:
> Hi Manorit
>
> On 25/08/23 16:47, Manorit Chawdhry wrote:
> > The following commit syncs the device tree from Linux tag
> > v6.5-rc1 to U-boot and fixes the following to be compatible with
> > the future syncs -
> >
>
> [...]
>
> > diff --git a/arch/arm/dts/k3-j721s2-r5-common-proc-board.dts
> > b/arch/arm/dts/k3-j721s2-r5-common-proc-board.dts
> > index c74e8e58ae81..022618b37c74 100644
> > --- a/arch/arm/dts/k3-j721s2-r5-common-proc-board.dts
> > +++ b/arch/arm/dts/k3-j721s2-r5-common-proc-board.dts
> > @@ -1,20 +1,19 @@
> > // SPDX-License-Identifier: GPL-2.0
> > /*
> > - * Copyright (C) 2021 Texas Instruments Incorporated - https://www.ti.com/
>
> [...]
>
> > +_mcu_wakeup {
> > sysctrler: sysctrler {
> > compatible = "ti,am654-system-controller";
> > - mboxes= <_secproxy 4>, <_secproxy 5>, <_secproxy 5>;
> > + mboxes= <_proxy_mcu 4>, <_proxy_mcu 5>,
> > <_proxy_sa3 5>;
> > mbox-names = "tx", "rx", "boot_notify";
> > bootph-pre-ram;
> > };
> > @@ -92,101 +67,17 @@
> > ti,host-id = <3>;
> > ti,secure-host;
> > mbox-names = "rx", "tx";
> > - mboxes= <_secproxy 21>,
> > - <_secproxy 23>;
> > + mboxes= <_proxy_mcu 21>,
> > + <_proxy_mcu 23>;
> > bootph-pre-ram;
> > };
> > };
>
> Sorry I didn't catch this earlier before the review tag. But dm_tifs can be
> moved to the root node, see review comments in [1]
Thanks for catching this, will be sending a v3 with the change.
Regards,
Manorit
>
> > /* Now include peripherals from each bus segment */
> >
>
> [1]
> https://patchwork.ozlabs.org/project/uboot/patch/20230822185725.6718-1-re...@ti.com/
>
> --
> Thanking You
> Neha Malcom Francis
Re: [PATCH v2 3/6] k3-j721s2: Sync from Linux tag v6.5-rc1
Hi Manorit
On 25/08/23 16:47, Manorit Chawdhry wrote:
The following commit syncs the device tree from Linux tag
v6.5-rc1 to U-boot and fixes the following to be compatible with
the future syncs -
[...]
diff --git a/arch/arm/dts/k3-j721s2-r5-common-proc-board.dts
b/arch/arm/dts/k3-j721s2-r5-common-proc-board.dts
index c74e8e58ae81..022618b37c74 100644
--- a/arch/arm/dts/k3-j721s2-r5-common-proc-board.dts
+++ b/arch/arm/dts/k3-j721s2-r5-common-proc-board.dts
@@ -1,20 +1,19 @@
// SPDX-License-Identifier: GPL-2.0
/*
- * Copyright (C) 2021 Texas Instruments Incorporated - https://www.ti.com/
[...]
+_mcu_wakeup {
sysctrler: sysctrler {
compatible = "ti,am654-system-controller";
- mboxes= <_secproxy 4>, <_secproxy 5>, <_secproxy 5>;
+ mboxes= <_proxy_mcu 4>, <_proxy_mcu 5>,
<_proxy_sa3 5>;
mbox-names = "tx", "rx", "boot_notify";
bootph-pre-ram;
};
@@ -92,101 +67,17 @@
ti,host-id = <3>;
ti,secure-host;
mbox-names = "rx", "tx";
- mboxes= <_secproxy 21>,
- <_secproxy 23>;
+ mboxes= <_proxy_mcu 21>,
+ <_proxy_mcu 23>;
bootph-pre-ram;
};
};
Sorry I didn't catch this earlier before the review tag. But dm_tifs can be
moved to the root node, see review comments in [1]
/* Now include peripherals from each bus segment */
[1]
https://patchwork.ozlabs.org/project/uboot/patch/20230822185725.6718-1-re...@ti.com/
--
Thanking You
Neha Malcom Francis
Re: [PATCH v2 3/6] k3-j721s2: Sync from Linux tag v6.5-rc1
Hi Manorit On 25/08/23 16:47, Manorit Chawdhry wrote: The following commit syncs the device tree from Linux tag v6.5-rc1 to U-boot and fixes the following to be compatible with the future syncs - - Include k3-j721s2-common-proc-board.dts file Remove the duplicated pinmuxes from r5 and -u-boot.dtsi files and include k3-j721s2-common-proc-board.dts for Linux fixes to propagate to U-boot. - Fixing the mcu_timer0 Remove timer0 and use the mcu_timer0 defined in mcu-wakeup.dtsi The device manager is not functional at this point so we can't configure the clocks for the mcu_timer0, delete the properties that enable the clocks and power domains for it. - Fixing secure proxy nodes Linux DT now have these nodes defined so remove them and rename to use the Linux DT ones. - Remove cpsw node The compatible is now fixed and the node is not required in -u-boot specifically - Remove aliases and chosen node Use these from Linux and don't override when not required. - Remove /delete-property/ from sdhci nodes We have the necessary clock and dev data so remove these. - Remove dummy_clocks and fs_loader0 These weren't being used anywhere so remove it. All these have been put in a single commit to not break the bisectability. Signed-off-by: Manorit Chawdhry --- .../dts/k3-j721s2-common-proc-board-u-boot.dtsi| 60 +-- arch/arm/dts/k3-j721s2-common-proc-board.dts | 330 ++-- arch/arm/dts/k3-j721s2-main.dtsi | 585 - arch/arm/dts/k3-j721s2-mcu-wakeup.dtsi | 365 - arch/arm/dts/k3-j721s2-r5-common-proc-board.dts| 151 +- arch/arm/dts/k3-j721s2-som-p0.dtsi | 165 +++--- arch/arm/dts/k3-j721s2-thermal.dtsi| 101 arch/arm/dts/k3-j721s2.dtsi| 12 +- 8 files changed, 1339 insertions(+), 430 deletions(-) This LGTM, Reviewed-by: Neha Malcom Francis -- Thanking You Neha Malcom Francis
[PATCH v2 3/6] k3-j721s2: Sync from Linux tag v6.5-rc1
The following commit syncs the device tree from Linux tag
v6.5-rc1 to U-boot and fixes the following to be compatible with
the future syncs -
- Include k3-j721s2-common-proc-board.dts file
Remove the duplicated pinmuxes from r5 and -u-boot.dtsi files and
include k3-j721s2-common-proc-board.dts for Linux fixes to propagate
to U-boot.
- Fixing the mcu_timer0
Remove timer0 and use the mcu_timer0 defined in mcu-wakeup.dtsi
The device manager is not functional at this point so we can't
configure the clocks for the mcu_timer0, delete the properties
that enable the clocks and power domains for it.
- Fixing secure proxy nodes
Linux DT now have these nodes defined so remove them and rename to
use the Linux DT ones.
- Remove cpsw node
The compatible is now fixed and the node is not required in
-u-boot specifically
- Remove aliases and chosen node
Use these from Linux and don't override when not required.
- Remove /delete-property/ from sdhci nodes
We have the necessary clock and dev data so remove these.
- Remove dummy_clocks and fs_loader0
These weren't being used anywhere so remove it.
All these have been put in a single commit to not break the
bisectability.
Signed-off-by: Manorit Chawdhry
---
.../dts/k3-j721s2-common-proc-board-u-boot.dtsi| 60 +--
arch/arm/dts/k3-j721s2-common-proc-board.dts | 330 ++--
arch/arm/dts/k3-j721s2-main.dtsi | 585 -
arch/arm/dts/k3-j721s2-mcu-wakeup.dtsi | 365 -
arch/arm/dts/k3-j721s2-r5-common-proc-board.dts| 151 +-
arch/arm/dts/k3-j721s2-som-p0.dtsi | 165 +++---
arch/arm/dts/k3-j721s2-thermal.dtsi| 101
arch/arm/dts/k3-j721s2.dtsi| 12 +-
8 files changed, 1339 insertions(+), 430 deletions(-)
diff --git a/arch/arm/dts/k3-j721s2-common-proc-board-u-boot.dtsi
b/arch/arm/dts/k3-j721s2-common-proc-board-u-boot.dtsi
index f940ffee8787..faa01169ebd8 100644
--- a/arch/arm/dts/k3-j721s2-common-proc-board-u-boot.dtsi
+++ b/arch/arm/dts/k3-j721s2-common-proc-board-u-boot.dtsi
@@ -1,28 +1,10 @@
// SPDX-License-Identifier: GPL-2.0
/*
- * Copyright (C) 2021 Texas Instruments Incorporated - https://www.ti.com/
+ * Copyright (C) 2021-2023 Texas Instruments Incorporated - https://www.ti.com/
*/
#include "k3-j721s2-binman.dtsi"
-/ {
- chosen {
- stdout-path = "serial2:115200n8";
- tick-timer =
- };
-
- aliases {
- serial0 = _uart0;
- serial1 = _uart0;
- serial2 = _uart8;
- i2c0 = _i2c0;
- i2c1 = _i2c0;
- i2c2 = _i2c1;
- i2c3 = _i2c0;
- ethernet0 = _port1;
- };
-};
-
_i2c0 {
bootph-pre-ram;
};
@@ -38,14 +20,6 @@
_mcu_wakeup {
bootph-pre-ram;
- timer1: timer@4040 {
- compatible = "ti,omap5430-timer";
- reg = <0x0 0x4040 0x0 0x80>;
- ti,timer-alwon;
- clock-frequency = <25000>;
- bootph-pre-ram;
- };
-
chipid@4314 {
bootph-pre-ram;
};
@@ -101,6 +75,10 @@
bootph-pre-ram;
};
+_usbss0_pins_default {
+ bootph-pre-ram;
+};
+
_pmx0 {
bootph-pre-ram;
};
@@ -129,23 +107,27 @@
bootph-pre-ram;
};
-_cpsw {
- reg = <0x0 0x4600 0x0 0x20>,
- <0x0 0x40f00200 0x0 0x8>;
- reg-names = "cpsw_nuss", "mac_efuse";
- /delete-property/ ranges;
+_sdhci0 {
+ bootph-pre-ram;
+};
- cpsw-phy-sel@40f04040 {
- compatible = "ti,am654-cpsw-phy-sel";
- reg= <0x0 0x40f04040 0x0 0x4>;
- reg-names = "gmii-sel";
- };
+_sdhci1 {
+ bootph-pre-ram;
};
-_sdhci0 {
+ {
+ status = "disabled";
+};
+
+ {
+ status = "disabled";
+};
+
+ {
bootph-pre-ram;
};
-_sdhci1 {
+ {
+ dr_mode = "peripheral";
bootph-pre-ram;
};
diff --git a/arch/arm/dts/k3-j721s2-common-proc-board.dts
b/arch/arm/dts/k3-j721s2-common-proc-board.dts
index 3bba6473a3b6..04d4739d7245 100644
--- a/arch/arm/dts/k3-j721s2-common-proc-board.dts
+++ b/arch/arm/dts/k3-j721s2-common-proc-board.dts
@@ -2,13 +2,16 @@
/*
* Copyright (C) 2021 Texas Instruments Incorporated - https://www.ti.com/
*
- * Link to Common Processor Board: https://www.ti.com/lit/zip/sprr439
+ * Common Processor Board: https://www.ti.com/tool/J721EXCPXEVM
*/
/dts-v1/;
#include "k3-j721s2-som-p0.dtsi"
#include
+#include
+#include
+#include
/ {
compatible = "ti,j721s2-evm", "ti,j721s2";
@@ -16,10 +19,10 @@
chosen {
stdout-path = "serial2:115200n8";
- bootargs = "console=ttyS2,115200n8
earlycon=ns16550a,mmio32,0x288";
};
aliases {
+ serial1 = _uart0;
serial2 = _uart8;
