Merge branch 'master' of git://git.denx.de/u-boot

[oweals/u-boot.git] / arch / arm / dts / k3-j721e-r5-common-proc-board.dts

diff --git a/arch/arm/dts/k3-j721e-r5-common-proc-board.dts b/arch/arm/dts/k3-j721e-r5-common-proc-board.dts
index 62009719fc6b6309d63bf0094bb0358ae847e45b..2dde65d9681dca15cb9a4cc9f5469ea05d067728 100644 (file)
--- a/arch/arm/dts/k3-j721e-r5-common-proc-board.dts
+++ b/arch/arm/dts/k3-j721e-r5-common-proc-board.dts
@@ -36,14 +36,14 @@
                u-boot,dm-spl;
        };
 
-       clk_200mhz: dummy_clock {
+       clk_200mhz: dummy_clock_200mhz {
                compatible = "fixed-clock";
                #clock-cells = <0>;
                clock-frequency = <200000000>;
                u-boot,dm-spl;
        };
 
-       clk_19_2mhz: dummy_clock {
+       clk_19_2mhz: dummy_clock_19_2mhz {
                compatible = "fixed-clock";
                #clock-cells = <0>;
                clock-frequency = <19200000>;
@@ -77,6 +77,15 @@
        };
 };
 
+&cbass_main {
+       main_esm: esm@700000 {
+               compatible = "ti,j721e-esm";
+               reg = <0x0 0x700000 0x0 0x1000>;
+               ti,esm-pins = <344>, <345>;
+               u-boot,dm-spl;
+       };
+};
+
 &dmsc {
        mboxes= <&mcu_secproxy 8>, <&mcu_secproxy 6>, <&mcu_secproxy 5>;
        mbox-names = "tx", "rx", "notify";
@@ -125,6 +134,20 @@
                        J721E_WKUP_IOPAD(0x002c, PIN_OUTPUT, 0) /* MCU_OSPI0_CSn0 */
                >;
        };
+
+       mcu_fss0_ospi1_pins_default: mcu-fss0-ospi1-pins-default {
+               u-boot,dm-spl;
+               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 */
+               >;
+       };
 };
 
 &main_pmx0 {
@@ -286,7 +309,7 @@
                reg = <0x0>;
                spi-tx-bus-width = <1>;
                spi-rx-bus-width = <8>;
-               spi-max-frequency = <40000000>;
+               spi-max-frequency = <50000000>;
                cdns,tshsl-ns = <60>;
                cdns,tsd2d-ns = <60>;
                cdns,tchsh-ns = <60>;
@@ -297,4 +320,29 @@
        };
 };
 
+&ospi1 {
+       pinctrl-names = "default";
+       pinctrl-0 = <&mcu_fss0_ospi1_pins_default>;
+       u-boot,dm-spl;
+
+       reg = <0x0 0x47050000 0x0 0x100>,
+             <0x0 0x58000000 0x0 0x8000000>;
+
+       flash@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>;
+               #address-cells = <1>;
+               #size-cells = <1>;
+               u-boot,dm-spl;
+       };
+};
+
 #include "k3-j721e-common-proc-board-u-boot.dtsi"