[PATCH 3/3] arm: dts: k3-j721e: Move to OF_UPSTREAM

Sumit Garg sumit.garg at linaro.org
Tue May 21 06:56:18 CEST 2024


On Mon, 20 May 2024 at 15:29, Neha Malcom Francis <n-francis at ti.com> wrote:
>
> Move to using OF_UPSTREAM config and thus using the devicetree-rebasing
> subtree.
>
> Signed-off-by: Neha Malcom Francis <n-francis at ti.com>
> ---
>  arch/arm/dts/Makefile                         |    4 +-
>  arch/arm/dts/k3-j721e-binman.dtsi             |    2 +-
>  .../k3-j721e-common-proc-board-u-boot.dtsi    |   14 +-
>  arch/arm/dts/k3-j721e-common-proc-board.dts   |  976 ------
>  arch/arm/dts/k3-j721e-main.dtsi               | 2741 -----------------
>  arch/arm/dts/k3-j721e-mcu-wakeup.dtsi         |  681 ----
>  arch/arm/dts/k3-j721e-sk-u-boot.dtsi          |   20 +-
>  arch/arm/dts/k3-j721e-sk.dts                  | 1074 -------
>  arch/arm/dts/k3-j721e-som-p0.dtsi             |  446 ---
>  arch/arm/dts/k3-j721e-thermal.dtsi            |   75 -
>  arch/arm/dts/k3-j721e.dtsi                    |  176 --
>  configs/j721e_evm_a72_defconfig               |    5 +-
>  configs/j721e_sk_a72_defconfig                |    4 +-
>  13 files changed, 16 insertions(+), 6202 deletions(-)
>  delete mode 100644 arch/arm/dts/k3-j721e-common-proc-board.dts
>  delete mode 100644 arch/arm/dts/k3-j721e-main.dtsi
>  delete mode 100644 arch/arm/dts/k3-j721e-mcu-wakeup.dtsi
>  delete mode 100644 arch/arm/dts/k3-j721e-sk.dts
>  delete mode 100644 arch/arm/dts/k3-j721e-som-p0.dtsi
>  delete mode 100644 arch/arm/dts/k3-j721e-thermal.dtsi
>  delete mode 100644 arch/arm/dts/k3-j721e.dtsi
>

Acked-by: Sumit Garg <sumit.garg at linaro.org>

-Sumit

> diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile
> index 087645f3541..2186c8950db 100644
> --- a/arch/arm/dts/Makefile
> +++ b/arch/arm/dts/Makefile
> @@ -1226,11 +1226,9 @@ dtb-$(CONFIG_SOC_K3_AM654) += \
>         k3-am6548-iot2050-advanced-m2-bkey-ekey-pcie-overlay.dtbo \
>         k3-am654-icssg2.dtbo
>
> -dtb-$(CONFIG_SOC_K3_J721E) += k3-j721e-common-proc-board.dtb \
> -                             k3-j721e-r5-common-proc-board.dtb \
> +dtb-$(CONFIG_SOC_K3_J721E) += k3-j721e-r5-common-proc-board.dtb \
>                               k3-j7200-common-proc-board.dtb \
>                               k3-j7200-r5-common-proc-board.dtb \
> -                             k3-j721e-sk.dtb \
>                               k3-j721e-r5-sk.dtb \
>                               k3-j721e-beagleboneai64.dtb \
>                               k3-j721e-r5-beagleboneai64.dtb
> diff --git a/arch/arm/dts/k3-j721e-binman.dtsi b/arch/arm/dts/k3-j721e-binman.dtsi
> index 2867d264664..244ea63fac2 100644
> --- a/arch/arm/dts/k3-j721e-binman.dtsi
> +++ b/arch/arm/dts/k3-j721e-binman.dtsi
> @@ -211,7 +211,7 @@
>
>  #ifdef CONFIG_TARGET_J721E_A72_EVM
>
> -#define SPL_J721E_EVM_DTB "spl/dts/k3-j721e-common-proc-board.dtb"
> +#define SPL_J721E_EVM_DTB "spl/dts/ti/k3-j721e-common-proc-board.dtb"
>  #define J721E_EVM_DTB "u-boot.dtb"
>
>  &binman {
> diff --git a/arch/arm/dts/k3-j721e-common-proc-board-u-boot.dtsi b/arch/arm/dts/k3-j721e-common-proc-board-u-boot.dtsi
> index aa919b40702..1b119f27357 100644
> --- a/arch/arm/dts/k3-j721e-common-proc-board-u-boot.dtsi
> +++ b/arch/arm/dts/k3-j721e-common-proc-board-u-boot.dtsi
> @@ -15,10 +15,10 @@
>
>  &cbass_mcu_wakeup {
>         bootph-all;
> +};
>
> -       chipid at 43000014 {
> -               bootph-all;
> -       };
> +&chipid {
> +       bootph-all;
>  };
>
>  &mcu_navss {
> @@ -30,14 +30,6 @@
>  };
>
>  &mcu_udmap {
> -       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-all;
>  };
>
> diff --git a/arch/arm/dts/k3-j721e-common-proc-board.dts b/arch/arm/dts/k3-j721e-common-proc-board.dts
> deleted file mode 100644
> index fe5207ac7d8..00000000000
> --- a/arch/arm/dts/k3-j721e-common-proc-board.dts
> +++ /dev/null
> @@ -1,976 +0,0 @@
> -// SPDX-License-Identifier: GPL-2.0
> -/*
> - * Copyright (C) 2019 Texas Instruments Incorporated - https://www.ti.com/
> - *
> - * Product Link: https://www.ti.com/tool/J721EXCPXEVM
> - */
> -
> -/dts-v1/;
> -
> -#include "k3-j721e-som-p0.dtsi"
> -#include <dt-bindings/gpio/gpio.h>
> -#include <dt-bindings/input/input.h>
> -#include <dt-bindings/net/ti-dp83867.h>
> -#include <dt-bindings/phy/phy-cadence.h>
> -
> -/ {
> -       compatible = "ti,j721e-evm", "ti,j721e";
> -       model = "Texas Instruments J721e EVM";
> -
> -       aliases {
> -               serial0 = &wkup_uart0;
> -               serial1 = &mcu_uart0;
> -               serial2 = &main_uart0;
> -               serial3 = &main_uart1;
> -               serial4 = &main_uart2;
> -               serial6 = &main_uart4;
> -               ethernet0 = &cpsw_port1;
> -               mmc0 = &main_sdhci0;
> -               mmc1 = &main_sdhci1;
> -       };
> -
> -       chosen {
> -               stdout-path = "serial2:115200n8";
> -       };
> -
> -       gpio_keys: gpio-keys {
> -               compatible = "gpio-keys";
> -               autorepeat;
> -               pinctrl-names = "default";
> -               pinctrl-0 = <&sw10_button_pins_default>, <&sw11_button_pins_default>;
> -
> -               sw10: switch-10 {
> -                       label = "GPIO Key USER1";
> -                       linux,code = <BTN_0>;
> -                       gpios = <&main_gpio0 0 GPIO_ACTIVE_LOW>;
> -               };
> -
> -               sw11: switch-11 {
> -                       label = "GPIO Key USER2";
> -                       linux,code = <BTN_1>;
> -                       gpios = <&wkup_gpio0 7 GPIO_ACTIVE_LOW>;
> -               };
> -       };
> -
> -       evm_12v0: fixedregulator-evm12v0 {
> -               /* main supply */
> -               compatible = "regulator-fixed";
> -               regulator-name = "evm_12v0";
> -               regulator-min-microvolt = <12000000>;
> -               regulator-max-microvolt = <12000000>;
> -               regulator-always-on;
> -               regulator-boot-on;
> -       };
> -
> -       vsys_3v3: fixedregulator-vsys3v3 {
> -               /* Output of LMS140 */
> -               compatible = "regulator-fixed";
> -               regulator-name = "vsys_3v3";
> -               regulator-min-microvolt = <3300000>;
> -               regulator-max-microvolt = <3300000>;
> -               vin-supply = <&evm_12v0>;
> -               regulator-always-on;
> -               regulator-boot-on;
> -       };
> -
> -       vsys_5v0: fixedregulator-vsys5v0 {
> -               /* Output of LM5140 */
> -               compatible = "regulator-fixed";
> -               regulator-name = "vsys_5v0";
> -               regulator-min-microvolt = <5000000>;
> -               regulator-max-microvolt = <5000000>;
> -               vin-supply = <&evm_12v0>;
> -               regulator-always-on;
> -               regulator-boot-on;
> -       };
> -
> -       vdd_mmc1: fixedregulator-sd {
> -               compatible = "regulator-fixed";
> -               regulator-name = "vdd_mmc1";
> -               regulator-min-microvolt = <3300000>;
> -               regulator-max-microvolt = <3300000>;
> -               regulator-boot-on;
> -               enable-active-high;
> -               vin-supply = <&vsys_3v3>;
> -               gpio = <&exp2 2 GPIO_ACTIVE_HIGH>;
> -       };
> -
> -       vdd_sd_dv_alt: gpio-regulator-TLV71033 {
> -               compatible = "regulator-gpio";
> -               pinctrl-names = "default";
> -               pinctrl-0 = <&vdd_sd_dv_alt_pins_default>;
> -               regulator-name = "tlv71033";
> -               regulator-min-microvolt = <1800000>;
> -               regulator-max-microvolt = <3300000>;
> -               regulator-boot-on;
> -               vin-supply = <&vsys_5v0>;
> -               gpios = <&main_gpio0 117 GPIO_ACTIVE_HIGH>;
> -               states = <1800000 0x0>,
> -                        <3300000 0x1>;
> -       };
> -
> -       sound0: sound-0 {
> -               compatible = "ti,j721e-cpb-audio";
> -               model = "j721e-cpb";
> -
> -               ti,cpb-mcasp = <&mcasp10>;
> -               ti,cpb-codec = <&pcm3168a_1>;
> -
> -               clocks = <&k3_clks 184 1>,
> -                        <&k3_clks 184 2>, <&k3_clks 184 4>,
> -                        <&k3_clks 157 371>,
> -                        <&k3_clks 157 400>, <&k3_clks 157 401>;
> -               clock-names = "cpb-mcasp-auxclk",
> -                             "cpb-mcasp-auxclk-48000", "cpb-mcasp-auxclk-44100",
> -                             "cpb-codec-scki",
> -                             "cpb-codec-scki-48000", "cpb-codec-scki-44100";
> -       };
> -
> -       transceiver1: can-phy0 {
> -               compatible = "ti,tcan1043";
> -               #phy-cells = <0>;
> -               max-bitrate = <5000000>;
> -               pinctrl-names = "default";
> -               pinctrl-0 = <&mcu_mcan0_gpio_pins_default>;
> -               standby-gpios = <&wkup_gpio0 54 GPIO_ACTIVE_LOW>;
> -               enable-gpios = <&wkup_gpio0 0 GPIO_ACTIVE_HIGH>;
> -       };
> -
> -       transceiver2: can-phy1 {
> -               compatible = "ti,tcan1042";
> -               #phy-cells = <0>;
> -               max-bitrate = <5000000>;
> -               pinctrl-names = "default";
> -               pinctrl-0 = <&mcu_mcan1_gpio_pins_default>;
> -               standby-gpios = <&wkup_gpio0 2 GPIO_ACTIVE_HIGH>;
> -       };
> -
> -       transceiver3: can-phy2 {
> -               compatible = "ti,tcan1043";
> -               #phy-cells = <0>;
> -               max-bitrate = <5000000>;
> -               standby-gpios = <&exp2 7 GPIO_ACTIVE_LOW>;
> -               enable-gpios = <&exp2 6 GPIO_ACTIVE_HIGH>;
> -       };
> -
> -       transceiver4: can-phy3 {
> -               compatible = "ti,tcan1042";
> -               #phy-cells = <0>;
> -               max-bitrate = <5000000>;
> -               pinctrl-names = "default";
> -               pinctrl-0 = <&main_mcan2_gpio_pins_default>;
> -               standby-gpios = <&main_gpio0 127 GPIO_ACTIVE_HIGH>;
> -       };
> -
> -       dp_pwr_3v3: regulator-dp-pwr {
> -               compatible = "regulator-fixed";
> -               regulator-name = "dp-pwr";
> -               regulator-min-microvolt = <3300000>;
> -               regulator-max-microvolt = <3300000>;
> -               gpio = <&exp4 0 GPIO_ACTIVE_HIGH>; /* P0 - DP0_PWR_SW_EN */
> -               enable-active-high;
> -       };
> -
> -       dp0: connector {
> -               compatible = "dp-connector";
> -               label = "DP0";
> -               type = "full-size";
> -               dp-pwr-supply = <&dp_pwr_3v3>;
> -
> -               port {
> -                       dp_connector_in: endpoint {
> -                               remote-endpoint = <&dp0_out>;
> -                       };
> -               };
> -       };
> -};
> -
> -&main_pmx0 {
> -       main_uart0_pins_default: main-uart0-default-pins {
> -               pinctrl-single,pins = <
> -                       J721E_IOPAD(0x1d4, PIN_INPUT, 1) /* (Y3) SPI1_CS0.UART0_CTSn */
> -                       J721E_IOPAD(0x1c0, PIN_OUTPUT, 1) /* (AA2) SPI0_CS0.UART0_RTSn */
> -                       J721E_IOPAD(0x1e8, PIN_INPUT, 0) /* (AB2) UART0_RXD */
> -                       J721E_IOPAD(0x1ec, PIN_OUTPUT, 0) /* (AB3) UART0_TXD */
> -               >;
> -       };
> -
> -       main_uart1_pins_default: main-uart1-default-pins {
> -               pinctrl-single,pins = <
> -                       J721E_IOPAD(0x1f8, PIN_INPUT, 0) /* (AA4) UART1_RXD */
> -                       J721E_IOPAD(0x1fc, PIN_OUTPUT, 0) /* (AB4) UART1_TXD */
> -               >;
> -       };
> -
> -       main_uart2_pins_default: main-uart2-default-pins {
> -               pinctrl-single,pins = <
> -                       J721E_IOPAD(0x1dc, PIN_INPUT, 3) /* (Y1) SPI1_CLK.UART2_RXD */
> -                       J721E_IOPAD(0x1e0, PIN_OUTPUT, 3) /* (Y5) SPI1_D0.UART2_TXD */
> -               >;
> -       };
> -
> -       main_uart4_pins_default: main-uart4-default-pins {
> -               pinctrl-single,pins = <
> -                       J721E_IOPAD(0x190, PIN_INPUT, 1) /* (W23) RGMII6_TD3.UART4_RXD */
> -                       J721E_IOPAD(0x194, PIN_OUTPUT, 1) /* (W28) RGMII6_TD2.UART4_TXD */
> -               >;
> -       };
> -
> -       sw10_button_pins_default: sw10-button-default-pins {
> -               pinctrl-single,pins = <
> -                       J721E_IOPAD(0x0, PIN_INPUT, 7) /* (AC18) EXTINTn.GPIO0_0 */
> -               >;
> -       };
> -
> -       main_mmc1_pins_default: main-mmc1-default-pins {
> -               pinctrl-single,pins = <
> -                       J721E_IOPAD(0x254, PIN_INPUT, 0) /* (R29) MMC1_CMD */
> -                       J721E_IOPAD(0x250, PIN_INPUT, 0) /* (P25) MMC1_CLK */
> -                       J721E_IOPAD(0x2ac, PIN_INPUT, 0) /* (P25) MMC1_CLKLB */
> -                       J721E_IOPAD(0x24c, PIN_INPUT, 0) /* (R24) MMC1_DAT0 */
> -                       J721E_IOPAD(0x248, PIN_INPUT, 0) /* (P24) MMC1_DAT1 */
> -                       J721E_IOPAD(0x244, PIN_INPUT, 0) /* (R25) MMC1_DAT2 */
> -                       J721E_IOPAD(0x240, PIN_INPUT, 0) /* (R26) MMC1_DAT3 */
> -                       J721E_IOPAD(0x258, PIN_INPUT, 0) /* (P23) MMC1_SDCD */
> -                       J721E_IOPAD(0x25c, PIN_INPUT, 0) /* (R28) MMC1_SDWP */
> -               >;
> -       };
> -
> -       vdd_sd_dv_alt_pins_default: vdd-sd-dv-alt-default-pins {
> -               pinctrl-single,pins = <
> -                       J721E_IOPAD(0x1d8, PIN_INPUT, 7) /* (W4) SPI1_CS1.GPIO0_117 */
> -               >;
> -       };
> -
> -       main_usbss0_pins_default: main-usbss0-default-pins {
> -               pinctrl-single,pins = <
> -                       J721E_IOPAD(0x290, PIN_OUTPUT, 0) /* (U6) USB0_DRVVBUS */
> -                       J721E_IOPAD(0x210, PIN_INPUT, 7) /* (W3) MCAN1_RX.GPIO1_3 */
> -               >;
> -       };
> -
> -       main_usbss1_pins_default: main-usbss1-default-pins {
> -               pinctrl-single,pins = <
> -                       J721E_IOPAD(0x214, PIN_OUTPUT, 4) /* (V4) MCAN1_TX.USB1_DRVVBUS */
> -               >;
> -       };
> -
> -       dp0_pins_default: dp0-default-pins {
> -               pinctrl-single,pins = <
> -                       J721E_IOPAD(0x1c4, PIN_INPUT, 5) /* SPI0_CS1.DP0_HPD */
> -               >;
> -       };
> -
> -       main_i2c1_exp4_pins_default: main-i2c1-exp4-default-pins {
> -               pinctrl-single,pins = <
> -                       J721E_IOPAD(0x230, PIN_INPUT, 7) /* (U2) ECAP0_IN_APWM_OUT.GPIO1_11 */
> -               >;
> -       };
> -
> -       main_i2c0_pins_default: main-i2c0-default-pins {
> -               pinctrl-single,pins = <
> -                       J721E_IOPAD(0x220, PIN_INPUT_PULLUP, 0) /* (AC5) I2C0_SCL */
> -                       J721E_IOPAD(0x224, PIN_INPUT_PULLUP, 0) /* (AA5) I2C0_SDA */
> -               >;
> -       };
> -
> -       main_i2c1_pins_default: main-i2c1-default-pins {
> -               pinctrl-single,pins = <
> -                       J721E_IOPAD(0x228, PIN_INPUT_PULLUP, 0) /* (Y6) I2C1_SCL */
> -                       J721E_IOPAD(0x22c, PIN_INPUT_PULLUP, 0) /* (AA6) I2C1_SDA */
> -               >;
> -       };
> -
> -       main_i2c3_pins_default: main-i2c3-default-pins {
> -               pinctrl-single,pins = <
> -                       J721E_IOPAD(0x270, PIN_INPUT_PULLUP, 4) /* (T26) MMC2_CLK.I2C3_SCL */
> -                       J721E_IOPAD(0x274, PIN_INPUT_PULLUP, 4) /* (T25) MMC2_CMD.I2C3_SDA */
> -               >;
> -       };
> -
> -       main_i2c6_pins_default: main-i2c6-default-pins {
> -               pinctrl-single,pins = <
> -                       J721E_IOPAD(0x1d0, PIN_INPUT_PULLUP, 2) /* (AA3) SPI0_D1.I2C6_SCL */
> -                       J721E_IOPAD(0x1e4, PIN_INPUT_PULLUP, 2) /* (Y2) SPI1_D1.I2C6_SDA */
> -               >;
> -       };
> -
> -       mcasp10_pins_default: mcasp10-default-pins {
> -               pinctrl-single,pins = <
> -                       J721E_IOPAD(0x158, PIN_OUTPUT_PULLDOWN, 12) /* (U23) RGMII5_TX_CTL.MCASP10_ACLKX */
> -                       J721E_IOPAD(0x15c, PIN_OUTPUT_PULLDOWN, 12) /* (U26) RGMII5_RX_CTL.MCASP10_AFSX */
> -                       J721E_IOPAD(0x160, PIN_OUTPUT_PULLDOWN, 12) /* (V28) RGMII5_TD3.MCASP10_AXR0 */
> -                       J721E_IOPAD(0x164, PIN_OUTPUT_PULLDOWN, 12) /* (V29) RGMII5_TD2.MCASP10_AXR1 */
> -                       J721E_IOPAD(0x170, PIN_OUTPUT_PULLDOWN, 12) /* (U29) RGMII5_TXC.MCASP10_AXR2 */
> -                       J721E_IOPAD(0x174, PIN_OUTPUT_PULLDOWN, 12) /* (U25) RGMII5_RXC.MCASP10_AXR3 */
> -                       J721E_IOPAD(0x198, PIN_INPUT_PULLDOWN, 12) /* (V25) RGMII6_TD1.MCASP10_AXR4 */
> -                       J721E_IOPAD(0x19c, PIN_INPUT_PULLDOWN, 12) /* (W27) RGMII6_TD0.MCASP10_AXR5 */
> -                       J721E_IOPAD(0x1a0, PIN_INPUT_PULLDOWN, 12) /* (W29) RGMII6_TXC.MCASP10_AXR6 */
> -               >;
> -       };
> -
> -       audi_ext_refclk2_pins_default: audi-ext-refclk2-default-pins {
> -               pinctrl-single,pins = <
> -                       J721E_IOPAD(0x1a4, PIN_OUTPUT, 3) /* (W26) RGMII6_RXC.AUDIO_EXT_REFCLK2 */
> -               >;
> -       };
> -
> -       main_mcan0_pins_default: main-mcan0-default-pins {
> -               pinctrl-single,pins = <
> -                       J721E_IOPAD(0x208, PIN_INPUT, 0) /* (W5) MCAN0_RX */
> -                       J721E_IOPAD(0x20c, PIN_OUTPUT, 0) /* (W6) MCAN0_TX */
> -               >;
> -       };
> -
> -       main_mcan2_pins_default: main-mcan2-default-pins {
> -               pinctrl-single,pins = <
> -                       J721E_IOPAD(0x01f0, PIN_INPUT, 3) /* (AC2) MCAN2_RX.GPIO0_123 */
> -                       J721E_IOPAD(0x01f4, PIN_OUTPUT, 3) /* (AB1) MCAN2_TX.GPIO0_124 */
> -               >;
> -       };
> -
> -       main_mcan2_gpio_pins_default: main-mcan2-gpio-default-pins {
> -               pinctrl-single,pins = <
> -                       J721E_IOPAD(0x200, PIN_INPUT, 7) /* (AC4) UART1_CTSn.GPIO0_127 */
> -               >;
> -       };
> -};
> -
> -&wkup_pmx0 {
> -       wkup_uart0_pins_default: wkup-uart0-default-pins {
> -               pinctrl-single,pins = <
> -                       J721E_WKUP_IOPAD(0xa0, PIN_INPUT, 0) /* (J29) WKUP_UART0_RXD */
> -                       J721E_WKUP_IOPAD(0xa4, PIN_OUTPUT, 0) /* (J28) WKUP_UART0_TXD */
> -               >;
> -       };
> -
> -       mcu_uart0_pins_default: mcu-uart0-default-pins {
> -               pinctrl-single,pins = <
> -                       J721E_WKUP_IOPAD(0xe8, PIN_INPUT, 0) /* (H29) WKUP_GPIO0_14.MCU_UART0_CTSn */
> -                       J721E_WKUP_IOPAD(0xec, PIN_OUTPUT, 0) /* (J27) WKUP_GPIO0_15.MCU_UART0_RTSn */
> -                       J721E_WKUP_IOPAD(0xe4, PIN_INPUT, 0) /* (H28) WKUP_GPIO0_13.MCU_UART0_RXD */
> -                       J721E_WKUP_IOPAD(0xe0, PIN_OUTPUT, 0) /* (G29) WKUP_GPIO0_12.MCU_UART0_TXD */
> -               >;
> -       };
> -
> -       sw11_button_pins_default: sw11-button-default-pins {
> -               pinctrl-single,pins = <
> -                       J721E_WKUP_IOPAD(0xcc, PIN_INPUT, 7) /* (G28) WKUP_GPIO0_7 */
> -               >;
> -       };
> -
> -       mcu_fss0_ospi1_pins_default: mcu-fss0-ospi1-default-pins {
> -               pinctrl-single,pins = <
> -                       J721E_WKUP_IOPAD(0x34, PIN_OUTPUT, 0) /* (F22) MCU_OSPI1_CLK */
> -                       J721E_WKUP_IOPAD(0x50, PIN_OUTPUT, 0) /* (C22) MCU_OSPI1_CSn0 */
> -                       J721E_WKUP_IOPAD(0x40, PIN_INPUT, 0) /* (D22) MCU_OSPI1_D0 */
> -                       J721E_WKUP_IOPAD(0x44, PIN_INPUT, 0) /* (G22) MCU_OSPI1_D1 */
> -                       J721E_WKUP_IOPAD(0x48, PIN_INPUT, 0) /* (D23) MCU_OSPI1_D2 */
> -                       J721E_WKUP_IOPAD(0x4c, PIN_INPUT, 0) /* (C23) MCU_OSPI1_D3 */
> -                       J721E_WKUP_IOPAD(0x3c, PIN_INPUT, 0) /* (B23) MCU_OSPI1_DQS */
> -                       J721E_WKUP_IOPAD(0x38, PIN_INPUT, 0) /* (A23) MCU_OSPI1_LBCLKO */
> -               >;
> -       };
> -
> -       mcu_cpsw_pins_default: mcu-cpsw-default-pins {
> -               pinctrl-single,pins = <
> -                       J721E_WKUP_IOPAD(0x0058, PIN_OUTPUT, 0) /* MCU_RGMII1_TX_CTL */
> -                       J721E_WKUP_IOPAD(0x005c, PIN_INPUT, 0) /* MCU_RGMII1_RX_CTL */
> -                       J721E_WKUP_IOPAD(0x0060, PIN_OUTPUT, 0) /* MCU_RGMII1_TD3 */
> -                       J721E_WKUP_IOPAD(0x0064, PIN_OUTPUT, 0) /* MCU_RGMII1_TD2 */
> -                       J721E_WKUP_IOPAD(0x0068, PIN_OUTPUT, 0) /* MCU_RGMII1_TD1 */
> -                       J721E_WKUP_IOPAD(0x006c, PIN_OUTPUT, 0) /* MCU_RGMII1_TD0 */
> -                       J721E_WKUP_IOPAD(0x0078, PIN_INPUT, 0) /* MCU_RGMII1_RD3 */
> -                       J721E_WKUP_IOPAD(0x007c, PIN_INPUT, 0) /* MCU_RGMII1_RD2 */
> -                       J721E_WKUP_IOPAD(0x0080, PIN_INPUT, 0) /* MCU_RGMII1_RD1 */
> -                       J721E_WKUP_IOPAD(0x0084, PIN_INPUT, 0) /* MCU_RGMII1_RD0 */
> -                       J721E_WKUP_IOPAD(0x0070, PIN_OUTPUT, 0) /* MCU_RGMII1_TXC */
> -                       J721E_WKUP_IOPAD(0x0074, PIN_INPUT, 0) /* MCU_RGMII1_RXC */
> -               >;
> -       };
> -
> -       mcu_mdio_pins_default: mcu-mdio1-default-pins {
> -               pinctrl-single,pins = <
> -                       J721E_WKUP_IOPAD(0x008c, PIN_OUTPUT, 0) /* MCU_MDIO0_MDC */
> -                       J721E_WKUP_IOPAD(0x0088, PIN_INPUT, 0) /* MCU_MDIO0_MDIO */
> -               >;
> -       };
> -
> -       mcu_mcan0_pins_default: mcu-mcan0-default-pins {
> -               pinctrl-single,pins = <
> -                       J721E_WKUP_IOPAD(0xac, PIN_INPUT, 0) /* (C29) MCU_MCAN0_RX */
> -                       J721E_WKUP_IOPAD(0xa8, PIN_OUTPUT, 0) /* (D29) MCU_MCAN0_TX */
> -               >;
> -       };
> -
> -       mcu_mcan0_gpio_pins_default: mcu-mcan0-gpio-default-pins {
> -               pinctrl-single,pins = <
> -                       J721E_WKUP_IOPAD(0xb0, PIN_INPUT, 7) /* (F26) WKUP_GPIO0_0 */
> -                       J721E_WKUP_IOPAD(0x98, PIN_INPUT, 7) /* (E28) MCU_SPI0_D1.WKUP_GPIO0_54 */
> -               >;
> -       };
> -
> -       mcu_mcan1_pins_default: mcu-mcan1-default-pins {
> -               pinctrl-single,pins = <
> -                       J721E_WKUP_IOPAD(0xc4, PIN_INPUT, 0) /* (G24) WKUP_GPIO0_5.MCU_MCAN1_RX */
> -                       J721E_WKUP_IOPAD(0xc0, PIN_OUTPUT, 0) /* (G25) WKUP_GPIO0_4.MCU_MCAN1_TX */
> -               >;
> -       };
> -
> -       mcu_mcan1_gpio_pins_default: mcu-mcan1-gpio-default-pins {
> -               pinctrl-single,pins = <
> -                       J721E_WKUP_IOPAD(0xb8, PIN_INPUT, 7) /* (F28) WKUP_GPIO0_2 */
> -               >;
> -       };
> -
> -       wkup_gpio_pins_default: wkup-gpio-default-pins {
> -               pinctrl-single,pins = <
> -                       J721E_WKUP_IOPAD(0xd0, PIN_INPUT, 7) /* (C14) WKUP_GPIO0_8 */
> -               >;
> -       };
> -};
> -
> -&wkup_uart0 {
> -       /* Wakeup UART is used by System firmware */
> -       status = "reserved";
> -       pinctrl-names = "default";
> -       pinctrl-0 = <&wkup_uart0_pins_default>;
> -};
> -
> -&mcu_uart0 {
> -       status = "okay";
> -       pinctrl-names = "default";
> -       pinctrl-0 = <&mcu_uart0_pins_default>;
> -};
> -
> -&main_uart0 {
> -       status = "okay";
> -       pinctrl-names = "default";
> -       pinctrl-0 = <&main_uart0_pins_default>;
> -       /* Shared with ATF on this platform */
> -       power-domains = <&k3_pds 146 TI_SCI_PD_SHARED>;
> -};
> -
> -&main_uart1 {
> -       status = "okay";
> -       pinctrl-names = "default";
> -       pinctrl-0 = <&main_uart1_pins_default>;
> -};
> -
> -&main_uart2 {
> -       status = "okay";
> -       pinctrl-names = "default";
> -       pinctrl-0 = <&main_uart2_pins_default>;
> -};
> -
> -&main_uart4 {
> -       status = "okay";
> -       pinctrl-names = "default";
> -       pinctrl-0 = <&main_uart4_pins_default>;
> -};
> -
> -&wkup_gpio0 {
> -       status = "okay";
> -       pinctrl-names = "default";
> -       pinctrl-0 = <&wkup_gpio_pins_default>;
> -};
> -
> -&main_gpio0 {
> -       status = "okay";
> -};
> -
> -&main_gpio1 {
> -       status = "okay";
> -};
> -
> -&main_sdhci0 {
> -       /* eMMC */
> -       status = "okay";
> -       non-removable;
> -       ti,driver-strength-ohm = <50>;
> -       disable-wp;
> -};
> -
> -&main_sdhci1 {
> -       /* SD/MMC */
> -       status = "okay";
> -       vmmc-supply = <&vdd_mmc1>;
> -       vqmmc-supply = <&vdd_sd_dv_alt>;
> -       pinctrl-names = "default";
> -       pinctrl-0 = <&main_mmc1_pins_default>;
> -       ti,driver-strength-ohm = <50>;
> -       disable-wp;
> -};
> -
> -&usb_serdes_mux {
> -       idle-states = <1>, <0>; /* USB0 to SERDES3, USB1 to SERDES1 */
> -};
> -
> -&serdes_ln_ctrl {
> -       idle-states = <J721E_SERDES0_LANE0_PCIE0_LANE0>, <J721E_SERDES0_LANE1_PCIE0_LANE1>,
> -                     <J721E_SERDES1_LANE0_PCIE1_LANE0>, <J721E_SERDES1_LANE1_PCIE1_LANE1>,
> -                     <J721E_SERDES2_LANE0_PCIE2_LANE0>, <J721E_SERDES2_LANE1_PCIE2_LANE1>,
> -                     <J721E_SERDES3_LANE0_USB3_0_SWAP>, <J721E_SERDES3_LANE1_USB3_0>,
> -                     <J721E_SERDES4_LANE0_EDP_LANE0>, <J721E_SERDES4_LANE1_EDP_LANE1>,
> -                     <J721E_SERDES4_LANE2_EDP_LANE2>, <J721E_SERDES4_LANE3_EDP_LANE3>;
> -};
> -
> -&serdes_wiz3 {
> -       typec-dir-gpios = <&main_gpio1 3 GPIO_ACTIVE_HIGH>;
> -       typec-dir-debounce-ms = <700>;  /* TUSB321, tCCB_DEFAULT 133 ms */
> -};
> -
> -&serdes3 {
> -       serdes3_usb_link: phy at 0 {
> -               reg = <0>;
> -               cdns,num-lanes = <2>;
> -               #phy-cells = <0>;
> -               cdns,phy-type = <PHY_TYPE_USB3>;
> -               resets = <&serdes_wiz3 1>, <&serdes_wiz3 2>;
> -       };
> -};
> -
> -&usbss0 {
> -       pinctrl-names = "default";
> -       pinctrl-0 = <&main_usbss0_pins_default>;
> -       ti,vbus-divider;
> -};
> -
> -&usb0 {
> -       dr_mode = "otg";
> -       maximum-speed = "super-speed";
> -       phys = <&serdes3_usb_link>;
> -       phy-names = "cdns3,usb3-phy";
> -};
> -
> -&usbss1 {
> -       pinctrl-names = "default";
> -       pinctrl-0 = <&main_usbss1_pins_default>;
> -       ti,usb2-only;
> -};
> -
> -&usb1 {
> -       dr_mode = "host";
> -       maximum-speed = "high-speed";
> -};
> -
> -&ospi1 {
> -       pinctrl-names = "default";
> -       pinctrl-0 = <&mcu_fss0_ospi1_pins_default>;
> -
> -       flash at 0 {
> -               compatible = "jedec,spi-nor";
> -               reg = <0x0>;
> -               spi-tx-bus-width = <1>;
> -               spi-rx-bus-width = <4>;
> -               spi-max-frequency = <40000000>;
> -               cdns,tshsl-ns = <60>;
> -               cdns,tsd2d-ns = <60>;
> -               cdns,tchsh-ns = <60>;
> -               cdns,tslch-ns = <60>;
> -               cdns,read-delay = <2>;
> -
> -               partitions {
> -                       compatible = "fixed-partitions";
> -                       #address-cells = <1>;
> -                       #size-cells = <1>;
> -
> -                       partition at 0 {
> -                               label = "qspi.tiboot3";
> -                               reg = <0x0 0x80000>;
> -                       };
> -
> -                       partition at 80000 {
> -                               label = "qspi.tispl";
> -                               reg = <0x80000 0x200000>;
> -                       };
> -
> -                       partition at 280000 {
> -                               label = "qspi.u-boot";
> -                               reg = <0x280000 0x400000>;
> -                       };
> -
> -                       partition at 680000 {
> -                               label = "qspi.env";
> -                               reg = <0x680000 0x20000>;
> -                       };
> -
> -                       partition at 6a0000 {
> -                               label = "qspi.env.backup";
> -                               reg = <0x6a0000 0x20000>;
> -                       };
> -
> -                       partition at 6c0000 {
> -                               label = "qspi.sysfw";
> -                               reg = <0x6c0000 0x100000>;
> -                       };
> -
> -                       partition at 800000 {
> -                               label = "qspi.rootfs";
> -                               reg = <0x800000 0x37c0000>;
> -                       };
> -
> -                       partition at 3fe0000 {
> -                               label = "qspi.phypattern";
> -                               reg = <0x3fe0000 0x20000>;
> -                       };
> -               };
> -       };
> -};
> -
> -&tscadc0 {
> -       status = "okay";
> -       adc {
> -               ti,adc-channels = <0 1 2 3 4 5 6 7>;
> -       };
> -};
> -
> -&tscadc1 {
> -       status = "okay";
> -       adc {
> -               ti,adc-channels = <0 1 2 3 4 5 6 7>;
> -       };
> -};
> -
> -&main_i2c0 {
> -       status = "okay";
> -       pinctrl-names = "default";
> -       pinctrl-0 = <&main_i2c0_pins_default>;
> -       clock-frequency = <400000>;
> -
> -       exp1: gpio at 20 {
> -               compatible = "ti,tca6416";
> -               reg = <0x20>;
> -               gpio-controller;
> -               #gpio-cells = <2>;
> -       };
> -
> -       exp2: gpio at 22 {
> -               compatible = "ti,tca6424";
> -               reg = <0x22>;
> -               gpio-controller;
> -               #gpio-cells = <2>;
> -
> -               p09-hog {
> -                       /* P11 - MCASP/TRACE_MUX_S0 */
> -                       gpio-hog;
> -                       gpios = <9 GPIO_ACTIVE_HIGH>;
> -                       output-low;
> -                       line-name = "MCASP/TRACE_MUX_S0";
> -               };
> -
> -               p10-hog {
> -                       /* P12 - MCASP/TRACE_MUX_S1 */
> -                       gpio-hog;
> -                       gpios = <10 GPIO_ACTIVE_HIGH>;
> -                       output-high;
> -                       line-name = "MCASP/TRACE_MUX_S1";
> -               };
> -       };
> -};
> -
> -&main_i2c1 {
> -       status = "okay";
> -       pinctrl-names = "default";
> -       pinctrl-0 = <&main_i2c1_pins_default>;
> -       clock-frequency = <400000>;
> -
> -       exp4: gpio at 20 {
> -               compatible = "ti,tca6408";
> -               reg = <0x20>;
> -               gpio-controller;
> -               #gpio-cells = <2>;
> -               pinctrl-names = "default";
> -               pinctrl-0 = <&main_i2c1_exp4_pins_default>;
> -               interrupt-parent = <&main_gpio1>;
> -               interrupts = <11 IRQ_TYPE_EDGE_FALLING>;
> -               interrupt-controller;
> -               #interrupt-cells = <2>;
> -       };
> -};
> -
> -&k3_clks {
> -       /* Confiure AUDIO_EXT_REFCLK2 pin as output */
> -       pinctrl-names = "default";
> -       pinctrl-0 = <&audi_ext_refclk2_pins_default>;
> -};
> -
> -&main_i2c3 {
> -       status = "okay";
> -       pinctrl-names = "default";
> -       pinctrl-0 = <&main_i2c3_pins_default>;
> -       clock-frequency = <400000>;
> -
> -       exp3: gpio at 20 {
> -               compatible = "ti,tca6408";
> -               reg = <0x20>;
> -               gpio-controller;
> -               #gpio-cells = <2>;
> -       };
> -
> -       pcm3168a_1: audio-codec at 44 {
> -               compatible = "ti,pcm3168a";
> -               reg = <0x44>;
> -
> -               #sound-dai-cells = <1>;
> -
> -               reset-gpios = <&exp3 0 GPIO_ACTIVE_LOW>;
> -
> -               /* C_AUDIO_REFCLK2 -> RGMII6_RXC (W26) */
> -               clocks = <&k3_clks 157 371>;
> -               clock-names = "scki";
> -
> -               /* HSDIV3_16FFT_MAIN_4_HSDIVOUT2_CLK -> REFCLK2 */
> -               assigned-clocks = <&k3_clks 157 371>;
> -               assigned-clock-parents = <&k3_clks 157 400>;
> -               assigned-clock-rates = <24576000>; /* for 48KHz */
> -
> -               VDD1-supply = <&vsys_3v3>;
> -               VDD2-supply = <&vsys_3v3>;
> -               VCCAD1-supply = <&vsys_5v0>;
> -               VCCAD2-supply = <&vsys_5v0>;
> -               VCCDA1-supply = <&vsys_5v0>;
> -               VCCDA2-supply = <&vsys_5v0>;
> -       };
> -};
> -
> -&main_i2c6 {
> -       status = "okay";
> -       pinctrl-names = "default";
> -       pinctrl-0 = <&main_i2c6_pins_default>;
> -       clock-frequency = <400000>;
> -
> -       exp5: gpio at 20 {
> -               compatible = "ti,tca6408";
> -               reg = <0x20>;
> -               gpio-controller;
> -               #gpio-cells = <2>;
> -       };
> -};
> -
> -&mcu_cpsw {
> -       pinctrl-names = "default";
> -       pinctrl-0 = <&mcu_cpsw_pins_default>, <&mcu_mdio_pins_default>;
> -};
> -
> -&davinci_mdio {
> -       phy0: ethernet-phy at 0 {
> -               reg = <0>;
> -               ti,rx-internal-delay = <DP83867_RGMIIDCTL_2_00_NS>;
> -               ti,fifo-depth = <DP83867_PHYCR_FIFO_DEPTH_4_B_NIB>;
> -       };
> -};
> -
> -&cpsw_port1 {
> -       phy-mode = "rgmii-rxid";
> -       phy-handle = <&phy0>;
> -};
> -
> -&dss {
> -       /*
> -        * These clock assignments are chosen to enable the following outputs:
> -        *
> -        * VP0 - DisplayPort SST
> -        * VP1 - DPI0
> -        * VP2 - DSI
> -        * VP3 - DPI1
> -        */
> -
> -       assigned-clocks = <&k3_clks 152 1>,
> -                         <&k3_clks 152 4>,
> -                         <&k3_clks 152 9>,
> -                         <&k3_clks 152 13>;
> -       assigned-clock-parents = <&k3_clks 152 2>,      /* PLL16_HSDIV0 */
> -                                <&k3_clks 152 6>,      /* PLL19_HSDIV0 */
> -                                <&k3_clks 152 11>,     /* PLL18_HSDIV0 */
> -                                <&k3_clks 152 18>;     /* PLL23_HSDIV0 */
> -};
> -
> -&dss_ports {
> -       port {
> -               dpi0_out: endpoint {
> -                       remote-endpoint = <&dp0_in>;
> -               };
> -       };
> -};
> -
> -&dp0_ports {
> -       #address-cells = <1>;
> -       #size-cells = <0>;
> -
> -       port at 0 {
> -               reg = <0>;
> -               dp0_in: endpoint {
> -                       remote-endpoint = <&dpi0_out>;
> -               };
> -       };
> -
> -       port at 4 {
> -               reg = <4>;
> -               dp0_out: endpoint {
> -                       remote-endpoint = <&dp_connector_in>;
> -               };
> -       };
> -};
> -
> -&mcasp10 {
> -       status = "okay";
> -       #sound-dai-cells = <0>;
> -
> -       pinctrl-names = "default";
> -       pinctrl-0 = <&mcasp10_pins_default>;
> -
> -       op-mode = <0>;          /* MCASP_IIS_MODE */
> -       tdm-slots = <2>;
> -       auxclk-fs-ratio = <256>;
> -
> -       serial-dir = <  /* 0: INACTIVE, 1: TX, 2: RX */
> -               1 1 1 1
> -               2 2 2 0
> -       >;
> -       tx-num-evt = <0>;
> -       rx-num-evt = <0>;
> -};
> -
> -&cmn_refclk1 {
> -       clock-frequency = <100000000>;
> -};
> -
> -&wiz0_pll1_refclk {
> -       assigned-clocks = <&wiz0_pll1_refclk>;
> -       assigned-clock-parents = <&cmn_refclk1>;
> -};
> -
> -&wiz0_refclk_dig {
> -       assigned-clocks = <&wiz0_refclk_dig>;
> -       assigned-clock-parents = <&cmn_refclk1>;
> -};
> -
> -&wiz1_pll1_refclk {
> -       assigned-clocks = <&wiz1_pll1_refclk>;
> -       assigned-clock-parents = <&cmn_refclk1>;
> -};
> -
> -&wiz1_refclk_dig {
> -       assigned-clocks = <&wiz1_refclk_dig>;
> -       assigned-clock-parents = <&cmn_refclk1>;
> -};
> -
> -&wiz2_pll1_refclk {
> -       assigned-clocks = <&wiz2_pll1_refclk>;
> -       assigned-clock-parents = <&cmn_refclk1>;
> -};
> -
> -&wiz2_refclk_dig {
> -       assigned-clocks = <&wiz2_refclk_dig>;
> -       assigned-clock-parents = <&cmn_refclk1>;
> -};
> -
> -&serdes0 {
> -       assigned-clocks = <&serdes0 CDNS_SIERRA_PLL_CMNLC>;
> -       assigned-clock-parents = <&wiz0_pll1_refclk>;
> -
> -       serdes0_pcie_link: phy at 0 {
> -               reg = <0>;
> -               cdns,num-lanes = <1>;
> -               #phy-cells = <0>;
> -               cdns,phy-type = <PHY_TYPE_PCIE>;
> -               resets = <&serdes_wiz0 1>;
> -       };
> -};
> -
> -&serdes1 {
> -       assigned-clocks = <&serdes1 CDNS_SIERRA_PLL_CMNLC>;
> -       assigned-clock-parents = <&wiz1_pll1_refclk>;
> -
> -       serdes1_pcie_link: phy at 0 {
> -               reg = <0>;
> -               cdns,num-lanes = <2>;
> -               #phy-cells = <0>;
> -               cdns,phy-type = <PHY_TYPE_PCIE>;
> -               resets = <&serdes_wiz1 1>, <&serdes_wiz1 2>;
> -       };
> -};
> -
> -&serdes2 {
> -       assigned-clocks = <&serdes2 CDNS_SIERRA_PLL_CMNLC>;
> -       assigned-clock-parents = <&wiz2_pll1_refclk>;
> -
> -       serdes2_pcie_link: phy at 0 {
> -               reg = <0>;
> -               cdns,num-lanes = <2>;
> -               #phy-cells = <0>;
> -               cdns,phy-type = <PHY_TYPE_PCIE>;
> -               resets = <&serdes_wiz2 1>, <&serdes_wiz2 2>;
> -       };
> -};
> -
> -&serdes4 {
> -       torrent_phy_dp: phy at 0 {
> -               reg = <0>;
> -               resets = <&serdes_wiz4 1>;
> -               cdns,phy-type = <PHY_TYPE_DP>;
> -               cdns,num-lanes = <4>;
> -               cdns,max-bit-rate = <5400>;
> -               #phy-cells = <0>;
> -       };
> -};
> -
> -&mhdp {
> -       phys = <&torrent_phy_dp>;
> -       phy-names = "dpphy";
> -       pinctrl-names = "default";
> -       pinctrl-0 = <&dp0_pins_default>;
> -};
> -
> -&pcie0_rc {
> -       status = "okay";
> -       reset-gpios = <&exp1 6 GPIO_ACTIVE_HIGH>;
> -       phys = <&serdes0_pcie_link>;
> -       phy-names = "pcie-phy";
> -       num-lanes = <1>;
> -};
> -
> -&pcie1_rc {
> -       status = "okay";
> -       reset-gpios = <&exp1 2 GPIO_ACTIVE_HIGH>;
> -       phys = <&serdes1_pcie_link>;
> -       phy-names = "pcie-phy";
> -       num-lanes = <2>;
> -};
> -
> -&pcie2_rc {
> -       status = "okay";
> -       reset-gpios = <&exp2 20 GPIO_ACTIVE_HIGH>;
> -       phys = <&serdes2_pcie_link>;
> -       phy-names = "pcie-phy";
> -       num-lanes = <2>;
> -};
> -
> -&mcu_mcan0 {
> -       status = "okay";
> -       pinctrl-names = "default";
> -       pinctrl-0 = <&mcu_mcan0_pins_default>;
> -       phys = <&transceiver1>;
> -};
> -
> -&mcu_mcan1 {
> -       status = "okay";
> -       pinctrl-names = "default";
> -       pinctrl-0 = <&mcu_mcan1_pins_default>;
> -       phys = <&transceiver2>;
> -};
> -
> -&main_mcan0 {
> -       status = "okay";
> -       pinctrl-names = "default";
> -       pinctrl-0 = <&main_mcan0_pins_default>;
> -       phys = <&transceiver3>;
> -};
> -
> -&main_mcan2 {
> -       status = "okay";
> -       pinctrl-names = "default";
> -       pinctrl-0 = <&main_mcan2_pins_default>;
> -       phys = <&transceiver4>;
> -};
> diff --git a/arch/arm/dts/k3-j721e-main.dtsi b/arch/arm/dts/k3-j721e-main.dtsi
> deleted file mode 100644
> index 746b9f8b1c6..00000000000
> --- a/arch/arm/dts/k3-j721e-main.dtsi
> +++ /dev/null
> @@ -1,2741 +0,0 @@
> -// SPDX-License-Identifier: GPL-2.0
> -/*
> - * Device Tree Source for J721E SoC Family Main Domain peripherals
> - *
> - * Copyright (C) 2016-2020 Texas Instruments Incorporated - https://www.ti.com/
> - */
> -#include <dt-bindings/phy/phy.h>
> -#include <dt-bindings/phy/phy-ti.h>
> -#include <dt-bindings/mux/mux.h>
> -
> -#include "k3-serdes.h"
> -
> -/ {
> -       cmn_refclk: clock-cmnrefclk {
> -               #clock-cells = <0>;
> -               compatible = "fixed-clock";
> -               clock-frequency = <0>;
> -       };
> -
> -       cmn_refclk1: clock-cmnrefclk1 {
> -               #clock-cells = <0>;
> -               compatible = "fixed-clock";
> -               clock-frequency = <0>;
> -       };
> -};
> -
> -&cbass_main {
> -       msmc_ram: sram at 70000000 {
> -               compatible = "mmio-sram";
> -               reg = <0x0 0x70000000 0x0 0x800000>;
> -               #address-cells = <1>;
> -               #size-cells = <1>;
> -               ranges = <0x0 0x0 0x70000000 0x800000>;
> -
> -               atf-sram at 0 {
> -                       reg = <0x0 0x20000>;
> -               };
> -       };
> -
> -       scm_conf: scm-conf at 100000 {
> -               compatible = "ti,j721e-system-controller", "syscon", "simple-mfd";
> -               reg = <0 0x00100000 0 0x1c000>; /* excludes pinctrl region */
> -               #address-cells = <1>;
> -               #size-cells = <1>;
> -               ranges = <0x0 0x0 0x00100000 0x1c000>;
> -
> -               serdes_ln_ctrl: mux-controller at 4080 {
> -                       compatible = "mmio-mux";
> -                       reg = <0x00004080 0x50>;
> -                       #mux-control-cells = <1>;
> -                       mux-reg-masks = <0x4080 0x3>, <0x4084 0x3>, /* SERDES0 lane0/1 select */
> -                                       <0x4090 0x3>, <0x4094 0x3>, /* SERDES1 lane0/1 select */
> -                                       <0x40a0 0x3>, <0x40a4 0x3>, /* SERDES2 lane0/1 select */
> -                                       <0x40b0 0x3>, <0x40b4 0x3>, /* SERDES3 lane0/1 select */
> -                                       <0x40c0 0x3>, <0x40c4 0x3>, <0x40c8 0x3>, <0x40cc 0x3>;
> -                                       /* SERDES4 lane0/1/2/3 select */
> -                       idle-states = <J721E_SERDES0_LANE0_PCIE0_LANE0>, <J721E_SERDES0_LANE1_PCIE0_LANE1>,
> -                                     <J721E_SERDES1_LANE0_PCIE1_LANE0>, <J721E_SERDES1_LANE1_PCIE1_LANE1>,
> -                                     <J721E_SERDES2_LANE0_PCIE2_LANE0>, <J721E_SERDES2_LANE1_PCIE2_LANE1>,
> -                                     <MUX_IDLE_AS_IS>, <J721E_SERDES3_LANE1_USB3_0>,
> -                                     <J721E_SERDES4_LANE0_EDP_LANE0>, <J721E_SERDES4_LANE1_EDP_LANE1>,
> -                                     <J721E_SERDES4_LANE2_EDP_LANE2>, <J721E_SERDES4_LANE3_EDP_LANE3>;
> -               };
> -
> -               cpsw0_phy_gmii_sel: phy at 4044 {
> -                       compatible = "ti,j721e-cpsw9g-phy-gmii-sel";
> -                       ti,qsgmii-main-ports = <2>, <2>;
> -                       reg = <0x4044 0x20>;
> -                       #phy-cells = <1>;
> -               };
> -
> -               usb_serdes_mux: mux-controller at 4000 {
> -                       compatible = "mmio-mux";
> -                       #mux-control-cells = <1>;
> -                       mux-reg-masks = <0x4000 0x8000000>, /* USB0 to SERDES0/3 mux */
> -                                       <0x4010 0x8000000>; /* USB1 to SERDES1/2 mux */
> -               };
> -
> -               ehrpwm_tbclk: clock-controller at 4140 {
> -                       compatible = "ti,am654-ehrpwm-tbclk";
> -                       reg = <0x4140 0x18>;
> -                       #clock-cells = <1>;
> -               };
> -       };
> -
> -       main_ehrpwm0: pwm at 3000000 {
> -               compatible = "ti,am654-ehrpwm", "ti,am3352-ehrpwm";
> -               #pwm-cells = <3>;
> -               reg = <0x00 0x3000000 0x00 0x100>;
> -               power-domains = <&k3_pds 83 TI_SCI_PD_EXCLUSIVE>;
> -               clocks = <&ehrpwm_tbclk 0>, <&k3_clks 83 0>;
> -               clock-names = "tbclk", "fck";
> -               status = "disabled";
> -       };
> -
> -       main_ehrpwm1: pwm at 3010000 {
> -               compatible = "ti,am654-ehrpwm", "ti,am3352-ehrpwm";
> -               #pwm-cells = <3>;
> -               reg = <0x00 0x3010000 0x00 0x100>;
> -               power-domains = <&k3_pds 84 TI_SCI_PD_EXCLUSIVE>;
> -               clocks = <&ehrpwm_tbclk 1>, <&k3_clks 84 0>;
> -               clock-names = "tbclk", "fck";
> -               status = "disabled";
> -       };
> -
> -       main_ehrpwm2: pwm at 3020000 {
> -               compatible = "ti,am654-ehrpwm", "ti,am3352-ehrpwm";
> -               #pwm-cells = <3>;
> -               reg = <0x00 0x3020000 0x00 0x100>;
> -               power-domains = <&k3_pds 85 TI_SCI_PD_EXCLUSIVE>;
> -               clocks = <&ehrpwm_tbclk 2>, <&k3_clks 85 0>;
> -               clock-names = "tbclk", "fck";
> -               status = "disabled";
> -       };
> -
> -       main_ehrpwm3: pwm at 3030000 {
> -               compatible = "ti,am654-ehrpwm", "ti,am3352-ehrpwm";
> -               #pwm-cells = <3>;
> -               reg = <0x00 0x3030000 0x00 0x100>;
> -               power-domains = <&k3_pds 86 TI_SCI_PD_EXCLUSIVE>;
> -               clocks = <&ehrpwm_tbclk 3>, <&k3_clks 86 0>;
> -               clock-names = "tbclk", "fck";
> -               status = "disabled";
> -       };
> -
> -       main_ehrpwm4: pwm at 3040000 {
> -               compatible = "ti,am654-ehrpwm", "ti,am3352-ehrpwm";
> -               #pwm-cells = <3>;
> -               reg = <0x00 0x3040000 0x00 0x100>;
> -               power-domains = <&k3_pds 87 TI_SCI_PD_EXCLUSIVE>;
> -               clocks = <&ehrpwm_tbclk 4>, <&k3_clks 87 0>;
> -               clock-names = "tbclk", "fck";
> -               status = "disabled";
> -       };
> -
> -       main_ehrpwm5: pwm at 3050000 {
> -               compatible = "ti,am654-ehrpwm", "ti,am3352-ehrpwm";
> -               #pwm-cells = <3>;
> -               reg = <0x00 0x3050000 0x00 0x100>;
> -               power-domains = <&k3_pds 88 TI_SCI_PD_EXCLUSIVE>;
> -               clocks = <&ehrpwm_tbclk 5>, <&k3_clks 88 0>;
> -               clock-names = "tbclk", "fck";
> -               status = "disabled";
> -       };
> -
> -       gic500: interrupt-controller at 1800000 {
> -               compatible = "arm,gic-v3";
> -               #address-cells = <2>;
> -               #size-cells = <2>;
> -               ranges;
> -               #interrupt-cells = <3>;
> -               interrupt-controller;
> -               reg = <0x00 0x01800000 0x00 0x10000>,   /* GICD */
> -                     <0x00 0x01900000 0x00 0x100000>,  /* GICR */
> -                     <0x00 0x6f000000 0x00 0x2000>,    /* GICC */
> -                     <0x00 0x6f010000 0x00 0x1000>,    /* GICH */
> -                     <0x00 0x6f020000 0x00 0x2000>;    /* GICV */
> -
> -               /* vcpumntirq: virtual CPU interface maintenance interrupt */
> -               interrupts = <GIC_PPI 9 IRQ_TYPE_LEVEL_HIGH>;
> -
> -               gic_its: msi-controller at 1820000 {
> -                       compatible = "arm,gic-v3-its";
> -                       reg = <0x00 0x01820000 0x00 0x10000>;
> -                       socionext,synquacer-pre-its = <0x1000000 0x400000>;
> -                       msi-controller;
> -                       #msi-cells = <1>;
> -               };
> -       };
> -
> -       main_gpio_intr: interrupt-controller at a00000 {
> -               compatible = "ti,sci-intr";
> -               reg = <0x00 0x00a00000 0x00 0x800>;
> -               ti,intr-trigger-type = <1>;
> -               interrupt-controller;
> -               interrupt-parent = <&gic500>;
> -               #interrupt-cells = <1>;
> -               ti,sci = <&dmsc>;
> -               ti,sci-dev-id = <131>;
> -               ti,interrupt-ranges = <8 392 56>;
> -       };
> -
> -       main_navss: bus at 30000000 {
> -               compatible = "simple-bus";
> -               #address-cells = <2>;
> -               #size-cells = <2>;
> -               ranges = <0x00 0x30000000 0x00 0x30000000 0x00 0x0c400000>;
> -               dma-coherent;
> -               dma-ranges;
> -
> -               ti,sci-dev-id = <199>;
> -
> -               main_navss_intr: interrupt-controller at 310e0000 {
> -                       compatible = "ti,sci-intr";
> -                       reg = <0x0 0x310e0000 0x0 0x4000>;
> -                       ti,intr-trigger-type = <4>;
> -                       interrupt-controller;
> -                       interrupt-parent = <&gic500>;
> -                       #interrupt-cells = <1>;
> -                       ti,sci = <&dmsc>;
> -                       ti,sci-dev-id = <213>;
> -                       ti,interrupt-ranges = <0 64 64>,
> -                                             <64 448 64>,
> -                                             <128 672 64>;
> -               };
> -
> -               main_udmass_inta: interrupt-controller at 33d00000 {
> -                       compatible = "ti,sci-inta";
> -                       reg = <0x0 0x33d00000 0x0 0x100000>;
> -                       interrupt-controller;
> -                       interrupt-parent = <&main_navss_intr>;
> -                       msi-controller;
> -                       #interrupt-cells = <0>;
> -                       ti,sci = <&dmsc>;
> -                       ti,sci-dev-id = <209>;
> -                       ti,interrupt-ranges = <0 0 256>;
> -               };
> -
> -               secure_proxy_main: mailbox at 32c00000 {
> -                       compatible = "ti,am654-secure-proxy";
> -                       #mbox-cells = <1>;
> -                       reg-names = "target_data", "rt", "scfg";
> -                       reg = <0x00 0x32c00000 0x00 0x100000>,
> -                             <0x00 0x32400000 0x00 0x100000>,
> -                             <0x00 0x32800000 0x00 0x100000>;
> -                       interrupt-names = "rx_011";
> -                       interrupts = <GIC_SPI 37 IRQ_TYPE_LEVEL_HIGH>;
> -               };
> -
> -               smmu0: iommu at 36600000 {
> -                       compatible = "arm,smmu-v3";
> -                       reg = <0x0 0x36600000 0x0 0x100000>;
> -                       interrupt-parent = <&gic500>;
> -                       interrupts = <GIC_SPI 772 IRQ_TYPE_EDGE_RISING>,
> -                                    <GIC_SPI 768 IRQ_TYPE_EDGE_RISING>;
> -                       interrupt-names = "eventq", "gerror";
> -                       #iommu-cells = <1>;
> -               };
> -
> -               hwspinlock: spinlock at 30e00000 {
> -                       compatible = "ti,am654-hwspinlock";
> -                       reg = <0x00 0x30e00000 0x00 0x1000>;
> -                       #hwlock-cells = <1>;
> -               };
> -
> -               mailbox0_cluster0: mailbox at 31f80000 {
> -                       compatible = "ti,am654-mailbox";
> -                       reg = <0x00 0x31f80000 0x00 0x200>;
> -                       #mbox-cells = <1>;
> -                       ti,mbox-num-users = <4>;
> -                       ti,mbox-num-fifos = <16>;
> -                       interrupt-parent = <&main_navss_intr>;
> -                       status = "disabled";
> -               };
> -
> -               mailbox0_cluster1: mailbox at 31f81000 {
> -                       compatible = "ti,am654-mailbox";
> -                       reg = <0x00 0x31f81000 0x00 0x200>;
> -                       #mbox-cells = <1>;
> -                       ti,mbox-num-users = <4>;
> -                       ti,mbox-num-fifos = <16>;
> -                       interrupt-parent = <&main_navss_intr>;
> -                       status = "disabled";
> -               };
> -
> -               mailbox0_cluster2: mailbox at 31f82000 {
> -                       compatible = "ti,am654-mailbox";
> -                       reg = <0x00 0x31f82000 0x00 0x200>;
> -                       #mbox-cells = <1>;
> -                       ti,mbox-num-users = <4>;
> -                       ti,mbox-num-fifos = <16>;
> -                       interrupt-parent = <&main_navss_intr>;
> -                       status = "disabled";
> -               };
> -
> -               mailbox0_cluster3: mailbox at 31f83000 {
> -                       compatible = "ti,am654-mailbox";
> -                       reg = <0x00 0x31f83000 0x00 0x200>;
> -                       #mbox-cells = <1>;
> -                       ti,mbox-num-users = <4>;
> -                       ti,mbox-num-fifos = <16>;
> -                       interrupt-parent = <&main_navss_intr>;
> -                       status = "disabled";
> -               };
> -
> -               mailbox0_cluster4: mailbox at 31f84000 {
> -                       compatible = "ti,am654-mailbox";
> -                       reg = <0x00 0x31f84000 0x00 0x200>;
> -                       #mbox-cells = <1>;
> -                       ti,mbox-num-users = <4>;
> -                       ti,mbox-num-fifos = <16>;
> -                       interrupt-parent = <&main_navss_intr>;
> -                       status = "disabled";
> -               };
> -
> -               mailbox0_cluster5: mailbox at 31f85000 {
> -                       compatible = "ti,am654-mailbox";
> -                       reg = <0x00 0x31f85000 0x00 0x200>;
> -                       #mbox-cells = <1>;
> -                       ti,mbox-num-users = <4>;
> -                       ti,mbox-num-fifos = <16>;
> -                       interrupt-parent = <&main_navss_intr>;
> -                       status = "disabled";
> -               };
> -
> -               mailbox0_cluster6: mailbox at 31f86000 {
> -                       compatible = "ti,am654-mailbox";
> -                       reg = <0x00 0x31f86000 0x00 0x200>;
> -                       #mbox-cells = <1>;
> -                       ti,mbox-num-users = <4>;
> -                       ti,mbox-num-fifos = <16>;
> -                       interrupt-parent = <&main_navss_intr>;
> -                       status = "disabled";
> -               };
> -
> -               mailbox0_cluster7: mailbox at 31f87000 {
> -                       compatible = "ti,am654-mailbox";
> -                       reg = <0x00 0x31f87000 0x00 0x200>;
> -                       #mbox-cells = <1>;
> -                       ti,mbox-num-users = <4>;
> -                       ti,mbox-num-fifos = <16>;
> -                       interrupt-parent = <&main_navss_intr>;
> -                       status = "disabled";
> -               };
> -
> -               mailbox0_cluster8: mailbox at 31f88000 {
> -                       compatible = "ti,am654-mailbox";
> -                       reg = <0x00 0x31f88000 0x00 0x200>;
> -                       #mbox-cells = <1>;
> -                       ti,mbox-num-users = <4>;
> -                       ti,mbox-num-fifos = <16>;
> -                       interrupt-parent = <&main_navss_intr>;
> -                       status = "disabled";
> -               };
> -
> -               mailbox0_cluster9: mailbox at 31f89000 {
> -                       compatible = "ti,am654-mailbox";
> -                       reg = <0x00 0x31f89000 0x00 0x200>;
> -                       #mbox-cells = <1>;
> -                       ti,mbox-num-users = <4>;
> -                       ti,mbox-num-fifos = <16>;
> -                       interrupt-parent = <&main_navss_intr>;
> -                       status = "disabled";
> -               };
> -
> -               mailbox0_cluster10: mailbox at 31f8a000 {
> -                       compatible = "ti,am654-mailbox";
> -                       reg = <0x00 0x31f8a000 0x00 0x200>;
> -                       #mbox-cells = <1>;
> -                       ti,mbox-num-users = <4>;
> -                       ti,mbox-num-fifos = <16>;
> -                       interrupt-parent = <&main_navss_intr>;
> -                       status = "disabled";
> -               };
> -
> -               mailbox0_cluster11: mailbox at 31f8b000 {
> -                       compatible = "ti,am654-mailbox";
> -                       reg = <0x00 0x31f8b000 0x00 0x200>;
> -                       #mbox-cells = <1>;
> -                       ti,mbox-num-users = <4>;
> -                       ti,mbox-num-fifos = <16>;
> -                       interrupt-parent = <&main_navss_intr>;
> -                       status = "disabled";
> -               };
> -
> -               main_ringacc: ringacc at 3c000000 {
> -                       compatible = "ti,am654-navss-ringacc";
> -                       reg = <0x0 0x3c000000 0x0 0x400000>,
> -                             <0x0 0x38000000 0x0 0x400000>,
> -                             <0x0 0x31120000 0x0 0x100>,
> -                             <0x0 0x33000000 0x0 0x40000>,
> -                             <0x0 0x31080000 0x0 0x40000>;
> -                       reg-names = "rt", "fifos", "proxy_gcfg", "proxy_target", "cfg";
> -                       ti,num-rings = <1024>;
> -                       ti,sci-rm-range-gp-rings = <0x1>; /* GP ring range */
> -                       ti,sci = <&dmsc>;
> -                       ti,sci-dev-id = <211>;
> -                       msi-parent = <&main_udmass_inta>;
> -               };
> -
> -               main_udmap: dma-controller at 31150000 {
> -                       compatible = "ti,j721e-navss-main-udmap";
> -                       reg = <0x0 0x31150000 0x0 0x100>,
> -                             <0x0 0x34000000 0x0 0x100000>,
> -                             <0x0 0x35000000 0x0 0x100000>;
> -                       reg-names = "gcfg", "rchanrt", "tchanrt";
> -                       msi-parent = <&main_udmass_inta>;
> -                       #dma-cells = <1>;
> -
> -                       ti,sci = <&dmsc>;
> -                       ti,sci-dev-id = <212>;
> -                       ti,ringacc = <&main_ringacc>;
> -
> -                       ti,sci-rm-range-tchan = <0x0d>, /* TX_CHAN */
> -                                               <0x0f>, /* TX_HCHAN */
> -                                               <0x10>; /* TX_UHCHAN */
> -                       ti,sci-rm-range-rchan = <0x0a>, /* RX_CHAN */
> -                                               <0x0b>, /* RX_HCHAN */
> -                                               <0x0c>; /* RX_UHCHAN */
> -                       ti,sci-rm-range-rflow = <0x00>; /* GP RFLOW */
> -               };
> -
> -               cpts at 310d0000 {
> -                       compatible = "ti,j721e-cpts";
> -                       reg = <0x0 0x310d0000 0x0 0x400>;
> -                       reg-names = "cpts";
> -                       clocks = <&k3_clks 201 1>;
> -                       clock-names = "cpts";
> -                       interrupts-extended = <&main_navss_intr 391>;
> -                       interrupt-names = "cpts";
> -                       ti,cpts-periodic-outputs = <6>;
> -                       ti,cpts-ext-ts-inputs = <8>;
> -               };
> -       };
> -
> -       cpsw0: ethernet at c000000 {
> -               compatible = "ti,j721e-cpswxg-nuss";
> -               #address-cells = <2>;
> -               #size-cells = <2>;
> -               reg = <0x0 0xc000000 0x0 0x200000>;
> -               reg-names = "cpsw_nuss";
> -               ranges = <0x0 0x0 0x0 0x0c000000 0x0 0x200000>;
> -               clocks = <&k3_clks 19 89>;
> -               clock-names = "fck";
> -               power-domains = <&k3_pds 19 TI_SCI_PD_EXCLUSIVE>;
> -
> -               dmas = <&main_udmap 0xca00>,
> -                      <&main_udmap 0xca01>,
> -                      <&main_udmap 0xca02>,
> -                      <&main_udmap 0xca03>,
> -                      <&main_udmap 0xca04>,
> -                      <&main_udmap 0xca05>,
> -                      <&main_udmap 0xca06>,
> -                      <&main_udmap 0xca07>,
> -                      <&main_udmap 0x4a00>;
> -               dma-names = "tx0", "tx1", "tx2", "tx3",
> -                           "tx4", "tx5", "tx6", "tx7",
> -                           "rx";
> -
> -               status = "disabled";
> -
> -               ethernet-ports {
> -                       #address-cells = <1>;
> -                       #size-cells = <0>;
> -                       cpsw0_port1: port at 1 {
> -                               reg = <1>;
> -                               ti,mac-only;
> -                               label = "port1";
> -                               status = "disabled";
> -                       };
> -
> -                       cpsw0_port2: port at 2 {
> -                               reg = <2>;
> -                               ti,mac-only;
> -                               label = "port2";
> -                               status = "disabled";
> -                       };
> -
> -                       cpsw0_port3: port at 3 {
> -                               reg = <3>;
> -                               ti,mac-only;
> -                               label = "port3";
> -                               status = "disabled";
> -                       };
> -
> -                       cpsw0_port4: port at 4 {
> -                               reg = <4>;
> -                               ti,mac-only;
> -                               label = "port4";
> -                               status = "disabled";
> -                       };
> -
> -                       cpsw0_port5: port at 5 {
> -                               reg = <5>;
> -                               ti,mac-only;
> -                               label = "port5";
> -                               status = "disabled";
> -                       };
> -
> -                       cpsw0_port6: port at 6 {
> -                               reg = <6>;
> -                               ti,mac-only;
> -                               label = "port6";
> -                               status = "disabled";
> -                       };
> -
> -                       cpsw0_port7: port at 7 {
> -                               reg = <7>;
> -                               ti,mac-only;
> -                               label = "port7";
> -                               status = "disabled";
> -                       };
> -
> -                       cpsw0_port8: port at 8 {
> -                               reg = <8>;
> -                               ti,mac-only;
> -                               label = "port8";
> -                               status = "disabled";
> -                       };
> -               };
> -
> -               cpsw9g_mdio: mdio at f00 {
> -                       compatible = "ti,cpsw-mdio","ti,davinci_mdio";
> -                       reg = <0x0 0xf00 0x0 0x100>;
> -                       #address-cells = <1>;
> -                       #size-cells = <0>;
> -                       clocks = <&k3_clks 19 89>;
> -                       clock-names = "fck";
> -                       bus_freq = <1000000>;
> -                       status = "disabled";
> -               };
> -
> -               cpts at 3d000 {
> -                       compatible = "ti,j721e-cpts";
> -                       reg = <0x0 0x3d000 0x0 0x400>;
> -                       clocks = <&k3_clks 19 16>;
> -                       clock-names = "cpts";
> -                       interrupts-extended = <&gic500 GIC_SPI 16 IRQ_TYPE_LEVEL_HIGH>;
> -                       interrupt-names = "cpts";
> -                       ti,cpts-ext-ts-inputs = <4>;
> -                       ti,cpts-periodic-outputs = <2>;
> -               };
> -       };
> -
> -       main_crypto: crypto at 4e00000 {
> -               compatible = "ti,j721e-sa2ul";
> -               reg = <0x0 0x4e00000 0x0 0x1200>;
> -               power-domains = <&k3_pds 264 TI_SCI_PD_EXCLUSIVE>;
> -               #address-cells = <2>;
> -               #size-cells = <2>;
> -               ranges = <0x0 0x04e00000 0x00 0x04e00000 0x0 0x30000>;
> -
> -               dmas = <&main_udmap 0xc000>, <&main_udmap 0x4000>,
> -                               <&main_udmap 0x4001>;
> -               dma-names = "tx", "rx1", "rx2";
> -
> -               rng: rng at 4e10000 {
> -                       compatible = "inside-secure,safexcel-eip76";
> -                       reg = <0x0 0x4e10000 0x0 0x7d>;
> -                       interrupts = <GIC_SPI 11 IRQ_TYPE_LEVEL_HIGH>;
> -               };
> -       };
> -
> -       main_pmx0: pinctrl at 11c000 {
> -               compatible = "pinctrl-single";
> -               /* Proxy 0 addressing */
> -               reg = <0x0 0x11c000 0x0 0x2b4>;
> -               #pinctrl-cells = <1>;
> -               pinctrl-single,register-width = <32>;
> -               pinctrl-single,function-mask = <0xffffffff>;
> -       };
> -
> -       /* TIMERIO pad input CTRLMMR_TIMER*_CTRL registers */
> -       main_timerio_input: pinctrl at 104200 {
> -               compatible = "pinctrl-single";
> -               reg = <0x00 0x104200 0x00 0x50>;
> -               #pinctrl-cells = <1>;
> -               pinctrl-single,register-width = <32>;
> -               pinctrl-single,function-mask = <0x00000007>;
> -       };
> -
> -       /* TIMERIO pad output CTCTRLMMR_TIMERIO*_CTRL registers */
> -       main_timerio_output: pinctrl at 104280 {
> -               compatible = "pinctrl-single";
> -               reg = <0x00 0x104280 0x00 0x20>;
> -               #pinctrl-cells = <1>;
> -               pinctrl-single,register-width = <32>;
> -               pinctrl-single,function-mask = <0x0000001f>;
> -       };
> -
> -       serdes_wiz0: wiz at 5000000 {
> -               compatible = "ti,j721e-wiz-16g";
> -               #address-cells = <1>;
> -               #size-cells = <1>;
> -               power-domains = <&k3_pds 292 TI_SCI_PD_EXCLUSIVE>;
> -               clocks = <&k3_clks 292 5>, <&k3_clks 292 11>, <&cmn_refclk>;
> -               clock-names = "fck", "core_ref_clk", "ext_ref_clk";
> -               assigned-clocks = <&k3_clks 292 11>, <&k3_clks 292 0>;
> -               assigned-clock-parents = <&k3_clks 292 15>, <&k3_clks 292 4>;
> -               num-lanes = <2>;
> -               #reset-cells = <1>;
> -               ranges = <0x5000000 0x0 0x5000000 0x10000>;
> -
> -               wiz0_pll0_refclk: pll0-refclk {
> -                       clocks = <&k3_clks 292 11>, <&cmn_refclk>;
> -                       #clock-cells = <0>;
> -                       assigned-clocks = <&wiz0_pll0_refclk>;
> -                       assigned-clock-parents = <&k3_clks 292 11>;
> -               };
> -
> -               wiz0_pll1_refclk: pll1-refclk {
> -                       clocks = <&k3_clks 292 0>, <&cmn_refclk1>;
> -                       #clock-cells = <0>;
> -                       assigned-clocks = <&wiz0_pll1_refclk>;
> -                       assigned-clock-parents = <&k3_clks 292 0>;
> -               };
> -
> -               wiz0_refclk_dig: refclk-dig {
> -                       clocks = <&k3_clks 292 11>, <&k3_clks 292 0>, <&cmn_refclk>, <&cmn_refclk1>;
> -                       #clock-cells = <0>;
> -                       assigned-clocks = <&wiz0_refclk_dig>;
> -                       assigned-clock-parents = <&k3_clks 292 11>;
> -               };
> -
> -               wiz0_cmn_refclk_dig_div: cmn-refclk-dig-div {
> -                       clocks = <&wiz0_refclk_dig>;
> -                       #clock-cells = <0>;
> -               };
> -
> -               wiz0_cmn_refclk1_dig_div: cmn-refclk1-dig-div {
> -                       clocks = <&wiz0_pll1_refclk>;
> -                       #clock-cells = <0>;
> -               };
> -
> -               serdes0: serdes at 5000000 {
> -                       compatible = "ti,sierra-phy-t0";
> -                       reg-names = "serdes";
> -                       reg = <0x5000000 0x10000>;
> -                       #address-cells = <1>;
> -                       #size-cells = <0>;
> -                       #clock-cells = <1>;
> -                       resets = <&serdes_wiz0 0>;
> -                       reset-names = "sierra_reset";
> -                       clocks = <&wiz0_cmn_refclk_dig_div>, <&wiz0_cmn_refclk1_dig_div>,
> -                                <&wiz0_pll0_refclk>, <&wiz0_pll1_refclk>;
> -                       clock-names = "cmn_refclk_dig_div", "cmn_refclk1_dig_div",
> -                                     "pll0_refclk", "pll1_refclk";
> -               };
> -       };
> -
> -       serdes_wiz1: wiz at 5010000 {
> -               compatible = "ti,j721e-wiz-16g";
> -               #address-cells = <1>;
> -               #size-cells = <1>;
> -               power-domains = <&k3_pds 293 TI_SCI_PD_EXCLUSIVE>;
> -               clocks = <&k3_clks 293 5>, <&k3_clks 293 13>, <&cmn_refclk>;
> -               clock-names = "fck", "core_ref_clk", "ext_ref_clk";
> -               assigned-clocks = <&k3_clks 293 13>, <&k3_clks 293 0>;
> -               assigned-clock-parents = <&k3_clks 293 17>, <&k3_clks 293 4>;
> -               num-lanes = <2>;
> -               #reset-cells = <1>;
> -               ranges = <0x5010000 0x0 0x5010000 0x10000>;
> -
> -               wiz1_pll0_refclk: pll0-refclk {
> -                       clocks = <&k3_clks 293 13>, <&cmn_refclk>;
> -                       #clock-cells = <0>;
> -                       assigned-clocks = <&wiz1_pll0_refclk>;
> -                       assigned-clock-parents = <&k3_clks 293 13>;
> -               };
> -
> -               wiz1_pll1_refclk: pll1-refclk {
> -                       clocks = <&k3_clks 293 0>, <&cmn_refclk1>;
> -                       #clock-cells = <0>;
> -                       assigned-clocks = <&wiz1_pll1_refclk>;
> -                       assigned-clock-parents = <&k3_clks 293 0>;
> -               };
> -
> -               wiz1_refclk_dig: refclk-dig {
> -                       clocks = <&k3_clks 293 13>, <&k3_clks 293 0>, <&cmn_refclk>, <&cmn_refclk1>;
> -                       #clock-cells = <0>;
> -                       assigned-clocks = <&wiz1_refclk_dig>;
> -                       assigned-clock-parents = <&k3_clks 293 13>;
> -               };
> -
> -               wiz1_cmn_refclk_dig_div: cmn-refclk-dig-div {
> -                       clocks = <&wiz1_refclk_dig>;
> -                       #clock-cells = <0>;
> -               };
> -
> -               wiz1_cmn_refclk1_dig_div: cmn-refclk1-dig-div {
> -                       clocks = <&wiz1_pll1_refclk>;
> -                       #clock-cells = <0>;
> -               };
> -
> -               serdes1: serdes at 5010000 {
> -                       compatible = "ti,sierra-phy-t0";
> -                       reg-names = "serdes";
> -                       reg = <0x5010000 0x10000>;
> -                       #address-cells = <1>;
> -                       #size-cells = <0>;
> -                       #clock-cells = <1>;
> -                       resets = <&serdes_wiz1 0>;
> -                       reset-names = "sierra_reset";
> -                       clocks = <&wiz1_cmn_refclk_dig_div>, <&wiz1_cmn_refclk1_dig_div>,
> -                                <&wiz1_pll0_refclk>, <&wiz1_pll1_refclk>;
> -                       clock-names = "cmn_refclk_dig_div", "cmn_refclk1_dig_div",
> -                                     "pll0_refclk", "pll1_refclk";
> -               };
> -       };
> -
> -       serdes_wiz2: wiz at 5020000 {
> -               compatible = "ti,j721e-wiz-16g";
> -               #address-cells = <1>;
> -               #size-cells = <1>;
> -               power-domains = <&k3_pds 294 TI_SCI_PD_EXCLUSIVE>;
> -               clocks = <&k3_clks 294 5>, <&k3_clks 294 11>, <&cmn_refclk>;
> -               clock-names = "fck", "core_ref_clk", "ext_ref_clk";
> -               assigned-clocks = <&k3_clks 294 11>, <&k3_clks 294 0>;
> -               assigned-clock-parents = <&k3_clks 294 15>, <&k3_clks 294 4>;
> -               num-lanes = <2>;
> -               #reset-cells = <1>;
> -               ranges = <0x5020000 0x0 0x5020000 0x10000>;
> -
> -               wiz2_pll0_refclk: pll0-refclk {
> -                       clocks = <&k3_clks 294 11>, <&cmn_refclk>;
> -                       #clock-cells = <0>;
> -                       assigned-clocks = <&wiz2_pll0_refclk>;
> -                       assigned-clock-parents = <&k3_clks 294 11>;
> -               };
> -
> -               wiz2_pll1_refclk: pll1-refclk {
> -                       clocks = <&k3_clks 294 0>, <&cmn_refclk1>;
> -                       #clock-cells = <0>;
> -                       assigned-clocks = <&wiz2_pll1_refclk>;
> -                       assigned-clock-parents = <&k3_clks 294 0>;
> -               };
> -
> -               wiz2_refclk_dig: refclk-dig {
> -                       clocks = <&k3_clks 294 11>, <&k3_clks 294 0>, <&cmn_refclk>, <&cmn_refclk1>;
> -                       #clock-cells = <0>;
> -                       assigned-clocks = <&wiz2_refclk_dig>;
> -                       assigned-clock-parents = <&k3_clks 294 11>;
> -               };
> -
> -               wiz2_cmn_refclk_dig_div: cmn-refclk-dig-div {
> -                       clocks = <&wiz2_refclk_dig>;
> -                       #clock-cells = <0>;
> -               };
> -
> -               wiz2_cmn_refclk1_dig_div: cmn-refclk1-dig-div {
> -                       clocks = <&wiz2_pll1_refclk>;
> -                       #clock-cells = <0>;
> -               };
> -
> -               serdes2: serdes at 5020000 {
> -                       compatible = "ti,sierra-phy-t0";
> -                       reg-names = "serdes";
> -                       reg = <0x5020000 0x10000>;
> -                       #address-cells = <1>;
> -                       #size-cells = <0>;
> -                       #clock-cells = <1>;
> -                       resets = <&serdes_wiz2 0>;
> -                       reset-names = "sierra_reset";
> -                       clocks = <&wiz2_cmn_refclk_dig_div>, <&wiz2_cmn_refclk1_dig_div>,
> -                                <&wiz2_pll0_refclk>, <&wiz2_pll1_refclk>;
> -                       clock-names = "cmn_refclk_dig_div", "cmn_refclk1_dig_div",
> -                                     "pll0_refclk", "pll1_refclk";
> -               };
> -       };
> -
> -       serdes_wiz3: wiz at 5030000 {
> -               compatible = "ti,j721e-wiz-16g";
> -               #address-cells = <1>;
> -               #size-cells = <1>;
> -               power-domains = <&k3_pds 295 TI_SCI_PD_EXCLUSIVE>;
> -               clocks = <&k3_clks 295 5>, <&k3_clks 295 9>, <&cmn_refclk>;
> -               clock-names = "fck", "core_ref_clk", "ext_ref_clk";
> -               assigned-clocks = <&k3_clks 295 9>, <&k3_clks 295 0>;
> -               assigned-clock-parents = <&k3_clks 295 13>, <&k3_clks 295 4>;
> -               num-lanes = <2>;
> -               #reset-cells = <1>;
> -               ranges = <0x5030000 0x0 0x5030000 0x10000>;
> -
> -               wiz3_pll0_refclk: pll0-refclk {
> -                       clocks = <&k3_clks 295 9>, <&cmn_refclk>;
> -                       #clock-cells = <0>;
> -                       assigned-clocks = <&wiz3_pll0_refclk>;
> -                       assigned-clock-parents = <&k3_clks 295 9>;
> -               };
> -
> -               wiz3_pll1_refclk: pll1-refclk {
> -                       clocks = <&k3_clks 295 0>, <&cmn_refclk1>;
> -                       #clock-cells = <0>;
> -                       assigned-clocks = <&wiz3_pll1_refclk>;
> -                       assigned-clock-parents = <&k3_clks 295 0>;
> -               };
> -
> -               wiz3_refclk_dig: refclk-dig {
> -                       clocks = <&k3_clks 295 9>, <&k3_clks 295 0>, <&cmn_refclk>, <&cmn_refclk1>;
> -                       #clock-cells = <0>;
> -                       assigned-clocks = <&wiz3_refclk_dig>;
> -                       assigned-clock-parents = <&k3_clks 295 9>;
> -               };
> -
> -               wiz3_cmn_refclk_dig_div: cmn-refclk-dig-div {
> -                       clocks = <&wiz3_refclk_dig>;
> -                       #clock-cells = <0>;
> -               };
> -
> -               wiz3_cmn_refclk1_dig_div: cmn-refclk1-dig-div {
> -                       clocks = <&wiz3_pll1_refclk>;
> -                       #clock-cells = <0>;
> -               };
> -
> -               serdes3: serdes at 5030000 {
> -                       compatible = "ti,sierra-phy-t0";
> -                       reg-names = "serdes";
> -                       reg = <0x5030000 0x10000>;
> -                       #address-cells = <1>;
> -                       #size-cells = <0>;
> -                       #clock-cells = <1>;
> -                       resets = <&serdes_wiz3 0>;
> -                       reset-names = "sierra_reset";
> -                       clocks = <&wiz3_cmn_refclk_dig_div>, <&wiz3_cmn_refclk1_dig_div>,
> -                                <&wiz3_pll0_refclk>, <&wiz3_pll1_refclk>;
> -                       clock-names = "cmn_refclk_dig_div", "cmn_refclk1_dig_div",
> -                                     "pll0_refclk", "pll1_refclk";
> -               };
> -       };
> -
> -       pcie0_rc: pcie at 2900000 {
> -               compatible = "ti,j721e-pcie-host";
> -               reg = <0x00 0x02900000 0x00 0x1000>,
> -                     <0x00 0x02907000 0x00 0x400>,
> -                     <0x00 0x0d000000 0x00 0x00800000>,
> -                     <0x00 0x10000000 0x00 0x00001000>;
> -               reg-names = "intd_cfg", "user_cfg", "reg", "cfg";
> -               interrupt-names = "link_state";
> -               interrupts = <GIC_SPI 318 IRQ_TYPE_EDGE_RISING>;
> -               device_type = "pci";
> -               ti,syscon-pcie-ctrl = <&scm_conf 0x4070>;
> -               max-link-speed = <3>;
> -               num-lanes = <2>;
> -               power-domains = <&k3_pds 239 TI_SCI_PD_EXCLUSIVE>;
> -               clocks = <&k3_clks 239 1>;
> -               clock-names = "fck";
> -               #address-cells = <3>;
> -               #size-cells = <2>;
> -               bus-range = <0x0 0xff>;
> -               vendor-id = <0x104c>;
> -               device-id = <0xb00d>;
> -               msi-map = <0x0 &gic_its 0x0 0x10000>;
> -               dma-coherent;
> -               ranges = <0x01000000 0x0 0x10001000 0x0 0x10001000 0x0 0x0010000>,
> -                        <0x02000000 0x0 0x10011000 0x0 0x10011000 0x0 0x7fef000>;
> -               dma-ranges = <0x02000000 0x0 0x0 0x0 0x0 0x10000 0x0>;
> -               status = "disabled";
> -       };
> -
> -       pcie1_rc: pcie at 2910000 {
> -               compatible = "ti,j721e-pcie-host";
> -               reg = <0x00 0x02910000 0x00 0x1000>,
> -                     <0x00 0x02917000 0x00 0x400>,
> -                     <0x00 0x0d800000 0x00 0x00800000>,
> -                     <0x00 0x18000000 0x00 0x00001000>;
> -               reg-names = "intd_cfg", "user_cfg", "reg", "cfg";
> -               interrupt-names = "link_state";
> -               interrupts = <GIC_SPI 330 IRQ_TYPE_EDGE_RISING>;
> -               device_type = "pci";
> -               ti,syscon-pcie-ctrl = <&scm_conf 0x4074>;
> -               max-link-speed = <3>;
> -               num-lanes = <2>;
> -               power-domains = <&k3_pds 240 TI_SCI_PD_EXCLUSIVE>;
> -               clocks = <&k3_clks 240 1>;
> -               clock-names = "fck";
> -               #address-cells = <3>;
> -               #size-cells = <2>;
> -               bus-range = <0x0 0xff>;
> -               vendor-id = <0x104c>;
> -               device-id = <0xb00d>;
> -               msi-map = <0x0 &gic_its 0x10000 0x10000>;
> -               dma-coherent;
> -               ranges = <0x01000000 0x0 0x18001000 0x0 0x18001000 0x0 0x0010000>,
> -                        <0x02000000 0x0 0x18011000 0x0 0x18011000 0x0 0x7fef000>;
> -               dma-ranges = <0x02000000 0x0 0x0 0x0 0x0 0x10000 0x0>;
> -               status = "disabled";
> -       };
> -
> -       pcie2_rc: pcie at 2920000 {
> -               compatible = "ti,j721e-pcie-host";
> -               reg = <0x00 0x02920000 0x00 0x1000>,
> -                     <0x00 0x02927000 0x00 0x400>,
> -                     <0x00 0x0e000000 0x00 0x00800000>,
> -                     <0x44 0x00000000 0x00 0x00001000>;
> -               reg-names = "intd_cfg", "user_cfg", "reg", "cfg";
> -               interrupt-names = "link_state";
> -               interrupts = <GIC_SPI 342 IRQ_TYPE_EDGE_RISING>;
> -               device_type = "pci";
> -               ti,syscon-pcie-ctrl = <&scm_conf 0x4078>;
> -               max-link-speed = <3>;
> -               num-lanes = <2>;
> -               power-domains = <&k3_pds 241 TI_SCI_PD_EXCLUSIVE>;
> -               clocks = <&k3_clks 241 1>;
> -               clock-names = "fck";
> -               #address-cells = <3>;
> -               #size-cells = <2>;
> -               bus-range = <0x0 0xff>;
> -               vendor-id = <0x104c>;
> -               device-id = <0xb00d>;
> -               msi-map = <0x0 &gic_its 0x20000 0x10000>;
> -               dma-coherent;
> -               ranges = <0x01000000 0x0 0x00001000 0x44 0x00001000 0x0 0x0010000>,
> -                        <0x02000000 0x0 0x00011000 0x44 0x00011000 0x0 0x7fef000>;
> -               dma-ranges = <0x02000000 0x0 0x0 0x0 0x0 0x10000 0x0>;
> -               status = "disabled";
> -       };
> -
> -       pcie3_rc: pcie at 2930000 {
> -               compatible = "ti,j721e-pcie-host";
> -               reg = <0x00 0x02930000 0x00 0x1000>,
> -                     <0x00 0x02937000 0x00 0x400>,
> -                     <0x00 0x0e800000 0x00 0x00800000>,
> -                     <0x44 0x10000000 0x00 0x00001000>;
> -               reg-names = "intd_cfg", "user_cfg", "reg", "cfg";
> -               interrupt-names = "link_state";
> -               interrupts = <GIC_SPI 354 IRQ_TYPE_EDGE_RISING>;
> -               device_type = "pci";
> -               ti,syscon-pcie-ctrl = <&scm_conf 0x407c>;
> -               max-link-speed = <3>;
> -               num-lanes = <2>;
> -               power-domains = <&k3_pds 242 TI_SCI_PD_EXCLUSIVE>;
> -               clocks = <&k3_clks 242 1>;
> -               clock-names = "fck";
> -               #address-cells = <3>;
> -               #size-cells = <2>;
> -               bus-range = <0x0 0xff>;
> -               vendor-id = <0x104c>;
> -               device-id = <0xb00d>;
> -               msi-map = <0x0 &gic_its 0x30000 0x10000>;
> -               dma-coherent;
> -               ranges = <0x01000000 0x0 0x00001000 0x44 0x10001000 0x0 0x0010000>,
> -                        <0x02000000 0x0 0x00011000 0x44 0x10011000 0x0 0x7fef000>;
> -               dma-ranges = <0x02000000 0x0 0x0 0x0 0x0 0x10000 0x0>;
> -               status = "disabled";
> -       };
> -
> -       serdes_wiz4: wiz at 5050000 {
> -               compatible = "ti,am64-wiz-10g";
> -               #address-cells = <1>;
> -               #size-cells = <1>;
> -               power-domains = <&k3_pds 297 TI_SCI_PD_EXCLUSIVE>;
> -               clocks = <&k3_clks 297 1>, <&k3_clks 297 9>, <&cmn_refclk>;
> -               clock-names = "fck", "core_ref_clk", "ext_ref_clk";
> -               assigned-clocks = <&k3_clks 297 9>;
> -               assigned-clock-parents = <&k3_clks 297 10>;
> -               assigned-clock-rates = <19200000>;
> -               num-lanes = <4>;
> -               #reset-cells = <1>;
> -               #clock-cells = <1>;
> -               ranges = <0x05050000 0x00 0x05050000 0x010000>,
> -                       <0x0a030a00 0x00 0x0a030a00 0x40>;
> -
> -               serdes4: serdes at 5050000 {
> -                       /*
> -                        * Note: we also map DPTX PHY registers as the Torrent
> -                        * needs to manage those.
> -                        */
> -                       compatible = "ti,j721e-serdes-10g";
> -                       reg = <0x05050000 0x010000>,
> -                             <0x0a030a00 0x40>; /* DPTX PHY */
> -                       reg-names = "torrent_phy", "dptx_phy";
> -
> -                       resets = <&serdes_wiz4 0>;
> -                       reset-names = "torrent_reset";
> -                       clocks = <&serdes_wiz4 TI_WIZ_PLL0_REFCLK>;
> -                       clock-names = "refclk";
> -                       assigned-clocks = <&serdes_wiz4 TI_WIZ_PLL0_REFCLK>,
> -                                         <&serdes_wiz4 TI_WIZ_PLL1_REFCLK>,
> -                                         <&serdes_wiz4 TI_WIZ_REFCLK_DIG>;
> -                       assigned-clock-parents = <&k3_clks 297 9>,
> -                                                <&k3_clks 297 9>,
> -                                                <&k3_clks 297 9>;
> -                       #address-cells = <1>;
> -                       #size-cells = <0>;
> -               };
> -       };
> -
> -       main_timer0: timer at 2400000 {
> -               compatible = "ti,am654-timer";
> -               reg = <0x00 0x2400000 0x00 0x400>;
> -               interrupts = <GIC_SPI 224 IRQ_TYPE_LEVEL_HIGH>;
> -               clocks = <&k3_clks 49 1>;
> -               clock-names = "fck";
> -               assigned-clocks = <&k3_clks 49 1>;
> -               assigned-clock-parents = <&k3_clks 49 2>;
> -               power-domains = <&k3_pds 49 TI_SCI_PD_EXCLUSIVE>;
> -               ti,timer-pwm;
> -       };
> -
> -       main_timer1: timer at 2410000 {
> -               compatible = "ti,am654-timer";
> -               reg = <0x00 0x2410000 0x00 0x400>;
> -               interrupts = <GIC_SPI 225 IRQ_TYPE_LEVEL_HIGH>;
> -               clocks = <&k3_clks 50 1>;
> -               clock-names = "fck";
> -               assigned-clocks = <&k3_clks 50 1>, <&k3_clks 327 0>;
> -               assigned-clock-parents = <&k3_clks 50 2>, <&k3_clks 327 1>;
> -               power-domains = <&k3_pds 50 TI_SCI_PD_EXCLUSIVE>;
> -               ti,timer-pwm;
> -       };
> -
> -       main_timer2: timer at 2420000 {
> -               compatible = "ti,am654-timer";
> -               reg = <0x00 0x2420000 0x00 0x400>;
> -               interrupts = <GIC_SPI 226 IRQ_TYPE_LEVEL_HIGH>;
> -               clocks = <&k3_clks 51 1>;
> -               clock-names = "fck";
> -               assigned-clocks = <&k3_clks 51 1>;
> -               assigned-clock-parents = <&k3_clks 51 2>;
> -               power-domains = <&k3_pds 51 TI_SCI_PD_EXCLUSIVE>;
> -               ti,timer-pwm;
> -       };
> -
> -       main_timer3: timer at 2430000 {
> -               compatible = "ti,am654-timer";
> -               reg = <0x00 0x2430000 0x00 0x400>;
> -               interrupts = <GIC_SPI 227 IRQ_TYPE_LEVEL_HIGH>;
> -               clocks = <&k3_clks 52 1>;
> -               clock-names = "fck";
> -               assigned-clocks = <&k3_clks 52 1>, <&k3_clks 328 0>;
> -               assigned-clock-parents = <&k3_clks 52 2>, <&k3_clks 328 1>;
> -               power-domains = <&k3_pds 52 TI_SCI_PD_EXCLUSIVE>;
> -               ti,timer-pwm;
> -       };
> -
> -       main_timer4: timer at 2440000 {
> -               compatible = "ti,am654-timer";
> -               reg = <0x00 0x2440000 0x00 0x400>;
> -               interrupts = <GIC_SPI 228 IRQ_TYPE_LEVEL_HIGH>;
> -               clocks = <&k3_clks 53 1>;
> -               clock-names = "fck";
> -               assigned-clocks = <&k3_clks 53 1>;
> -               assigned-clock-parents = <&k3_clks 53 2>;
> -               power-domains = <&k3_pds 53 TI_SCI_PD_EXCLUSIVE>;
> -               ti,timer-pwm;
> -       };
> -
> -       main_timer5: timer at 2450000 {
> -               compatible = "ti,am654-timer";
> -               reg = <0x00 0x2450000 0x00 0x400>;
> -               interrupts = <GIC_SPI 229 IRQ_TYPE_LEVEL_HIGH>;
> -               clocks = <&k3_clks 54 1>;
> -               clock-names = "fck";
> -               assigned-clocks = <&k3_clks 54 1>, <&k3_clks 329 0>;
> -               assigned-clock-parents = <&k3_clks 54 2>, <&k3_clks 329 1>;
> -               power-domains = <&k3_pds 54 TI_SCI_PD_EXCLUSIVE>;
> -               ti,timer-pwm;
> -       };
> -
> -       main_timer6: timer at 2460000 {
> -               compatible = "ti,am654-timer";
> -               reg = <0x00 0x2460000 0x00 0x400>;
> -               interrupts = <GIC_SPI 230 IRQ_TYPE_LEVEL_HIGH>;
> -               clocks = <&k3_clks 55 1>;
> -               clock-names = "fck";
> -               assigned-clocks = <&k3_clks 55 1>;
> -               assigned-clock-parents = <&k3_clks 55 2>;
> -               power-domains = <&k3_pds 55 TI_SCI_PD_EXCLUSIVE>;
> -               ti,timer-pwm;
> -       };
> -
> -       main_timer7: timer at 2470000 {
> -               compatible = "ti,am654-timer";
> -               reg = <0x00 0x2470000 0x00 0x400>;
> -               interrupts = <GIC_SPI 231 IRQ_TYPE_LEVEL_HIGH>;
> -               clocks = <&k3_clks 57 1>;
> -               clock-names = "fck";
> -               assigned-clocks = <&k3_clks 57 1>, <&k3_clks 330 0>;
> -               assigned-clock-parents = <&k3_clks 57 2>, <&k3_clks 330 1>;
> -               power-domains = <&k3_pds 57 TI_SCI_PD_EXCLUSIVE>;
> -               ti,timer-pwm;
> -       };
> -
> -       main_timer8: timer at 2480000 {
> -               compatible = "ti,am654-timer";
> -               reg = <0x00 0x2480000 0x00 0x400>;
> -               interrupts = <GIC_SPI 232 IRQ_TYPE_LEVEL_HIGH>;
> -               clocks = <&k3_clks 58 1>;
> -               clock-names = "fck";
> -               assigned-clocks = <&k3_clks 58 1>;
> -               assigned-clock-parents = <&k3_clks 58 2>;
> -               power-domains = <&k3_pds 58 TI_SCI_PD_EXCLUSIVE>;
> -               ti,timer-pwm;
> -       };
> -
> -       main_timer9: timer at 2490000 {
> -               compatible = "ti,am654-timer";
> -               reg = <0x00 0x2490000 0x00 0x400>;
> -               interrupts = <GIC_SPI 233 IRQ_TYPE_LEVEL_HIGH>;
> -               clocks = <&k3_clks 59 1>;
> -               clock-names = "fck";
> -               assigned-clocks = <&k3_clks 59 1>, <&k3_clks 331 0>;
> -               assigned-clock-parents = <&k3_clks 59 2>, <&k3_clks 331 1>;
> -               power-domains = <&k3_pds 59 TI_SCI_PD_EXCLUSIVE>;
> -               ti,timer-pwm;
> -       };
> -
> -       main_timer10: timer at 24a0000 {
> -               compatible = "ti,am654-timer";
> -               reg = <0x00 0x24a0000 0x00 0x400>;
> -               interrupts = <GIC_SPI 234 IRQ_TYPE_LEVEL_HIGH>;
> -               clocks = <&k3_clks 60 1>;
> -               clock-names = "fck";
> -               assigned-clocks = <&k3_clks 60 1>;
> -               assigned-clock-parents = <&k3_clks 60 2>;
> -               power-domains = <&k3_pds 60 TI_SCI_PD_EXCLUSIVE>;
> -               ti,timer-pwm;
> -       };
> -
> -       main_timer11: timer at 24b0000 {
> -               compatible = "ti,am654-timer";
> -               reg = <0x00 0x24b0000 0x00 0x400>;
> -               interrupts = <GIC_SPI 235 IRQ_TYPE_LEVEL_HIGH>;
> -               clocks = <&k3_clks 62 1>;
> -               clock-names = "fck";
> -               assigned-clocks = <&k3_clks 62 1>, <&k3_clks 332 0>;
> -               assigned-clock-parents = <&k3_clks 62 2>, <&k3_clks 332 1>;
> -               power-domains = <&k3_pds 62 TI_SCI_PD_EXCLUSIVE>;
> -               ti,timer-pwm;
> -       };
> -
> -       main_timer12: timer at 24c0000 {
> -               compatible = "ti,am654-timer";
> -               reg = <0x00 0x24c0000 0x00 0x400>;
> -               interrupts = <GIC_SPI 236 IRQ_TYPE_LEVEL_HIGH>;
> -               clocks = <&k3_clks 63 1>;
> -               clock-names = "fck";
> -               assigned-clocks = <&k3_clks 63 1>;
> -               assigned-clock-parents = <&k3_clks 63 2>;
> -               power-domains = <&k3_pds 63 TI_SCI_PD_EXCLUSIVE>;
> -               ti,timer-pwm;
> -       };
> -
> -       main_timer13: timer at 24d0000 {
> -               compatible = "ti,am654-timer";
> -               reg = <0x00 0x24d0000 0x00 0x400>;
> -               interrupts = <GIC_SPI 237 IRQ_TYPE_LEVEL_HIGH>;
> -               clocks = <&k3_clks 64 1>;
> -               clock-names = "fck";
> -               assigned-clocks = <&k3_clks 64 1>, <&k3_clks 333 0>;
> -               assigned-clock-parents = <&k3_clks 64 2>, <&k3_clks 333 1>;
> -               power-domains = <&k3_pds 64 TI_SCI_PD_EXCLUSIVE>;
> -               ti,timer-pwm;
> -       };
> -
> -       main_timer14: timer at 24e0000 {
> -               compatible = "ti,am654-timer";
> -               reg = <0x00 0x24e0000 0x00 0x400>;
> -               interrupts = <GIC_SPI 238 IRQ_TYPE_LEVEL_HIGH>;
> -               clocks = <&k3_clks 65 1>;
> -               clock-names = "fck";
> -               assigned-clocks = <&k3_clks 65 1>;
> -               assigned-clock-parents = <&k3_clks 65 2>;
> -               power-domains = <&k3_pds 65 TI_SCI_PD_EXCLUSIVE>;
> -               ti,timer-pwm;
> -       };
> -
> -       main_timer15: timer at 24f0000 {
> -               compatible = "ti,am654-timer";
> -               reg = <0x00 0x24f0000 0x00 0x400>;
> -               interrupts = <GIC_SPI 239 IRQ_TYPE_LEVEL_HIGH>;
> -               clocks = <&k3_clks 66 1>;
> -               clock-names = "fck";
> -               assigned-clocks = <&k3_clks 66 1>, <&k3_clks 334 0>;
> -               assigned-clock-parents = <&k3_clks 66 2>, <&k3_clks 334 1>;
> -               power-domains = <&k3_pds 66 TI_SCI_PD_EXCLUSIVE>;
> -               ti,timer-pwm;
> -       };
> -
> -       main_timer16: timer at 2500000 {
> -               compatible = "ti,am654-timer";
> -               reg = <0x00 0x2500000 0x00 0x400>;
> -               interrupts = <GIC_SPI 240 IRQ_TYPE_LEVEL_HIGH>;
> -               clocks = <&k3_clks 67 1>;
> -               clock-names = "fck";
> -               assigned-clocks = <&k3_clks 67 1>;
> -               assigned-clock-parents = <&k3_clks 67 2>;
> -               power-domains = <&k3_pds 67 TI_SCI_PD_EXCLUSIVE>;
> -               ti,timer-pwm;
> -       };
> -
> -       main_timer17: timer at 2510000 {
> -               compatible = "ti,am654-timer";
> -               reg = <0x00 0x2510000 0x00 0x400>;
> -               interrupts = <GIC_SPI 241 IRQ_TYPE_LEVEL_HIGH>;
> -               clocks = <&k3_clks 68 1>;
> -               clock-names = "fck";
> -               assigned-clocks = <&k3_clks 68 1>, <&k3_clks 335 0>;
> -               assigned-clock-parents = <&k3_clks 68 2>, <&k3_clks 335 1>;
> -               power-domains = <&k3_pds 68 TI_SCI_PD_EXCLUSIVE>;
> -               ti,timer-pwm;
> -       };
> -
> -       main_timer18: timer at 2520000 {
> -               compatible = "ti,am654-timer";
> -               reg = <0x00 0x2520000 0x00 0x400>;
> -               interrupts = <GIC_SPI 242 IRQ_TYPE_LEVEL_HIGH>;
> -               clocks = <&k3_clks 69 1>;
> -               clock-names = "fck";
> -               assigned-clocks = <&k3_clks 69 1>;
> -               assigned-clock-parents = <&k3_clks 69 2>;
> -               power-domains = <&k3_pds 69 TI_SCI_PD_EXCLUSIVE>;
> -               ti,timer-pwm;
> -       };
> -
> -       main_timer19: timer at 2530000 {
> -               compatible = "ti,am654-timer";
> -               reg = <0x00 0x2530000 0x00 0x400>;
> -               interrupts = <GIC_SPI 243 IRQ_TYPE_LEVEL_HIGH>;
> -               clocks = <&k3_clks 70 1>;
> -               clock-names = "fck";
> -               assigned-clocks = <&k3_clks 70 1>, <&k3_clks 336 0>;
> -               assigned-clock-parents = <&k3_clks 70 2>, <&k3_clks 336 1>;
> -               power-domains = <&k3_pds 70 TI_SCI_PD_EXCLUSIVE>;
> -               ti,timer-pwm;
> -       };
> -
> -       main_uart0: serial at 2800000 {
> -               compatible = "ti,j721e-uart", "ti,am654-uart";
> -               reg = <0x00 0x02800000 0x00 0x100>;
> -               interrupts = <GIC_SPI 192 IRQ_TYPE_LEVEL_HIGH>;
> -               clock-frequency = <48000000>;
> -               current-speed = <115200>;
> -               power-domains = <&k3_pds 146 TI_SCI_PD_EXCLUSIVE>;
> -               clocks = <&k3_clks 146 0>;
> -               clock-names = "fclk";
> -               status = "disabled";
> -       };
> -
> -       main_uart1: serial at 2810000 {
> -               compatible = "ti,j721e-uart", "ti,am654-uart";
> -               reg = <0x00 0x02810000 0x00 0x100>;
> -               interrupts = <GIC_SPI 193 IRQ_TYPE_LEVEL_HIGH>;
> -               clock-frequency = <48000000>;
> -               current-speed = <115200>;
> -               power-domains = <&k3_pds 278 TI_SCI_PD_EXCLUSIVE>;
> -               clocks = <&k3_clks 278 0>;
> -               clock-names = "fclk";
> -               status = "disabled";
> -       };
> -
> -       main_uart2: serial at 2820000 {
> -               compatible = "ti,j721e-uart", "ti,am654-uart";
> -               reg = <0x00 0x02820000 0x00 0x100>;
> -               interrupts = <GIC_SPI 194 IRQ_TYPE_LEVEL_HIGH>;
> -               clock-frequency = <48000000>;
> -               current-speed = <115200>;
> -               power-domains = <&k3_pds 279 TI_SCI_PD_EXCLUSIVE>;
> -               clocks = <&k3_clks 279 0>;
> -               clock-names = "fclk";
> -               status = "disabled";
> -       };
> -
> -       main_uart3: serial at 2830000 {
> -               compatible = "ti,j721e-uart", "ti,am654-uart";
> -               reg = <0x00 0x02830000 0x00 0x100>;
> -               interrupts = <GIC_SPI 195 IRQ_TYPE_LEVEL_HIGH>;
> -               clock-frequency = <48000000>;
> -               current-speed = <115200>;
> -               power-domains = <&k3_pds 280 TI_SCI_PD_EXCLUSIVE>;
> -               clocks = <&k3_clks 280 0>;
> -               clock-names = "fclk";
> -               status = "disabled";
> -       };
> -
> -       main_uart4: serial at 2840000 {
> -               compatible = "ti,j721e-uart", "ti,am654-uart";
> -               reg = <0x00 0x02840000 0x00 0x100>;
> -               interrupts = <GIC_SPI 196 IRQ_TYPE_LEVEL_HIGH>;
> -               clock-frequency = <48000000>;
> -               current-speed = <115200>;
> -               power-domains = <&k3_pds 281 TI_SCI_PD_EXCLUSIVE>;
> -               clocks = <&k3_clks 281 0>;
> -               clock-names = "fclk";
> -               status = "disabled";
> -       };
> -
> -       main_uart5: serial at 2850000 {
> -               compatible = "ti,j721e-uart", "ti,am654-uart";
> -               reg = <0x00 0x02850000 0x00 0x100>;
> -               interrupts = <GIC_SPI 197 IRQ_TYPE_LEVEL_HIGH>;
> -               clock-frequency = <48000000>;
> -               current-speed = <115200>;
> -               power-domains = <&k3_pds 282 TI_SCI_PD_EXCLUSIVE>;
> -               clocks = <&k3_clks 282 0>;
> -               clock-names = "fclk";
> -               status = "disabled";
> -       };
> -
> -       main_uart6: serial at 2860000 {
> -               compatible = "ti,j721e-uart", "ti,am654-uart";
> -               reg = <0x00 0x02860000 0x00 0x100>;
> -               interrupts = <GIC_SPI 198 IRQ_TYPE_LEVEL_HIGH>;
> -               clock-frequency = <48000000>;
> -               current-speed = <115200>;
> -               power-domains = <&k3_pds 283 TI_SCI_PD_EXCLUSIVE>;
> -               clocks = <&k3_clks 283 0>;
> -               clock-names = "fclk";
> -               status = "disabled";
> -       };
> -
> -       main_uart7: serial at 2870000 {
> -               compatible = "ti,j721e-uart", "ti,am654-uart";
> -               reg = <0x00 0x02870000 0x00 0x100>;
> -               interrupts = <GIC_SPI 199 IRQ_TYPE_LEVEL_HIGH>;
> -               clock-frequency = <48000000>;
> -               current-speed = <115200>;
> -               power-domains = <&k3_pds 284 TI_SCI_PD_EXCLUSIVE>;
> -               clocks = <&k3_clks 284 0>;
> -               clock-names = "fclk";
> -               status = "disabled";
> -       };
> -
> -       main_uart8: serial at 2880000 {
> -               compatible = "ti,j721e-uart", "ti,am654-uart";
> -               reg = <0x00 0x02880000 0x00 0x100>;
> -               interrupts = <GIC_SPI 248 IRQ_TYPE_LEVEL_HIGH>;
> -               clock-frequency = <48000000>;
> -               current-speed = <115200>;
> -               power-domains = <&k3_pds 285 TI_SCI_PD_EXCLUSIVE>;
> -               clocks = <&k3_clks 285 0>;
> -               clock-names = "fclk";
> -               status = "disabled";
> -       };
> -
> -       main_uart9: serial at 2890000 {
> -               compatible = "ti,j721e-uart", "ti,am654-uart";
> -               reg = <0x00 0x02890000 0x00 0x100>;
> -               interrupts = <GIC_SPI 249 IRQ_TYPE_LEVEL_HIGH>;
> -               clock-frequency = <48000000>;
> -               current-speed = <115200>;
> -               power-domains = <&k3_pds 286 TI_SCI_PD_EXCLUSIVE>;
> -               clocks = <&k3_clks 286 0>;
> -               clock-names = "fclk";
> -               status = "disabled";
> -       };
> -
> -       main_gpio0: gpio at 600000 {
> -               compatible = "ti,j721e-gpio", "ti,keystone-gpio";
> -               reg = <0x0 0x00600000 0x0 0x100>;
> -               gpio-controller;
> -               #gpio-cells = <2>;
> -               interrupt-parent = <&main_gpio_intr>;
> -               interrupts = <256>, <257>, <258>, <259>,
> -                            <260>, <261>, <262>, <263>;
> -               interrupt-controller;
> -               #interrupt-cells = <2>;
> -               ti,ngpio = <128>;
> -               ti,davinci-gpio-unbanked = <0>;
> -               power-domains = <&k3_pds 105 TI_SCI_PD_EXCLUSIVE>;
> -               clocks = <&k3_clks 105 0>;
> -               clock-names = "gpio";
> -               status = "disabled";
> -       };
> -
> -       main_gpio1: gpio at 601000 {
> -               compatible = "ti,j721e-gpio", "ti,keystone-gpio";
> -               reg = <0x0 0x00601000 0x0 0x100>;
> -               gpio-controller;
> -               #gpio-cells = <2>;
> -               interrupt-parent = <&main_gpio_intr>;
> -               interrupts = <288>, <289>, <290>;
> -               interrupt-controller;
> -               #interrupt-cells = <2>;
> -               ti,ngpio = <36>;
> -               ti,davinci-gpio-unbanked = <0>;
> -               power-domains = <&k3_pds 106 TI_SCI_PD_EXCLUSIVE>;
> -               clocks = <&k3_clks 106 0>;
> -               clock-names = "gpio";
> -               status = "disabled";
> -       };
> -
> -       main_gpio2: gpio at 610000 {
> -               compatible = "ti,j721e-gpio", "ti,keystone-gpio";
> -               reg = <0x0 0x00610000 0x0 0x100>;
> -               gpio-controller;
> -               #gpio-cells = <2>;
> -               interrupt-parent = <&main_gpio_intr>;
> -               interrupts = <264>, <265>, <266>, <267>,
> -                            <268>, <269>, <270>, <271>;
> -               interrupt-controller;
> -               #interrupt-cells = <2>;
> -               ti,ngpio = <128>;
> -               ti,davinci-gpio-unbanked = <0>;
> -               power-domains = <&k3_pds 107 TI_SCI_PD_EXCLUSIVE>;
> -               clocks = <&k3_clks 107 0>;
> -               clock-names = "gpio";
> -               status = "disabled";
> -       };
> -
> -       main_gpio3: gpio at 611000 {
> -               compatible = "ti,j721e-gpio", "ti,keystone-gpio";
> -               reg = <0x0 0x00611000 0x0 0x100>;
> -               gpio-controller;
> -               #gpio-cells = <2>;
> -               interrupt-parent = <&main_gpio_intr>;
> -               interrupts = <292>, <293>, <294>;
> -               interrupt-controller;
> -               #interrupt-cells = <2>;
> -               ti,ngpio = <36>;
> -               ti,davinci-gpio-unbanked = <0>;
> -               power-domains = <&k3_pds 108 TI_SCI_PD_EXCLUSIVE>;
> -               clocks = <&k3_clks 108 0>;
> -               clock-names = "gpio";
> -               status = "disabled";
> -       };
> -
> -       main_gpio4: gpio at 620000 {
> -               compatible = "ti,j721e-gpio", "ti,keystone-gpio";
> -               reg = <0x0 0x00620000 0x0 0x100>;
> -               gpio-controller;
> -               #gpio-cells = <2>;
> -               interrupt-parent = <&main_gpio_intr>;
> -               interrupts = <272>, <273>, <274>, <275>,
> -                            <276>, <277>, <278>, <279>;
> -               interrupt-controller;
> -               #interrupt-cells = <2>;
> -               ti,ngpio = <128>;
> -               ti,davinci-gpio-unbanked = <0>;
> -               power-domains = <&k3_pds 109 TI_SCI_PD_EXCLUSIVE>;
> -               clocks = <&k3_clks 109 0>;
> -               clock-names = "gpio";
> -               status = "disabled";
> -       };
> -
> -       main_gpio5: gpio at 621000 {
> -               compatible = "ti,j721e-gpio", "ti,keystone-gpio";
> -               reg = <0x0 0x00621000 0x0 0x100>;
> -               gpio-controller;
> -               #gpio-cells = <2>;
> -               interrupt-parent = <&main_gpio_intr>;
> -               interrupts = <296>, <297>, <298>;
> -               interrupt-controller;
> -               #interrupt-cells = <2>;
> -               ti,ngpio = <36>;
> -               ti,davinci-gpio-unbanked = <0>;
> -               power-domains = <&k3_pds 110 TI_SCI_PD_EXCLUSIVE>;
> -               clocks = <&k3_clks 110 0>;
> -               clock-names = "gpio";
> -               status = "disabled";
> -       };
> -
> -       main_gpio6: gpio at 630000 {
> -               compatible = "ti,j721e-gpio", "ti,keystone-gpio";
> -               reg = <0x0 0x00630000 0x0 0x100>;
> -               gpio-controller;
> -               #gpio-cells = <2>;
> -               interrupt-parent = <&main_gpio_intr>;
> -               interrupts = <280>, <281>, <282>, <283>,
> -                            <284>, <285>, <286>, <287>;
> -               interrupt-controller;
> -               #interrupt-cells = <2>;
> -               ti,ngpio = <128>;
> -               ti,davinci-gpio-unbanked = <0>;
> -               power-domains = <&k3_pds 111 TI_SCI_PD_EXCLUSIVE>;
> -               clocks = <&k3_clks 111 0>;
> -               clock-names = "gpio";
> -               status = "disabled";
> -       };
> -
> -       main_gpio7: gpio at 631000 {
> -               compatible = "ti,j721e-gpio", "ti,keystone-gpio";
> -               reg = <0x0 0x00631000 0x0 0x100>;
> -               gpio-controller;
> -               #gpio-cells = <2>;
> -               interrupt-parent = <&main_gpio_intr>;
> -               interrupts = <300>, <301>, <302>;
> -               interrupt-controller;
> -               #interrupt-cells = <2>;
> -               ti,ngpio = <36>;
> -               ti,davinci-gpio-unbanked = <0>;
> -               power-domains = <&k3_pds 112 TI_SCI_PD_EXCLUSIVE>;
> -               clocks = <&k3_clks 112 0>;
> -               clock-names = "gpio";
> -               status = "disabled";
> -       };
> -
> -       main_sdhci0: mmc at 4f80000 {
> -               compatible = "ti,j721e-sdhci-8bit";
> -               reg = <0x0 0x4f80000 0x0 0x1000>, <0x0 0x4f88000 0x0 0x400>;
> -               interrupts = <GIC_SPI 3 IRQ_TYPE_LEVEL_HIGH>;
> -               power-domains = <&k3_pds 91 TI_SCI_PD_EXCLUSIVE>;
> -               clock-names = "clk_ahb", "clk_xin";
> -               clocks = <&k3_clks 91 0>, <&k3_clks 91 1>;
> -               assigned-clocks = <&k3_clks 91 1>;
> -               assigned-clock-parents = <&k3_clks 91 2>;
> -               bus-width = <8>;
> -               mmc-hs200-1_8v;
> -               mmc-ddr-1_8v;
> -               ti,otap-del-sel-legacy = <0x0>;
> -               ti,otap-del-sel-mmc-hs = <0x0>;
> -               ti,otap-del-sel-ddr52 = <0x5>;
> -               ti,otap-del-sel-hs200 = <0x6>;
> -               ti,otap-del-sel-hs400 = <0x0>;
> -               ti,itap-del-sel-legacy = <0x10>;
> -               ti,itap-del-sel-mmc-hs = <0xa>;
> -               ti,itap-del-sel-ddr52 = <0x3>;
> -               ti,trm-icp = <0x8>;
> -               dma-coherent;
> -               status = "disabled";
> -       };
> -
> -       main_sdhci1: mmc at 4fb0000 {
> -               compatible = "ti,j721e-sdhci-4bit";
> -               reg = <0x0 0x04fb0000 0x0 0x1000>, <0x0 0x4fb8000 0x0 0x400>;
> -               interrupts = <GIC_SPI 4 IRQ_TYPE_LEVEL_HIGH>;
> -               power-domains = <&k3_pds 92 TI_SCI_PD_EXCLUSIVE>;
> -               clock-names = "clk_ahb", "clk_xin";
> -               clocks = <&k3_clks 92 5>, <&k3_clks 92 0>;
> -               assigned-clocks = <&k3_clks 92 0>;
> -               assigned-clock-parents = <&k3_clks 92 1>;
> -               ti,otap-del-sel-legacy = <0x0>;
> -               ti,otap-del-sel-sd-hs = <0x0>;
> -               ti,otap-del-sel-sdr12 = <0xf>;
> -               ti,otap-del-sel-sdr25 = <0xf>;
> -               ti,otap-del-sel-sdr50 = <0xc>;
> -               ti,otap-del-sel-ddr50 = <0xc>;
> -               ti,otap-del-sel-sdr104 = <0x5>;
> -               ti,itap-del-sel-legacy = <0x0>;
> -               ti,itap-del-sel-sd-hs = <0x0>;
> -               ti,itap-del-sel-sdr12 = <0x0>;
> -               ti,itap-del-sel-sdr25 = <0x0>;
> -               ti,itap-del-sel-ddr50 = <0x2>;
> -               ti,trm-icp = <0x8>;
> -               ti,clkbuf-sel = <0x7>;
> -               dma-coherent;
> -               sdhci-caps-mask = <0x2 0x0>;
> -               status = "disabled";
> -       };
> -
> -       main_sdhci2: mmc at 4f98000 {
> -               compatible = "ti,j721e-sdhci-4bit";
> -               reg = <0x0 0x4f98000 0x0 0x1000>, <0x0 0x4f90000 0x0 0x400>;
> -               interrupts = <GIC_SPI 5 IRQ_TYPE_LEVEL_HIGH>;
> -               power-domains = <&k3_pds 93 TI_SCI_PD_EXCLUSIVE>;
> -               clock-names = "clk_ahb", "clk_xin";
> -               clocks = <&k3_clks 93 5>, <&k3_clks 93 0>;
> -               assigned-clocks = <&k3_clks 93 0>;
> -               assigned-clock-parents = <&k3_clks 93 1>;
> -               ti,otap-del-sel-legacy = <0x0>;
> -               ti,otap-del-sel-sd-hs = <0x0>;
> -               ti,otap-del-sel-sdr12 = <0xf>;
> -               ti,otap-del-sel-sdr25 = <0xf>;
> -               ti,otap-del-sel-sdr50 = <0xc>;
> -               ti,otap-del-sel-ddr50 = <0xc>;
> -               ti,otap-del-sel-sdr104 = <0x5>;
> -               ti,itap-del-sel-legacy = <0x0>;
> -               ti,itap-del-sel-sd-hs = <0x0>;
> -               ti,itap-del-sel-sdr12 = <0x0>;
> -               ti,itap-del-sel-sdr25 = <0x0>;
> -               ti,itap-del-sel-ddr50 = <0x2>;
> -               ti,trm-icp = <0x8>;
> -               ti,clkbuf-sel = <0x7>;
> -               dma-coherent;
> -               sdhci-caps-mask = <0x2 0x0>;
> -               status = "disabled";
> -       };
> -
> -       usbss0: cdns-usb at 4104000 {
> -               compatible = "ti,j721e-usb";
> -               reg = <0x00 0x4104000 0x00 0x100>;
> -               dma-coherent;
> -               power-domains = <&k3_pds 288 TI_SCI_PD_EXCLUSIVE>;
> -               clocks = <&k3_clks 288 15>, <&k3_clks 288 3>;
> -               clock-names = "ref", "lpm";
> -               assigned-clocks = <&k3_clks 288 15>;    /* USB2_REFCLK */
> -               assigned-clock-parents = <&k3_clks 288 16>; /* HFOSC0 */
> -               #address-cells = <2>;
> -               #size-cells = <2>;
> -               ranges;
> -
> -               usb0: usb at 6000000 {
> -                       compatible = "cdns,usb3";
> -                       reg = <0x00 0x6000000 0x00 0x10000>,
> -                             <0x00 0x6010000 0x00 0x10000>,
> -                             <0x00 0x6020000 0x00 0x10000>;
> -                       reg-names = "otg", "xhci", "dev";
> -                       interrupts = <GIC_SPI 96 IRQ_TYPE_LEVEL_HIGH>,  /* irq.0 */
> -                                    <GIC_SPI 102 IRQ_TYPE_LEVEL_HIGH>, /* irq.6 */
> -                                    <GIC_SPI 120 IRQ_TYPE_LEVEL_HIGH>; /* otgirq.0 */
> -                       interrupt-names = "host",
> -                                         "peripheral",
> -                                         "otg";
> -                       maximum-speed = "super-speed";
> -                       dr_mode = "otg";
> -               };
> -       };
> -
> -       usbss1: cdns-usb at 4114000 {
> -               compatible = "ti,j721e-usb";
> -               reg = <0x00 0x4114000 0x00 0x100>;
> -               dma-coherent;
> -               power-domains = <&k3_pds 289 TI_SCI_PD_EXCLUSIVE>;
> -               clocks = <&k3_clks 289 15>, <&k3_clks 289 3>;
> -               clock-names = "ref", "lpm";
> -               assigned-clocks = <&k3_clks 289 15>;    /* USB2_REFCLK */
> -               assigned-clock-parents = <&k3_clks 289 16>; /* HFOSC0 */
> -               #address-cells = <2>;
> -               #size-cells = <2>;
> -               ranges;
> -
> -               usb1: usb at 6400000 {
> -                       compatible = "cdns,usb3";
> -                       reg = <0x00 0x6400000 0x00 0x10000>,
> -                             <0x00 0x6410000 0x00 0x10000>,
> -                             <0x00 0x6420000 0x00 0x10000>;
> -                       reg-names = "otg", "xhci", "dev";
> -                       interrupts = <GIC_SPI 104 IRQ_TYPE_LEVEL_HIGH>, /* irq.0 */
> -                                    <GIC_SPI 110 IRQ_TYPE_LEVEL_HIGH>, /* irq.6 */
> -                                    <GIC_SPI 121 IRQ_TYPE_LEVEL_HIGH>; /* otgirq.0 */
> -                       interrupt-names = "host",
> -                                         "peripheral",
> -                                         "otg";
> -                       maximum-speed = "super-speed";
> -                       dr_mode = "otg";
> -               };
> -       };
> -
> -       main_i2c0: i2c at 2000000 {
> -               compatible = "ti,j721e-i2c", "ti,omap4-i2c";
> -               reg = <0x0 0x2000000 0x0 0x100>;
> -               interrupts = <GIC_SPI 200 IRQ_TYPE_LEVEL_HIGH>;
> -               #address-cells = <1>;
> -               #size-cells = <0>;
> -               clock-names = "fck";
> -               clocks = <&k3_clks 187 0>;
> -               power-domains = <&k3_pds 187 TI_SCI_PD_SHARED>;
> -               status = "disabled";
> -       };
> -
> -       main_i2c1: i2c at 2010000 {
> -               compatible = "ti,j721e-i2c", "ti,omap4-i2c";
> -               reg = <0x0 0x2010000 0x0 0x100>;
> -               interrupts = <GIC_SPI 201 IRQ_TYPE_LEVEL_HIGH>;
> -               #address-cells = <1>;
> -               #size-cells = <0>;
> -               clock-names = "fck";
> -               clocks = <&k3_clks 188 0>;
> -               power-domains = <&k3_pds 188 TI_SCI_PD_EXCLUSIVE>;
> -               status = "disabled";
> -       };
> -
> -       main_i2c2: i2c at 2020000 {
> -               compatible = "ti,j721e-i2c", "ti,omap4-i2c";
> -               reg = <0x0 0x2020000 0x0 0x100>;
> -               interrupts = <GIC_SPI 202 IRQ_TYPE_LEVEL_HIGH>;
> -               #address-cells = <1>;
> -               #size-cells = <0>;
> -               clock-names = "fck";
> -               clocks = <&k3_clks 189 0>;
> -               power-domains = <&k3_pds 189 TI_SCI_PD_EXCLUSIVE>;
> -               status = "disabled";
> -       };
> -
> -       main_i2c3: i2c at 2030000 {
> -               compatible = "ti,j721e-i2c", "ti,omap4-i2c";
> -               reg = <0x0 0x2030000 0x0 0x100>;
> -               interrupts = <GIC_SPI 203 IRQ_TYPE_LEVEL_HIGH>;
> -               #address-cells = <1>;
> -               #size-cells = <0>;
> -               clock-names = "fck";
> -               clocks = <&k3_clks 190 0>;
> -               power-domains = <&k3_pds 190 TI_SCI_PD_EXCLUSIVE>;
> -               status = "disabled";
> -       };
> -
> -       main_i2c4: i2c at 2040000 {
> -               compatible = "ti,j721e-i2c", "ti,omap4-i2c";
> -               reg = <0x0 0x2040000 0x0 0x100>;
> -               interrupts = <GIC_SPI 204 IRQ_TYPE_LEVEL_HIGH>;
> -               #address-cells = <1>;
> -               #size-cells = <0>;
> -               clock-names = "fck";
> -               clocks = <&k3_clks 191 0>;
> -               power-domains = <&k3_pds 191 TI_SCI_PD_EXCLUSIVE>;
> -               status = "disabled";
> -       };
> -
> -       main_i2c5: i2c at 2050000 {
> -               compatible = "ti,j721e-i2c", "ti,omap4-i2c";
> -               reg = <0x0 0x2050000 0x0 0x100>;
> -               interrupts = <GIC_SPI 205 IRQ_TYPE_LEVEL_HIGH>;
> -               #address-cells = <1>;
> -               #size-cells = <0>;
> -               clock-names = "fck";
> -               clocks = <&k3_clks 192 0>;
> -               power-domains = <&k3_pds 192 TI_SCI_PD_EXCLUSIVE>;
> -               status = "disabled";
> -       };
> -
> -       main_i2c6: i2c at 2060000 {
> -               compatible = "ti,j721e-i2c", "ti,omap4-i2c";
> -               reg = <0x0 0x2060000 0x0 0x100>;
> -               interrupts = <GIC_SPI 206 IRQ_TYPE_LEVEL_HIGH>;
> -               #address-cells = <1>;
> -               #size-cells = <0>;
> -               clock-names = "fck";
> -               clocks = <&k3_clks 193 0>;
> -               power-domains = <&k3_pds 193 TI_SCI_PD_EXCLUSIVE>;
> -               status = "disabled";
> -       };
> -
> -       ufs_wrapper: ufs-wrapper at 4e80000 {
> -               compatible = "ti,j721e-ufs";
> -               reg = <0x0 0x4e80000 0x0 0x100>;
> -               power-domains = <&k3_pds 277 TI_SCI_PD_EXCLUSIVE>;
> -               clocks = <&k3_clks 277 1>;
> -               assigned-clocks = <&k3_clks 277 1>;
> -               assigned-clock-parents = <&k3_clks 277 4>;
> -               ranges;
> -               #address-cells = <2>;
> -               #size-cells = <2>;
> -
> -               ufs at 4e84000 {
> -                       compatible = "cdns,ufshc-m31-16nm", "jedec,ufs-2.0";
> -                       reg = <0x0 0x4e84000 0x0 0x10000>;
> -                       interrupts = <GIC_SPI 17 IRQ_TYPE_LEVEL_HIGH>;
> -                       freq-table-hz = <250000000 250000000>, <19200000 19200000>, <19200000 19200000>;
> -                       clocks = <&k3_clks 277 0>, <&k3_clks 277 1>, <&k3_clks 277 1>;
> -                       clock-names = "core_clk", "phy_clk", "ref_clk";
> -                       dma-coherent;
> -               };
> -       };
> -
> -       mhdp: dp-bridge at a000000 {
> -               compatible = "ti,j721e-mhdp8546";
> -               /*
> -                * Note: we do not map DPTX PHY area, as that is handled by
> -                * the PHY driver.
> -                */
> -               reg = <0x00 0x0a000000 0x00 0x030a00>, /* DSS_EDP0_V2A_CORE_VP_REGS_APB */
> -                     <0x00 0x04f40000 0x00 0x20>;    /* DSS_EDP0_INTG_CFG_VP */
> -               reg-names = "mhdptx", "j721e-intg";
> -
> -               clocks = <&k3_clks 151 36>;
> -
> -               interrupt-parent = <&gic500>;
> -               interrupts = <GIC_SPI 614 IRQ_TYPE_LEVEL_HIGH>;
> -
> -               power-domains = <&k3_pds 151 TI_SCI_PD_EXCLUSIVE>;
> -
> -               dp0_ports: ports {
> -                       #address-cells = <1>;
> -                       #size-cells = <0>;
> -
> -                       port at 0 {
> -                           reg = <0>;
> -                       };
> -
> -                       port at 4 {
> -                           reg = <4>;
> -                       };
> -               };
> -       };
> -
> -       dss: dss at 4a00000 {
> -               compatible = "ti,j721e-dss";
> -               reg =
> -                       <0x00 0x04a00000 0x00 0x10000>, /* common_m */
> -                       <0x00 0x04a10000 0x00 0x10000>, /* common_s0*/
> -                       <0x00 0x04b00000 0x00 0x10000>, /* common_s1*/
> -                       <0x00 0x04b10000 0x00 0x10000>, /* common_s2*/
> -
> -                       <0x00 0x04a20000 0x00 0x10000>, /* vidl1 */
> -                       <0x00 0x04a30000 0x00 0x10000>, /* vidl2 */
> -                       <0x00 0x04a50000 0x00 0x10000>, /* vid1 */
> -                       <0x00 0x04a60000 0x00 0x10000>, /* vid2 */
> -
> -                       <0x00 0x04a70000 0x00 0x10000>, /* ovr1 */
> -                       <0x00 0x04a90000 0x00 0x10000>, /* ovr2 */
> -                       <0x00 0x04ab0000 0x00 0x10000>, /* ovr3 */
> -                       <0x00 0x04ad0000 0x00 0x10000>, /* ovr4 */
> -
> -                       <0x00 0x04a80000 0x00 0x10000>, /* vp1 */
> -                       <0x00 0x04aa0000 0x00 0x10000>, /* vp2 */
> -                       <0x00 0x04ac0000 0x00 0x10000>, /* vp3 */
> -                       <0x00 0x04ae0000 0x00 0x10000>, /* vp4 */
> -                       <0x00 0x04af0000 0x00 0x10000>; /* wb */
> -
> -               reg-names = "common_m", "common_s0",
> -                       "common_s1", "common_s2",
> -                       "vidl1", "vidl2","vid1","vid2",
> -                       "ovr1", "ovr2", "ovr3", "ovr4",
> -                       "vp1", "vp2", "vp3", "vp4",
> -                       "wb";
> -
> -               clocks = <&k3_clks 152 0>,
> -                        <&k3_clks 152 1>,
> -                        <&k3_clks 152 4>,
> -                        <&k3_clks 152 9>,
> -                        <&k3_clks 152 13>;
> -               clock-names = "fck", "vp1", "vp2", "vp3", "vp4";
> -
> -               power-domains = <&k3_pds 152 TI_SCI_PD_EXCLUSIVE>;
> -
> -               interrupts = <GIC_SPI 602 IRQ_TYPE_LEVEL_HIGH>,
> -                            <GIC_SPI 603 IRQ_TYPE_LEVEL_HIGH>,
> -                            <GIC_SPI 604 IRQ_TYPE_LEVEL_HIGH>,
> -                            <GIC_SPI 605 IRQ_TYPE_LEVEL_HIGH>;
> -               interrupt-names = "common_m",
> -                                 "common_s0",
> -                                 "common_s1",
> -                                 "common_s2";
> -
> -               dss_ports: ports {
> -               };
> -       };
> -
> -       mcasp0: mcasp at 2b00000 {
> -               compatible = "ti,am33xx-mcasp-audio";
> -               reg = <0x0 0x02b00000 0x0 0x2000>,
> -                       <0x0 0x02b08000 0x0 0x1000>;
> -               reg-names = "mpu","dat";
> -               interrupts = <GIC_SPI 544 IRQ_TYPE_LEVEL_HIGH>,
> -                               <GIC_SPI 545 IRQ_TYPE_LEVEL_HIGH>;
> -               interrupt-names = "tx", "rx";
> -
> -               dmas = <&main_udmap 0xc400>, <&main_udmap 0x4400>;
> -               dma-names = "tx", "rx";
> -
> -               clocks = <&k3_clks 174 1>;
> -               clock-names = "fck";
> -               power-domains = <&k3_pds 174 TI_SCI_PD_EXCLUSIVE>;
> -               status = "disabled";
> -       };
> -
> -       mcasp1: mcasp at 2b10000 {
> -               compatible = "ti,am33xx-mcasp-audio";
> -               reg = <0x0 0x02b10000 0x0 0x2000>,
> -                       <0x0 0x02b18000 0x0 0x1000>;
> -               reg-names = "mpu","dat";
> -               interrupts = <GIC_SPI 546 IRQ_TYPE_LEVEL_HIGH>,
> -                               <GIC_SPI 547 IRQ_TYPE_LEVEL_HIGH>;
> -               interrupt-names = "tx", "rx";
> -
> -               dmas = <&main_udmap 0xc401>, <&main_udmap 0x4401>;
> -               dma-names = "tx", "rx";
> -
> -               clocks = <&k3_clks 175 1>;
> -               clock-names = "fck";
> -               power-domains = <&k3_pds 175 TI_SCI_PD_EXCLUSIVE>;
> -               status = "disabled";
> -       };
> -
> -       mcasp2: mcasp at 2b20000 {
> -               compatible = "ti,am33xx-mcasp-audio";
> -               reg = <0x0 0x02b20000 0x0 0x2000>,
> -                       <0x0 0x02b28000 0x0 0x1000>;
> -               reg-names = "mpu","dat";
> -               interrupts = <GIC_SPI 548 IRQ_TYPE_LEVEL_HIGH>,
> -                               <GIC_SPI 549 IRQ_TYPE_LEVEL_HIGH>;
> -               interrupt-names = "tx", "rx";
> -
> -               dmas = <&main_udmap 0xc402>, <&main_udmap 0x4402>;
> -               dma-names = "tx", "rx";
> -
> -               clocks = <&k3_clks 176 1>;
> -               clock-names = "fck";
> -               power-domains = <&k3_pds 176 TI_SCI_PD_EXCLUSIVE>;
> -               status = "disabled";
> -       };
> -
> -       mcasp3: mcasp at 2b30000 {
> -               compatible = "ti,am33xx-mcasp-audio";
> -               reg = <0x0 0x02b30000 0x0 0x2000>,
> -                       <0x0 0x02b38000 0x0 0x1000>;
> -               reg-names = "mpu","dat";
> -               interrupts = <GIC_SPI 550 IRQ_TYPE_LEVEL_HIGH>,
> -                               <GIC_SPI 551 IRQ_TYPE_LEVEL_HIGH>;
> -               interrupt-names = "tx", "rx";
> -
> -               dmas = <&main_udmap 0xc500>, <&main_udmap 0x4500>;
> -               dma-names = "tx", "rx";
> -
> -               clocks = <&k3_clks 177 1>;
> -               clock-names = "fck";
> -               power-domains = <&k3_pds 177 TI_SCI_PD_EXCLUSIVE>;
> -               status = "disabled";
> -       };
> -
> -       mcasp4: mcasp at 2b40000 {
> -               compatible = "ti,am33xx-mcasp-audio";
> -               reg = <0x0 0x02b40000 0x0 0x2000>,
> -                       <0x0 0x02b48000 0x0 0x1000>;
> -               reg-names = "mpu","dat";
> -               interrupts = <GIC_SPI 552 IRQ_TYPE_LEVEL_HIGH>,
> -                               <GIC_SPI 553 IRQ_TYPE_LEVEL_HIGH>;
> -               interrupt-names = "tx", "rx";
> -
> -               dmas = <&main_udmap 0xc501>, <&main_udmap 0x4501>;
> -               dma-names = "tx", "rx";
> -
> -               clocks = <&k3_clks 178 1>;
> -               clock-names = "fck";
> -               power-domains = <&k3_pds 178 TI_SCI_PD_EXCLUSIVE>;
> -               status = "disabled";
> -       };
> -
> -       mcasp5: mcasp at 2b50000 {
> -               compatible = "ti,am33xx-mcasp-audio";
> -               reg = <0x0 0x02b50000 0x0 0x2000>,
> -                       <0x0 0x02b58000 0x0 0x1000>;
> -               reg-names = "mpu","dat";
> -               interrupts = <GIC_SPI 554 IRQ_TYPE_LEVEL_HIGH>,
> -                               <GIC_SPI 555 IRQ_TYPE_LEVEL_HIGH>;
> -               interrupt-names = "tx", "rx";
> -
> -               dmas = <&main_udmap 0xc502>, <&main_udmap 0x4502>;
> -               dma-names = "tx", "rx";
> -
> -               clocks = <&k3_clks 179 1>;
> -               clock-names = "fck";
> -               power-domains = <&k3_pds 179 TI_SCI_PD_EXCLUSIVE>;
> -               status = "disabled";
> -       };
> -
> -       mcasp6: mcasp at 2b60000 {
> -               compatible = "ti,am33xx-mcasp-audio";
> -               reg = <0x0 0x02b60000 0x0 0x2000>,
> -                       <0x0 0x02b68000 0x0 0x1000>;
> -               reg-names = "mpu","dat";
> -               interrupts = <GIC_SPI 556 IRQ_TYPE_LEVEL_HIGH>,
> -                               <GIC_SPI 557 IRQ_TYPE_LEVEL_HIGH>;
> -               interrupt-names = "tx", "rx";
> -
> -               dmas = <&main_udmap 0xc503>, <&main_udmap 0x4503>;
> -               dma-names = "tx", "rx";
> -
> -               clocks = <&k3_clks 180 1>;
> -               clock-names = "fck";
> -               power-domains = <&k3_pds 180 TI_SCI_PD_EXCLUSIVE>;
> -               status = "disabled";
> -       };
> -
> -       mcasp7: mcasp at 2b70000 {
> -               compatible = "ti,am33xx-mcasp-audio";
> -               reg = <0x0 0x02b70000 0x0 0x2000>,
> -                       <0x0 0x02b78000 0x0 0x1000>;
> -               reg-names = "mpu","dat";
> -               interrupts = <GIC_SPI 558 IRQ_TYPE_LEVEL_HIGH>,
> -                               <GIC_SPI 559 IRQ_TYPE_LEVEL_HIGH>;
> -               interrupt-names = "tx", "rx";
> -
> -               dmas = <&main_udmap 0xc504>, <&main_udmap 0x4504>;
> -               dma-names = "tx", "rx";
> -
> -               clocks = <&k3_clks 181 1>;
> -               clock-names = "fck";
> -               power-domains = <&k3_pds 181 TI_SCI_PD_EXCLUSIVE>;
> -               status = "disabled";
> -       };
> -
> -       mcasp8: mcasp at 2b80000 {
> -               compatible = "ti,am33xx-mcasp-audio";
> -               reg = <0x0 0x02b80000 0x0 0x2000>,
> -                       <0x0 0x02b88000 0x0 0x1000>;
> -               reg-names = "mpu","dat";
> -               interrupts = <GIC_SPI 560 IRQ_TYPE_LEVEL_HIGH>,
> -                               <GIC_SPI 561 IRQ_TYPE_LEVEL_HIGH>;
> -               interrupt-names = "tx", "rx";
> -
> -               dmas = <&main_udmap 0xc505>, <&main_udmap 0x4505>;
> -               dma-names = "tx", "rx";
> -
> -               clocks = <&k3_clks 182 1>;
> -               clock-names = "fck";
> -               power-domains = <&k3_pds 182 TI_SCI_PD_EXCLUSIVE>;
> -               status = "disabled";
> -       };
> -
> -       mcasp9: mcasp at 2b90000 {
> -               compatible = "ti,am33xx-mcasp-audio";
> -               reg = <0x0 0x02b90000 0x0 0x2000>,
> -                       <0x0 0x02b98000 0x0 0x1000>;
> -               reg-names = "mpu","dat";
> -               interrupts = <GIC_SPI 562 IRQ_TYPE_LEVEL_HIGH>,
> -                               <GIC_SPI 563 IRQ_TYPE_LEVEL_HIGH>;
> -               interrupt-names = "tx", "rx";
> -
> -               dmas = <&main_udmap 0xc506>, <&main_udmap 0x4506>;
> -               dma-names = "tx", "rx";
> -
> -               clocks = <&k3_clks 183 1>;
> -               clock-names = "fck";
> -               power-domains = <&k3_pds 183 TI_SCI_PD_EXCLUSIVE>;
> -               status = "disabled";
> -       };
> -
> -       mcasp10: mcasp at 2ba0000 {
> -               compatible = "ti,am33xx-mcasp-audio";
> -               reg = <0x0 0x02ba0000 0x0 0x2000>,
> -                       <0x0 0x02ba8000 0x0 0x1000>;
> -               reg-names = "mpu","dat";
> -               interrupts = <GIC_SPI 564 IRQ_TYPE_LEVEL_HIGH>,
> -                               <GIC_SPI 565 IRQ_TYPE_LEVEL_HIGH>;
> -               interrupt-names = "tx", "rx";
> -
> -               dmas = <&main_udmap 0xc507>, <&main_udmap 0x4507>;
> -               dma-names = "tx", "rx";
> -
> -               clocks = <&k3_clks 184 1>;
> -               clock-names = "fck";
> -               power-domains = <&k3_pds 184 TI_SCI_PD_EXCLUSIVE>;
> -               status = "disabled";
> -       };
> -
> -       mcasp11: mcasp at 2bb0000 {
> -               compatible = "ti,am33xx-mcasp-audio";
> -               reg = <0x0 0x02bb0000 0x0 0x2000>,
> -                       <0x0 0x02bb8000 0x0 0x1000>;
> -               reg-names = "mpu","dat";
> -               interrupts = <GIC_SPI 566 IRQ_TYPE_LEVEL_HIGH>,
> -                               <GIC_SPI 567 IRQ_TYPE_LEVEL_HIGH>;
> -               interrupt-names = "tx", "rx";
> -
> -               dmas = <&main_udmap 0xc508>, <&main_udmap 0x4508>;
> -               dma-names = "tx", "rx";
> -
> -               clocks = <&k3_clks 185 1>;
> -               clock-names = "fck";
> -               power-domains = <&k3_pds 185 TI_SCI_PD_EXCLUSIVE>;
> -               status = "disabled";
> -       };
> -
> -       watchdog0: watchdog at 2200000 {
> -               compatible = "ti,j7-rti-wdt";
> -               reg = <0x0 0x2200000 0x0 0x100>;
> -               clocks = <&k3_clks 252 1>;
> -               power-domains = <&k3_pds 252 TI_SCI_PD_EXCLUSIVE>;
> -               assigned-clocks = <&k3_clks 252 1>;
> -               assigned-clock-parents = <&k3_clks 252 5>;
> -       };
> -
> -       watchdog1: watchdog at 2210000 {
> -               compatible = "ti,j7-rti-wdt";
> -               reg = <0x0 0x2210000 0x0 0x100>;
> -               clocks = <&k3_clks 253 1>;
> -               power-domains = <&k3_pds 253 TI_SCI_PD_EXCLUSIVE>;
> -               assigned-clocks = <&k3_clks 253 1>;
> -               assigned-clock-parents = <&k3_clks 253 5>;
> -       };
> -
> -       main_r5fss0: r5fss at 5c00000 {
> -               compatible = "ti,j721e-r5fss";
> -               ti,cluster-mode = <1>;
> -               #address-cells = <1>;
> -               #size-cells = <1>;
> -               ranges = <0x5c00000 0x00 0x5c00000 0x20000>,
> -                        <0x5d00000 0x00 0x5d00000 0x20000>;
> -               power-domains = <&k3_pds 243 TI_SCI_PD_EXCLUSIVE>;
> -
> -               main_r5fss0_core0: r5f at 5c00000 {
> -                       compatible = "ti,j721e-r5f";
> -                       reg = <0x5c00000 0x00008000>,
> -                             <0x5c10000 0x00008000>;
> -                       reg-names = "atcm", "btcm";
> -                       ti,sci = <&dmsc>;
> -                       ti,sci-dev-id = <245>;
> -                       ti,sci-proc-ids = <0x06 0xff>;
> -                       resets = <&k3_reset 245 1>;
> -                       firmware-name = "j7-main-r5f0_0-fw";
> -                       ti,atcm-enable = <1>;
> -                       ti,btcm-enable = <1>;
> -                       ti,loczrama = <1>;
> -               };
> -
> -               main_r5fss0_core1: r5f at 5d00000 {
> -                       compatible = "ti,j721e-r5f";
> -                       reg = <0x5d00000 0x00008000>,
> -                             <0x5d10000 0x00008000>;
> -                       reg-names = "atcm", "btcm";
> -                       ti,sci = <&dmsc>;
> -                       ti,sci-dev-id = <246>;
> -                       ti,sci-proc-ids = <0x07 0xff>;
> -                       resets = <&k3_reset 246 1>;
> -                       firmware-name = "j7-main-r5f0_1-fw";
> -                       ti,atcm-enable = <1>;
> -                       ti,btcm-enable = <1>;
> -                       ti,loczrama = <1>;
> -               };
> -       };
> -
> -       main_r5fss1: r5fss at 5e00000 {
> -               compatible = "ti,j721e-r5fss";
> -               ti,cluster-mode = <1>;
> -               #address-cells = <1>;
> -               #size-cells = <1>;
> -               ranges = <0x5e00000 0x00 0x5e00000 0x20000>,
> -                        <0x5f00000 0x00 0x5f00000 0x20000>;
> -               power-domains = <&k3_pds 244 TI_SCI_PD_EXCLUSIVE>;
> -
> -               main_r5fss1_core0: r5f at 5e00000 {
> -                       compatible = "ti,j721e-r5f";
> -                       reg = <0x5e00000 0x00008000>,
> -                             <0x5e10000 0x00008000>;
> -                       reg-names = "atcm", "btcm";
> -                       ti,sci = <&dmsc>;
> -                       ti,sci-dev-id = <247>;
> -                       ti,sci-proc-ids = <0x08 0xff>;
> -                       resets = <&k3_reset 247 1>;
> -                       firmware-name = "j7-main-r5f1_0-fw";
> -                       ti,atcm-enable = <1>;
> -                       ti,btcm-enable = <1>;
> -                       ti,loczrama = <1>;
> -               };
> -
> -               main_r5fss1_core1: r5f at 5f00000 {
> -                       compatible = "ti,j721e-r5f";
> -                       reg = <0x5f00000 0x00008000>,
> -                             <0x5f10000 0x00008000>;
> -                       reg-names = "atcm", "btcm";
> -                       ti,sci = <&dmsc>;
> -                       ti,sci-dev-id = <248>;
> -                       ti,sci-proc-ids = <0x09 0xff>;
> -                       resets = <&k3_reset 248 1>;
> -                       firmware-name = "j7-main-r5f1_1-fw";
> -                       ti,atcm-enable = <1>;
> -                       ti,btcm-enable = <1>;
> -                       ti,loczrama = <1>;
> -               };
> -       };
> -
> -       c66_0: dsp at 4d80800000 {
> -               compatible = "ti,j721e-c66-dsp";
> -               reg = <0x4d 0x80800000 0x00 0x00048000>,
> -                     <0x4d 0x80e00000 0x00 0x00008000>,
> -                     <0x4d 0x80f00000 0x00 0x00008000>;
> -               reg-names = "l2sram", "l1pram", "l1dram";
> -               ti,sci = <&dmsc>;
> -               ti,sci-dev-id = <142>;
> -               ti,sci-proc-ids = <0x03 0xff>;
> -               resets = <&k3_reset 142 1>;
> -               firmware-name = "j7-c66_0-fw";
> -               status = "disabled";
> -       };
> -
> -       c66_1: dsp at 4d81800000 {
> -               compatible = "ti,j721e-c66-dsp";
> -               reg = <0x4d 0x81800000 0x00 0x00048000>,
> -                     <0x4d 0x81e00000 0x00 0x00008000>,
> -                     <0x4d 0x81f00000 0x00 0x00008000>;
> -               reg-names = "l2sram", "l1pram", "l1dram";
> -               ti,sci = <&dmsc>;
> -               ti,sci-dev-id = <143>;
> -               ti,sci-proc-ids = <0x04 0xff>;
> -               resets = <&k3_reset 143 1>;
> -               firmware-name = "j7-c66_1-fw";
> -               status = "disabled";
> -       };
> -
> -       c71_0: dsp at 64800000 {
> -               compatible = "ti,j721e-c71-dsp";
> -               reg = <0x00 0x64800000 0x00 0x00080000>,
> -                     <0x00 0x64e00000 0x00 0x0000c000>;
> -               reg-names = "l2sram", "l1dram";
> -               ti,sci = <&dmsc>;
> -               ti,sci-dev-id = <15>;
> -               ti,sci-proc-ids = <0x30 0xff>;
> -               resets = <&k3_reset 15 1>;
> -               firmware-name = "j7-c71_0-fw";
> -               status = "disabled";
> -       };
> -
> -       icssg0: icssg at b000000 {
> -               compatible = "ti,j721e-icssg";
> -               reg = <0x00 0xb000000 0x00 0x80000>;
> -               power-domains = <&k3_pds 119 TI_SCI_PD_EXCLUSIVE>;
> -               #address-cells = <1>;
> -               #size-cells = <1>;
> -               ranges = <0x0 0x00 0x0b000000 0x100000>;
> -
> -               icssg0_mem: memories at 0 {
> -                       reg = <0x0 0x2000>,
> -                             <0x2000 0x2000>,
> -                             <0x10000 0x10000>;
> -                       reg-names = "dram0", "dram1",
> -                                   "shrdram2";
> -               };
> -
> -               icssg0_cfg: cfg at 26000 {
> -                       compatible = "ti,pruss-cfg", "syscon";
> -                       reg = <0x26000 0x200>;
> -                       #address-cells = <1>;
> -                       #size-cells = <1>;
> -                       ranges = <0x0 0x26000 0x2000>;
> -
> -                       clocks {
> -                               #address-cells = <1>;
> -                               #size-cells = <0>;
> -
> -                               icssg0_coreclk_mux: coreclk-mux at 3c {
> -                                       reg = <0x3c>;
> -                                       #clock-cells = <0>;
> -                                       clocks = <&k3_clks 119 24>, /* icssg0_core_clk */
> -                                                <&k3_clks 119 1>;  /* icssg0_iclk */
> -                                       assigned-clocks = <&icssg0_coreclk_mux>;
> -                                       assigned-clock-parents = <&k3_clks 119 1>;
> -                               };
> -
> -                               icssg0_iepclk_mux: iepclk-mux at 30 {
> -                                       reg = <0x30>;
> -                                       #clock-cells = <0>;
> -                                       clocks = <&k3_clks 119 3>,      /* icssg0_iep_clk */
> -                                                <&icssg0_coreclk_mux>; /* core_clk */
> -                                       assigned-clocks = <&icssg0_iepclk_mux>;
> -                                       assigned-clock-parents = <&icssg0_coreclk_mux>;
> -                               };
> -                       };
> -               };
> -
> -               icssg0_mii_rt: mii-rt at 32000 {
> -                       compatible = "ti,pruss-mii", "syscon";
> -                       reg = <0x32000 0x100>;
> -               };
> -
> -               icssg0_mii_g_rt: mii-g-rt at 33000 {
> -                       compatible = "ti,pruss-mii-g", "syscon";
> -                       reg = <0x33000 0x1000>;
> -               };
> -
> -               icssg0_intc: interrupt-controller at 20000 {
> -                       compatible = "ti,icssg-intc";
> -                       reg = <0x20000 0x2000>;
> -                       interrupt-controller;
> -                       #interrupt-cells = <3>;
> -                       interrupts = <GIC_SPI 254 IRQ_TYPE_LEVEL_HIGH>,
> -                                    <GIC_SPI 255 IRQ_TYPE_LEVEL_HIGH>,
> -                                    <GIC_SPI 256 IRQ_TYPE_LEVEL_HIGH>,
> -                                    <GIC_SPI 257 IRQ_TYPE_LEVEL_HIGH>,
> -                                    <GIC_SPI 258 IRQ_TYPE_LEVEL_HIGH>,
> -                                    <GIC_SPI 259 IRQ_TYPE_LEVEL_HIGH>,
> -                                    <GIC_SPI 260 IRQ_TYPE_LEVEL_HIGH>,
> -                                    <GIC_SPI 261 IRQ_TYPE_LEVEL_HIGH>;
> -                       interrupt-names = "host_intr0", "host_intr1",
> -                                         "host_intr2", "host_intr3",
> -                                         "host_intr4", "host_intr5",
> -                                         "host_intr6", "host_intr7";
> -               };
> -
> -               pru0_0: pru at 34000 {
> -                       compatible = "ti,j721e-pru";
> -                       reg = <0x34000 0x3000>,
> -                             <0x22000 0x100>,
> -                             <0x22400 0x100>;
> -                       reg-names = "iram", "control", "debug";
> -                       firmware-name = "j7-pru0_0-fw";
> -               };
> -
> -               rtu0_0: rtu at 4000 {
> -                       compatible = "ti,j721e-rtu";
> -                       reg = <0x4000 0x2000>,
> -                             <0x23000 0x100>,
> -                             <0x23400 0x100>;
> -                       reg-names = "iram", "control", "debug";
> -                       firmware-name = "j7-rtu0_0-fw";
> -               };
> -
> -               tx_pru0_0: txpru at a000 {
> -                       compatible = "ti,j721e-tx-pru";
> -                       reg = <0xa000 0x1800>,
> -                             <0x25000 0x100>,
> -                             <0x25400 0x100>;
> -                       reg-names = "iram", "control", "debug";
> -                       firmware-name = "j7-txpru0_0-fw";
> -               };
> -
> -               pru0_1: pru at 38000 {
> -                       compatible = "ti,j721e-pru";
> -                       reg = <0x38000 0x3000>,
> -                             <0x24000 0x100>,
> -                             <0x24400 0x100>;
> -                       reg-names = "iram", "control", "debug";
> -                       firmware-name = "j7-pru0_1-fw";
> -               };
> -
> -               rtu0_1: rtu at 6000 {
> -                       compatible = "ti,j721e-rtu";
> -                       reg = <0x6000 0x2000>,
> -                             <0x23800 0x100>,
> -                             <0x23c00 0x100>;
> -                       reg-names = "iram", "control", "debug";
> -                       firmware-name = "j7-rtu0_1-fw";
> -               };
> -
> -               tx_pru0_1: txpru at c000 {
> -                       compatible = "ti,j721e-tx-pru";
> -                       reg = <0xc000 0x1800>,
> -                             <0x25800 0x100>,
> -                             <0x25c00 0x100>;
> -                       reg-names = "iram", "control", "debug";
> -                       firmware-name = "j7-txpru0_1-fw";
> -               };
> -
> -               icssg0_mdio: mdio at 32400 {
> -                       compatible = "ti,davinci_mdio";
> -                       reg = <0x32400 0x100>;
> -                       clocks = <&k3_clks 119 1>;
> -                       clock-names = "fck";
> -                       #address-cells = <1>;
> -                       #size-cells = <0>;
> -                       bus_freq = <1000000>;
> -                       status = "disabled";
> -               };
> -       };
> -
> -       icssg1: icssg at b100000 {
> -               compatible = "ti,j721e-icssg";
> -               reg = <0x00 0xb100000 0x00 0x80000>;
> -               power-domains = <&k3_pds 120 TI_SCI_PD_EXCLUSIVE>;
> -               #address-cells = <1>;
> -               #size-cells = <1>;
> -               ranges = <0x0 0x00 0x0b100000 0x100000>;
> -
> -               icssg1_mem: memories at b100000 {
> -                       reg = <0x0 0x2000>,
> -                             <0x2000 0x2000>,
> -                             <0x10000 0x10000>;
> -                       reg-names = "dram0", "dram1",
> -                                   "shrdram2";
> -               };
> -
> -               icssg1_cfg: cfg at 26000 {
> -                       compatible = "ti,pruss-cfg", "syscon";
> -                       reg = <0x26000 0x200>;
> -                       #address-cells = <1>;
> -                       #size-cells = <1>;
> -                       ranges = <0x0 0x26000 0x2000>;
> -
> -                       clocks {
> -                               #address-cells = <1>;
> -                               #size-cells = <0>;
> -
> -                               icssg1_coreclk_mux: coreclk-mux at 3c {
> -                                       reg = <0x3c>;
> -                                       #clock-cells = <0>;
> -                                       clocks = <&k3_clks 120 54>, /* icssg1_core_clk */
> -                                                <&k3_clks 120 4>;  /* icssg1_iclk */
> -                                       assigned-clocks = <&icssg1_coreclk_mux>;
> -                                       assigned-clock-parents = <&k3_clks 120 4>;
> -                               };
> -
> -                               icssg1_iepclk_mux: iepclk-mux at 30 {
> -                                       reg = <0x30>;
> -                                       #clock-cells = <0>;
> -                                       clocks = <&k3_clks 120 9>,      /* icssg1_iep_clk */
> -                                                <&icssg1_coreclk_mux>; /* core_clk */
> -                                       assigned-clocks = <&icssg1_iepclk_mux>;
> -                                       assigned-clock-parents = <&icssg1_coreclk_mux>;
> -                               };
> -                       };
> -               };
> -
> -               icssg1_mii_rt: mii-rt at 32000 {
> -                       compatible = "ti,pruss-mii", "syscon";
> -                       reg = <0x32000 0x100>;
> -               };
> -
> -               icssg1_mii_g_rt: mii-g-rt at 33000 {
> -                       compatible = "ti,pruss-mii-g", "syscon";
> -                       reg = <0x33000 0x1000>;
> -               };
> -
> -               icssg1_intc: interrupt-controller at 20000 {
> -                       compatible = "ti,icssg-intc";
> -                       reg = <0x20000 0x2000>;
> -                       interrupt-controller;
> -                       #interrupt-cells = <3>;
> -                       interrupts = <GIC_SPI 262 IRQ_TYPE_LEVEL_HIGH>,
> -                                    <GIC_SPI 263 IRQ_TYPE_LEVEL_HIGH>,
> -                                    <GIC_SPI 264 IRQ_TYPE_LEVEL_HIGH>,
> -                                    <GIC_SPI 265 IRQ_TYPE_LEVEL_HIGH>,
> -                                    <GIC_SPI 266 IRQ_TYPE_LEVEL_HIGH>,
> -                                    <GIC_SPI 267 IRQ_TYPE_LEVEL_HIGH>,
> -                                    <GIC_SPI 268 IRQ_TYPE_LEVEL_HIGH>,
> -                                    <GIC_SPI 269 IRQ_TYPE_LEVEL_HIGH>;
> -                       interrupt-names = "host_intr0", "host_intr1",
> -                                         "host_intr2", "host_intr3",
> -                                         "host_intr4", "host_intr5",
> -                                         "host_intr6", "host_intr7";
> -               };
> -
> -               pru1_0: pru at 34000 {
> -                       compatible = "ti,j721e-pru";
> -                       reg = <0x34000 0x4000>,
> -                             <0x22000 0x100>,
> -                             <0x22400 0x100>;
> -                       reg-names = "iram", "control", "debug";
> -                       firmware-name = "j7-pru1_0-fw";
> -               };
> -
> -               rtu1_0: rtu at 4000 {
> -                       compatible = "ti,j721e-rtu";
> -                       reg = <0x4000 0x2000>,
> -                             <0x23000 0x100>,
> -                             <0x23400 0x100>;
> -                       reg-names = "iram", "control", "debug";
> -                       firmware-name = "j7-rtu1_0-fw";
> -               };
> -
> -               tx_pru1_0: txpru at a000 {
> -                       compatible = "ti,j721e-tx-pru";
> -                       reg = <0xa000 0x1800>,
> -                             <0x25000 0x100>,
> -                             <0x25400 0x100>;
> -                       reg-names = "iram", "control", "debug";
> -                       firmware-name = "j7-txpru1_0-fw";
> -               };
> -
> -               pru1_1: pru at 38000 {
> -                       compatible = "ti,j721e-pru";
> -                       reg = <0x38000 0x4000>,
> -                             <0x24000 0x100>,
> -                             <0x24400 0x100>;
> -                       reg-names = "iram", "control", "debug";
> -                       firmware-name = "j7-pru1_1-fw";
> -               };
> -
> -               rtu1_1: rtu at 6000 {
> -                       compatible = "ti,j721e-rtu";
> -                       reg = <0x6000 0x2000>,
> -                             <0x23800 0x100>,
> -                             <0x23c00 0x100>;
> -                       reg-names = "iram", "control", "debug";
> -                       firmware-name = "j7-rtu1_1-fw";
> -               };
> -
> -               tx_pru1_1: txpru at c000 {
> -                       compatible = "ti,j721e-tx-pru";
> -                       reg = <0xc000 0x1800>,
> -                             <0x25800 0x100>,
> -                             <0x25c00 0x100>;
> -                       reg-names = "iram", "control", "debug";
> -                       firmware-name = "j7-txpru1_1-fw";
> -               };
> -
> -               icssg1_mdio: mdio at 32400 {
> -                       compatible = "ti,davinci_mdio";
> -                       reg = <0x32400 0x100>;
> -                       clocks = <&k3_clks 120 4>;
> -                       clock-names = "fck";
> -                       #address-cells = <1>;
> -                       #size-cells = <0>;
> -                       bus_freq = <1000000>;
> -                       status = "disabled";
> -               };
> -       };
> -
> -       main_mcan0: can at 2701000 {
> -               compatible = "bosch,m_can";
> -               reg = <0x00 0x02701000 0x00 0x200>,
> -                     <0x00 0x02708000 0x00 0x8000>;
> -               reg-names = "m_can", "message_ram";
> -               power-domains = <&k3_pds 156 TI_SCI_PD_EXCLUSIVE>;
> -               clocks = <&k3_clks 156 0>, <&k3_clks 156 1>;
> -               clock-names = "hclk", "cclk";
> -               interrupts = <GIC_SPI 124 IRQ_TYPE_LEVEL_HIGH>,
> -                            <GIC_SPI 125 IRQ_TYPE_LEVEL_HIGH>;
> -               interrupt-names = "int0", "int1";
> -               bosch,mram-cfg = <0x0 128 64 64 64 64 32 32>;
> -               status = "disabled";
> -       };
> -
> -       main_mcan1: can at 2711000 {
> -               compatible = "bosch,m_can";
> -               reg = <0x00 0x02711000 0x00 0x200>,
> -                     <0x00 0x02718000 0x00 0x8000>;
> -               reg-names = "m_can", "message_ram";
> -               power-domains = <&k3_pds 158 TI_SCI_PD_EXCLUSIVE>;
> -               clocks = <&k3_clks 158 0>, <&k3_clks 158 1>;
> -               clock-names = "hclk", "cclk";
> -               interrupts = <GIC_SPI 127 IRQ_TYPE_LEVEL_HIGH>,
> -                            <GIC_SPI 128 IRQ_TYPE_LEVEL_HIGH>;
> -               interrupt-names = "int0", "int1";
> -               bosch,mram-cfg = <0x0 128 64 64 64 64 32 32>;
> -               status = "disabled";
> -       };
> -
> -       main_mcan2: can at 2721000 {
> -               compatible = "bosch,m_can";
> -               reg = <0x00 0x02721000 0x00 0x200>,
> -                     <0x00 0x02728000 0x00 0x8000>;
> -               reg-names = "m_can", "message_ram";
> -               power-domains = <&k3_pds 160 TI_SCI_PD_EXCLUSIVE>;
> -               clocks = <&k3_clks 160 0>, <&k3_clks 160 1>;
> -               clock-names = "hclk", "cclk";
> -               interrupts = <GIC_SPI 130 IRQ_TYPE_LEVEL_HIGH>,
> -                            <GIC_SPI 131 IRQ_TYPE_LEVEL_HIGH>;
> -               interrupt-names = "int0", "int1";
> -               bosch,mram-cfg = <0x0 128 64 64 64 64 32 32>;
> -               status = "disabled";
> -       };
> -
> -       main_mcan3: can at 2731000 {
> -               compatible = "bosch,m_can";
> -               reg = <0x00 0x02731000 0x00 0x200>,
> -                     <0x00 0x02738000 0x00 0x8000>;
> -               reg-names = "m_can", "message_ram";
> -               power-domains = <&k3_pds 161 TI_SCI_PD_EXCLUSIVE>;
> -               clocks = <&k3_clks 161 0>, <&k3_clks 161 1>;
> -               clock-names = "hclk", "cclk";
> -               interrupts = <GIC_SPI 133 IRQ_TYPE_LEVEL_HIGH>,
> -                            <GIC_SPI 134 IRQ_TYPE_LEVEL_HIGH>;
> -               interrupt-names = "int0", "int1";
> -               bosch,mram-cfg = <0x0 128 64 64 64 64 32 32>;
> -               status = "disabled";
> -       };
> -
> -       main_mcan4: can at 2741000 {
> -               compatible = "bosch,m_can";
> -               reg = <0x00 0x02741000 0x00 0x200>,
> -                     <0x00 0x02748000 0x00 0x8000>;
> -               reg-names = "m_can", "message_ram";
> -               power-domains = <&k3_pds 162 TI_SCI_PD_EXCLUSIVE>;
> -               clocks = <&k3_clks 162 0>, <&k3_clks 162 1>;
> -               clock-names = "hclk", "cclk";
> -               interrupts = <GIC_SPI 136 IRQ_TYPE_LEVEL_HIGH>,
> -                            <GIC_SPI 137 IRQ_TYPE_LEVEL_HIGH>;
> -               interrupt-names = "int0", "int1";
> -               bosch,mram-cfg = <0x0 128 64 64 64 64 32 32>;
> -               status = "disabled";
> -       };
> -
> -       main_mcan5: can at 2751000 {
> -               compatible = "bosch,m_can";
> -               reg = <0x00 0x02751000 0x00 0x200>,
> -                     <0x00 0x02758000 0x00 0x8000>;
> -               reg-names = "m_can", "message_ram";
> -               power-domains = <&k3_pds 163 TI_SCI_PD_EXCLUSIVE>;
> -               clocks = <&k3_clks 163 0>, <&k3_clks 163 1>;
> -               clock-names = "hclk", "cclk";
> -               interrupts = <GIC_SPI 139 IRQ_TYPE_LEVEL_HIGH>,
> -                            <GIC_SPI 140 IRQ_TYPE_LEVEL_HIGH>;
> -               interrupt-names = "int0", "int1";
> -               bosch,mram-cfg = <0x0 128 64 64 64 64 32 32>;
> -               status = "disabled";
> -       };
> -
> -       main_mcan6: can at 2761000 {
> -               compatible = "bosch,m_can";
> -               reg = <0x00 0x02761000 0x00 0x200>,
> -                     <0x00 0x02768000 0x00 0x8000>;
> -               reg-names = "m_can", "message_ram";
> -               power-domains = <&k3_pds 164 TI_SCI_PD_EXCLUSIVE>;
> -               clocks = <&k3_clks 164 0>, <&k3_clks 164 1>;
> -               clock-names = "hclk", "cclk";
> -               interrupts = <GIC_SPI 142 IRQ_TYPE_LEVEL_HIGH>,
> -                            <GIC_SPI 143 IRQ_TYPE_LEVEL_HIGH>;
> -               interrupt-names = "int0", "int1";
> -               bosch,mram-cfg = <0x0 128 64 64 64 64 32 32>;
> -               status = "disabled";
> -       };
> -
> -       main_mcan7: can at 2771000 {
> -               compatible = "bosch,m_can";
> -               reg = <0x00 0x02771000 0x00 0x200>,
> -                     <0x00 0x02778000 0x00 0x8000>;
> -               reg-names = "m_can", "message_ram";
> -               power-domains = <&k3_pds 165 TI_SCI_PD_EXCLUSIVE>;
> -               clocks = <&k3_clks 165 0>, <&k3_clks 165 1>;
> -               clock-names = "hclk", "cclk";
> -               interrupts = <GIC_SPI 145 IRQ_TYPE_LEVEL_HIGH>,
> -                            <GIC_SPI 146 IRQ_TYPE_LEVEL_HIGH>;
> -               interrupt-names = "int0", "int1";
> -               bosch,mram-cfg = <0x0 128 64 64 64 64 32 32>;
> -               status = "disabled";
> -       };
> -
> -       main_mcan8: can at 2781000 {
> -               compatible = "bosch,m_can";
> -               reg = <0x00 0x02781000 0x00 0x200>,
> -                     <0x00 0x02788000 0x00 0x8000>;
> -               reg-names = "m_can", "message_ram";
> -               power-domains = <&k3_pds 166 TI_SCI_PD_EXCLUSIVE>;
> -               clocks = <&k3_clks 166 0>, <&k3_clks 166 1>;
> -               clock-names = "hclk", "cclk";
> -               interrupts = <GIC_SPI 576 IRQ_TYPE_LEVEL_HIGH>,
> -                            <GIC_SPI 577 IRQ_TYPE_LEVEL_HIGH>;
> -               interrupt-names = "int0", "int1";
> -               bosch,mram-cfg = <0x0 128 64 64 64 64 32 32>;
> -               status = "disabled";
> -       };
> -
> -       main_mcan9: can at 2791000 {
> -               compatible = "bosch,m_can";
> -               reg = <0x00 0x02791000 0x00 0x200>,
> -                     <0x00 0x02798000 0x00 0x8000>;
> -               reg-names = "m_can", "message_ram";
> -               power-domains = <&k3_pds 167 TI_SCI_PD_EXCLUSIVE>;
> -               clocks = <&k3_clks 167 0>, <&k3_clks 167 1>;
> -               clock-names = "hclk", "cclk";
> -               interrupts = <GIC_SPI 579 IRQ_TYPE_LEVEL_HIGH>,
> -                            <GIC_SPI 580 IRQ_TYPE_LEVEL_HIGH>;
> -               interrupt-names = "int0", "int1";
> -               bosch,mram-cfg = <0x0 128 64 64 64 64 32 32>;
> -               status = "disabled";
> -       };
> -
> -       main_mcan10: can at 27a1000 {
> -               compatible = "bosch,m_can";
> -               reg = <0x00 0x027a1000 0x00 0x200>,
> -                     <0x00 0x027a8000 0x00 0x8000>;
> -               reg-names = "m_can", "message_ram";
> -               power-domains = <&k3_pds 168 TI_SCI_PD_EXCLUSIVE>;
> -               clocks = <&k3_clks 168 0>, <&k3_clks 168 1>;
> -               clock-names = "hclk", "cclk";
> -               interrupts = <GIC_SPI 582 IRQ_TYPE_LEVEL_HIGH>,
> -                            <GIC_SPI 583 IRQ_TYPE_LEVEL_HIGH>;
> -               interrupt-names = "int0", "int1";
> -               bosch,mram-cfg = <0x0 128 64 64 64 64 32 32>;
> -               status = "disabled";
> -       };
> -
> -       main_mcan11: can at 27b1000 {
> -               compatible = "bosch,m_can";
> -               reg = <0x00 0x027b1000 0x00 0x200>,
> -                     <0x00 0x027b8000 0x00 0x8000>;
> -               reg-names = "m_can", "message_ram";
> -               power-domains = <&k3_pds 169 TI_SCI_PD_EXCLUSIVE>;
> -               clocks = <&k3_clks 169 0>, <&k3_clks 169 1>;
> -               clock-names = "hclk", "cclk";
> -               interrupts = <GIC_SPI 585 IRQ_TYPE_LEVEL_HIGH>,
> -                            <GIC_SPI 586 IRQ_TYPE_LEVEL_HIGH>;
> -               interrupt-names = "int0", "int1";
> -               bosch,mram-cfg = <0x0 128 64 64 64 64 32 32>;
> -               status = "disabled";
> -       };
> -
> -       main_mcan12: can at 27c1000 {
> -               compatible = "bosch,m_can";
> -               reg = <0x00 0x027c1000 0x00 0x200>,
> -                     <0x00 0x027c8000 0x00 0x8000>;
> -               reg-names = "m_can", "message_ram";
> -               power-domains = <&k3_pds 170 TI_SCI_PD_EXCLUSIVE>;
> -               clocks = <&k3_clks 170 0>, <&k3_clks 170 1>;
> -               clock-names = "hclk", "cclk";
> -               interrupts = <GIC_SPI 588 IRQ_TYPE_LEVEL_HIGH>,
> -                            <GIC_SPI 589 IRQ_TYPE_LEVEL_HIGH>;
> -               interrupt-names = "int0", "int1";
> -               bosch,mram-cfg = <0x0 128 64 64 64 64 32 32>;
> -               status = "disabled";
> -       };
> -
> -       main_mcan13: can at 27d1000 {
> -               compatible = "bosch,m_can";
> -               reg = <0x00 0x027d1000 0x00 0x200>,
> -                     <0x00 0x027d8000 0x00 0x8000>;
> -               reg-names = "m_can", "message_ram";
> -               power-domains = <&k3_pds 171 TI_SCI_PD_EXCLUSIVE>;
> -               clocks = <&k3_clks 171 0>, <&k3_clks 171 1>;
> -               clock-names = "hclk", "cclk";
> -               interrupts = <GIC_SPI 591 IRQ_TYPE_LEVEL_HIGH>,
> -                            <GIC_SPI 592 IRQ_TYPE_LEVEL_HIGH>;
> -               interrupt-names = "int0", "int1";
> -               bosch,mram-cfg = <0x0 128 64 64 64 64 32 32>;
> -               status = "disabled";
> -       };
> -
> -       main_spi0: spi at 2100000 {
> -               compatible = "ti,am654-mcspi","ti,omap4-mcspi";
> -               reg = <0x00 0x02100000 0x00 0x400>;
> -               interrupts = <GIC_SPI 184 IRQ_TYPE_LEVEL_HIGH>;
> -               #address-cells = <1>;
> -               #size-cells = <0>;
> -               power-domains = <&k3_pds 266 TI_SCI_PD_EXCLUSIVE>;
> -               clocks = <&k3_clks 266 1>;
> -               status = "disabled";
> -       };
> -
> -       main_spi1: spi at 2110000 {
> -               compatible = "ti,am654-mcspi","ti,omap4-mcspi";
> -               reg = <0x00 0x02110000 0x00 0x400>;
> -               interrupts = <GIC_SPI 185 IRQ_TYPE_LEVEL_HIGH>;
> -               #address-cells = <1>;
> -               #size-cells = <0>;
> -               power-domains = <&k3_pds 267 TI_SCI_PD_EXCLUSIVE>;
> -               clocks = <&k3_clks 267 1>;
> -               status = "disabled";
> -       };
> -
> -       main_spi2: spi at 2120000 {
> -               compatible = "ti,am654-mcspi","ti,omap4-mcspi";
> -               reg = <0x00 0x02120000 0x00 0x400>;
> -               interrupts = <GIC_SPI 186 IRQ_TYPE_LEVEL_HIGH>;
> -               #address-cells = <1>;
> -               #size-cells = <0>;
> -               power-domains = <&k3_pds 268 TI_SCI_PD_EXCLUSIVE>;
> -               clocks = <&k3_clks 268 1>;
> -               status = "disabled";
> -       };
> -
> -       main_spi3: spi at 2130000 {
> -               compatible = "ti,am654-mcspi","ti,omap4-mcspi";
> -               reg = <0x00 0x02130000 0x00 0x400>;
> -               interrupts = <GIC_SPI 187 IRQ_TYPE_LEVEL_HIGH>;
> -               #address-cells = <1>;
> -               #size-cells = <0>;
> -               power-domains = <&k3_pds 269 TI_SCI_PD_EXCLUSIVE>;
> -               clocks = <&k3_clks 269 1>;
> -               status = "disabled";
> -       };
> -
> -       main_spi4: spi at 2140000 {
> -               compatible = "ti,am654-mcspi","ti,omap4-mcspi";
> -               reg = <0x00 0x02140000 0x00 0x400>;
> -               interrupts = <GIC_SPI 188 IRQ_TYPE_LEVEL_HIGH>;
> -               #address-cells = <1>;
> -               #size-cells = <0>;
> -               power-domains = <&k3_pds 270 TI_SCI_PD_EXCLUSIVE>;
> -               clocks = <&k3_clks 270 1>;
> -               status = "disabled";
> -       };
> -
> -       main_spi5: spi at 2150000 {
> -               compatible = "ti,am654-mcspi","ti,omap4-mcspi";
> -               reg = <0x00 0x02150000 0x00 0x400>;
> -               interrupts = <GIC_SPI 189 IRQ_TYPE_LEVEL_HIGH>;
> -               #address-cells = <1>;
> -               #size-cells = <0>;
> -               power-domains = <&k3_pds 271 TI_SCI_PD_EXCLUSIVE>;
> -               clocks = <&k3_clks 271 1>;
> -               status = "disabled";
> -       };
> -
> -       main_spi6: spi at 2160000 {
> -               compatible = "ti,am654-mcspi","ti,omap4-mcspi";
> -               reg = <0x00 0x02160000 0x00 0x400>;
> -               interrupts = <GIC_SPI 190 IRQ_TYPE_LEVEL_HIGH>;
> -               #address-cells = <1>;
> -               #size-cells = <0>;
> -               power-domains = <&k3_pds 272 TI_SCI_PD_EXCLUSIVE>;
> -               clocks = <&k3_clks 272 1>;
> -               status = "disabled";
> -       };
> -
> -       main_spi7: spi at 2170000 {
> -               compatible = "ti,am654-mcspi","ti,omap4-mcspi";
> -               reg = <0x00 0x02170000 0x00 0x400>;
> -               interrupts = <GIC_SPI 191 IRQ_TYPE_LEVEL_HIGH>;
> -               #address-cells = <1>;
> -               #size-cells = <0>;
> -               power-domains = <&k3_pds 273 TI_SCI_PD_EXCLUSIVE>;
> -               clocks = <&k3_clks 273 1>;
> -               status = "disabled";
> -       };
> -
> -       main_esm: esm at 700000 {
> -               compatible = "ti,j721e-esm";
> -               reg = <0x0 0x700000 0x0 0x1000>;
> -               ti,esm-pins = <344>, <345>;
> -       };
> -};
> diff --git a/arch/arm/dts/k3-j721e-mcu-wakeup.dtsi b/arch/arm/dts/k3-j721e-mcu-wakeup.dtsi
> deleted file mode 100644
> index f7ab7719fc0..00000000000
> --- a/arch/arm/dts/k3-j721e-mcu-wakeup.dtsi
> +++ /dev/null
> @@ -1,681 +0,0 @@
> -// SPDX-License-Identifier: GPL-2.0
> -/*
> - * Device Tree Source for J721E SoC Family MCU/WAKEUP Domain peripherals
> - *
> - * Copyright (C) 2016-2020 Texas Instruments Incorporated - https://www.ti.com/
> - */
> -
> -&cbass_mcu_wakeup {
> -       dmsc: system-controller at 44083000 {
> -               compatible = "ti,k2g-sci";
> -               ti,host-id = <12>;
> -
> -               mbox-names = "rx", "tx";
> -
> -               mboxes = <&secure_proxy_main 11>,
> -                        <&secure_proxy_main 13>;
> -
> -               reg-names = "debug_messages";
> -               reg = <0x00 0x44083000 0x0 0x1000>;
> -
> -               k3_pds: power-controller {
> -                       compatible = "ti,sci-pm-domain";
> -                       #power-domain-cells = <2>;
> -               };
> -
> -               k3_clks: clock-controller {
> -                       compatible = "ti,k2g-sci-clk";
> -                       #clock-cells = <2>;
> -               };
> -
> -               k3_reset: reset-controller {
> -                       compatible = "ti,sci-reset";
> -                       #reset-cells = <2>;
> -               };
> -       };
> -
> -       mcu_conf: syscon at 40f00000 {
> -               compatible = "syscon", "simple-mfd";
> -               reg = <0x0 0x40f00000 0x0 0x20000>;
> -               #address-cells = <1>;
> -               #size-cells = <1>;
> -               ranges = <0x0 0x0 0x40f00000 0x20000>;
> -
> -               phy_gmii_sel: phy at 4040 {
> -                       compatible = "ti,am654-phy-gmii-sel";
> -                       reg = <0x4040 0x4>;
> -                       #phy-cells = <1>;
> -               };
> -       };
> -
> -       chipid at 43000014 {
> -               compatible = "ti,am654-chipid";
> -               reg = <0x0 0x43000014 0x0 0x4>;
> -       };
> -
> -       wkup_pmx0: pinctrl at 4301c000 {
> -               compatible = "pinctrl-single";
> -               /* Proxy 0 addressing */
> -               reg = <0x00 0x4301c000 0x00 0x178>;
> -               #pinctrl-cells = <1>;
> -               pinctrl-single,register-width = <32>;
> -               pinctrl-single,function-mask = <0xffffffff>;
> -       };
> -
> -       /* MCU_TIMERIO pad input CTRLMMR_MCU_TIMER*_CTRL registers */
> -       mcu_timerio_input: pinctrl at 40f04200 {
> -               compatible = "pinctrl-single";
> -               reg = <0x00 0x40f04200 0x00 0x28>;
> -               #pinctrl-cells = <1>;
> -               pinctrl-single,register-width = <32>;
> -               pinctrl-single,function-mask = <0x0000000f>;
> -               /* Non-MPU Firmware usage */
> -               status = "reserved";
> -       };
> -
> -       /* MCU_TIMERIO pad output CTRLMMR_MCU_TIMERIO*_CTRL registers */
> -       mcu_timerio_output: pinctrl at 40f04280 {
> -               compatible = "pinctrl-single";
> -               reg = <0x00 0x40f04280 0x00 0x28>;
> -               #pinctrl-cells = <1>;
> -               pinctrl-single,register-width = <32>;
> -               pinctrl-single,function-mask = <0x0000000f>;
> -               /* Non-MPU Firmware usage */
> -               status = "reserved";
> -       };
> -
> -       mcu_ram: sram at 41c00000 {
> -               compatible = "mmio-sram";
> -               reg = <0x00 0x41c00000 0x00 0x100000>;
> -               ranges = <0x0 0x00 0x41c00000 0x100000>;
> -               #address-cells = <1>;
> -               #size-cells = <1>;
> -       };
> -
> -       mcu_timer0: timer at 40400000 {
> -               compatible = "ti,am654-timer";
> -               reg = <0x00 0x40400000 0x00 0x400>;
> -               interrupts = <GIC_SPI 816 IRQ_TYPE_LEVEL_HIGH>;
> -               clocks = <&k3_clks 35 1>;
> -               clock-names = "fck";
> -               assigned-clocks = <&k3_clks 35 1>;
> -               assigned-clock-parents = <&k3_clks 35 2>;
> -               power-domains = <&k3_pds 35 TI_SCI_PD_EXCLUSIVE>;
> -               ti,timer-pwm;
> -               /* Non-MPU Firmware usage */
> -               status = "reserved";
> -       };
> -
> -       mcu_timer1: timer at 40410000 {
> -               compatible = "ti,am654-timer";
> -               reg = <0x00 0x40410000 0x00 0x400>;
> -               interrupts = <GIC_SPI 817 IRQ_TYPE_LEVEL_HIGH>;
> -               clocks = <&k3_clks 71 1>;
> -               clock-names = "fck";
> -               assigned-clocks = <&k3_clks 71 1>, <&k3_clks 322 0>;
> -               assigned-clock-parents = <&k3_clks 71 2>, <&k3_clks 322 1>;
> -               power-domains = <&k3_pds 71 TI_SCI_PD_EXCLUSIVE>;
> -               ti,timer-pwm;
> -               /* Non-MPU Firmware usage */
> -               status = "reserved";
> -       };
> -
> -       mcu_timer2: timer at 40420000 {
> -               compatible = "ti,am654-timer";
> -               reg = <0x00 0x40420000 0x00 0x400>;
> -               interrupts = <GIC_SPI 818 IRQ_TYPE_LEVEL_HIGH>;
> -               clocks = <&k3_clks 72 1>;
> -               clock-names = "fck";
> -               assigned-clocks = <&k3_clks 72 1>;
> -               assigned-clock-parents = <&k3_clks 72 2>;
> -               power-domains = <&k3_pds 72 TI_SCI_PD_EXCLUSIVE>;
> -               ti,timer-pwm;
> -               /* Non-MPU Firmware usage */
> -               status = "reserved";
> -       };
> -
> -       mcu_timer3: timer at 40430000 {
> -               compatible = "ti,am654-timer";
> -               reg = <0x00 0x40430000 0x00 0x400>;
> -               interrupts = <GIC_SPI 819 IRQ_TYPE_LEVEL_HIGH>;
> -               clocks = <&k3_clks 73 1>;
> -               clock-names = "fck";
> -               assigned-clocks = <&k3_clks 73 1>, <&k3_clks 323 0>;
> -               assigned-clock-parents = <&k3_clks 73 2>, <&k3_clks 323 1>;
> -               power-domains = <&k3_pds 73 TI_SCI_PD_EXCLUSIVE>;
> -               ti,timer-pwm;
> -               /* Non-MPU Firmware usage */
> -               status = "reserved";
> -       };
> -
> -       mcu_timer4: timer at 40440000 {
> -               compatible = "ti,am654-timer";
> -               reg = <0x00 0x40440000 0x00 0x400>;
> -               interrupts = <GIC_SPI 820 IRQ_TYPE_LEVEL_HIGH>;
> -               clocks = <&k3_clks 74 1>;
> -               clock-names = "fck";
> -               assigned-clocks = <&k3_clks 74 1>;
> -               assigned-clock-parents = <&k3_clks 74 2>;
> -               power-domains = <&k3_pds 74 TI_SCI_PD_EXCLUSIVE>;
> -               ti,timer-pwm;
> -               /* Non-MPU Firmware usage */
> -               status = "reserved";
> -       };
> -
> -       mcu_timer5: timer at 40450000 {
> -               compatible = "ti,am654-timer";
> -               reg = <0x00 0x40450000 0x00 0x400>;
> -               interrupts = <GIC_SPI 821 IRQ_TYPE_LEVEL_HIGH>;
> -               clocks = <&k3_clks 75 1>;
> -               clock-names = "fck";
> -               assigned-clocks = <&k3_clks 75 1>, <&k3_clks 324 0>;
> -               assigned-clock-parents = <&k3_clks 75 2>, <&k3_clks 324 1>;
> -               power-domains = <&k3_pds 75 TI_SCI_PD_EXCLUSIVE>;
> -               ti,timer-pwm;
> -               /* Non-MPU Firmware usage */
> -               status = "reserved";
> -       };
> -
> -       mcu_timer6: timer at 40460000 {
> -               compatible = "ti,am654-timer";
> -               reg = <0x00 0x40460000 0x00 0x400>;
> -               interrupts = <GIC_SPI 822 IRQ_TYPE_LEVEL_HIGH>;
> -               clocks = <&k3_clks 76 1>;
> -               clock-names = "fck";
> -               assigned-clocks = <&k3_clks 76 1>;
> -               assigned-clock-parents = <&k3_clks 76 2>;
> -               power-domains = <&k3_pds 76 TI_SCI_PD_EXCLUSIVE>;
> -               ti,timer-pwm;
> -               /* Non-MPU Firmware usage */
> -               status = "reserved";
> -       };
> -
> -       mcu_timer7: timer at 40470000 {
> -               compatible = "ti,am654-timer";
> -               reg = <0x00 0x40470000 0x00 0x400>;
> -               interrupts = <GIC_SPI 823 IRQ_TYPE_LEVEL_HIGH>;
> -               clocks = <&k3_clks 77 1>;
> -               clock-names = "fck";
> -               assigned-clocks = <&k3_clks 77 1>, <&k3_clks 325 0>;
> -               assigned-clock-parents = <&k3_clks 77 2>, <&k3_clks 325 1>;
> -               power-domains = <&k3_pds 77 TI_SCI_PD_EXCLUSIVE>;
> -               ti,timer-pwm;
> -               /* Non-MPU Firmware usage */
> -               status = "reserved";
> -       };
> -
> -       mcu_timer8: timer at 40480000 {
> -               compatible = "ti,am654-timer";
> -               reg = <0x00 0x40480000 0x00 0x400>;
> -               interrupts = <GIC_SPI 824 IRQ_TYPE_LEVEL_HIGH>;
> -               clocks = <&k3_clks 78 1>;
> -               clock-names = "fck";
> -               assigned-clocks = <&k3_clks 78 1>;
> -               assigned-clock-parents = <&k3_clks 78 2>;
> -               power-domains = <&k3_pds 78 TI_SCI_PD_EXCLUSIVE>;
> -               ti,timer-pwm;
> -               /* Non-MPU Firmware usage */
> -               status = "reserved";
> -       };
> -
> -       mcu_timer9: timer at 40490000 {
> -               compatible = "ti,am654-timer";
> -               reg = <0x00 0x40490000 0x00 0x400>;
> -               interrupts = <GIC_SPI 825 IRQ_TYPE_LEVEL_HIGH>;
> -               clocks = <&k3_clks 79 1>;
> -               clock-names = "fck";
> -               assigned-clocks = <&k3_clks 79 1>, <&k3_clks 326 0>;
> -               assigned-clock-parents = <&k3_clks 79 2>, <&k3_clks 326 1>;
> -               power-domains = <&k3_pds 79 TI_SCI_PD_EXCLUSIVE>;
> -               ti,timer-pwm;
> -               /* Non-MPU Firmware usage */
> -               status = "reserved";
> -       };
> -       wkup_uart0: serial at 42300000 {
> -               compatible = "ti,j721e-uart", "ti,am654-uart";
> -               reg = <0x00 0x42300000 0x00 0x100>;
> -               interrupts = <GIC_SPI 897 IRQ_TYPE_LEVEL_HIGH>;
> -               clock-frequency = <48000000>;
> -               current-speed = <115200>;
> -               power-domains = <&k3_pds 287 TI_SCI_PD_EXCLUSIVE>;
> -               clocks = <&k3_clks 287 0>;
> -               clock-names = "fclk";
> -               status = "disabled";
> -       };
> -
> -       mcu_uart0: serial at 40a00000 {
> -               compatible = "ti,j721e-uart", "ti,am654-uart";
> -               reg = <0x00 0x40a00000 0x00 0x100>;
> -               interrupts = <GIC_SPI 846 IRQ_TYPE_LEVEL_HIGH>;
> -               clock-frequency = <96000000>;
> -               current-speed = <115200>;
> -               power-domains = <&k3_pds 149 TI_SCI_PD_EXCLUSIVE>;
> -               clocks = <&k3_clks 149 0>;
> -               clock-names = "fclk";
> -               status = "disabled";
> -       };
> -
> -       wkup_gpio_intr: interrupt-controller at 42200000 {
> -               compatible = "ti,sci-intr";
> -               reg = <0x00 0x42200000 0x00 0x400>;
> -               ti,intr-trigger-type = <1>;
> -               interrupt-controller;
> -               interrupt-parent = <&gic500>;
> -               #interrupt-cells = <1>;
> -               ti,sci = <&dmsc>;
> -               ti,sci-dev-id = <137>;
> -               ti,interrupt-ranges = <16 960 16>;
> -       };
> -
> -       wkup_gpio0: gpio at 42110000 {
> -               compatible = "ti,j721e-gpio", "ti,keystone-gpio";
> -               reg = <0x0 0x42110000 0x0 0x100>;
> -               gpio-controller;
> -               #gpio-cells = <2>;
> -               interrupt-parent = <&wkup_gpio_intr>;
> -               interrupts = <103>, <104>, <105>, <106>, <107>, <108>;
> -               interrupt-controller;
> -               #interrupt-cells = <2>;
> -               ti,ngpio = <84>;
> -               ti,davinci-gpio-unbanked = <0>;
> -               power-domains = <&k3_pds 113 TI_SCI_PD_EXCLUSIVE>;
> -               clocks = <&k3_clks 113 0>;
> -               clock-names = "gpio";
> -               status = "disabled";
> -       };
> -
> -       wkup_gpio1: gpio at 42100000 {
> -               compatible = "ti,j721e-gpio", "ti,keystone-gpio";
> -               reg = <0x0 0x42100000 0x0 0x100>;
> -               gpio-controller;
> -               #gpio-cells = <2>;
> -               interrupt-parent = <&wkup_gpio_intr>;
> -               interrupts = <112>, <113>, <114>, <115>, <116>, <117>;
> -               interrupt-controller;
> -               #interrupt-cells = <2>;
> -               ti,ngpio = <84>;
> -               ti,davinci-gpio-unbanked = <0>;
> -               power-domains = <&k3_pds 114 TI_SCI_PD_EXCLUSIVE>;
> -               clocks = <&k3_clks 114 0>;
> -               clock-names = "gpio";
> -               status = "disabled";
> -       };
> -
> -       mcu_i2c0: i2c at 40b00000 {
> -               compatible = "ti,j721e-i2c", "ti,omap4-i2c";
> -               reg = <0x0 0x40b00000 0x0 0x100>;
> -               interrupts = <GIC_SPI 852 IRQ_TYPE_LEVEL_HIGH>;
> -               #address-cells = <1>;
> -               #size-cells = <0>;
> -               clock-names = "fck";
> -               clocks = <&k3_clks 194 0>;
> -               power-domains = <&k3_pds 194 TI_SCI_PD_EXCLUSIVE>;
> -               status = "disabled";
> -       };
> -
> -       mcu_i2c1: i2c at 40b10000 {
> -               compatible = "ti,j721e-i2c", "ti,omap4-i2c";
> -               reg = <0x0 0x40b10000 0x0 0x100>;
> -               interrupts = <GIC_SPI 853 IRQ_TYPE_LEVEL_HIGH>;
> -               #address-cells = <1>;
> -               #size-cells = <0>;
> -               clock-names = "fck";
> -               clocks = <&k3_clks 195 0>;
> -               power-domains = <&k3_pds 195 TI_SCI_PD_EXCLUSIVE>;
> -               status = "disabled";
> -       };
> -
> -       wkup_i2c0: i2c at 42120000 {
> -               compatible = "ti,j721e-i2c", "ti,omap4-i2c";
> -               reg = <0x0 0x42120000 0x0 0x100>;
> -               interrupts = <GIC_SPI 896 IRQ_TYPE_LEVEL_HIGH>;
> -               #address-cells = <1>;
> -               #size-cells = <0>;
> -               clock-names = "fck";
> -               clocks = <&k3_clks 197 0>;
> -               power-domains = <&k3_pds 197 TI_SCI_PD_SHARED>;
> -               status = "disabled";
> -       };
> -
> -       fss: bus at 47000000 {
> -               compatible = "simple-bus";
> -               reg = <0x0 0x47000000 0x0 0x100>;
> -               #address-cells = <2>;
> -               #size-cells = <2>;
> -               ranges;
> -
> -               hbmc_mux: mux-controller at 47000004 {
> -                       compatible = "reg-mux";
> -                       reg = <0x00 0x47000004 0x00 0x2>;
> -                       #mux-control-cells = <1>;
> -                       mux-reg-masks = <0x4 0x2>; /* HBMC select */
> -               };
> -
> -               hbmc: hyperbus at 47034000 {
> -                       compatible = "ti,am654-hbmc";
> -                       reg = <0x00 0x47034000 0x00 0x100>,
> -                               <0x05 0x00000000 0x01 0x0000000>;
> -                       power-domains = <&k3_pds 102 TI_SCI_PD_EXCLUSIVE>;
> -                       clocks = <&k3_clks 102 0>;
> -                       assigned-clocks = <&k3_clks 102 5>;
> -                       assigned-clock-rates = <333333333>;
> -                       #address-cells = <2>;
> -                       #size-cells = <1>;
> -                       mux-controls = <&hbmc_mux 0>;
> -                       status = "disabled";
> -               };
> -
> -               ospi0: spi at 47040000 {
> -                       compatible = "ti,am654-ospi", "cdns,qspi-nor";
> -                       reg = <0x0 0x47040000 0x0 0x100>,
> -                               <0x5 0x00000000 0x1 0x0000000>;
> -                       interrupts = <GIC_SPI 840 IRQ_TYPE_LEVEL_HIGH>;
> -                       cdns,fifo-depth = <256>;
> -                       cdns,fifo-width = <4>;
> -                       cdns,trigger-address = <0x0>;
> -                       clocks = <&k3_clks 103 0>;
> -                       assigned-clocks = <&k3_clks 103 0>;
> -                       assigned-clock-parents = <&k3_clks 103 2>;
> -                       assigned-clock-rates = <166666666>;
> -                       power-domains = <&k3_pds 103 TI_SCI_PD_EXCLUSIVE>;
> -                       #address-cells = <1>;
> -                       #size-cells = <0>;
> -                       status = "disabled";
> -               };
> -
> -               ospi1: spi at 47050000 {
> -                       compatible = "ti,am654-ospi", "cdns,qspi-nor";
> -                       reg = <0x0 0x47050000 0x0 0x100>,
> -                               <0x7 0x00000000 0x1 0x00000000>;
> -                       interrupts = <GIC_SPI 841 IRQ_TYPE_LEVEL_HIGH>;
> -                       cdns,fifo-depth = <256>;
> -                       cdns,fifo-width = <4>;
> -                       cdns,trigger-address = <0x0>;
> -                       clocks = <&k3_clks 104 0>;
> -                       power-domains = <&k3_pds 104 TI_SCI_PD_EXCLUSIVE>;
> -                       #address-cells = <1>;
> -                       #size-cells = <0>;
> -                       status = "disabled";
> -               };
> -       };
> -
> -       tscadc0: tscadc at 40200000 {
> -               compatible = "ti,am3359-tscadc";
> -               reg = <0x0 0x40200000 0x0 0x1000>;
> -               interrupts = <GIC_SPI 860 IRQ_TYPE_LEVEL_HIGH>;
> -               power-domains = <&k3_pds 0 TI_SCI_PD_EXCLUSIVE>;
> -               clocks = <&k3_clks 0 1>;
> -               assigned-clocks = <&k3_clks 0 3>;
> -               assigned-clock-rates = <60000000>;
> -               clock-names = "fck";
> -               dmas = <&main_udmap 0x7400>,
> -                       <&main_udmap 0x7401>;
> -               dma-names = "fifo0", "fifo1";
> -               status = "disabled";
> -
> -               adc {
> -                       #io-channel-cells = <1>;
> -                       compatible = "ti,am3359-adc";
> -               };
> -       };
> -
> -       tscadc1: tscadc at 40210000 {
> -               compatible = "ti,am3359-tscadc";
> -               reg = <0x0 0x40210000 0x0 0x1000>;
> -               interrupts = <GIC_SPI 861 IRQ_TYPE_LEVEL_HIGH>;
> -               power-domains = <&k3_pds 1 TI_SCI_PD_EXCLUSIVE>;
> -               clocks = <&k3_clks 1 1>;
> -               assigned-clocks = <&k3_clks 1 3>;
> -               assigned-clock-rates = <60000000>;
> -               clock-names = "fck";
> -               dmas = <&main_udmap 0x7402>,
> -                       <&main_udmap 0x7403>;
> -               dma-names = "fifo0", "fifo1";
> -               status = "disabled";
> -
> -               adc {
> -                       #io-channel-cells = <1>;
> -                       compatible = "ti,am3359-adc";
> -               };
> -       };
> -
> -       mcu_navss: bus at 28380000 {
> -               compatible = "simple-bus";
> -               #address-cells = <2>;
> -               #size-cells = <2>;
> -               ranges = <0x00 0x28380000 0x00 0x28380000 0x00 0x03880000>;
> -               dma-coherent;
> -               dma-ranges;
> -
> -               ti,sci-dev-id = <232>;
> -
> -               mcu_ringacc: ringacc at 2b800000 {
> -                       compatible = "ti,am654-navss-ringacc";
> -                       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";
> -                       ti,num-rings = <286>;
> -                       ti,sci-rm-range-gp-rings = <0x1>; /* GP ring range */
> -                       ti,sci = <&dmsc>;
> -                       ti,sci-dev-id = <235>;
> -                       msi-parent = <&main_udmass_inta>;
> -               };
> -
> -               mcu_udmap: dma-controller at 285c0000 {
> -                       compatible = "ti,j721e-navss-mcu-udmap";
> -                       reg = <0x0 0x285c0000 0x0 0x100>,
> -                             <0x0 0x2a800000 0x0 0x40000>,
> -                             <0x0 0x2aa00000 0x0 0x40000>;
> -                       reg-names = "gcfg", "rchanrt", "tchanrt";
> -                       msi-parent = <&main_udmass_inta>;
> -                       #dma-cells = <1>;
> -
> -                       ti,sci = <&dmsc>;
> -                       ti,sci-dev-id = <236>;
> -                       ti,ringacc = <&mcu_ringacc>;
> -
> -                       ti,sci-rm-range-tchan = <0x0d>, /* TX_CHAN */
> -                                               <0x0f>; /* TX_HCHAN */
> -                       ti,sci-rm-range-rchan = <0x0a>, /* RX_CHAN */
> -                                               <0x0b>; /* RX_HCHAN */
> -                       ti,sci-rm-range-rflow = <0x00>; /* GP RFLOW */
> -               };
> -       };
> -
> -       secure_proxy_mcu: mailbox at 2a480000 {
> -               compatible = "ti,am654-secure-proxy";
> -               #mbox-cells = <1>;
> -               reg-names = "target_data", "rt", "scfg";
> -               reg = <0x0 0x2a480000 0x0 0x80000>,
> -                     <0x0 0x2a380000 0x0 0x80000>,
> -                     <0x0 0x2a400000 0x0 0x80000>;
> -               /*
> -                * Marked Disabled:
> -                * Node is incomplete as it is meant for bootloaders and
> -                * firmware on non-MPU processors
> -                */
> -               status = "disabled";
> -       };
> -
> -       mcu_cpsw: ethernet at 46000000 {
> -               compatible = "ti,j721e-cpsw-nuss";
> -               #address-cells = <2>;
> -               #size-cells = <2>;
> -               reg = <0x0 0x46000000 0x0 0x200000>;
> -               reg-names = "cpsw_nuss";
> -               ranges = <0x0 0x0 0x0 0x46000000 0x0 0x200000>;
> -               dma-coherent;
> -               clocks = <&k3_clks 18 22>;
> -               clock-names = "fck";
> -               power-domains = <&k3_pds 18 TI_SCI_PD_EXCLUSIVE>;
> -
> -               dmas = <&mcu_udmap 0xf000>,
> -                      <&mcu_udmap 0xf001>,
> -                      <&mcu_udmap 0xf002>,
> -                      <&mcu_udmap 0xf003>,
> -                      <&mcu_udmap 0xf004>,
> -                      <&mcu_udmap 0xf005>,
> -                      <&mcu_udmap 0xf006>,
> -                      <&mcu_udmap 0xf007>,
> -                      <&mcu_udmap 0x7000>;
> -               dma-names = "tx0", "tx1", "tx2", "tx3",
> -                           "tx4", "tx5", "tx6", "tx7",
> -                           "rx";
> -
> -               ethernet-ports {
> -                       #address-cells = <1>;
> -                       #size-cells = <0>;
> -
> -                       cpsw_port1: port at 1 {
> -                               reg = <1>;
> -                               ti,mac-only;
> -                               label = "port1";
> -                               ti,syscon-efuse = <&mcu_conf 0x200>;
> -                               phys = <&phy_gmii_sel 1>;
> -                       };
> -               };
> -
> -               davinci_mdio: mdio at f00 {
> -                       compatible = "ti,cpsw-mdio","ti,davinci_mdio";
> -                       reg = <0x0 0xf00 0x0 0x100>;
> -                       #address-cells = <1>;
> -                       #size-cells = <0>;
> -                       clocks = <&k3_clks 18 22>;
> -                       clock-names = "fck";
> -                       bus_freq = <1000000>;
> -               };
> -
> -               cpts at 3d000 {
> -                       compatible = "ti,am65-cpts";
> -                       reg = <0x0 0x3d000 0x0 0x400>;
> -                       clocks = <&k3_clks 18 2>;
> -                       clock-names = "cpts";
> -                       interrupts-extended = <&gic500 GIC_SPI 858 IRQ_TYPE_LEVEL_HIGH>;
> -                       interrupt-names = "cpts";
> -                       ti,cpts-ext-ts-inputs = <4>;
> -                       ti,cpts-periodic-outputs = <2>;
> -               };
> -       };
> -
> -       mcu_r5fss0: r5fss at 41000000 {
> -               compatible = "ti,j721e-r5fss";
> -               ti,cluster-mode = <1>;
> -               #address-cells = <1>;
> -               #size-cells = <1>;
> -               ranges = <0x41000000 0x00 0x41000000 0x20000>,
> -                        <0x41400000 0x00 0x41400000 0x20000>;
> -               power-domains = <&k3_pds 249 TI_SCI_PD_EXCLUSIVE>;
> -
> -               mcu_r5fss0_core0: r5f at 41000000 {
> -                       compatible = "ti,j721e-r5f";
> -                       reg = <0x41000000 0x00008000>,
> -                             <0x41010000 0x00008000>;
> -                       reg-names = "atcm", "btcm";
> -                       ti,sci = <&dmsc>;
> -                       ti,sci-dev-id = <250>;
> -                       ti,sci-proc-ids = <0x01 0xff>;
> -                       resets = <&k3_reset 250 1>;
> -                       firmware-name = "j7-mcu-r5f0_0-fw";
> -                       ti,atcm-enable = <1>;
> -                       ti,btcm-enable = <1>;
> -                       ti,loczrama = <1>;
> -               };
> -
> -               mcu_r5fss0_core1: r5f at 41400000 {
> -                       compatible = "ti,j721e-r5f";
> -                       reg = <0x41400000 0x00008000>,
> -                             <0x41410000 0x00008000>;
> -                       reg-names = "atcm", "btcm";
> -                       ti,sci = <&dmsc>;
> -                       ti,sci-dev-id = <251>;
> -                       ti,sci-proc-ids = <0x02 0xff>;
> -                       resets = <&k3_reset 251 1>;
> -                       firmware-name = "j7-mcu-r5f0_1-fw";
> -                       ti,atcm-enable = <1>;
> -                       ti,btcm-enable = <1>;
> -                       ti,loczrama = <1>;
> -               };
> -       };
> -
> -       mcu_mcan0: can at 40528000 {
> -               compatible = "bosch,m_can";
> -               reg = <0x00 0x40528000 0x00 0x200>,
> -                     <0x00 0x40500000 0x00 0x8000>;
> -               reg-names = "m_can", "message_ram";
> -               power-domains = <&k3_pds 172 TI_SCI_PD_EXCLUSIVE>;
> -               clocks = <&k3_clks 172 0>, <&k3_clks 172 1>;
> -               clock-names = "hclk", "cclk";
> -               interrupts = <GIC_SPI 832 IRQ_TYPE_LEVEL_HIGH>,
> -                            <GIC_SPI 833 IRQ_TYPE_LEVEL_HIGH>;
> -               interrupt-names = "int0", "int1";
> -               bosch,mram-cfg = <0x0 128 64 64 64 64 32 32>;
> -               status = "disabled";
> -       };
> -
> -       mcu_mcan1: can at 40568000 {
> -               compatible = "bosch,m_can";
> -               reg = <0x00 0x40568000 0x00 0x200>,
> -                     <0x00 0x40540000 0x00 0x8000>;
> -               reg-names = "m_can", "message_ram";
> -               power-domains = <&k3_pds 173 TI_SCI_PD_EXCLUSIVE>;
> -               clocks = <&k3_clks 173 0>, <&k3_clks 173 1>;
> -               clock-names = "hclk", "cclk";
> -               interrupts = <GIC_SPI 835 IRQ_TYPE_LEVEL_HIGH>,
> -                            <GIC_SPI 836 IRQ_TYPE_LEVEL_HIGH>;
> -               interrupt-names = "int0", "int1";
> -               bosch,mram-cfg = <0x0 128 64 64 64 64 32 32>;
> -               status = "disabled";
> -       };
> -
> -       mcu_spi0: spi at 40300000 {
> -               compatible = "ti,am654-mcspi", "ti,omap4-mcspi";
> -               reg = <0x00 0x040300000 0x00 0x400>;
> -               interrupts = <GIC_SPI 848 IRQ_TYPE_LEVEL_HIGH>;
> -               #address-cells = <1>;
> -               #size-cells = <0>;
> -               power-domains = <&k3_pds 274 TI_SCI_PD_EXCLUSIVE>;
> -               clocks = <&k3_clks 274 0>;
> -               status = "disabled";
> -       };
> -
> -       mcu_spi1: spi at 40310000 {
> -               compatible = "ti,am654-mcspi", "ti,omap4-mcspi";
> -               reg = <0x00 0x040310000 0x00 0x400>;
> -               interrupts = <GIC_SPI 849 IRQ_TYPE_LEVEL_HIGH>;
> -               #address-cells = <1>;
> -               #size-cells = <0>;
> -               power-domains = <&k3_pds 275 TI_SCI_PD_EXCLUSIVE>;
> -               clocks = <&k3_clks 275 0>;
> -               status = "disabled";
> -       };
> -
> -       mcu_spi2: spi at 40320000 {
> -               compatible = "ti,am654-mcspi", "ti,omap4-mcspi";
> -               reg = <0x00 0x040320000 0x00 0x400>;
> -               interrupts = <GIC_SPI 850 IRQ_TYPE_LEVEL_HIGH>;
> -               #address-cells = <1>;
> -               #size-cells = <0>;
> -               power-domains = <&k3_pds 276 TI_SCI_PD_EXCLUSIVE>;
> -               clocks = <&k3_clks 276 0>;
> -               status = "disabled";
> -       };
> -
> -       wkup_vtm0: temperature-sensor at 42040000 {
> -               compatible = "ti,j721e-vtm";
> -               reg = <0x00 0x42040000 0x00 0x350>,
> -                     <0x00 0x42050000 0x00 0x350>,
> -                     <0x00 0x43000300 0x00 0x10>;
> -               power-domains = <&k3_pds 154 TI_SCI_PD_EXCLUSIVE>;
> -               #thermal-sensor-cells = <1>;
> -       };
> -
> -       mcu_esm: esm at 40800000 {
> -               compatible = "ti,j721e-esm";
> -               reg = <0x00 0x40800000 0x00 0x1000>;
> -               ti,esm-pins = <95>;
> -               bootph-pre-ram;
> -       };
> -};
> diff --git a/arch/arm/dts/k3-j721e-sk-u-boot.dtsi b/arch/arm/dts/k3-j721e-sk-u-boot.dtsi
> index 6d0f7457ccd..07ed7b40fed 100644
> --- a/arch/arm/dts/k3-j721e-sk-u-boot.dtsi
> +++ b/arch/arm/dts/k3-j721e-sk-u-boot.dtsi
> @@ -15,10 +15,10 @@
>
>  &cbass_mcu_wakeup {
>         bootph-all;
> +};
>
> -       chipid at 43000014 {
> -               bootph-all;
> -       };
> +&chipid {
> +       bootph-all;
>  };
>
>  &mcu_navss {
> @@ -26,19 +26,11 @@
>  };
>
>  &mcu_ringacc {
> -               bootph-all;
> +       bootph-all;
>  };
>
>  &mcu_udmap {
> -       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-all;
> +       bootph-all;
>  };
>
>  &secure_proxy_main {
> @@ -158,7 +150,7 @@
>
>  #ifdef CONFIG_TARGET_J721E_A72_EVM
>
> -#define SPL_J721E_SK_DTB "spl/dts/k3-j721e-sk.dtb"
> +#define SPL_J721E_SK_DTB "spl/dts/ti/k3-j721e-sk.dtb"
>  #define J721E_SK_DTB "u-boot.dtb"
>
>  &spl_j721e_dtb {
> diff --git a/arch/arm/dts/k3-j721e-sk.dts b/arch/arm/dts/k3-j721e-sk.dts
> deleted file mode 100644
> index 42fe8eee9ec..00000000000
> --- a/arch/arm/dts/k3-j721e-sk.dts
> +++ /dev/null
> @@ -1,1074 +0,0 @@
> -// SPDX-License-Identifier: GPL-2.0
> -/*
> - * Copyright (C) 2021 Texas Instruments Incorporated - https://www.ti.com/
> - *
> - * J721E SK URL: https://www.ti.com/tool/SK-TDA4VM
> - */
> -
> -/dts-v1/;
> -
> -#include "k3-j721e.dtsi"
> -#include <dt-bindings/gpio/gpio.h>
> -#include <dt-bindings/input/input.h>
> -#include <dt-bindings/net/ti-dp83867.h>
> -
> -/ {
> -       compatible = "ti,j721e-sk", "ti,j721e";
> -       model = "Texas Instruments J721E SK";
> -
> -       aliases {
> -               serial0 = &wkup_uart0;
> -               serial1 = &mcu_uart0;
> -               serial2 = &main_uart0;
> -               serial3 = &main_uart1;
> -               ethernet0 = &cpsw_port1;
> -               mmc1 = &main_sdhci1;
> -       };
> -
> -       chosen {
> -               stdout-path = "serial2:115200n8";
> -       };
> -
> -       memory at 80000000 {
> -               device_type = "memory";
> -               /* 4G RAM */
> -               reg = <0x00000000 0x80000000 0x00000000 0x80000000>,
> -                     <0x00000008 0x80000000 0x00000000 0x80000000>;
> -       };
> -
> -       reserved_memory: reserved-memory {
> -               #address-cells = <2>;
> -               #size-cells = <2>;
> -               ranges;
> -
> -               secure_ddr: optee at 9e800000 {
> -                       reg = <0x00 0x9e800000 0x00 0x01800000>;
> -                       alignment = <0x1000>;
> -                       no-map;
> -               };
> -
> -               mcu_r5fss0_core0_dma_memory_region: r5f-dma-memory at a0000000 {
> -                       compatible = "shared-dma-pool";
> -                       reg = <0x00 0xa0000000 0x00 0x100000>;
> -                       no-map;
> -               };
> -
> -               mcu_r5fss0_core0_memory_region: r5f-memory at a0100000 {
> -                       compatible = "shared-dma-pool";
> -                       reg = <0x00 0xa0100000 0x00 0xf00000>;
> -                       no-map;
> -               };
> -
> -               mcu_r5fss0_core1_dma_memory_region: r5f-dma-memory at a1000000 {
> -                       compatible = "shared-dma-pool";
> -                       reg = <0x00 0xa1000000 0x00 0x100000>;
> -                       no-map;
> -               };
> -
> -               mcu_r5fss0_core1_memory_region: r5f-memory at a1100000 {
> -                       compatible = "shared-dma-pool";
> -                       reg = <0x00 0xa1100000 0x00 0xf00000>;
> -                       no-map;
> -               };
> -
> -               main_r5fss0_core0_dma_memory_region: r5f-dma-memory at a2000000 {
> -                       compatible = "shared-dma-pool";
> -                       reg = <0x00 0xa2000000 0x00 0x100000>;
> -                       no-map;
> -               };
> -
> -               main_r5fss0_core0_memory_region: r5f-memory at a2100000 {
> -                       compatible = "shared-dma-pool";
> -                       reg = <0x00 0xa2100000 0x00 0xf00000>;
> -                       no-map;
> -               };
> -
> -               main_r5fss0_core1_dma_memory_region: r5f-dma-memory at a3000000 {
> -                       compatible = "shared-dma-pool";
> -                       reg = <0x00 0xa3000000 0x00 0x100000>;
> -                       no-map;
> -               };
> -
> -               main_r5fss0_core1_memory_region: r5f-memory at a3100000 {
> -                       compatible = "shared-dma-pool";
> -                       reg = <0x00 0xa3100000 0x00 0xf00000>;
> -                       no-map;
> -               };
> -
> -               main_r5fss1_core0_dma_memory_region: r5f-dma-memory at a4000000 {
> -                       compatible = "shared-dma-pool";
> -                       reg = <0x00 0xa4000000 0x00 0x100000>;
> -                       no-map;
> -               };
> -
> -               main_r5fss1_core0_memory_region: r5f-memory at a4100000 {
> -                       compatible = "shared-dma-pool";
> -                       reg = <0x00 0xa4100000 0x00 0xf00000>;
> -                       no-map;
> -               };
> -
> -               main_r5fss1_core1_dma_memory_region: r5f-dma-memory at a5000000 {
> -                       compatible = "shared-dma-pool";
> -                       reg = <0x00 0xa5000000 0x00 0x100000>;
> -                       no-map;
> -               };
> -
> -               main_r5fss1_core1_memory_region: r5f-memory at a5100000 {
> -                       compatible = "shared-dma-pool";
> -                       reg = <0x00 0xa5100000 0x00 0xf00000>;
> -                       no-map;
> -               };
> -
> -               c66_1_dma_memory_region: c66-dma-memory at a6000000 {
> -                       compatible = "shared-dma-pool";
> -                       reg = <0x00 0xa6000000 0x00 0x100000>;
> -                       no-map;
> -               };
> -
> -               c66_0_memory_region: c66-memory at a6100000 {
> -                       compatible = "shared-dma-pool";
> -                       reg = <0x00 0xa6100000 0x00 0xf00000>;
> -                       no-map;
> -               };
> -
> -               c66_0_dma_memory_region: c66-dma-memory at a7000000 {
> -                       compatible = "shared-dma-pool";
> -                       reg = <0x00 0xa7000000 0x00 0x100000>;
> -                       no-map;
> -               };
> -
> -               c66_1_memory_region: c66-memory at a7100000 {
> -                       compatible = "shared-dma-pool";
> -                       reg = <0x00 0xa7100000 0x00 0xf00000>;
> -                       no-map;
> -               };
> -
> -               c71_0_dma_memory_region: c71-dma-memory at a8000000 {
> -                       compatible = "shared-dma-pool";
> -                       reg = <0x00 0xa8000000 0x00 0x100000>;
> -                       no-map;
> -               };
> -
> -               c71_0_memory_region: c71-memory at a8100000 {
> -                       compatible = "shared-dma-pool";
> -                       reg = <0x00 0xa8100000 0x00 0xf00000>;
> -                       no-map;
> -               };
> -
> -               rtos_ipc_memory_region: ipc-memories at aa000000 {
> -                       reg = <0x00 0xaa000000 0x00 0x01c00000>;
> -                       alignment = <0x1000>;
> -                       no-map;
> -               };
> -       };
> -
> -       vusb_main: fixedregulator-vusb-main5v0 {
> -               /* USB MAIN INPUT 5V DC */
> -               compatible = "regulator-fixed";
> -               regulator-name = "vusb-main5v0";
> -               regulator-min-microvolt = <5000000>;
> -               regulator-max-microvolt = <5000000>;
> -               regulator-always-on;
> -               regulator-boot-on;
> -       };
> -
> -       vsys_3v3: fixedregulator-vsys3v3 {
> -               /* Output of LM5141 */
> -               compatible = "regulator-fixed";
> -               regulator-name = "vsys_3v3";
> -               regulator-min-microvolt = <3300000>;
> -               regulator-max-microvolt = <3300000>;
> -               vin-supply = <&vusb_main>;
> -               regulator-always-on;
> -               regulator-boot-on;
> -       };
> -
> -       vdd_mmc1: fixedregulator-sd {
> -               compatible = "regulator-fixed";
> -               pinctrl-names = "default";
> -               pinctrl-0 = <&vdd_mmc1_en_pins_default>;
> -               regulator-name = "vdd_mmc1";
> -               regulator-min-microvolt = <3300000>;
> -               regulator-max-microvolt = <3300000>;
> -               regulator-boot-on;
> -               enable-active-high;
> -               vin-supply = <&vsys_3v3>;
> -               gpio = <&wkup_gpio0 8 GPIO_ACTIVE_HIGH>;
> -       };
> -
> -       vdd_sd_dv_alt: gpio-regulator-tps659411 {
> -               compatible = "regulator-gpio";
> -               pinctrl-names = "default";
> -               pinctrl-0 = <&vdd_sd_dv_alt_pins_default>;
> -               regulator-name = "tps659411";
> -               regulator-min-microvolt = <1800000>;
> -               regulator-max-microvolt = <3300000>;
> -               regulator-boot-on;
> -               vin-supply = <&vsys_3v3>;
> -               gpios = <&wkup_gpio0 9 GPIO_ACTIVE_HIGH>;
> -               states = <1800000 0x0>,
> -                        <3300000 0x1>;
> -       };
> -
> -       dp_pwr_3v3: fixedregulator-dp-prw {
> -               compatible = "regulator-fixed";
> -               regulator-name = "dp-pwr";
> -               regulator-min-microvolt = <3300000>;
> -               regulator-max-microvolt = <3300000>;
> -               pinctrl-names = "default";
> -               pinctrl-0 = <&dp_pwr_en_pins_default>;
> -               gpio = <&main_gpio0 111 0>;     /* DP0_3V3 _EN */
> -               enable-active-high;
> -       };
> -
> -       dp0: connector {
> -               compatible = "dp-connector";
> -               label = "DP0";
> -               type = "full-size";
> -               dp-pwr-supply = <&dp_pwr_3v3>;
> -
> -               port {
> -                       dp_connector_in: endpoint {
> -                               remote-endpoint = <&dp0_out>;
> -                       };
> -               };
> -       };
> -
> -       hdmi-connector {
> -               compatible = "hdmi-connector";
> -               label = "hdmi";
> -               type = "a";
> -
> -               pinctrl-names = "default";
> -               pinctrl-0 = <&hdmi_hpd_pins_default>;
> -
> -               ddc-i2c-bus = <&main_i2c1>;
> -
> -               /* HDMI_HPD */
> -               hpd-gpios = <&main_gpio1 0 GPIO_ACTIVE_HIGH>;
> -
> -               port {
> -                       hdmi_connector_in: endpoint {
> -                               remote-endpoint = <&tfp410_out>;
> -                       };
> -               };
> -       };
> -
> -       dvi-bridge {
> -               compatible = "ti,tfp410";
> -
> -               pinctrl-names = "default";
> -               pinctrl-0 = <&hdmi_pdn_pins_default>;
> -
> -               powerdown-gpios = <&main_gpio0 127 GPIO_ACTIVE_LOW>;
> -               ti,deskew = <0>;
> -
> -               ports {
> -                       #address-cells = <1>;
> -                       #size-cells = <0>;
> -
> -                       port at 0 {
> -                               reg = <0>;
> -
> -                               tfp410_in: endpoint {
> -                                       remote-endpoint = <&dpi1_out>;
> -                                       pclk-sample = <1>;
> -                               };
> -                       };
> -
> -                       port at 1 {
> -                               reg = <1>;
> -
> -                               tfp410_out: endpoint {
> -                                       remote-endpoint =
> -                                               <&hdmi_connector_in>;
> -                               };
> -                       };
> -               };
> -       };
> -};
> -
> -&main_pmx0 {
> -       main_mmc1_pins_default: main-mmc1-default-pins {
> -               pinctrl-single,pins = <
> -                       J721E_IOPAD(0x254, PIN_INPUT, 0) /* (R29) MMC1_CMD */
> -                       J721E_IOPAD(0x250, PIN_INPUT, 0) /* (P25) MMC1_CLK */
> -                       J721E_IOPAD(0x2ac, PIN_INPUT, 0) /* (P25) MMC1_CLKLB */
> -                       J721E_IOPAD(0x24c, PIN_INPUT, 0) /* (R24) MMC1_DAT0 */
> -                       J721E_IOPAD(0x248, PIN_INPUT, 0) /* (P24) MMC1_DAT1 */
> -                       J721E_IOPAD(0x244, PIN_INPUT, 0) /* (R25) MMC1_DAT2 */
> -                       J721E_IOPAD(0x240, PIN_INPUT, 0) /* (R26) MMC1_DAT3 */
> -                       J721E_IOPAD(0x258, PIN_INPUT, 0) /* (P23) MMC1_SDCD */
> -               >;
> -       };
> -
> -       main_uart0_pins_default: main-uart0-default-pins {
> -               pinctrl-single,pins = <
> -                       J721E_IOPAD(0x1f0, PIN_INPUT, 0) /* (AC2) UART0_CTSn */
> -                       J721E_IOPAD(0x1f4, PIN_OUTPUT, 0) /* (AB1) UART0_RTSn */
> -                       J721E_IOPAD(0x1e8, PIN_INPUT, 0) /* (AB2) UART0_RXD */
> -                       J721E_IOPAD(0x1ec, PIN_OUTPUT, 0) /* (AB3) UART0_TXD */
> -               >;
> -       };
> -
> -       main_uart1_pins_default: main-uart1-default-pins {
> -               pinctrl-single,pins = <
> -                       J721E_IOPAD(0x1f8, PIN_INPUT, 0) /* (AA4) UART1_RXD */
> -                       J721E_IOPAD(0x1fc, PIN_OUTPUT, 0) /* (AB4) UART1_TXD */
> -               >;
> -       };
> -
> -       main_i2c0_pins_default: main-i2c0-default-pins {
> -               pinctrl-single,pins = <
> -                       J721E_IOPAD(0x220, PIN_INPUT_PULLUP, 0) /* (AC5) I2C0_SCL */
> -                       J721E_IOPAD(0x224, PIN_INPUT_PULLUP, 0) /* (AA5) I2C0_SDA */
> -               >;
> -       };
> -
> -       main_i2c1_pins_default: main-i2c1-default-pins {
> -               pinctrl-single,pins = <
> -                       J721E_IOPAD(0x228, PIN_INPUT_PULLUP, 0) /* (Y6) I2C1_SCL */
> -                       J721E_IOPAD(0x22c, PIN_INPUT_PULLUP, 0) /* (AA6) I2C1_SDA */
> -               >;
> -       };
> -
> -       main_i2c3_pins_default: main-i2c3-default-pins {
> -               pinctrl-single,pins = <
> -                       J721E_IOPAD(0x270, PIN_INPUT_PULLUP, 4) /* (T26) MMC2_CLK.I2C3_SCL */
> -                       J721E_IOPAD(0x274, PIN_INPUT_PULLUP, 4) /* (T25) MMC2_CMD.I2C3_SDA */
> -               >;
> -       };
> -
> -       main_usbss0_pins_default: main-usbss0-default-pins {
> -               pinctrl-single,pins = <
> -                       J721E_IOPAD(0x290, PIN_OUTPUT, 0) /* (U6) USB0_DRVVBUS */
> -                       J721E_IOPAD(0x210, PIN_INPUT, 7) /* (W3) MCAN1_RX.GPIO1_3 */
> -               >;
> -       };
> -
> -       main_usbss1_pins_default: main-usbss1-default-pins {
> -               pinctrl-single,pins = <
> -                       J721E_IOPAD(0x214, PIN_OUTPUT, 4) /* (V4) MCAN1_TX.USB1_DRVVBUS */
> -               >;
> -       };
> -
> -       dp0_pins_default: dp0-default-pins {
> -               pinctrl-single,pins = <
> -                       J721E_IOPAD(0x1c4, PIN_INPUT, 5) /* SPI0_CS1.DP0_HPD */
> -               >;
> -       };
> -
> -       dp_pwr_en_pins_default: dp-pwr-en-default-pins {
> -               pinctrl-single,pins = <
> -                       J721E_IOPAD(0x1c0, PIN_INPUT, 7) /* (AA2) SPI0_CS0.GPIO0_111 */
> -               >;
> -       };
> -
> -       dss_vout0_pins_default: dss-vout0-default-pins {
> -               pinctrl-single,pins = <
> -                       J721E_IOPAD(0x58, PIN_OUTPUT, 10) /* (AE22) PRG1_PRU1_GPO0.VOUT0_DATA0 */
> -                       J721E_IOPAD(0x5c, PIN_OUTPUT, 10) /* (AG23) PRG1_PRU1_GPO1.VOUT0_DATA1 */
> -                       J721E_IOPAD(0x60, PIN_OUTPUT, 10) /* (AF23) PRG1_PRU1_GPO2.VOUT0_DATA2 */
> -                       J721E_IOPAD(0x64, PIN_OUTPUT, 10) /* (AD23) PRG1_PRU1_GPO3.VOUT0_DATA3 */
> -                       J721E_IOPAD(0x68, PIN_OUTPUT, 10) /* (AH24) PRG1_PRU1_GPO4.VOUT0_DATA4 */
> -                       J721E_IOPAD(0x6c, PIN_OUTPUT, 10) /* (AG21) PRG1_PRU1_GPO5.VOUT0_DATA5 */
> -                       J721E_IOPAD(0x70, PIN_OUTPUT, 10) /* (AE23) PRG1_PRU1_GPO6.VOUT0_DATA6 */
> -                       J721E_IOPAD(0x74, PIN_OUTPUT, 10) /* (AC21) PRG1_PRU1_GPO7.VOUT0_DATA7 */
> -                       J721E_IOPAD(0x78, PIN_OUTPUT, 10) /* (Y23) PRG1_PRU1_GPO8.VOUT0_DATA8 */
> -                       J721E_IOPAD(0x7c, PIN_OUTPUT, 10) /* (AF21) PRG1_PRU1_GPO9.VOUT0_DATA9 */
> -                       J721E_IOPAD(0x80, PIN_OUTPUT, 10) /* (AB23) PRG1_PRU1_GPO10.VOUT0_DATA10 */
> -                       J721E_IOPAD(0x84, PIN_OUTPUT, 10) /* (AJ25) PRG1_PRU1_GPO11.VOUT0_DATA11 */
> -                       J721E_IOPAD(0x88, PIN_OUTPUT, 10) /* (AH25) PRG1_PRU1_GPO12.VOUT0_DATA12 */
> -                       J721E_IOPAD(0x8c, PIN_OUTPUT, 10) /* (AG25) PRG1_PRU1_GPO13.VOUT0_DATA13 */
> -                       J721E_IOPAD(0x90, PIN_OUTPUT, 10) /* (AH26) PRG1_PRU1_GPO14.VOUT0_DATA14 */
> -                       J721E_IOPAD(0x94, PIN_OUTPUT, 10) /* (AJ27) PRG1_PRU1_GPO15.VOUT0_DATA15 */
> -                       J721E_IOPAD(0x30, PIN_OUTPUT, 10) /* (AF24) PRG1_PRU0_GPO11.VOUT0_DATA16 */
> -                       J721E_IOPAD(0x34, PIN_OUTPUT, 10) /* (AJ24) PRG1_PRU0_GPO12.VOUT0_DATA17 */
> -                       J721E_IOPAD(0x38, PIN_OUTPUT, 10) /* (AG24) PRG1_PRU0_GPO13.VOUT0_DATA18 */
> -                       J721E_IOPAD(0x3c, PIN_OUTPUT, 10) /* (AD24) PRG1_PRU0_GPO14.VOUT0_DATA19 */
> -                       J721E_IOPAD(0x40, PIN_OUTPUT, 10) /* (AC24) PRG1_PRU0_GPO15.VOUT0_DATA20 */
> -                       J721E_IOPAD(0x44, PIN_OUTPUT, 10) /* (AE24) PRG1_PRU0_GPO16.VOUT0_DATA21 */
> -                       J721E_IOPAD(0x24, PIN_OUTPUT, 10) /* (AJ20) PRG1_PRU0_GPO8.VOUT0_DATA22 */
> -                       J721E_IOPAD(0x28, PIN_OUTPUT, 10) /* (AG20) PRG1_PRU0_GPO9.VOUT0_DATA23 */
> -                       J721E_IOPAD(0x9c, PIN_OUTPUT, 10) /* (AC22) PRG1_PRU1_GPO17.VOUT0_DE */
> -                       J721E_IOPAD(0x98, PIN_OUTPUT, 10) /* (AJ26) PRG1_PRU1_GPO16.VOUT0_HSYNC */
> -                       J721E_IOPAD(0xa4, PIN_OUTPUT, 10) /* (AH22) PRG1_PRU1_GPO19.VOUT0_PCLK */
> -                       J721E_IOPAD(0xa0, PIN_OUTPUT, 10) /* (AJ22) PRG1_PRU1_GPO18.VOUT0_VSYNC */
> -               >;
> -       };
> -
> -       hdmi_hpd_pins_default: hdmi-hpd-default-pins {
> -               pinctrl-single,pins = <
> -                       J721E_IOPAD(0x204, PIN_INPUT, 7) /* (AD5) UART1_RTSn.GPIO1_0 */
> -               >;
> -       };
> -
> -       hdmi_pdn_pins_default: hdmi-pdn-default-pins {
> -               pinctrl-single,pins = <
> -                       J721E_IOPAD(0x200, PIN_INPUT, 7) /* (AC4) UART1_CTSn.GPIO0_127 */
> -               >;
> -       };
> -
> -       /* Reset for M.2 E Key slot on PCIe0  */
> -       ekey_reset_pins_default: ekey-reset-pns-default-pins {
> -               pinctrl-single,pins = <
> -                       J721E_IOPAD(0x124, PIN_INPUT, 7) /* (Y24) PRG0_PRU1_GPO9.GPIO0_72 */
> -               >;
> -       };
> -
> -       main_i2c5_pins_default: main-i2c5-default-pins {
> -               pinctrl-single,pins = <
> -                       J721E_IOPAD(0x150, PIN_INPUT_PULLUP, 2) /* (Y26) PRG0_MDIO0_MDIO.I2C5_SCL */
> -                       J721E_IOPAD(0x154, PIN_INPUT_PULLUP, 2) /* (AA27) PRG0_MDIO0_MDC.I2C5_SDA */
> -               >;
> -       };
> -
> -       rpi_header_gpio0_pins_default: rpi-header-gpio0-default-pins {
> -               pinctrl-single,pins = <
> -                       J721E_IOPAD(0x01C, PIN_INPUT, 7) /* (AD22) PRG1_PRU0_GPO6.GPIO0_7 */
> -                       J721E_IOPAD(0x120, PIN_INPUT, 7) /* (AA28) PRG0_PRU1_GPO8.GPIO0_71 */
> -                       J721E_IOPAD(0x14C, PIN_INPUT, 7) /* (AA29) PRG0_PRU1_GPO19.GPIO0_82 */
> -                       J721E_IOPAD(0x02C, PIN_INPUT, 7) /* (AD21) PRG1_PRU0_GPO10.GPIO0_11 */
> -                       J721E_IOPAD(0x198, PIN_INPUT, 7) /* (V25) RGMII6_TD1.GPIO0_101 */
> -                       J721E_IOPAD(0x1B0, PIN_INPUT, 7) /* (W24) RGMII6_RD1.GPIO0_107 */
> -                       J721E_IOPAD(0x1A0, PIN_INPUT, 7) /* (W29) RGMII6_TXC.GPIO0_103 */
> -                       J721E_IOPAD(0x008, PIN_INPUT, 7) /* (AG22) PRG1_PRU0_GPO1.GPIO0_2 */
> -                       J721E_IOPAD(0x1D0, PIN_INPUT, 7) /* (AA3) SPI0_D1.GPIO0_115 */
> -                       J721E_IOPAD(0x11C, PIN_INPUT, 7) /* (AA24) PRG0_PRU1_GPO7.GPIO0_70 */
> -                       J721E_IOPAD(0x148, PIN_INPUT, 7) /* (AA26) PRG0_PRU1_GPO18.GPIO0_81 */
> -                       J721E_IOPAD(0x004, PIN_INPUT, 7) /* (AC23) PRG1_PRU0_GPO0.GPIO0_1 */
> -                       J721E_IOPAD(0x014, PIN_INPUT, 7) /* (AH23) PRG1_PRU0_GPO4.GPIO0_5 */
> -                       J721E_IOPAD(0x020, PIN_INPUT, 7) /* (AE20) PRG1_PRU0_GPO7.GPIO0_8 */
> -                       J721E_IOPAD(0x19C, PIN_INPUT, 7) /* (W27) RGMII6_TD0.GPIO0_102 */
> -                       J721E_IOPAD(0x1B4, PIN_INPUT, 7) /* (W25) RGMII6_RD0.GPIO0_108 */
> -                       J721E_IOPAD(0x188, PIN_INPUT, 7) /* (Y28) RGMII6_TX_CTL.GPIO0_97 */
> -                       J721E_IOPAD(0x00C, PIN_INPUT, 7) /* (AF22) PRG1_PRU0_GPO2.GPIO0_3 */
> -                       J721E_IOPAD(0x010, PIN_INPUT, 7) /* (AJ23) PRG1_PRU0_GPO3.GPIO0_4 */
> -                       J721E_IOPAD(0x178, PIN_INPUT, 7) /* (U27) RGMII5_RD3.GPIO0_93 */
> -                       J721E_IOPAD(0x17C, PIN_INPUT, 7) /* (U24) RGMII5_RD2.GPIO0_94 */
> -                       J721E_IOPAD(0x190, PIN_INPUT, 7) /* (W23) RGMII6_TD3.GPIO0_99 */
> -                       J721E_IOPAD(0x18C, PIN_INPUT, 7) /* (V23) RGMII6_RX_CTL.GPIO0_98 */
> -               >;
> -       };
> -
> -       rpi_header_gpio1_pins_default: rpi-header-gpio1-default-pins {
> -               pinctrl-single,pins = <
> -                       J721E_IOPAD(0x234, PIN_INPUT, 7) /* (U3) EXT_REFCLK1.GPIO1_12 */
> -               >;
> -       };
> -};
> -
> -&wkup_pmx0 {
> -       mcu_cpsw_pins_default: mcu-cpsw-default-pins {
> -               pinctrl-single,pins = <
> -                       J721E_WKUP_IOPAD(0x84, PIN_INPUT, 0) /* (B24) MCU_RGMII1_RD0 */
> -                       J721E_WKUP_IOPAD(0x80, PIN_INPUT, 0) /* (A24) MCU_RGMII1_RD1 */
> -                       J721E_WKUP_IOPAD(0x7c, PIN_INPUT, 0) /* (D24) MCU_RGMII1_RD2 */
> -                       J721E_WKUP_IOPAD(0x78, PIN_INPUT, 0) /* (A25) MCU_RGMII1_RD3 */
> -                       J721E_WKUP_IOPAD(0x74, PIN_INPUT, 0) /* (C24) MCU_RGMII1_RXC */
> -                       J721E_WKUP_IOPAD(0x5c, PIN_INPUT, 0) /* (C25) MCU_RGMII1_RX_CTL */
> -                       J721E_WKUP_IOPAD(0x6c, PIN_OUTPUT, 0) /* (B25) MCU_RGMII1_TD0 */
> -                       J721E_WKUP_IOPAD(0x68, PIN_OUTPUT, 0) /* (A26) MCU_RGMII1_TD1 */
> -                       J721E_WKUP_IOPAD(0x64, PIN_OUTPUT, 0) /* (A27) MCU_RGMII1_TD2 */
> -                       J721E_WKUP_IOPAD(0x60, PIN_OUTPUT, 0) /* (A28) MCU_RGMII1_TD3 */
> -                       J721E_WKUP_IOPAD(0x70, PIN_OUTPUT, 0) /* (B26) MCU_RGMII1_TXC */
> -                       J721E_WKUP_IOPAD(0x58, PIN_OUTPUT, 0) /* (B27) MCU_RGMII1_TX_CTL */
> -               >;
> -       };
> -
> -       mcu_mdio_pins_default: mcu-mdio1-default-pins {
> -               pinctrl-single,pins = <
> -                       J721E_WKUP_IOPAD(0x8c, PIN_OUTPUT, 0) /* (F23) MCU_MDIO0_MDC */
> -                       J721E_WKUP_IOPAD(0x88, PIN_INPUT, 0) /* (E23) MCU_MDIO0_MDIO */
> -               >;
> -       };
> -
> -       mcu_fss0_ospi0_pins_default: mcu-fss0-ospi0-default-pins {
> -               pinctrl-single,pins = <
> -                       J721E_WKUP_IOPAD(0x0, PIN_OUTPUT, 0) /* (E20) MCU_OSPI0_CLK */
> -                       J721E_WKUP_IOPAD(0x2c, PIN_OUTPUT, 0) /* (F19) MCU_OSPI0_CSn0 */
> -                       J721E_WKUP_IOPAD(0xc, PIN_INPUT, 0) /* (D20) MCU_OSPI0_D0 */
> -                       J721E_WKUP_IOPAD(0x10, PIN_INPUT, 0) /* (G19) MCU_OSPI0_D1 */
> -                       J721E_WKUP_IOPAD(0x14, PIN_INPUT, 0) /* (G20) MCU_OSPI0_D2 */
> -                       J721E_WKUP_IOPAD(0x18, PIN_INPUT, 0) /* (F20) MCU_OSPI0_D3 */
> -                       J721E_WKUP_IOPAD(0x1c, PIN_INPUT, 0) /* (F21) MCU_OSPI0_D4 */
> -                       J721E_WKUP_IOPAD(0x20, PIN_INPUT, 0) /* (E21) MCU_OSPI0_D5 */
> -                       J721E_WKUP_IOPAD(0x24, PIN_INPUT, 0) /* (B22) MCU_OSPI0_D6 */
> -                       J721E_WKUP_IOPAD(0x28, PIN_INPUT, 0) /* (G21) MCU_OSPI0_D7 */
> -                       J721E_WKUP_IOPAD(0x8, PIN_INPUT, 0) /* (D21) MCU_OSPI0_DQS */
> -               >;
> -       };
> -
> -       vdd_mmc1_en_pins_default: vdd-mmc1-en-default-pins {
> -               pinctrl-single,pins = <
> -                       J721E_WKUP_IOPAD(0xd0, PIN_OUTPUT, 7) /* (G27) WKUP_GPIO0_8 */
> -               >;
> -       };
> -
> -       vdd_sd_dv_alt_pins_default: vdd-sd-dv-alt-default-pins {
> -               pinctrl-single,pins = <
> -                       J721E_WKUP_IOPAD(0xd4, PIN_OUTPUT, 7) /* (G26) WKUP_GPIO0_9 */
> -               >;
> -       };
> -
> -       wkup_uart0_pins_default: wkup-uart0-default-pins {
> -               pinctrl-single,pins = <
> -                       J721E_WKUP_IOPAD(0xa0, PIN_INPUT, 0) /* (J29) WKUP_UART0_RXD */
> -                       J721E_WKUP_IOPAD(0xa4, PIN_OUTPUT, 0) /* (J28) WKUP_UART0_TXD */
> -               >;
> -       };
> -
> -       mcu_uart0_pins_default: mcu-uart0-default-pins {
> -               pinctrl-single,pins = <
> -                       J721E_WKUP_IOPAD(0xf0, PIN_INPUT, 2) /* (D26) MCU_I3C0_SCL.MCU_UART0_CTSn */
> -                       J721E_WKUP_IOPAD(0xf4, PIN_OUTPUT, 2)/* (D25) MCU_I3C0_SDA.MCU_UART0_RTSn */
> -                       J721E_WKUP_IOPAD(0xe4, PIN_INPUT, 0) /* (H28) WKUP_GPIO0_13.MCU_UART0_RXD */
> -                       J721E_WKUP_IOPAD(0xe0, PIN_OUTPUT, 0)/* (G29) WKUP_GPIO0_12.MCU_UART0_TXD */
> -               >;
> -       };
> -
> -       wkup_i2c0_pins_default: wkup-i2c0-default-pins {
> -               pinctrl-single,pins = <
> -                       J721E_WKUP_IOPAD(0xf8, PIN_INPUT_PULLUP, 0) /* (J25) WKUP_I2C0_SCL */
> -                       J721E_WKUP_IOPAD(0xfc, PIN_INPUT_PULLUP, 0) /* (H24) WKUP_I2C0_SDA */
> -               >;
> -       };
> -
> -       /* Reset for M.2 M Key slot on PCIe1  */
> -       mkey_reset_pins_default: mkey-reset-pns-default-pins {
> -               pinctrl-single,pins = <
> -                       J721E_WKUP_IOPAD(0xdc, PIN_INPUT, 7) /* (H27) WKUP_GPIO0_11 */
> -               >;
> -       };
> -};
> -
> -&wkup_uart0 {
> -       /* Wakeup UART is used by System firmware */
> -       status = "reserved";
> -       pinctrl-names = "default";
> -       pinctrl-0 = <&wkup_uart0_pins_default>;
> -};
> -
> -&wkup_i2c0 {
> -       status = "okay";
> -       pinctrl-names = "default";
> -       pinctrl-0 = <&wkup_i2c0_pins_default>;
> -       clock-frequency = <400000>;
> -
> -       eeprom at 51 {
> -               /* AT24C512C-MAHM-T */
> -               compatible = "atmel,24c512";
> -               reg = <0x51>;
> -       };
> -};
> -
> -&mcu_uart0 {
> -       status = "okay";
> -       pinctrl-names = "default";
> -       pinctrl-0 = <&mcu_uart0_pins_default>;
> -};
> -
> -&main_uart0 {
> -       status = "okay";
> -       pinctrl-names = "default";
> -       pinctrl-0 = <&main_uart0_pins_default>;
> -       /* Shared with ATF on this platform */
> -       power-domains = <&k3_pds 146 TI_SCI_PD_SHARED>;
> -};
> -
> -&main_uart1 {
> -       status = "okay";
> -       pinctrl-names = "default";
> -       pinctrl-0 = <&main_uart1_pins_default>;
> -};
> -
> -&main_sdhci1 {
> -       /* SD Card */
> -       status = "okay";
> -       vmmc-supply = <&vdd_mmc1>;
> -       vqmmc-supply = <&vdd_sd_dv_alt>;
> -       pinctrl-names = "default";
> -       pinctrl-0 = <&main_mmc1_pins_default>;
> -       ti,driver-strength-ohm = <50>;
> -       disable-wp;
> -};
> -
> -&ospi0 {
> -       status = "okay";
> -       pinctrl-names = "default";
> -       pinctrl-0 = <&mcu_fss0_ospi0_pins_default>;
> -
> -       flash at 0 {
> -               compatible = "jedec,spi-nor";
> -               reg = <0x0>;
> -               spi-tx-bus-width = <8>;
> -               spi-rx-bus-width = <8>;
> -               spi-max-frequency = <25000000>;
> -               cdns,tshsl-ns = <60>;
> -               cdns,tsd2d-ns = <60>;
> -               cdns,tchsh-ns = <60>;
> -               cdns,tslch-ns = <60>;
> -               cdns,read-delay = <4>;
> -
> -               partitions {
> -                       compatible = "fixed-partitions";
> -                       #address-cells = <1>;
> -                       #size-cells = <1>;
> -
> -                       partition at 0 {
> -                               label = "ospi.tiboot3";
> -                               reg = <0x0 0x80000>;
> -                       };
> -
> -                       partition at 80000 {
> -                               label = "ospi.tispl";
> -                               reg = <0x80000 0x200000>;
> -                       };
> -
> -                       partition at 280000 {
> -                               label = "ospi.u-boot";
> -                               reg = <0x280000 0x400000>;
> -                       };
> -
> -                       partition at 680000 {
> -                               label = "ospi.env";
> -                               reg = <0x680000 0x40000>;
> -                       };
> -
> -                       partition at 6c0000 {
> -                               label = "ospi.sysfw";
> -                               reg = <0x6c0000 0x100000>;
> -                       };
> -
> -                       partition at 7c0000 {
> -                               label = "ospi.env.backup";
> -                               reg = <0x7c0000 0x40000>;
> -                       };
> -
> -                       partition at 800000 {
> -                               label = "ospi.rootfs";
> -                               reg = <0x800000 0x37c0000>;
> -                       };
> -
> -                       partition at 3fc0000 {
> -                               label = "ospi.phypattern";
> -                               reg = <0x3fc0000 0x40000>;
> -                       };
> -               };
> -       };
> -};
> -
> -&main_i2c0 {
> -       status = "okay";
> -       pinctrl-names = "default";
> -       pinctrl-0 = <&main_i2c0_pins_default>;
> -       clock-frequency = <400000>;
> -
> -       i2c-mux at 71 {
> -               compatible = "nxp,pca9543";
> -               #address-cells = <1>;
> -               #size-cells = <0>;
> -               reg = <0x71>;
> -
> -               /* PCIe1 M.2 M Key I2C */
> -               i2c at 0 {
> -                       #address-cells = <1>;
> -                       #size-cells = <0>;
> -                       reg = <0>;
> -               };
> -
> -               /* PCIe0 M.2 E Key I2C */
> -               i2c at 1 {
> -                       #address-cells = <1>;
> -                       #size-cells = <0>;
> -                       reg = <1>;
> -               };
> -       };
> -};
> -
> -&main_i2c1 {
> -       status = "okay";
> -       pinctrl-names = "default";
> -       pinctrl-0 = <&main_i2c1_pins_default>;
> -       /* i2c1 is used for DVI DDC, so we need to use 100kHz */
> -       clock-frequency = <100000>;
> -};
> -
> -&main_i2c3 {
> -       status = "okay";
> -       pinctrl-names = "default";
> -       pinctrl-0 = <&main_i2c3_pins_default>;
> -       clock-frequency = <400000>;
> -
> -       i2c-mux at 70 {
> -               compatible = "nxp,pca9543";
> -               #address-cells = <1>;
> -               #size-cells = <0>;
> -               reg = <0x70>;
> -
> -               /* CSI0 I2C */
> -               i2c at 0 {
> -                       #address-cells = <1>;
> -                       #size-cells = <0>;
> -                       reg = <0>;
> -               };
> -
> -               /* CSI1 I2C */
> -               i2c at 1 {
> -                       #address-cells = <1>;
> -                       #size-cells = <0>;
> -                       reg = <1>;
> -               };
> -       };
> -};
> -
> -&main_i2c5 {
> -       /* Brought out on RPi Header */
> -       status = "okay";
> -       pinctrl-names = "default";
> -       pinctrl-0 = <&main_i2c5_pins_default>;
> -       clock-frequency = <400000>;
> -};
> -
> -&main_gpio0 {
> -       status = "okay";
> -       pinctrl-names = "default";
> -       pinctrl-0 = <&rpi_header_gpio0_pins_default>;
> -};
> -
> -&main_gpio1 {
> -       status = "okay";
> -       pinctrl-names = "default";
> -       pinctrl-0 = <&rpi_header_gpio1_pins_default>;
> -};
> -
> -&wkup_gpio0 {
> -       status = "okay";
> -};
> -
> -&usb_serdes_mux {
> -       idle-states = <1>, <1>; /* USB0 to SERDES3, USB1 to SERDES2 */
> -};
> -
> -&serdes_ln_ctrl {
> -       idle-states = <J721E_SERDES0_LANE0_PCIE0_LANE0>, <J721E_SERDES0_LANE1_IP4_UNUSED>,
> -                     <J721E_SERDES1_LANE0_PCIE1_LANE0>, <J721E_SERDES1_LANE1_PCIE1_LANE1>,
> -                     <J721E_SERDES2_LANE0_IP1_UNUSED>, <J721E_SERDES2_LANE1_USB3_1>,
> -                     <J721E_SERDES3_LANE0_USB3_0_SWAP>, <J721E_SERDES3_LANE1_USB3_0>,
> -                     <J721E_SERDES4_LANE0_EDP_LANE0>, <J721E_SERDES4_LANE1_EDP_LANE1>,
> -                     <J721E_SERDES4_LANE2_EDP_LANE2>, <J721E_SERDES4_LANE3_EDP_LANE3>;
> -};
> -
> -&serdes_wiz3 {
> -       typec-dir-gpios = <&main_gpio1 3 GPIO_ACTIVE_HIGH>;
> -       typec-dir-debounce-ms = <700>;  /* TUSB321, tCCB_DEFAULT 133 ms */
> -};
> -
> -&serdes3 {
> -       serdes3_usb_link: phy at 0 {
> -               reg = <0>;
> -               cdns,num-lanes = <2>;
> -               #phy-cells = <0>;
> -               cdns,phy-type = <PHY_TYPE_USB3>;
> -               resets = <&serdes_wiz3 1>, <&serdes_wiz3 2>;
> -       };
> -};
> -
> -&serdes4 {
> -       torrent_phy_dp: phy at 0 {
> -               reg = <0>;
> -               resets = <&serdes_wiz4 1>;
> -               cdns,phy-type = <PHY_TYPE_DP>;
> -               cdns,num-lanes = <4>;
> -               cdns,max-bit-rate = <5400>;
> -               #phy-cells = <0>;
> -       };
> -};
> -
> -&mhdp {
> -       phys = <&torrent_phy_dp>;
> -       phy-names = "dpphy";
> -       pinctrl-names = "default";
> -       pinctrl-0 = <&dp0_pins_default>;
> -};
> -
> -&usbss0 {
> -       pinctrl-names = "default";
> -       pinctrl-0 = <&main_usbss0_pins_default>;
> -       ti,vbus-divider;
> -};
> -
> -&usb0 {
> -       dr_mode = "otg";
> -       maximum-speed = "super-speed";
> -       phys = <&serdes3_usb_link>;
> -       phy-names = "cdns3,usb3-phy";
> -};
> -
> -&serdes2 {
> -       serdes2_usb_link: phy at 1 {
> -               reg = <1>;
> -               cdns,num-lanes = <1>;
> -               #phy-cells = <0>;
> -               cdns,phy-type = <PHY_TYPE_USB3>;
> -               resets = <&serdes_wiz2 2>;
> -       };
> -};
> -
> -&usbss1 {
> -       pinctrl-names = "default";
> -       pinctrl-0 = <&main_usbss1_pins_default>;
> -       ti,vbus-divider;
> -};
> -
> -&usb1 {
> -       dr_mode = "host";
> -       maximum-speed = "super-speed";
> -       phys = <&serdes2_usb_link>;
> -       phy-names = "cdns3,usb3-phy";
> -};
> -
> -&mcu_cpsw {
> -       pinctrl-names = "default";
> -       pinctrl-0 = <&mcu_cpsw_pins_default>, <&mcu_mdio_pins_default>;
> -};
> -
> -&davinci_mdio {
> -       phy0: ethernet-phy at 0 {
> -               reg = <0>;
> -               ti,rx-internal-delay = <DP83867_RGMIIDCTL_2_00_NS>;
> -               ti,fifo-depth = <DP83867_PHYCR_FIFO_DEPTH_4_B_NIB>;
> -       };
> -};
> -
> -&cpsw_port1 {
> -       phy-mode = "rgmii-rxid";
> -       phy-handle = <&phy0>;
> -};
> -
> -&dss {
> -       pinctrl-names = "default";
> -       pinctrl-0 = <&dss_vout0_pins_default>;
> -
> -       assigned-clocks = <&k3_clks 152 1>,     /* VP 1 pixel clock */
> -                         <&k3_clks 152 4>,     /* VP 2 pixel clock */
> -                         <&k3_clks 152 9>,     /* VP 3 pixel clock */
> -                         <&k3_clks 152 13>;    /* VP 4 pixel clock */
> -       assigned-clock-parents = <&k3_clks 152 2>,      /* PLL16_HSDIV0 */
> -                                <&k3_clks 152 6>,      /* DPI0_EXT_CLKSEL_OUT0 */
> -                                <&k3_clks 152 11>,     /* PLL18_HSDIV0 */
> -                                <&k3_clks 152 18>;     /* DPI1_EXT_CLKSEL_OUT0 */
> -};
> -
> -&dss_ports {
> -       #address-cells = <1>;
> -       #size-cells = <0>;
> -
> -       port at 0  {
> -               reg = <0>;
> -
> -               dpi0_out: endpoint {
> -                       remote-endpoint = <&dp0_in>;
> -               };
> -       };
> -
> -       port at 1 {
> -               reg = <1>;
> -
> -               dpi1_out: endpoint {
> -                       remote-endpoint = <&tfp410_in>;
> -               };
> -       };
> -};
> -
> -&dp0_ports {
> -       #address-cells = <1>;
> -       #size-cells = <0>;
> -
> -       port at 0 {
> -               reg = <0>;
> -               dp0_in: endpoint {
> -                       remote-endpoint = <&dpi0_out>;
> -               };
> -       };
> -
> -       port at 4 {
> -               reg = <4>;
> -               dp0_out: endpoint {
> -                       remote-endpoint = <&dp_connector_in>;
> -               };
> -       };
> -};
> -
> -&serdes0 {
> -       serdes0_pcie_link: phy at 0 {
> -               reg = <0>;
> -               cdns,num-lanes = <1>;
> -               #phy-cells = <0>;
> -               cdns,phy-type = <PHY_TYPE_PCIE>;
> -               resets = <&serdes_wiz0 1>;
> -       };
> -};
> -
> -&serdes1 {
> -       serdes1_pcie_link: phy at 0 {
> -               reg = <0>;
> -               cdns,num-lanes = <2>;
> -               #phy-cells = <0>;
> -               cdns,phy-type = <PHY_TYPE_PCIE>;
> -               resets = <&serdes_wiz1 1>, <&serdes_wiz1 2>;
> -       };
> -};
> -
> -&pcie0_rc {
> -       status = "okay";
> -       pinctrl-names = "default";
> -       pinctrl-0 = <&ekey_reset_pins_default>;
> -       reset-gpios = <&main_gpio0 72 GPIO_ACTIVE_HIGH>;
> -
> -       phys = <&serdes0_pcie_link>;
> -       phy-names = "pcie-phy";
> -       num-lanes = <1>;
> -};
> -
> -&pcie1_rc {
> -       status = "okay";
> -       pinctrl-names = "default";
> -       pinctrl-0 = <&mkey_reset_pins_default>;
> -       reset-gpios = <&wkup_gpio0 11 GPIO_ACTIVE_HIGH>;
> -
> -       phys = <&serdes1_pcie_link>;
> -       phy-names = "pcie-phy";
> -       num-lanes = <2>;
> -};
> -
> -&ufs_wrapper {
> -       status = "disabled";
> -};
> -
> -&mailbox0_cluster0 {
> -       status = "okay";
> -       interrupts = <436>;
> -
> -       mbox_mcu_r5fss0_core0: mbox-mcu-r5fss0-core0 {
> -               ti,mbox-rx = <0 0 0>;
> -               ti,mbox-tx = <1 0 0>;
> -       };
> -
> -       mbox_mcu_r5fss0_core1: mbox-mcu-r5fss0-core1 {
> -               ti,mbox-rx = <2 0 0>;
> -               ti,mbox-tx = <3 0 0>;
> -       };
> -};
> -
> -&mailbox0_cluster1 {
> -       status = "okay";
> -       interrupts = <432>;
> -
> -       mbox_main_r5fss0_core0: mbox-main-r5fss0-core0 {
> -               ti,mbox-rx = <0 0 0>;
> -               ti,mbox-tx = <1 0 0>;
> -       };
> -
> -       mbox_main_r5fss0_core1: mbox-main-r5fss0-core1 {
> -               ti,mbox-rx = <2 0 0>;
> -               ti,mbox-tx = <3 0 0>;
> -       };
> -};
> -
> -&mailbox0_cluster2 {
> -       status = "okay";
> -       interrupts = <428>;
> -
> -       mbox_main_r5fss1_core0: mbox-main-r5fss1-core0 {
> -               ti,mbox-rx = <0 0 0>;
> -               ti,mbox-tx = <1 0 0>;
> -       };
> -
> -       mbox_main_r5fss1_core1: mbox-main-r5fss1-core1 {
> -               ti,mbox-rx = <2 0 0>;
> -               ti,mbox-tx = <3 0 0>;
> -       };
> -};
> -
> -&mailbox0_cluster3 {
> -       status = "okay";
> -       interrupts = <424>;
> -
> -       mbox_c66_0: mbox-c66-0 {
> -               ti,mbox-rx = <0 0 0>;
> -               ti,mbox-tx = <1 0 0>;
> -       };
> -
> -       mbox_c66_1: mbox-c66-1 {
> -               ti,mbox-rx = <2 0 0>;
> -               ti,mbox-tx = <3 0 0>;
> -       };
> -};
> -
> -&mailbox0_cluster4 {
> -       status = "okay";
> -       interrupts = <420>;
> -
> -       mbox_c71_0: mbox-c71-0 {
> -               ti,mbox-rx = <0 0 0>;
> -               ti,mbox-tx = <1 0 0>;
> -       };
> -};
> -
> -&mcu_r5fss0_core0 {
> -       mboxes = <&mailbox0_cluster0>, <&mbox_mcu_r5fss0_core0>;
> -       memory-region = <&mcu_r5fss0_core0_dma_memory_region>,
> -                       <&mcu_r5fss0_core0_memory_region>;
> -};
> -
> -&mcu_r5fss0_core1 {
> -       mboxes = <&mailbox0_cluster0>, <&mbox_mcu_r5fss0_core1>;
> -       memory-region = <&mcu_r5fss0_core1_dma_memory_region>,
> -                       <&mcu_r5fss0_core1_memory_region>;
> -};
> -
> -&main_r5fss0_core0 {
> -       mboxes = <&mailbox0_cluster1>, <&mbox_main_r5fss0_core0>;
> -       memory-region = <&main_r5fss0_core0_dma_memory_region>,
> -                       <&main_r5fss0_core0_memory_region>;
> -};
> -
> -&main_r5fss0_core1 {
> -       mboxes = <&mailbox0_cluster1>, <&mbox_main_r5fss0_core1>;
> -       memory-region = <&main_r5fss0_core1_dma_memory_region>,
> -                       <&main_r5fss0_core1_memory_region>;
> -};
> -
> -&main_r5fss1_core0 {
> -       mboxes = <&mailbox0_cluster2>, <&mbox_main_r5fss1_core0>;
> -       memory-region = <&main_r5fss1_core0_dma_memory_region>,
> -                       <&main_r5fss1_core0_memory_region>;
> -};
> -
> -&main_r5fss1_core1 {
> -       mboxes = <&mailbox0_cluster2>, <&mbox_main_r5fss1_core1>;
> -       memory-region = <&main_r5fss1_core1_dma_memory_region>,
> -                       <&main_r5fss1_core1_memory_region>;
> -};
> -
> -&c66_0 {
> -       status = "okay";
> -       mboxes = <&mailbox0_cluster3>, <&mbox_c66_0>;
> -       memory-region = <&c66_0_dma_memory_region>,
> -                       <&c66_0_memory_region>;
> -};
> -
> -&c66_1 {
> -       status = "okay";
> -       mboxes = <&mailbox0_cluster3>, <&mbox_c66_1>;
> -       memory-region = <&c66_1_dma_memory_region>,
> -                       <&c66_1_memory_region>;
> -};
> -
> -&c71_0 {
> -       status = "okay";
> -       mboxes = <&mailbox0_cluster4>, <&mbox_c71_0>;
> -       memory-region = <&c71_0_dma_memory_region>,
> -                       <&c71_0_memory_region>;
> -};
> diff --git a/arch/arm/dts/k3-j721e-som-p0.dtsi b/arch/arm/dts/k3-j721e-som-p0.dtsi
> deleted file mode 100644
> index 7f0686c2ce3..00000000000
> --- a/arch/arm/dts/k3-j721e-som-p0.dtsi
> +++ /dev/null
> @@ -1,446 +0,0 @@
> -// SPDX-License-Identifier: GPL-2.0
> -/*
> - * Copyright (C) 2019-2020 Texas Instruments Incorporated - https://www.ti.com/
> - *
> - * Product Link: https://www.ti.com/tool/J721EXSOMXEVM
> - */
> -
> -/dts-v1/;
> -
> -#include "k3-j721e.dtsi"
> -
> -/ {
> -       memory at 80000000 {
> -               device_type = "memory";
> -               /* 4G RAM */
> -               reg = <0x00000000 0x80000000 0x00000000 0x80000000>,
> -                     <0x00000008 0x80000000 0x00000000 0x80000000>;
> -       };
> -
> -       reserved_memory: reserved-memory {
> -               #address-cells = <2>;
> -               #size-cells = <2>;
> -               ranges;
> -
> -               secure_ddr: optee at 9e800000 {
> -                       reg = <0x00 0x9e800000 0x00 0x01800000>;
> -                       alignment = <0x1000>;
> -                       no-map;
> -               };
> -
> -               mcu_r5fss0_core0_dma_memory_region: r5f-dma-memory at a0000000 {
> -                       compatible = "shared-dma-pool";
> -                       reg = <0x00 0xa0000000 0x00 0x100000>;
> -                       no-map;
> -               };
> -
> -               mcu_r5fss0_core0_memory_region: r5f-memory at a0100000 {
> -                       compatible = "shared-dma-pool";
> -                       reg = <0x00 0xa0100000 0x00 0xf00000>;
> -                       no-map;
> -               };
> -
> -               mcu_r5fss0_core1_dma_memory_region: r5f-dma-memory at a1000000 {
> -                       compatible = "shared-dma-pool";
> -                       reg = <0x00 0xa1000000 0x00 0x100000>;
> -                       no-map;
> -               };
> -
> -               mcu_r5fss0_core1_memory_region: r5f-memory at a1100000 {
> -                       compatible = "shared-dma-pool";
> -                       reg = <0x00 0xa1100000 0x00 0xf00000>;
> -                       no-map;
> -               };
> -
> -               main_r5fss0_core0_dma_memory_region: r5f-dma-memory at a2000000 {
> -                       compatible = "shared-dma-pool";
> -                       reg = <0x00 0xa2000000 0x00 0x100000>;
> -                       no-map;
> -               };
> -
> -               main_r5fss0_core0_memory_region: r5f-memory at a2100000 {
> -                       compatible = "shared-dma-pool";
> -                       reg = <0x00 0xa2100000 0x00 0xf00000>;
> -                       no-map;
> -               };
> -
> -               main_r5fss0_core1_dma_memory_region: r5f-dma-memory at a3000000 {
> -                       compatible = "shared-dma-pool";
> -                       reg = <0x00 0xa3000000 0x00 0x100000>;
> -                       no-map;
> -               };
> -
> -               main_r5fss0_core1_memory_region: r5f-memory at a3100000 {
> -                       compatible = "shared-dma-pool";
> -                       reg = <0x00 0xa3100000 0x00 0xf00000>;
> -                       no-map;
> -               };
> -
> -               main_r5fss1_core0_dma_memory_region: r5f-dma-memory at a4000000 {
> -                       compatible = "shared-dma-pool";
> -                       reg = <0x00 0xa4000000 0x00 0x100000>;
> -                       no-map;
> -               };
> -
> -               main_r5fss1_core0_memory_region: r5f-memory at a4100000 {
> -                       compatible = "shared-dma-pool";
> -                       reg = <0x00 0xa4100000 0x00 0xf00000>;
> -                       no-map;
> -               };
> -
> -               main_r5fss1_core1_dma_memory_region: r5f-dma-memory at a5000000 {
> -                       compatible = "shared-dma-pool";
> -                       reg = <0x00 0xa5000000 0x00 0x100000>;
> -                       no-map;
> -               };
> -
> -               main_r5fss1_core1_memory_region: r5f-memory at a5100000 {
> -                       compatible = "shared-dma-pool";
> -                       reg = <0x00 0xa5100000 0x00 0xf00000>;
> -                       no-map;
> -               };
> -
> -               c66_1_dma_memory_region: c66-dma-memory at a6000000 {
> -                       compatible = "shared-dma-pool";
> -                       reg = <0x00 0xa6000000 0x00 0x100000>;
> -                       no-map;
> -               };
> -
> -               c66_0_memory_region: c66-memory at a6100000 {
> -                       compatible = "shared-dma-pool";
> -                       reg = <0x00 0xa6100000 0x00 0xf00000>;
> -                       no-map;
> -               };
> -
> -               c66_0_dma_memory_region: c66-dma-memory at a7000000 {
> -                       compatible = "shared-dma-pool";
> -                       reg = <0x00 0xa7000000 0x00 0x100000>;
> -                       no-map;
> -               };
> -
> -               c66_1_memory_region: c66-memory at a7100000 {
> -                       compatible = "shared-dma-pool";
> -                       reg = <0x00 0xa7100000 0x00 0xf00000>;
> -                       no-map;
> -               };
> -
> -               c71_0_dma_memory_region: c71-dma-memory at a8000000 {
> -                       compatible = "shared-dma-pool";
> -                       reg = <0x00 0xa8000000 0x00 0x100000>;
> -                       no-map;
> -               };
> -
> -               c71_0_memory_region: c71-memory at a8100000 {
> -                       compatible = "shared-dma-pool";
> -                       reg = <0x00 0xa8100000 0x00 0xf00000>;
> -                       no-map;
> -               };
> -
> -               rtos_ipc_memory_region: ipc-memories at aa000000 {
> -                       reg = <0x00 0xaa000000 0x00 0x01c00000>;
> -                       alignment = <0x1000>;
> -                       no-map;
> -               };
> -       };
> -};
> -
> -&wkup_pmx0 {
> -       wkup_i2c0_pins_default: wkup-i2c0-default-pins {
> -               pinctrl-single,pins = <
> -                       J721E_WKUP_IOPAD(0xf8, PIN_INPUT_PULLUP, 0) /* (J25) WKUP_I2C0_SCL */
> -                       J721E_WKUP_IOPAD(0xfc, PIN_INPUT_PULLUP, 0) /* (H24) WKUP_I2C0_SDA */
> -               >;
> -       };
> -
> -       mcu_fss0_ospi0_pins_default: mcu-fss0-ospi0-default-pins {
> -               pinctrl-single,pins = <
> -                       J721E_WKUP_IOPAD(0x0000, PIN_OUTPUT, 0) /* MCU_OSPI0_CLK */
> -                       J721E_WKUP_IOPAD(0x0008, PIN_INPUT, 0)  /* MCU_OSPI0_DQS */
> -                       J721E_WKUP_IOPAD(0x000c, PIN_INPUT, 0)  /* MCU_OSPI0_D0 */
> -                       J721E_WKUP_IOPAD(0x0010, PIN_INPUT, 0)  /* MCU_OSPI0_D1 */
> -                       J721E_WKUP_IOPAD(0x0014, PIN_INPUT, 0)  /* MCU_OSPI0_D2 */
> -                       J721E_WKUP_IOPAD(0x0018, PIN_INPUT, 0)  /* MCU_OSPI0_D3 */
> -                       J721E_WKUP_IOPAD(0x001c, PIN_INPUT, 0)  /* MCU_OSPI0_D4 */
> -                       J721E_WKUP_IOPAD(0x0020, PIN_INPUT, 0)  /* MCU_OSPI0_D5 */
> -                       J721E_WKUP_IOPAD(0x0024, PIN_INPUT, 0)  /* MCU_OSPI0_D6 */
> -                       J721E_WKUP_IOPAD(0x0028, PIN_INPUT, 0)  /* MCU_OSPI0_D7 */
> -                       J721E_WKUP_IOPAD(0x002c, PIN_OUTPUT, 0) /* MCU_OSPI0_CSn0 */
> -               >;
> -       };
> -
> -       mcu_fss0_hpb0_pins_default: mcu-fss0-hpb0-default-pins {
> -               pinctrl-single,pins = <
> -                       J721E_WKUP_IOPAD(0x0, PIN_OUTPUT, 1)  /* MCU_HYPERBUS0_CK */
> -                       J721E_WKUP_IOPAD(0x4, PIN_OUTPUT, 1)  /* MCU_HYPERBUS0_CKn */
> -                       J721E_WKUP_IOPAD(0x2c, PIN_OUTPUT, 1) /* MCU_HYPERBUS0_CSn0 */
> -                       J721E_WKUP_IOPAD(0x54, PIN_OUTPUT, 3) /* MCU_HYPERBUS0_CSn1 */
> -                       J721E_WKUP_IOPAD(0x30, PIN_OUTPUT, 1) /* MCU_HYPERBUS0_RESETn */
> -                       J721E_WKUP_IOPAD(0x8, PIN_INPUT, 1)   /* MCU_HYPERBUS0_RWDS */
> -                       J721E_WKUP_IOPAD(0xc, PIN_INPUT, 1)   /* MCU_HYPERBUS0_DQ0 */
> -                       J721E_WKUP_IOPAD(0x10, PIN_INPUT, 1)  /* MCU_HYPERBUS0_DQ1 */
> -                       J721E_WKUP_IOPAD(0x14, PIN_INPUT, 1)  /* MCU_HYPERBUS0_DQ2 */
> -                       J721E_WKUP_IOPAD(0x18, PIN_INPUT, 1)  /* MCU_HYPERBUS0_DQ3 */
> -                       J721E_WKUP_IOPAD(0x1c, PIN_INPUT, 1)  /* MCU_HYPERBUS0_DQ4 */
> -                       J721E_WKUP_IOPAD(0x20, PIN_INPUT, 1)  /* MCU_HYPERBUS0_DQ5 */
> -                       J721E_WKUP_IOPAD(0x24, PIN_INPUT, 1)  /* MCU_HYPERBUS0_DQ6 */
> -                       J721E_WKUP_IOPAD(0x28, PIN_INPUT, 1)  /* MCU_HYPERBUS0_DQ7 */
> -               >;
> -       };
> -};
> -
> -&wkup_i2c0 {
> -       status = "okay";
> -       pinctrl-names = "default";
> -       pinctrl-0 = <&wkup_i2c0_pins_default>;
> -       clock-frequency = <400000>;
> -
> -       eeprom at 50 {
> -               /* CAV24C256WE-GT3 */
> -               compatible = "atmel,24c256";
> -               reg = <0x50>;
> -       };
> -};
> -
> -&ospi0 {
> -       status = "okay";
> -       pinctrl-names = "default";
> -       pinctrl-0 = <&mcu_fss0_ospi0_pins_default>;
> -
> -       flash at 0 {
> -               compatible = "jedec,spi-nor";
> -               reg = <0x0>;
> -               spi-tx-bus-width = <8>;
> -               spi-rx-bus-width = <8>;
> -               spi-max-frequency = <25000000>;
> -               cdns,tshsl-ns = <60>;
> -               cdns,tsd2d-ns = <60>;
> -               cdns,tchsh-ns = <60>;
> -               cdns,tslch-ns = <60>;
> -               cdns,read-delay = <0>;
> -
> -               partitions {
> -                       compatible = "fixed-partitions";
> -                       #address-cells = <1>;
> -                       #size-cells = <1>;
> -
> -                       partition at 0 {
> -                               label = "ospi.tiboot3";
> -                               reg = <0x0 0x80000>;
> -                       };
> -
> -                       partition at 80000 {
> -                               label = "ospi.tispl";
> -                               reg = <0x80000 0x200000>;
> -                       };
> -
> -                       partition at 280000 {
> -                               label = "ospi.u-boot";
> -                               reg = <0x280000 0x400000>;
> -                       };
> -
> -                       partition at 680000 {
> -                               label = "ospi.env";
> -                               reg = <0x680000 0x20000>;
> -                       };
> -
> -                       partition at 6a0000 {
> -                               label = "ospi.env.backup";
> -                               reg = <0x6a0000 0x20000>;
> -                       };
> -
> -                       partition at 6c0000 {
> -                               label = "ospi.sysfw";
> -                               reg = <0x6c0000 0x100000>;
> -                       };
> -
> -                       partition at 800000 {
> -                               label = "ospi.rootfs";
> -                               reg = <0x800000 0x37c0000>;
> -                       };
> -
> -                       partition at 3fe0000 {
> -                               label = "ospi.phypattern";
> -                               reg = <0x3fe0000 0x20000>;
> -                       };
> -               };
> -       };
> -};
> -
> -&hbmc {
> -       /* OSPI and HBMC are muxed inside FSS, Bootloader will enable
> -        * appropriate node based on board detection
> -        */
> -       status = "disabled";
> -       pinctrl-names = "default";
> -       pinctrl-0 = <&mcu_fss0_hpb0_pins_default>;
> -       ranges = <0x00 0x00 0x05 0x00000000 0x4000000>, /* 64MB Flash on CS0 */
> -                <0x01 0x00 0x05 0x04000000 0x800000>; /* 8MB RAM on CS1 */
> -
> -       flash at 0,0 {
> -               compatible = "cypress,hyperflash", "cfi-flash";
> -               reg = <0x00 0x00 0x4000000>;
> -
> -               partitions {
> -                       compatible = "fixed-partitions";
> -                       #address-cells = <1>;
> -                       #size-cells = <1>;
> -
> -                       partition at 0 {
> -                               label = "hbmc.tiboot3";
> -                               reg = <0x0 0x80000>;
> -                       };
> -
> -                       partition at 80000 {
> -                               label = "hbmc.tispl";
> -                               reg = <0x80000 0x200000>;
> -                       };
> -
> -                       partition at 280000 {
> -                               label = "hbmc.u-boot";
> -                               reg = <0x280000 0x400000>;
> -                       };
> -
> -                       partition at 680000 {
> -                               label = "hbmc.env";
> -                               reg = <0x680000 0x40000>;
> -                       };
> -
> -                       partition at 6c0000 {
> -                               label = "hbmc.sysfw";
> -                               reg = <0x6c0000 0x100000>;
> -                       };
> -
> -                       partition at 800000 {
> -                               label = "hbmc.rootfs";
> -                               reg = <0x800000 0x3800000>;
> -                       };
> -               };
> -       };
> -};
> -
> -&mailbox0_cluster0 {
> -       status = "okay";
> -       interrupts = <436>;
> -
> -       mbox_mcu_r5fss0_core0: mbox-mcu-r5fss0-core0 {
> -               ti,mbox-rx = <0 0 0>;
> -               ti,mbox-tx = <1 0 0>;
> -       };
> -
> -       mbox_mcu_r5fss0_core1: mbox-mcu-r5fss0-core1 {
> -               ti,mbox-rx = <2 0 0>;
> -               ti,mbox-tx = <3 0 0>;
> -       };
> -};
> -
> -&mailbox0_cluster1 {
> -       status = "okay";
> -       interrupts = <432>;
> -
> -       mbox_main_r5fss0_core0: mbox-main-r5fss0-core0 {
> -               ti,mbox-rx = <0 0 0>;
> -               ti,mbox-tx = <1 0 0>;
> -       };
> -
> -       mbox_main_r5fss0_core1: mbox-main-r5fss0-core1 {
> -               ti,mbox-rx = <2 0 0>;
> -               ti,mbox-tx = <3 0 0>;
> -       };
> -};
> -
> -&mailbox0_cluster2 {
> -       status = "okay";
> -       interrupts = <428>;
> -
> -       mbox_main_r5fss1_core0: mbox-main-r5fss1-core0 {
> -               ti,mbox-rx = <0 0 0>;
> -               ti,mbox-tx = <1 0 0>;
> -       };
> -
> -       mbox_main_r5fss1_core1: mbox-main-r5fss1-core1 {
> -               ti,mbox-rx = <2 0 0>;
> -               ti,mbox-tx = <3 0 0>;
> -       };
> -};
> -
> -&mailbox0_cluster3 {
> -       status = "okay";
> -       interrupts = <424>;
> -
> -       mbox_c66_0: mbox-c66-0 {
> -               ti,mbox-rx = <0 0 0>;
> -               ti,mbox-tx = <1 0 0>;
> -       };
> -
> -       mbox_c66_1: mbox-c66-1 {
> -               ti,mbox-rx = <2 0 0>;
> -               ti,mbox-tx = <3 0 0>;
> -       };
> -};
> -
> -&mailbox0_cluster4 {
> -       status = "okay";
> -       interrupts = <420>;
> -
> -       mbox_c71_0: mbox-c71-0 {
> -               ti,mbox-rx = <0 0 0>;
> -               ti,mbox-tx = <1 0 0>;
> -       };
> -};
> -
> -&mcu_r5fss0_core0 {
> -       mboxes = <&mailbox0_cluster0>, <&mbox_mcu_r5fss0_core0>;
> -       memory-region = <&mcu_r5fss0_core0_dma_memory_region>,
> -                       <&mcu_r5fss0_core0_memory_region>;
> -};
> -
> -&mcu_r5fss0_core1 {
> -       mboxes = <&mailbox0_cluster0>, <&mbox_mcu_r5fss0_core1>;
> -       memory-region = <&mcu_r5fss0_core1_dma_memory_region>,
> -                       <&mcu_r5fss0_core1_memory_region>;
> -};
> -
> -&main_r5fss0_core0 {
> -       mboxes = <&mailbox0_cluster1>, <&mbox_main_r5fss0_core0>;
> -       memory-region = <&main_r5fss0_core0_dma_memory_region>,
> -                       <&main_r5fss0_core0_memory_region>;
> -};
> -
> -&main_r5fss0_core1 {
> -       mboxes = <&mailbox0_cluster1>, <&mbox_main_r5fss0_core1>;
> -       memory-region = <&main_r5fss0_core1_dma_memory_region>,
> -                       <&main_r5fss0_core1_memory_region>;
> -};
> -
> -&main_r5fss1_core0 {
> -       mboxes = <&mailbox0_cluster2>, <&mbox_main_r5fss1_core0>;
> -       memory-region = <&main_r5fss1_core0_dma_memory_region>,
> -                       <&main_r5fss1_core0_memory_region>;
> -};
> -
> -&main_r5fss1_core1 {
> -       mboxes = <&mailbox0_cluster2>, <&mbox_main_r5fss1_core1>;
> -       memory-region = <&main_r5fss1_core1_dma_memory_region>,
> -                       <&main_r5fss1_core1_memory_region>;
> -};
> -
> -&c66_0 {
> -       status = "okay";
> -       mboxes = <&mailbox0_cluster3>, <&mbox_c66_0>;
> -       memory-region = <&c66_0_dma_memory_region>,
> -                       <&c66_0_memory_region>;
> -};
> -
> -&c66_1 {
> -       status = "okay";
> -       mboxes = <&mailbox0_cluster3>, <&mbox_c66_1>;
> -       memory-region = <&c66_1_dma_memory_region>,
> -                       <&c66_1_memory_region>;
> -};
> -
> -&c71_0 {
> -       status = "okay";
> -       mboxes = <&mailbox0_cluster4>, <&mbox_c71_0>;
> -       memory-region = <&c71_0_dma_memory_region>,
> -                       <&c71_0_memory_region>;
> -};
> diff --git a/arch/arm/dts/k3-j721e-thermal.dtsi b/arch/arm/dts/k3-j721e-thermal.dtsi
> deleted file mode 100644
> index c2523279001..00000000000
> --- a/arch/arm/dts/k3-j721e-thermal.dtsi
> +++ /dev/null
> @@ -1,75 +0,0 @@
> -// SPDX-License-Identifier: GPL-2.0
> -
> -#include <dt-bindings/thermal/thermal.h>
> -
> -thermal_zones: thermal-zones {
> -       wkup_thermal: wkup-thermal {
> -               polling-delay-passive = <250>; /* milliseconds */
> -               polling-delay = <500>; /* milliseconds */
> -               thermal-sensors = <&wkup_vtm0 0>;
> -
> -               trips {
> -                       wkup_crit: wkup-crit {
> -                               temperature = <125000>; /* milliCelsius */
> -                               hysteresis = <2000>; /* milliCelsius */
> -                               type = "critical";
> -                       };
> -               };
> -       };
> -
> -       mpu_thermal: mpu-thermal {
> -               polling-delay-passive = <250>; /* milliseconds */
> -               polling-delay = <500>; /* milliseconds */
> -               thermal-sensors = <&wkup_vtm0 1>;
> -
> -               trips {
> -                       mpu_crit: mpu-crit {
> -                               temperature = <125000>; /* milliCelsius */
> -                               hysteresis = <2000>; /* milliCelsius */
> -                               type = "critical";
> -                       };
> -               };
> -       };
> -
> -       c7x_thermal: c7x-thermal {
> -               polling-delay-passive = <250>; /* milliseconds */
> -               polling-delay = <500>; /* milliseconds */
> -               thermal-sensors = <&wkup_vtm0 2>;
> -
> -               trips {
> -                       c7x_crit: c7x-crit {
> -                               temperature = <125000>; /* milliCelsius */
> -                               hysteresis = <2000>; /* milliCelsius */
> -                               type = "critical";
> -                       };
> -               };
> -       };
> -
> -       gpu_thermal: gpu-thermal {
> -               polling-delay-passive = <250>; /* milliseconds */
> -               polling-delay = <500>; /* milliseconds */
> -               thermal-sensors = <&wkup_vtm0 3>;
> -
> -               trips {
> -                       gpu_crit: gpu-crit {
> -                               temperature = <125000>; /* milliCelsius */
> -                               hysteresis = <2000>; /* milliCelsius */
> -                               type = "critical";
> -                       };
> -               };
> -       };
> -
> -       r5f_thermal: r5f-thermal {
> -               polling-delay-passive = <250>; /* milliseconds */
> -               polling-delay = <500>; /* milliseconds */
> -               thermal-sensors = <&wkup_vtm0 4>;
> -
> -               trips {
> -                       r5f_crit: r5f-crit {
> -                               temperature = <125000>; /* milliCelsius */
> -                               hysteresis = <2000>; /* milliCelsius */
> -                               type = "critical";
> -                       };
> -               };
> -       };
> -};
> diff --git a/arch/arm/dts/k3-j721e.dtsi b/arch/arm/dts/k3-j721e.dtsi
> deleted file mode 100644
> index a200810df54..00000000000
> --- a/arch/arm/dts/k3-j721e.dtsi
> +++ /dev/null
> @@ -1,176 +0,0 @@
> -// SPDX-License-Identifier: GPL-2.0
> -/*
> - * Device Tree Source for J721E SoC Family
> - *
> - * Copyright (C) 2016-2019 Texas Instruments Incorporated - https://www.ti.com/
> - */
> -
> -#include <dt-bindings/interrupt-controller/irq.h>
> -#include <dt-bindings/interrupt-controller/arm-gic.h>
> -#include <dt-bindings/soc/ti,sci_pm_domain.h>
> -
> -#include "k3-pinctrl.h"
> -
> -/ {
> -       model = "Texas Instruments K3 J721E SoC";
> -       compatible = "ti,j721e";
> -       interrupt-parent = <&gic500>;
> -       #address-cells = <2>;
> -       #size-cells = <2>;
> -
> -       chosen { };
> -
> -       cpus {
> -               #address-cells = <1>;
> -               #size-cells = <0>;
> -               cpu-map {
> -                       cluster0: cluster0 {
> -                               core0 {
> -                                       cpu = <&cpu0>;
> -                               };
> -
> -                               core1 {
> -                                       cpu = <&cpu1>;
> -                               };
> -                       };
> -
> -               };
> -
> -               cpu0: cpu at 0 {
> -                       compatible = "arm,cortex-a72";
> -                       reg = <0x000>;
> -                       device_type = "cpu";
> -                       enable-method = "psci";
> -                       i-cache-size = <0xC000>;
> -                       i-cache-line-size = <64>;
> -                       i-cache-sets = <256>;
> -                       d-cache-size = <0x8000>;
> -                       d-cache-line-size = <64>;
> -                       d-cache-sets = <256>;
> -                       next-level-cache = <&L2_0>;
> -               };
> -
> -               cpu1: cpu at 1 {
> -                       compatible = "arm,cortex-a72";
> -                       reg = <0x001>;
> -                       device_type = "cpu";
> -                       enable-method = "psci";
> -                       i-cache-size = <0xC000>;
> -                       i-cache-line-size = <64>;
> -                       i-cache-sets = <256>;
> -                       d-cache-size = <0x8000>;
> -                       d-cache-line-size = <64>;
> -                       d-cache-sets = <256>;
> -                       next-level-cache = <&L2_0>;
> -               };
> -       };
> -
> -       L2_0: l2-cache0 {
> -               compatible = "cache";
> -               cache-level = <2>;
> -               cache-unified;
> -               cache-size = <0x100000>;
> -               cache-line-size = <64>;
> -               cache-sets = <1024>;
> -               next-level-cache = <&msmc_l3>;
> -       };
> -
> -       msmc_l3: l3-cache0 {
> -               compatible = "cache";
> -               cache-level = <3>;
> -               cache-unified;
> -       };
> -
> -       firmware {
> -               optee {
> -                       compatible = "linaro,optee-tz";
> -                       method = "smc";
> -               };
> -
> -               psci: psci {
> -                       compatible = "arm,psci-1.0";
> -                       method = "smc";
> -               };
> -       };
> -
> -       a72_timer0: timer-cl0-cpu0 {
> -               compatible = "arm,armv8-timer";
> -               interrupts = <GIC_PPI 13 IRQ_TYPE_LEVEL_LOW>, /* cntpsirq */
> -                            <GIC_PPI 14 IRQ_TYPE_LEVEL_LOW>, /* cntpnsirq */
> -                            <GIC_PPI 11 IRQ_TYPE_LEVEL_LOW>, /* cntvirq */
> -                            <GIC_PPI 10 IRQ_TYPE_LEVEL_LOW>; /* cnthpirq */
> -       };
> -
> -       pmu: pmu {
> -               compatible = "arm,cortex-a72-pmu";
> -               /* Recommendation from GIC500 TRM Table A.3 */
> -               interrupts = <GIC_PPI 7 IRQ_TYPE_LEVEL_HIGH>;
> -       };
> -
> -       cbass_main: bus at 100000 {
> -               compatible = "simple-bus";
> -               #address-cells = <2>;
> -               #size-cells = <2>;
> -               ranges = <0x00 0x00100000 0x00 0x00100000 0x00 0x00020000>, /* ctrl mmr */
> -                        <0x00 0x00600000 0x00 0x00600000 0x00 0x00031100>, /* GPIO */
> -                        <0x00 0x00700000 0x00 0x00700000 0x00 0x00001000>, /* ESM */
> -                        <0x00 0x00900000 0x00 0x00900000 0x00 0x00012000>, /* serdes */
> -                        <0x00 0x00a40000 0x00 0x00a40000 0x00 0x00000800>, /* timesync router */
> -                        <0x00 0x06000000 0x00 0x06000000 0x00 0x00400000>, /* USBSS0 */
> -                        <0x00 0x06400000 0x00 0x06400000 0x00 0x00400000>, /* USBSS1 */
> -                        <0x00 0x01000000 0x00 0x01000000 0x00 0x0af02400>, /* Most peripherals */
> -                        <0x00 0x0c000000 0x00 0x0c000000 0x00 0x0d000000>, /* CPSW9G */
> -                        <0x00 0x30000000 0x00 0x30000000 0x00 0x0c400000>, /* MAIN NAVSS */
> -                        <0x00 0x0d000000 0x00 0x0d000000 0x00 0x01800000>, /* PCIe Core*/
> -                        <0x00 0x0e000000 0x00 0x0e000000 0x00 0x01800000>, /* PCIe Core*/
> -                        <0x00 0x10000000 0x00 0x10000000 0x00 0x10000000>, /* PCIe DAT */
> -                        <0x00 0x64800000 0x00 0x64800000 0x00 0x00800000>, /* C71 */
> -                        <0x00 0x6f000000 0x00 0x6f000000 0x00 0x00310000>, /* A72 PERIPHBASE */
> -                        <0x44 0x00000000 0x44 0x00000000 0x00 0x08000000>, /* PCIe2 DAT */
> -                        <0x44 0x10000000 0x44 0x10000000 0x00 0x08000000>, /* PCIe3 DAT */
> -                        <0x4d 0x80800000 0x4d 0x80800000 0x00 0x00800000>, /* C66_0 */
> -                        <0x4d 0x81800000 0x4d 0x81800000 0x00 0x00800000>, /* C66_1 */
> -                        <0x4e 0x20000000 0x4e 0x20000000 0x00 0x00080000>, /* GPU */
> -                        <0x00 0x70000000 0x00 0x70000000 0x00 0x00800000>, /* MSMC RAM */
> -
> -                        /* MCUSS_WKUP Range */
> -                        <0x00 0x28380000 0x00 0x28380000 0x00 0x03880000>,
> -                        <0x00 0x40200000 0x00 0x40200000 0x00 0x00998400>,
> -                        <0x00 0x40f00000 0x00 0x40f00000 0x00 0x00020000>,
> -                        <0x00 0x41000000 0x00 0x41000000 0x00 0x00020000>,
> -                        <0x00 0x41400000 0x00 0x41400000 0x00 0x00020000>,
> -                        <0x00 0x41c00000 0x00 0x41c00000 0x00 0x00100000>,
> -                        <0x00 0x42040000 0x00 0x42040000 0x00 0x03ac2400>,
> -                        <0x00 0x45100000 0x00 0x45100000 0x00 0x00c24000>,
> -                        <0x00 0x46000000 0x00 0x46000000 0x00 0x00200000>,
> -                        <0x00 0x47000000 0x00 0x47000000 0x00 0x00068400>,
> -                        <0x00 0x50000000 0x00 0x50000000 0x00 0x10000000>,
> -                        <0x05 0x00000000 0x05 0x00000000 0x01 0x00000000>,
> -                        <0x07 0x00000000 0x07 0x00000000 0x01 0x00000000>;
> -
> -               cbass_mcu_wakeup: bus at 28380000 {
> -                       compatible = "simple-bus";
> -                       #address-cells = <2>;
> -                       #size-cells = <2>;
> -                       ranges = <0x00 0x28380000 0x00 0x28380000 0x00 0x03880000>, /* MCU NAVSS*/
> -                                <0x00 0x40200000 0x00 0x40200000 0x00 0x00998400>, /* First peripheral window */
> -                                <0x00 0x40f00000 0x00 0x40f00000 0x00 0x00020000>, /* CTRL_MMR0 */
> -                                <0x00 0x41000000 0x00 0x41000000 0x00 0x00020000>, /* MCU R5F Core0 */
> -                                <0x00 0x41400000 0x00 0x41400000 0x00 0x00020000>, /* MCU R5F Core1 */
> -                                <0x00 0x41c00000 0x00 0x41c00000 0x00 0x00100000>, /* MCU SRAM */
> -                                <0x00 0x42040000 0x00 0x42040000 0x00 0x03ac2400>, /* WKUP peripheral window */
> -                                <0x00 0x45100000 0x00 0x45100000 0x00 0x00c24000>, /* MMRs, remaining NAVSS */
> -                                <0x00 0x46000000 0x00 0x46000000 0x00 0x00200000>, /* CPSW */
> -                                <0x00 0x47000000 0x00 0x47000000 0x00 0x00068400>, /* OSPI register space */
> -                                <0x00 0x50000000 0x00 0x50000000 0x00 0x10000000>, /* FSS OSPI0/1 data region 0 */
> -                                <0x05 0x00000000 0x05 0x00000000 0x01 0x00000000>, /* FSS OSPI0 data region 3 */
> -                                <0x07 0x00000000 0x07 0x00000000 0x01 0x00000000>; /* FSS OSPI1 data region 3*/
> -               };
> -       };
> -
> -       #include "k3-j721e-thermal.dtsi"
> -};
> -
> -/* Now include the peripherals for each bus segments */
> -#include "k3-j721e-main.dtsi"
> -#include "k3-j721e-mcu-wakeup.dtsi"
> diff --git a/configs/j721e_evm_a72_defconfig b/configs/j721e_evm_a72_defconfig
> index b8d7c33c45c..451a6a91c4f 100644
> --- a/configs/j721e_evm_a72_defconfig
> +++ b/configs/j721e_evm_a72_defconfig
> @@ -14,7 +14,7 @@ CONFIG_SF_DEFAULT_SPEED=25000000
>  CONFIG_ENV_SIZE=0x20000
>  CONFIG_DM_GPIO=y
>  CONFIG_SPL_DM_SPI=y
> -CONFIG_DEFAULT_DEVICE_TREE="k3-j721e-common-proc-board"
> +CONFIG_DEFAULT_DEVICE_TREE="ti/k3-j721e-common-proc-board"
>  CONFIG_SPL_TEXT_BASE=0x80080000
>  CONFIG_OF_LIBFDT_OVERLAY=y
>  CONFIG_DM_RESET=y
> @@ -88,7 +88,7 @@ CONFIG_MMC_SPEED_MODE_SET=y
>  # CONFIG_SPL_EFI_PARTITION is not set
>  CONFIG_OF_CONTROL=y
>  CONFIG_SPL_OF_CONTROL=y
> -CONFIG_OF_LIST="k3-j721e-common-proc-board"
> +CONFIG_OF_LIST="ti/k3-j721e-common-proc-board"
>  CONFIG_MULTI_DTB_FIT=y
>  CONFIG_SPL_MULTI_DTB_FIT=y
>  CONFIG_SPL_MULTI_DTB_FIT_NO_COMPRESSION=y
> @@ -101,6 +101,7 @@ CONFIG_REGMAP=y
>  CONFIG_SPL_REGMAP=y
>  CONFIG_SPL_SYSCON=y
>  CONFIG_SPL_OF_TRANSLATE=y
> +CONFIG_OF_UPSTREAM=y
>  CONFIG_CLK=y
>  CONFIG_SPL_CLK=y
>  CONFIG_CLK_TI_SCI=y
> diff --git a/configs/j721e_sk_a72_defconfig b/configs/j721e_sk_a72_defconfig
> index 8907b8ae58f..80e3e90cafd 100644
> --- a/configs/j721e_sk_a72_defconfig
> +++ b/configs/j721e_sk_a72_defconfig
> @@ -5,5 +5,5 @@ CONFIG_ARCH_K3=y
>  CONFIG_SOC_K3_J721E=y
>  CONFIG_TARGET_J721E_A72_EVM=y
>
> -CONFIG_DEFAULT_DEVICE_TREE="k3-j721e-sk"
> -CONFIG_OF_LIST="k3-j721e-sk"
> +CONFIG_DEFAULT_DEVICE_TREE="ti/k3-j721e-sk"
> +CONFIG_OF_LIST="ti/k3-j721e-sk"
> --
> 2.34.1
>


More information about the U-Boot mailing list