Merge https://gitlab.denx.de/u-boot/custodians/u-boot-spi

[oweals/u-boot.git] / arch / arm / dts / rk3399-gru.dtsi

diff --git a/arch/arm/dts/rk3399-gru.dtsi b/arch/arm/dts/rk3399-gru.dtsi
index 7cc9b2642b1bbd581656a4cc0a2b4b6a4c673f95..0e2e0471808d5dc78c3857b8132314f99d9e3213 100644 (file)
--- a/arch/arm/dts/rk3399-gru.dtsi
+++ b/arch/arm/dts/rk3399-gru.dtsi
@@ -11,7 +11,13 @@
 
 / {
        chosen {
+               u-boot,dm-pre-reloc;
                stdout-path = "serial2:115200n8";
+               u-boot,spl-boot-order = &spi_flash;
+       };
+
+       config {
+               u-boot,spl-payload-offset = <0x40000>;
        };
 
        /*
@@ -543,7 +549,8 @@ ap_i2c_audio: &i2c8 {
        pinctrl-names = "default", "sleep";
        pinctrl-1 = <&spi1_sleep>;
 
-       spiflash@0 {
+       spi_flash: spiflash@0 {
+               u-boot,dm-pre-reloc;
                compatible = "jedec,spi-nor";
                reg = <0>;
 
@@ -558,12 +565,16 @@ ap_i2c_audio: &i2c8 {
 
 &spi5 {
        status = "okay";
+       spi-activate-delay = <100>;
+       spi-max-frequency = <3000000>;
+       spi-deactivate-delay = <200>;
 
        cros_ec: ec@0 {
                compatible = "google,cros-ec-spi";
                reg = <0>;
                interrupt-parent = <&gpio0>;
                interrupts = <1 IRQ_TYPE_LEVEL_LOW>;
+               ec-interrupt = <&gpio0 1 GPIO_ACTIVE_LOW>;
                pinctrl-names = "default";
                pinctrl-0 = <&ec_ap_int_l>;
                spi-max-frequency = <3000000>;
@@ -650,8 +661,8 @@ ap_i2c_audio: &i2c8 {
        status = "okay";
 };
 
-#include <arm/cros-ec-keyboard.dtsi>
-#include <arm/cros-ec-sbs.dtsi>
+#include <cros-ec-keyboard.dtsi>
+#include <cros-ec-sbs.dtsi>
 
 &pinctrl {
        /*