The R5 board file for U-Boot should be the same as the board file copied
from Linux with a few alterations to work with the R5's view of the SoC.
First we need to unify the R5 board file and it's U-Boot overlay before
we can unify the Linux board file with this one.
Tested-by: Tom Rini
Signed-off-by: Bryan Brattlof
---
arch/arm/dts/k3-am654-base-board-u-boot.dtsi | 1 -
.../dts/k3-am654-r5-base-board-u-boot.dtsi| 208 --
arch/arm/dts/k3-am654-r5-base-board.dts | 124 ++-
3 files changed, 119 insertions(+), 214 deletions(-)
delete mode 100644 arch/arm/dts/k3-am654-r5-base-board-u-boot.dtsi
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 11d83927ac525..f29cecf870bcd 100644
--- a/arch/arm/dts/k3-am654-base-board-u-boot.dtsi
+++ b/arch/arm/dts/k3-am654-base-board-u-boot.dtsi
@@ -3,7 +3,6 @@
* Copyright (C) 2018-2021 Texas Instruments Incorporated - https://www.ti.com/
*/
-#include "k3-am654-r5-base-board-u-boot.dtsi"
#include "k3-am65x-binman.dtsi"
_0 {
diff --git a/arch/arm/dts/k3-am654-r5-base-board-u-boot.dtsi
b/arch/arm/dts/k3-am654-r5-base-board-u-boot.dtsi
deleted file mode 100644
index 286604576e028..0
--- a/arch/arm/dts/k3-am654-r5-base-board-u-boot.dtsi
+++ /dev/null
@@ -1,208 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0
-/*
- * Copyright (C) 2018-2021 Texas Instruments Incorporated - https://www.ti.com/
- */
-
-#include
-#include
-#include "k3-am65x-binman.dtsi"
-
-/ {
- chosen {
- stdout-path = "serial2:115200n8";
- };
-
- aliases {
- serial2 = _uart0;
- ethernet0 = _port1;
- usb0 =
- usb1 =
- spi0 =
- spi1 =
- };
-};
-
-_main{
- bootph-pre-ram;
- main_navss: bus@3080 {
- bootph-pre-ram;
- };
-};
-
-_mcu {
- bootph-pre-ram;
-
- mcu_navss: bus@2838 {
- bootph-pre-ram;
-
- ringacc@2b80 {
- reg = <0x0 0x2b80 0x0 0x40>,
- <0x0 0x2b00 0x0 0x40>,
- <0x0 0x2859 0x0 0x100>,
- <0x0 0x2a50 0x0 0x4>,
- <0x0 0x2844 0x0 0x4>;
- reg-names = "rt", "fifos", "proxy_gcfg",
"proxy_target", "cfg";
- bootph-pre-ram;
- ti,dma-ring-reset-quirk;
- };
-
- dma-controller@285c {
- reg = <0x0 0x285c 0x0 0x100>,
- <0x0 0x284c 0x0 0x4000>,
- <0x0 0x2a80 0x0 0x4>,
- <0x0 0x284a 0x0 0x4000>,
- <0x0 0x2aa0 0x0 0x4>,
- <0x0 0x2840 0x0 0x2000>;
- reg-names = "gcfg", "rchan", "rchanrt", "tchan",
- "tchanrt", "rflow";
- bootph-pre-ram;
- };
- };
-};
-
-_wakeup {
- bootph-pre-ram;
-
- chipid@4314 {
- bootph-pre-ram;
- };
-};
-
-_proxy_main {
- bootph-pre-ram;
-};
-
- {
- bootph-pre-ram;
- k3_sysreset: sysreset-controller {
- compatible = "ti,sci-sysreset";
- bootph-pre-ram;
- };
-};
-
-_pds {
- bootph-pre-ram;
-};
-
-_clks {
- bootph-pre-ram;
-};
-
-_reset {
- bootph-pre-ram;
-};
-
-_pmx0 {
- bootph-pre-ram;
-
- wkup_i2c0_pins_default {
- bootph-pre-ram;
- };
-};
-
-_pmx0 {
- bootph-pre-ram;
- usb0_pins_default: usb0_pins_default {
- pinctrl-single,pins = <
- AM65X_IOPAD(0x02bc, PIN_OUTPUT, 0) /* (AD9)
USB0_DRVVBUS */
- >;
- bootph-pre-ram;
- };
-};
-
-_uart0_pins_default {
- bootph-pre-ram;
-};
-
-_pmx1 {
- bootph-pre-ram;
-};
-
-_pmx0 {
- mcu-fss0-ospi0-pins-default {
- bootph-pre-ram;
- };
-};
-
-_uart0 {
- bootph-pre-ram;
-};
-
-_mmc0_pins_default {
- bootph-pre-ram;
-};
-
-_mmc1_pins_default {
- bootph-pre-ram;
-};
-
- {
- bootph-pre-ram;
-};
-
- {
- bootph-pre-ram;
-};
-
-_mdio {
- phy0: ethernet-phy@0 {
- reg = <0>;
- /* TODO: phy reset:
TCA9555RTWR(i2c:0x21)[p04].GPIO_MCU_RGMII_RSTN */
- ti,rx-internal-delay = ;
- ti,fifo-depth = ;
- };
-};
-
-_cpsw {
- reg = <0x0 0x4600 0x0 0x20>,
- <0x0 0x40f00200 0x0 0x2>;
- reg-names = "cpsw_nuss", "mac_efuse";
- /delete-property/ ranges;
-
- cpsw-phy-sel@40f04040 {
- compatible = "ti,am654-cpsw-phy-sel";
- reg= <0x0 0x40f04040 0x0 0x4>;
-
