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

[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 df19263accb1790b9867b371b3da8bb3f8465eff..0e2e0471808d5dc78c3857b8132314f99d9e3213 100644 (file)
--- a/arch/arm/dts/rk3399-gru.dtsi
+++ b/arch/arm/dts/rk3399-gru.dtsi
@@ -545,14 +545,13 @@ ap_i2c_audio: &i2c8 {
 
 &spi1 {
        status = "okay";
-       u-boot,dm-pre-reloc;
 
        pinctrl-names = "default", "sleep";
        pinctrl-1 = <&spi1_sleep>;
 
        spi_flash: spiflash@0 {
                u-boot,dm-pre-reloc;
-               compatible = "jedec,spi-nor", "spi-flash";
+               compatible = "jedec,spi-nor";
                reg = <0>;
 
                /* May run faster once verified. */
@@ -630,7 +629,6 @@ ap_i2c_audio: &i2c8 {
 
 &uart2 {
        status = "okay";
-       u-boot,dm-pre-reloc;
 };
 
 &usb_host0_ohci {