Merge tag 'u-boot-imx-20191105' of https://gitlab.denx.de/u-boot/custodians/u-boot-imx

[oweals/u-boot.git] / arch / arm / dts / k3-am654-r5-base-board.dts

diff --git a/arch/arm/dts/k3-am654-r5-base-board.dts b/arch/arm/dts/k3-am654-r5-base-board.dts
index 7ed307f0d84c68af437d1367f3e36b9fdc08907b..5c110ef9ddea1aa85e932d6ae05f5c60d8112b7e 100644 (file)
--- a/arch/arm/dts/k3-am654-r5-base-board.dts
+++ b/arch/arm/dts/k3-am654-r5-base-board.dts
@@ -7,7 +7,7 @@
 
 #include "k3-am654.dtsi"
 #include "k3-am654-base-board-u-boot.dtsi"
-#include "k3-am654-base-board-ddr4-1600MHz.dtsi"
+#include "k3-am654-base-board-ddr4-1600MTs.dtsi"
 #include "k3-am654-ddr.dtsi"
 
 / {
@@ -16,6 +16,7 @@
 
        aliases {
                serial0 = &wkup_uart0;
+               serial1 = &mcu_uart0;
                serial2 = &main_uart0;
        };
 
@@ -96,6 +97,13 @@
                u-boot,dm-spl;
        };
 
+       wkup_vtm0: wkup_vtm@42050000 {
+               compatible = "ti,am654-vtm", "ti,am654-avs";
+               reg = <0x42050000 0x25c>;
+               power-domains = <&k3_pds 80>;
+               #thermal-sensor-cells = <1>;
+       };
+
        clk_200mhz: dummy_clock {
                compatible = "fixed-clock";
                #clock-cells = <0>;
@@ -118,10 +126,24 @@
        status = "okay";
 };
 
+&mcu_uart0 {
+       u-boot,dm-spl;
+       pinctrl-names = "default";
+       pinctrl-0 = <&mcu_uart0_pins_default>;
+       clock-frequency = <48000000>;
+       status = "okay";
+};
+
 &main_uart0 {
        power-domains = <&k3_pds 146 TI_SCI_PD_SHARED>;
 };
 
+&wkup_vtm0 {
+       vdd-supply-3 = <&vdd_mpu>;
+       vdd-supply-4 = <&vdd_mpu>;
+       u-boot,dm-spl;
+};
+
 &wkup_pmx0 {
        u-boot,dm-spl;
        wkup_uart0_pins_default: wkup_uart0_pins_default {
@@ -141,6 +163,16 @@
                u-boot,dm-spl;
        };
 
+       mcu_uart0_pins_default: mcu_uart0_pins_default {
+               pinctrl-single,pins = <
+                       AM65X_WKUP_IOPAD(0x0044, PIN_INPUT, 4)  /* (P4) MCU_OSPI1_D1.MCU_UART0_RXD */
+                       AM65X_WKUP_IOPAD(0x0048, PIN_OUTPUT, 4) /* (P5) MCU_OSPI1_D2.MCU_UART0_TXD */
+                       AM65X_WKUP_IOPAD(0x004C, PIN_INPUT, 4)  /* (P1) MCU_OSPI1_D3.MCU_UART0_CTSn */
+                       AM65X_WKUP_IOPAD(0x0054, PIN_OUTPUT, 4) /* (N3) MCU_OSPI1_CSn1.MCU_UART0_RTSn */
+               >;
+               u-boot,dm-spl;
+       };
+
        wkup_i2c0_pins_default: wkup-i2c0-pins-default {
                pinctrl-single,pins = <
                        AM65X_WKUP_IOPAD(0x00e0, PIN_INPUT, 0) /* (AC7) WKUP_I2C0_SCL */
@@ -192,4 +224,18 @@
        pinctrl-names = "default";
        pinctrl-0 = <&wkup_i2c0_pins_default>;
        clock-frequency = <400000>;
+       u-boot,dm-spl;
+
+       vdd_mpu: tps62363@60 {
+               compatible = "ti,tps62363";
+               reg = <0x60>;
+               regulator-name = "VDD_MPU";
+               regulator-min-microvolt = <500000>;
+               regulator-max-microvolt = <1770000>;
+               regulator-always-on;
+               regulator-boot-on;
+               ti,vsel0-state-high;
+               ti,vsel1-state-high;
+               u-boot,dm-spl;
+       };
 };