arm: dts: k3-am654-r5: Merge board file and U-Boot overlay

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 <trini@konsulko.com>
Signed-off-by: Bryan Brattlof <bb@ti.com>
Reviewed-by: Nishanth Menon <nm@ti.com>

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 11d83927ac52577049160c8c96e0517d834d8ede..f29cecf870bcd1be61c022390fbf7e29219c7bd1 100644 (file)
--- 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"
 
 &pru0_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 (file)
index 2866045..0000000
--- 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 <dt-bindings/pinctrl/k3.h>
-#include <dt-bindings/net/ti-dp83867.h>
-#include "k3-am65x-binman.dtsi"
-
-/ {
-       chosen {
-               stdout-path = "serial2:115200n8";
-       };
-
-       aliases {
-               serial2 = &main_uart0;
-               ethernet0 = &cpsw_port1;
-               usb0 = &usb0;
-               usb1 = &usb1;
-               spi0 = &ospi0;
-               spi1 = &ospi1;
-       };
-};
-
-&cbass_main{
-       bootph-pre-ram;
-       main_navss: bus@30800000 {
-               bootph-pre-ram;
-       };
-};
-
-&cbass_mcu {
-       bootph-pre-ram;
-
-       mcu_navss: bus@28380000 {
-               bootph-pre-ram;
-
-               ringacc@2b800000 {
-                       reg =   <0x0 0x2b800000 0x0 0x400000>,
-                               <0x0 0x2b000000 0x0 0x400000>,
-                               <0x0 0x28590000 0x0 0x100>,
-                               <0x0 0x2a500000 0x0 0x40000>,
-                               <0x0 0x28440000 0x0 0x40000>;
-                       reg-names = "rt", "fifos", "proxy_gcfg", "proxy_target", "cfg";
-                       bootph-pre-ram;
-                       ti,dma-ring-reset-quirk;
-               };
-
-               dma-controller@285c0000 {
-                       reg =   <0x0 0x285c0000 0x0 0x100>,
-                               <0x0 0x284c0000 0x0 0x4000>,
-                               <0x0 0x2a800000 0x0 0x40000>,
-                               <0x0 0x284a0000 0x0 0x4000>,
-                               <0x0 0x2aa00000 0x0 0x40000>,
-                               <0x0 0x28400000 0x0 0x2000>;
-                       reg-names = "gcfg", "rchan", "rchanrt", "tchan",
-                                           "tchanrt", "rflow";
-                       bootph-pre-ram;
-               };
-       };
-};
-
-&cbass_wakeup {
-       bootph-pre-ram;
-
-       chipid@43000014 {
-               bootph-pre-ram;
-       };
-};
-
-&secure_proxy_main {
-       bootph-pre-ram;
-};
-
-&dmsc {
-       bootph-pre-ram;
-       k3_sysreset: sysreset-controller {
-               compatible = "ti,sci-sysreset";
-               bootph-pre-ram;
-       };
-};
-
-&k3_pds {
-       bootph-pre-ram;
-};
-
-&k3_clks {
-       bootph-pre-ram;
-};
-
-&k3_reset {
-       bootph-pre-ram;
-};
-
-&wkup_pmx0 {
-       bootph-pre-ram;
-
-       wkup_i2c0_pins_default {
-               bootph-pre-ram;
-       };
-};
-
-&main_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;
-       };
-};
-
-&main_uart0_pins_default {
-       bootph-pre-ram;
-};
-
-&main_pmx1 {
-       bootph-pre-ram;
-};
-
-&wkup_pmx0 {
-       mcu-fss0-ospi0-pins-default {
-               bootph-pre-ram;
-       };
-};
-
-&main_uart0 {
-       bootph-pre-ram;
-};
-
-&main_mmc0_pins_default {
-       bootph-pre-ram;
-};
-
-&main_mmc1_pins_default {
-       bootph-pre-ram;
-};
-
-&sdhci0 {
-       bootph-pre-ram;
-};
-
-&sdhci1 {
-       bootph-pre-ram;
-};
-
-&davinci_mdio {
-       phy0: ethernet-phy@0 {
-               reg = <0>;
-               /* TODO: phy reset: TCA9555RTWR(i2c:0x21)[p04].GPIO_MCU_RGMII_RSTN */
-               ti,rx-internal-delay = <DP83867_RGMIIDCTL_2_00_NS>;
-               ti,fifo-depth = <DP83867_PHYCR_FIFO_DEPTH_4_B_NIB>;
-       };
-};
-
-&mcu_cpsw {
-       reg = <0x0 0x46000000 0x0 0x200000>,
-             <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>;
-               reg-names = "gmii-sel";
-       };
-};
-
-&wkup_i2c0 {
-       bootph-pre-ram;
-};
-
-&usb1 {
-       dr_mode = "peripheral";
-};
-
-&fss {
-       bootph-pre-ram;
-};
-
-&ospi0 {
-       bootph-pre-ram;
-
-        flash@0{
-               bootph-pre-ram;
-       };
-};
-
-&dwc3_0 {
-       status = "okay";
-       bootph-pre-ram;
-};
-
-&usb0_phy {
-       status = "okay";
-       bootph-pre-ram;
-};
-
-&usb0 {
-       pinctrl-names = "default";
-       pinctrl-0 = <&usb0_pins_default>;
-       dr_mode = "peripheral";
-       bootph-pre-ram;
-};
-
-&scm_conf {
-       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 637a5cc85e0950b0bf8a6aba66a2e826d411c44d..d75c7bf3fe6625ff99b8d7e1f44f7b2684b68c5a 100644 (file)
--- a/arch/arm/dts/k3-am654-r5-base-board.dts
+++ b/arch/arm/dts/k3-am654-r5-base-board.dts
@@ -14,9 +14,16 @@
        model = "Texas Instruments AM654 R5 Base Board";
 
        aliases {
+               ethernet0 = &cpsw_port1;
+               remoteproc0 = &sysctrler;
+               remoteproc1 = &a53_0;
                serial0 = &wkup_uart0;
                serial1 = &mcu_uart0;
                serial2 = &main_uart0;
+               spi0 = &ospi0;
+               spi1 = &ospi1;
+               usb0 = &usb0;
+               usb1 = &usb1;
        };
 
        chosen {
@@ -24,11 +31,6 @@
                tick-timer = &timer1;
        };
 
-       aliases {
-               remoteproc0 = &sysctrler;
-               remoteproc1 = &a53_0;
-       };
-
        a53_0: a53@0 {
                compatible = "ti,am654-rproc";
                reg = <0x0 0x00a90000 0x0 0x10>;
@@ -56,6 +58,8 @@
 };
 
 &cbass_main {
+       bootph-pre-ram;
+
        timer1: timer@40400000 {
                compatible = "ti,omap5430-timer";
                reg = <0x0 0x40400000 0x0 0x80>;
@@ -63,9 +67,15 @@
                clock-frequency = <25000000>;
                bootph-all;
        };
+
+       main_navss: bus@30800000 {
+               bootph-pre-ram;
+       };
 };
 
 &cbass_mcu {
+       bootph-pre-ram;
+
        mcu_secproxy: secproxy@28380000 {
                compatible = "ti,am654-secure-proxy";
                reg = <0x0 0x2a380000 0x0 0x80000>,
@@ -75,13 +85,58 @@
                #mbox-cells = <1>;
                bootph-pre-ram;
        };
+
+       mcu_navss: bus@28380000 {
+               bootph-pre-ram;
+
+               ringacc@2b800000 {
+                       reg =   <0x0 0x2b800000 0x0 0x400000>,
+                               <0x0 0x2b000000 0x0 0x400000>,
+                               <0x0 0x28590000 0x0 0x100>,
+                               <0x0 0x2a500000 0x0 0x40000>,
+                               <0x0 0x28440000 0x0 0x40000>;
+                       reg-names = "rt", "fifos", "proxy_gcfg", "proxy_target", "cfg";
+                       bootph-pre-ram;
+                       ti,dma-ring-reset-quirk;
+               };
+
+               dma-controller@285c0000 {
+                       reg =   <0x0 0x285c0000 0x0 0x100>,
+                               <0x0 0x284c0000 0x0 0x4000>,
+                               <0x0 0x2a800000 0x0 0x40000>,
+                               <0x0 0x284a0000 0x0 0x4000>,
+                               <0x0 0x2aa00000 0x0 0x40000>,
+                               <0x0 0x28400000 0x0 0x2000>;
+                       reg-names = "gcfg", "rchan", "rchanrt", "tchan",
+                                           "tchanrt", "rflow";
+                       bootph-pre-ram;
+               };
+       };
+};
+
+&k3_pds {
+       bootph-pre-ram;
+};
+
+&k3_clks {
+       bootph-pre-ram;
+};
+
+&k3_reset {
+       bootph-pre-ram;
 };
 
 &wkup_gpio0 {
        bootph-pre-ram;
 };
 
+&secure_proxy_main {
+       bootph-pre-ram;
+};
+
 &cbass_wakeup {
+       bootph-pre-ram;
+
        sysctrler: sysctrler {
                compatible = "ti,am654-system-controller";
                mboxes= <&mcu_secproxy 4>, <&mcu_secproxy 5>;
@@ -95,13 +150,24 @@
                clock-frequency = <200000000>;
                bootph-pre-ram;
        };
+
+       chipid@43000014 {
+               bootph-pre-ram;
+       };
 };
 
 &dmsc {
+       bootph-pre-ram;
+
        mboxes= <&mcu_secproxy 8>, <&mcu_secproxy 6>, <&mcu_secproxy 5>;
        mbox-names = "tx", "rx", "notify";
        ti,host-id = <4>;
        ti,secure-host;
+
+       k3_sysreset: sysreset-controller {
+               compatible = "ti,sci-sysreset";
+               bootph-pre-ram;
+       };
 };
 
 &wkup_uart0 {
@@ -125,6 +191,7 @@
        pinctrl-0 = <&main_uart0_pins_default>;
        power-domains = <&k3_pds 146 TI_SCI_PD_SHARED>;
        status = "okay";
+       bootph-pre-ram;
 };
 
 &wkup_vtm0 {
@@ -168,6 +235,7 @@
                        AM65X_WKUP_IOPAD(0x00e0, PIN_INPUT, 0) /* (AC7) WKUP_I2C0_SCL */
                        AM65X_WKUP_IOPAD(0x00e4, PIN_INPUT, 0) /* (AD6) WKUP_I2C0_SDA */
                >;
+               bootph-pre-ram;
        };
 
        mcu_fss0_ospi0_pins_default: mcu-fss0-ospi0-pins_default {
@@ -184,6 +252,7 @@
                        AM65X_WKUP_IOPAD(0x0028, PIN_INPUT, 0)  /* (R3) MCU_OSPI0_D7 */
                        AM65X_WKUP_IOPAD(0x002c, PIN_OUTPUT, 0) /* (R4) MCU_OSPI0_CSn0 */
                >;
+               bootph-pre-ram;
        };
 };
 
@@ -229,6 +298,17 @@
                >;
                bootph-pre-ram;
        };
+
+       usb0_pins_default: usb0_pins_default {
+               pinctrl-single,pins = <
+                       AM65X_IOPAD(0x02bc, PIN_OUTPUT, 0) /* (AD9) USB0_DRVVBUS */
+               >;
+               bootph-pre-ram;
+       };
+};
+
+&main_pmx1 {
+       bootph-pre-ram;
 };
 
 &memorycontroller {
@@ -243,6 +323,7 @@
        pinctrl-0 = <&main_mmc0_pins_default>;
        /delete-property/ power-domains;
        ti,driver-strength-ohm = <50>;
+       bootph-pre-ram;
 };
 
 &sdhci1 {
@@ -251,6 +332,7 @@
        pinctrl-0 = <&main_mmc1_pins_default>;
        /delete-property/ power-domains;
        ti,driver-strength-ohm = <50>;
+       bootph-pre-ram;
 };
 
 &wkup_i2c0 {
@@ -276,6 +358,7 @@
 &ospi0 {
        pinctrl-names = "default";
        pinctrl-0 = <&mcu_fss0_ospi0_pins_default>;
+       bootph-pre-ram;
 
        reg = <0x0 0x47040000 0x0 0x100>,
              <0x0 0x50000000 0x0 0x8000000>;
@@ -293,6 +376,7 @@
                cdns,read-delay = <0>;
                #address-cells = <1>;
                #size-cells = <1>;
+               bootph-pre-ram;
        };
 };
 
@@ -331,3 +415,33 @@
 &scm_conf {
        bootph-pre-ram;
 };
+
+&davinci_mdio {
+       phy0: ethernet-phy@0 {
+               reg = <0>;
+               /* TODO: phy reset: TCA9555RTWR(i2c:0x21)[p04].GPIO_MCU_RGMII_RSTN */
+               ti,rx-internal-delay = <DP83867_RGMIIDCTL_2_00_NS>;
+               ti,fifo-depth = <DP83867_PHYCR_FIFO_DEPTH_4_B_NIB>;
+       };
+};
+
+&mcu_cpsw {
+       reg = <0x0 0x46000000 0x0 0x200000>,
+             <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>;
+               reg-names = "gmii-sel";
+       };
+};
+
+&usb1 {
+       dr_mode = "peripheral";
+};
+
+&fss {
+       bootph-pre-ram;
+};