U-Boot Archive on lore.kernel.org
 help / color / mirror / Atom feed
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>,
	Jan Kiszka <jan.kiszka@siemens.com>, Bryan Brattlof <bb@ti.com>
Subject: [PATCH v2 21/26] arm: dts: k3-am654: remove duplicate vtt pinmux
Date: Fri, 29 Dec 2023 11:47:18 -0600	[thread overview]
Message-ID: <20231229174656.634065-49-bb@ti.com> (raw)
In-Reply-To: <20231229174656.634065-28-bb@ti.com>

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

Tested-by: Tom Rini <trini@konsulko.com>
Signed-off-by: Bryan Brattlof <bb@ti.com>
---
 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(-)

diff --git a/arch/arm/dts/k3-am654-base-board-u-boot.dtsi b/arch/arm/dts/k3-am654-base-board-u-boot.dtsi
index 3647088c29e4b..da6d4dffbf9d2 100644
--- a/arch/arm/dts/k3-am654-base-board-u-boot.dtsi
+++ b/arch/arm/dts/k3-am654-base-board-u-boot.dtsi
@@ -93,7 +93,7 @@
 	bootph-pre-ram;
 };
 
-&wkup_vtt_pins_default {
+&ddr_vtt_pins_default {
 	bootph-pre-ram;
 };
 
diff --git a/arch/arm/dts/k3-am654-r5-base-board.dts b/arch/arm/dts/k3-am654-r5-base-board.dts
index 14bf1b4c8a462..fb238adaea5b2 100644
--- a/arch/arm/dts/k3-am654-r5-base-board.dts
+++ b/arch/arm/dts/k3-am654-r5-base-board.dts
@@ -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>;
 };
 
 /*
-- 
2.43.0


  parent reply	other threads:[~2023-12-29 17:47 UTC|newest]

Thread overview: 56+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-12-29 17:46 [PATCH v2 00/26] sync am65x device tree with Linux v6.7-rc1 Bryan Brattlof
2023-12-29 17:46 ` [PATCH v2 01/26] configs: am65x_evm_r5: enable driver for fixed regulators Bryan Brattlof
2024-01-02 18:46   ` Nishanth Menon
2023-12-29 17:46 ` [PATCH v2 02/26] configs: am65x_evm_a53: disable CONSOLE_MUX Bryan Brattlof
2024-01-02 18:47   ` Nishanth Menon
2023-12-29 17:47 ` [PATCH v2 03/26] arm: dts: k3-am654-r5: Merge board file and U-Boot overlay Bryan Brattlof
2024-01-02 18:47   ` Nishanth Menon
2023-12-29 17:47 ` [PATCH v2 04/26] arm: dts: k3-am654: pull in dtb update from Linux Bryan Brattlof
2024-01-02 18:47   ` Nishanth Menon
2023-12-29 17:47 ` [PATCH v2 05/26] arm: dts: k3-am654: copy bootph properties to a53 dts Bryan Brattlof
2024-01-02 18:48   ` Nishanth Menon
2023-12-29 17:47 ` [PATCH v2 06/26] arm: dts: k3-am654: include a53 board dtb for r5 build Bryan Brattlof
2024-01-02 18:48   ` Nishanth Menon
2023-12-29 17:47 ` [PATCH v2 07/26] arm: dts: k3-am654: remove duplicate vtt_supply Bryan Brattlof
2024-01-02 18:48   ` Nishanth Menon
2023-12-29 17:47 ` [PATCH v2 08/26] arm: dts: k3-am654: remove duplicate wkup_uart0 Bryan Brattlof
2024-01-02 18:48   ` Nishanth Menon
2023-12-29 17:47 ` [PATCH v2 09/26] arm: dts: k3-am654: remove duplicate timer Bryan Brattlof
2024-01-02 18:49   ` Nishanth Menon
2023-12-29 17:47 ` [PATCH v2 10/26] arm: dts: k3-am654: remove duplicate mcu_ringacc Bryan Brattlof
2024-01-02 18:49   ` Nishanth Menon
2023-12-29 17:47 ` [PATCH v2 11/26] arm: dts: k3-am654: remove duplicate mcu_udmap Bryan Brattlof
2024-01-02 18:49   ` Nishanth Menon
2023-12-29 17:47 ` [PATCH v2 12/26] arm: dts: k3-am654: add needed regs to udmap nodes Bryan Brattlof
2024-01-02 18:51   ` Nishanth Menon
2023-12-29 17:47 ` [PATCH v2 13/26] arm: dts: k3-am654: remove duplicate mcu_uart0 node Bryan Brattlof
2024-01-02 18:51   ` Nishanth Menon
2023-12-29 17:47 ` [PATCH v2 14/26] arm: dts: k3-am654: remove duplicate main_uart0 Bryan Brattlof
2024-01-02 18:51   ` Nishanth Menon
2023-12-29 17:47 ` [PATCH v2 15/26] arm: dts: k3-am654: remove duplicate sdhci0 pinmux node Bryan Brattlof
2024-01-02 18:51   ` Nishanth Menon
2023-12-29 17:47 ` [PATCH v2 16/26] arm: dts: k3-am654: remove duplicate sdhci1 " Bryan Brattlof
2024-01-02 18:51   ` Nishanth Menon
2023-12-29 17:47 ` [PATCH v2 17/26] arm: dts: k3-am654: remove duplicate wkup_i2c0 Bryan Brattlof
2024-01-02 18:52   ` Nishanth Menon
2023-12-29 17:47 ` [PATCH v2 18/26] arm: dts: k3-am654: remove duplicate ospi0 node Bryan Brattlof
2024-01-02 18:52   ` Nishanth Menon
2023-12-29 17:47 ` [PATCH v2 19/26] arm: dts: k3-am654: remove usb0 Bryan Brattlof
2024-01-02 18:52   ` Nishanth Menon
2023-12-29 17:47 ` [PATCH v2 20/26] arm: dts: k3-am654: remove duplicate mdio Bryan Brattlof
2024-01-02 18:52   ` Nishanth Menon
2023-12-29 17:47 ` Bryan Brattlof [this message]
2024-01-02 18:52   ` [PATCH v2 21/26] arm: dts: k3-am654: remove duplicate vtt pinmux Nishanth Menon
2023-12-29 17:47 ` [PATCH v2 22/26] arm: dts: k3-am654: remove duplicate root properties Bryan Brattlof
2024-01-02 18:53   ` Nishanth Menon
2023-12-29 17:47 ` [PATCH v2 23/26] arm: dts: k3-am654: remove un-needed aliases Bryan Brattlof
2024-01-02 18:53   ` Nishanth Menon
2023-12-29 17:47 ` [PATCH v2 24/26] arm: dts: k3-am654: move dummy_clock to root node Bryan Brattlof
2024-01-02 18:53   ` Nishanth Menon
2023-12-29 17:47 ` [PATCH v2 25/26] arm: dts: k3-am654: remove duplicate mcu secure proxy node Bryan Brattlof
2024-01-02 18:53   ` Nishanth Menon
2023-12-29 17:47 ` [PATCH v2 26/26] arm: dts: k3-am654: convert bootph-pre-ram to bootph-all Bryan Brattlof
2024-01-02 18:55   ` Nishanth Menon
2024-01-03 13:54 ` [PATCH v2 00/26] sync am65x device tree with Linux v6.7-rc1 Tom Rini
2024-01-06 11:57 ` Jan Kiszka
2024-01-06 11:58   ` Jan Kiszka

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20231229174656.634065-49-bb@ti.com \
    --to=bb@ti.com \
    --cc=afd@ti.com \
    --cc=clamor95@gmail.com \
    --cc=jan.kiszka@siemens.com \
    --cc=m-chawdhry@ti.com \
    --cc=marcel.ziswiler@toradex.com \
    --cc=martyn.welch@collabora.com \
    --cc=n-francis@ti.com \
    --cc=nm@ti.com \
    --cc=sjg@chromium.org \
    --cc=trini@konsulko.com \
    --cc=u-boot@lists.denx.de \
    --cc=vigneshr@ti.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox