[PATCH 4/4] arm: dts: k3-am625-sk-r5/u-boot: Drop duplicate bootph-nodes
Dhruva Gole
d-gole at ti.com
Tue Nov 14 04:30:23 CET 2023
On Nov 13, 2023 at 08:59:19 -0600, Nishanth Menon wrote:
> Kernel dts import now provides bootph-all and bootph-pre-ram properties
> for the properties we have been overriding so far. Drop the same.
>
> While at this enable the DM and tifs uarts for programming pinmux
s/tifs/TIFS UARTs
> since they are marked reserved by board.dts
>
> Signed-off-by: Nishanth Menon <nm at ti.com>
> ---
> arch/arm/dts/k3-am625-r5-sk.dts | 12 +---
> arch/arm/dts/k3-am625-sk-u-boot.dtsi | 92 ----------------------------
> 2 files changed, 2 insertions(+), 102 deletions(-)
>
> diff --git a/arch/arm/dts/k3-am625-r5-sk.dts b/arch/arm/dts/k3-am625-r5-sk.dts
> index 55420b2f2c15..6b9f40e55581 100644
> --- a/arch/arm/dts/k3-am625-r5-sk.dts
> +++ b/arch/arm/dts/k3-am625-r5-sk.dts
> @@ -69,22 +69,14 @@
> };
> };
>
> -&wkup_uart0_pins_default {
> - bootph-pre-ram;
> -};
> -
> -&main_uart1_pins_default {
> - bootph-pre-ram;
> -};
> -
> /* WKUP UART0 is used for DM firmware logs */
> &wkup_uart0 {
> - bootph-pre-ram;
> + status = "okay";
> };
>
> /* Main UART1 is used for TIFS firmware logs */
> &main_uart1 {
> - bootph-pre-ram;
> + status = "okay";
> };
>
> &ospi0 {
> diff --git a/arch/arm/dts/k3-am625-sk-u-boot.dtsi b/arch/arm/dts/k3-am625-sk-u-boot.dtsi
> index dcf7c7652d31..fa778b0ff4c1 100644
> --- a/arch/arm/dts/k3-am625-sk-u-boot.dtsi
> +++ b/arch/arm/dts/k3-am625-sk-u-boot.dtsi
> @@ -8,71 +8,14 @@
>
> / {
> chosen {
> - stdout-path = "serial2:115200n8";
> tick-timer = &main_timer0;
> };
> -
> - aliases {
> - mmc1 = &sdhci1;
> - };
> -
> - memory at 80000000 {
> - bootph-all;
> - };
> -};
> -
> -&main_conf {
> - bootph-all;
> };
>
> &main_timer0 {
> clock-frequency = <25000000>;
> };
>
> -&main_uart0 {
> - bootph-all;
> -};
> -
> -&main_uart0_pins_default {
> - bootph-all;
> -};
> -
> -&sdhci1 {
> - bootph-all;
> -};
> -
> -&main_mmc1_pins_default {
> - bootph-all;
> -};
> -
> -&fss {
> - bootph-all;
> -};
> -
> -&ospi0_pins_default {
> - bootph-all;
> -};
> -
> -&ospi0 {
> - bootph-all;
> -
> - flash at 0 {
> - bootph-all;
> -
> - partitions {
> - bootph-all;
> -
> - partition at 3fc0000 {
> - bootph-all;
> - };
> - };
> - };
> -};
> -
> -&inta_main_dmss {
> - bootph-all;
> -};
> -
> &main_bcdma {
> reg = <0x00 0x485c0100 0x00 0x100>,
> <0x00 0x4c000000 0x00 0x20000>,
> @@ -100,41 +43,6 @@
> bootph-all;
> };
>
> -&cpsw3g_mdio {
> - bootph-all;
> -};
> -
> -&cpsw3g_phy0 {
> - bootph-all;
> -};
> -
> -&cpsw3g_phy1 {
> - bootph-all;
> -};
> -
> -&main_rgmii1_pins_default {
> - bootph-all;
> -};
> -
> -&main_rgmii2_pins_default {
> - bootph-all;
> -};
> -
> -&phy_gmii_sel {
> - bootph-all;
> -};
> -
> -&cpsw3g {
> - bootph-all;
> - ethernet-ports {
> - bootph-all;
> - };
> -};
> -
> -&cpsw_port1 {
> - bootph-all;
> -};
> -
> &cpsw_port2 {
> status = "disabled";
> };
> --
> 2.40.0
Looks okay,
Reviewed-by: Dhruva Gole <d-gole at ti.com>
>
>
--
Best regards,
Dhruva Gole <d-gole at ti.com>
More information about the U-Boot
mailing list