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

[oweals/u-boot.git] / arch / arm / dts / rk3288-veyron.dtsi

diff --git a/arch/arm/dts/rk3288-veyron.dtsi b/arch/arm/dts/rk3288-veyron.dtsi
index a31405875036d471c71b50521a93790c8c9d2b16..8754043b9b37626dddd756b9a2e01371e09e5563 100644 (file)
--- a/arch/arm/dts/rk3288-veyron.dtsi
+++ b/arch/arm/dts/rk3288-veyron.dtsi
@@ -1,9 +1,8 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Google Veyron (and derivatives) board device tree source
  *
  * Copyright 2014 Google, Inc
- *
- * SPDX-License-Identifier:    GPL-2.0
  */
 
 #include <dt-bindings/clock/rockchip,rk808.h>
@@ -17,11 +16,7 @@
 
        chosen {
                stdout-path = &uart2;
-       };
-
-       config {
-               u-boot,dm-pre-reloc;
-               u-boot,boot0 = &spi_flash;
+               u-boot,spl-boot-order = &spi_flash;
        };
 
        firmware {
@@ -84,8 +79,6 @@
 
        gpio_keys: gpio-keys {
                compatible = "gpio-keys";
-               #address-cells = <1>;
-               #size-cells = <0>;
 
                pinctrl-names = "default";
                pinctrl-0 = <&pwr_key_h>;
@@ -310,7 +303,7 @@
 
        spi_flash: spiflash@0 {
                u-boot,dm-pre-reloc;
-               compatible = "spidev", "spi-flash";
+               compatible = "spidev", "jedec,spi-nor";
                spi-max-frequency = <20000000>; /* Reduce for Dediprog em100 pro */
                reg = <0>;
        };
@@ -487,6 +480,7 @@
        max98090: max98090@10 {
                compatible = "maxim,max98090";
                reg = <0x10>;
+               #sound-dai-cells = <0>;
                interrupt-parent = <&gpio6>;
                interrupts = <7 IRQ_TYPE_EDGE_FALLING>;
                pinctrl-names = "default";