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 18/26] arm: dts: k3-am654: remove duplicate ospi0 node
Date: Thu, 21 Dec 2023 11:44:04 -0600 [thread overview]
Message-ID: <20231221174412.210807-19-bb@ti.com> (raw)
In-Reply-To: <20231221174412.210807-1-bb@ti.com>
With the Linux and U-Boot board dtb files unified, we now have a
duplicate ospi0 node. Remove it
Signed-off-by: Bryan Brattlof <bb@ti.com>
---
arch/arm/dts/k3-am654-r5-base-board.dts | 37 -------------------------
1 file changed, 37 deletions(-)
diff --git a/arch/arm/dts/k3-am654-r5-base-board.dts b/arch/arm/dts/k3-am654-r5-base-board.dts
index 19691d26e6fe4..af2a8a15b5533 100644
--- a/arch/arm/dts/k3-am654-r5-base-board.dts
+++ b/arch/arm/dts/k3-am654-r5-base-board.dts
@@ -18,8 +18,6 @@
ethernet0 = &cpsw_port1;
remoteproc0 = &sysctrler;
remoteproc1 = &a53_0;
- spi0 = &ospi0;
- spi1 = &ospi1;
usb0 = &usb0;
usb1 = &usb1;
};
@@ -111,22 +109,6 @@
AM65X_WKUP_IOPAD(0x0040, PIN_OUTPUT_PULLUP, 7) /* WKUP_GPIO0_28 */
>;
};
-
- mcu_fss0_ospi0_pins_default: mcu-fss0-ospi0-pins_default {
- pinctrl-single,pins = <
- AM65X_WKUP_IOPAD(0x0000, PIN_OUTPUT, 0) /* (V1) MCU_OSPI0_CLK */
- AM65X_WKUP_IOPAD(0x0008, PIN_INPUT, 0) /* (U2) MCU_OSPI0_DQS */
- AM65X_WKUP_IOPAD(0x000c, PIN_INPUT, 0) /* (U4) MCU_OSPI0_D0 */
- AM65X_WKUP_IOPAD(0x0010, PIN_INPUT, 0) /* (U5) MCU_OSPI0_D1 */
- AM65X_WKUP_IOPAD(0x0014, PIN_INPUT, 0) /* (T2) MCU_OSPI0_D2 */
- AM65X_WKUP_IOPAD(0x0018, PIN_INPUT, 0) /* (T3) MCU_OSPI0_D3 */
- AM65X_WKUP_IOPAD(0x001c, PIN_INPUT, 0) /* (T4) MCU_OSPI0_D4 */
- AM65X_WKUP_IOPAD(0x0020, PIN_INPUT, 0) /* (T5) MCU_OSPI0_D5 */
- AM65X_WKUP_IOPAD(0x0024, PIN_INPUT, 0) /* (R2) MCU_OSPI0_D6 */
- AM65X_WKUP_IOPAD(0x0028, PIN_INPUT, 0) /* (R3) MCU_OSPI0_D7 */
- AM65X_WKUP_IOPAD(0x002c, PIN_OUTPUT, 0) /* (R4) MCU_OSPI0_CSn0 */
- >;
- };
};
&main_pmx0 {
@@ -170,27 +152,8 @@
};
&ospi0 {
- pinctrl-names = "default";
- pinctrl-0 = <&mcu_fss0_ospi0_pins_default>;
- bootph-pre-ram;
-
reg = <0x0 0x47040000 0x0 0x100>,
<0x0 0x50000000 0x0 0x8000000>;
-
- flash@0{
- compatible = "jedec,spi-nor";
- reg = <0x0>;
- spi-tx-bus-width = <1>;
- spi-rx-bus-width = <8>;
- spi-max-frequency = <50000000>;
- cdns,tshsl-ns = <60>;
- cdns,tsd2d-ns = <60>;
- cdns,tchsh-ns = <60>;
- cdns,tslch-ns = <60>;
- cdns,read-delay = <0>;
- #address-cells = <1>;
- #size-cells = <1>;
- };
};
&main_pmx0 {
--
2.43.0
next prev parent reply other threads:[~2023-12-21 17:44 UTC|newest]
Thread overview: 40+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-12-21 17:43 [PATCH 00/26] sync am65x device tree with Linux v6.7-rc1 Bryan Brattlof
2023-12-21 17:43 ` [PATCH 01/26] configs: am65x_evm_r5: enable driver for fixed regulators Bryan Brattlof
2023-12-21 17:43 ` [PATCH 02/26] configs: am65x_evm_a53: disable CONSOLE_MUX Bryan Brattlof
2023-12-21 17:43 ` [PATCH 03/26] arm: dts: k3-am654-r5: Merge board file and U-Boot overlay Bryan Brattlof
2023-12-21 17:43 ` [PATCH 04/26] arm: dts: k3-am654: pull in dtb update from Linux Bryan Brattlof
2023-12-21 17:43 ` [PATCH 05/26] arm: dts: k3-am654: copy bootph properties to a53 dts Bryan Brattlof
2023-12-21 17:43 ` [PATCH 06/26] arm: dts: k3-am654: include a53 board dtb for r5 build Bryan Brattlof
2023-12-21 17:43 ` [PATCH 07/26] arm: dts: k3-am654: remove duplicate vtt_supply Bryan Brattlof
2023-12-21 17:43 ` [PATCH 08/26] arm: dts: k3-am654: remove duplicate wkup_uart0 Bryan Brattlof
2023-12-21 17:43 ` [PATCH 09/26] arm: dts: k3-am654: remove duplicate timer Bryan Brattlof
2023-12-21 17:43 ` [PATCH 10/26] arm: dts: k3-am654: remove duplicate mcu_ringacc Bryan Brattlof
2023-12-21 17:43 ` [PATCH 11/26] arm: dts: k3-am654: remove duplicate mcu_udmap Bryan Brattlof
2023-12-21 17:43 ` [PATCH 12/26] arm: dts: k3-am654: add needed regs to udmap nodes Bryan Brattlof
2023-12-27 12:25 ` Nishanth Menon
2023-12-28 17:18 ` Bryan Brattlof
2023-12-21 17:43 ` [PATCH 13/26] arm: dts: k3-am654: remove duplicate mcu_uart0 node Bryan Brattlof
2023-12-21 17:44 ` [PATCH 14/26] arm: dts: k3-am654: remove duplicate main_uart0 Bryan Brattlof
2023-12-21 17:44 ` [PATCH 15/26] arm: dts: k3-am654: remove duplicate sdhci0 pinmux node Bryan Brattlof
2023-12-27 12:30 ` Nishanth Menon
2023-12-21 17:44 ` [PATCH 16/26] arm: dts: k3-am654: remove duplicate sdhci1 " Bryan Brattlof
2023-12-27 12:31 ` Nishanth Menon
2023-12-21 17:44 ` [PATCH 17/26] arm: dts: k3-am654: remove duplicate wkup_i2c0 Bryan Brattlof
2023-12-21 17:44 ` Bryan Brattlof [this message]
2023-12-21 17:44 ` [PATCH 19/26] arm: dts: k3-am654: remove usb0 Bryan Brattlof
2023-12-21 17:44 ` [PATCH 20/26] arm: dts: k3-am654: remove duplicate mdio Bryan Brattlof
2023-12-21 17:44 ` [PATCH 21/26] arm: dts: k3-am654: remove duplicate vtt pinmux Bryan Brattlof
2023-12-21 17:44 ` [PATCH 22/26] arm: dts: k3-am654: remove duplicate root properties Bryan Brattlof
2023-12-21 17:44 ` [PATCH 23/26] arm: dts: k3-am654: remove un-needed aliases Bryan Brattlof
2023-12-21 17:44 ` [PATCH 24/26] arm: dts: k3-am654: move dummy_clock to root node Bryan Brattlof
2023-12-21 17:44 ` [PATCH 25/26] arm: dts: k3-am65: remove duplicate mcu secure proxy node Bryan Brattlof
2023-12-21 17:44 ` [PATCH 26/26] arm: dts: k3-am654: convert bootph-pre-ram to bootph-all Bryan Brattlof
2023-12-27 12:29 ` Nishanth Menon
2023-12-28 17:30 ` Bryan Brattlof
2023-12-21 20:00 ` [PATCH 00/26] sync am65x device tree with Linux v6.7-rc1 Tom Rini
2023-12-27 12:39 ` Nishanth Menon
2023-12-27 13:32 ` Tom Rini
2024-01-02 7:27 ` Jan Kiszka
2024-01-02 17:42 ` Tom Rini
2024-01-03 5:10 ` Jan Kiszka
2024-01-03 15:50 ` Tom Rini
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=20231221174412.210807-19-bb@ti.com \
--to=bb@ti.com \
--cc=afd@ti.com \
--cc=clamor95@gmail.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.