[08/26] arm: dts: k3-am654: remove duplicate wkup_uart0

Message ID	20231221174412.210807-9-bb@ti.com
State	Superseded
Delegated to:	Tom Rini
Headers	show Return-Path: <u-boot-bounces@lists.denx.de> From: Bryan Brattlof <bb@ti.com> To: Tom Rini <trini@konsulko.com> CC: UBoot Mailing List <u-boot@lists.denx.de>, Vignesh Raghavendra <vigneshr@ti.com>, Andrew Davis <afd@ti.com>, Nishanth Menon <nm@ti.com>, Neha Malcom Francis <n-francis@ti.com>, Manorit Chawdhry <m-chawdhry@ti.com>, Martyn Welch <martyn.welch@collabora.com>, Svyatoslav Ryhel <clamor95@gmail.com>, Marcel Ziswiler <marcel.ziswiler@toradex.com>, Simon Glass <sjg@chromium.org>, Bryan Brattlof <bb@ti.com> Subject: [PATCH 08/26] arm: dts: k3-am654: remove duplicate wkup_uart0 Date: Thu, 21 Dec 2023 11:43:54 -0600 Message-ID: <20231221174412.210807-9-bb@ti.com> In-Reply-To: <20231221174412.210807-1-bb@ti.com> References: <20231221174412.210807-1-bb@ti.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain Precedence: list Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" <u-boot-bounces@lists.denx.de>
Series	sync am65x device tree with Linux v6.7-rc1 \| expand [00/26] sync am65x device tree with Linux v6.7-rc1 [01/26] configs: am65x_evm_r5: enable driver for fixed regulators [02/26] configs: am65x_evm_a53: disable CONSOLE_MUX [03/26] arm: dts: k3-am654-r5: Merge board file and U-Boot overlay [04/26] arm: dts: k3-am654: pull in dtb update from Linux [05/26] arm: dts: k3-am654: copy bootph properties to a53 dts [06/26] arm: dts: k3-am654: include a53 board dtb for r5 build [07/26] arm: dts: k3-am654: remove duplicate vtt_supply [08/26] arm: dts: k3-am654: remove duplicate wkup_uart0 [09/26] arm: dts: k3-am654: remove duplicate timer [10/26] arm: dts: k3-am654: remove duplicate mcu_ringacc [11/26] arm: dts: k3-am654: remove duplicate mcu_udmap [12/26] arm: dts: k3-am654: add needed regs to udmap nodes [13/26] arm: dts: k3-am654: remove duplicate mcu_uart0 node [14/26] arm: dts: k3-am654: remove duplicate main_uart0 [15/26] arm: dts: k3-am654: remove duplicate sdhci0 pinmux node [16/26] arm: dts: k3-am654: remove duplicate sdhci1 pinmux node [17/26] arm: dts: k3-am654: remove duplicate wkup_i2c0 [18/26] arm: dts: k3-am654: remove duplicate ospi0 node [19/26] arm: dts: k3-am654: remove usb0 [20/26] arm: dts: k3-am654: remove duplicate mdio [21/26] arm: dts: k3-am654: remove duplicate vtt pinmux [22/26] arm: dts: k3-am654: remove duplicate root properties [23/26] arm: dts: k3-am654: remove un-needed aliases [24/26] arm: dts: k3-am654: move dummy_clock to root node [25/26] arm: dts: k3-am65: remove duplicate mcu secure proxy node [26/26] arm: dts: k3-am654: convert bootph-pre-ram to bootph-all

Message ID

20231221174412.210807-9-bb@ti.com

State

Superseded

Delegated to:

Tom Rini

Headers

From: Bryan Brattlof <bb@ti.com>
To: Tom Rini <trini@konsulko.com>
CC: UBoot Mailing List <u-boot@lists.denx.de>, Vignesh Raghavendra
 <vigneshr@ti.com>, Andrew Davis <afd@ti.com>,
 Nishanth Menon <nm@ti.com>, Neha Malcom Francis <n-francis@ti.com>,
 Manorit Chawdhry <m-chawdhry@ti.com>,
 Martyn Welch <martyn.welch@collabora.com>, Svyatoslav Ryhel
 <clamor95@gmail.com>, Marcel Ziswiler <marcel.ziswiler@toradex.com>, Simon
 Glass <sjg@chromium.org>, Bryan Brattlof <bb@ti.com>
Subject: [PATCH 08/26] arm: dts: k3-am654: remove duplicate wkup_uart0
Date: Thu, 21 Dec 2023 11:43:54 -0600
Message-ID: <20231221174412.210807-9-bb@ti.com>
In-Reply-To: <20231221174412.210807-1-bb@ti.com>
References: <20231221174412.210807-1-bb@ti.com>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
Precedence: list
Errors-To: u-boot-bounces@lists.denx.de
Sender: "U-Boot" <u-boot-bounces@lists.denx.de>

Series

sync am65x device tree with Linux v6.7-rc1 | expand

Commit Message

Bryan Brattlof Dec. 21, 2023, 5:43 p.m. UTC

With the Linux and U-Boot board files unified, we now have a duplicate
wkup_uart0 node. Remove it

Signed-off-by: Bryan Brattlof <bb@ti.com>
---
 arch/arm/dts/k3-am654-r5-base-board.dts | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/arch/arm/dts/k3-am654-r5-base-board.dts b/arch/arm/dts/k3-am654-r5-base-board.dts
index d55ddb83837f3..3e94cfccd4321 100644
--- a/arch/arm/dts/k3-am654-r5-base-board.dts
+++ b/arch/arm/dts/k3-am654-r5-base-board.dts
@@ -18,7 +18,6 @@ 
 		ethernet0 = &cpsw_port1;
 		remoteproc0 = &sysctrler;
 		remoteproc1 = &a53_0;
-		serial0 = &wkup_uart0;
 		serial1 = &mcu_uart0;
 		serial2 = &main_uart0;
 		spi0 = &ospi0;
@@ -117,8 +116,6 @@ 
 };
 
 &wkup_uart0 {
-	pinctrl-names = "default";
-	pinctrl-0 = <&wkup_uart0_pins_default>;
 	status = "okay";
 };
 
@@ -144,15 +141,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 */

[08/26] arm: dts: k3-am654: remove duplicate wkup_uart0

Commit Message

Patch