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 12404ff76b99687cfde3ccd6e7513e018a14d7ff..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>;
@@ -245,16 +238,6 @@
                533000 1150000
                666000 1200000
        >;
-       rockchip,num-channels = <2>;
-       rockchip,pctl-timing = <0x29a 0xc8 0x1f8 0x42 0x4e 0x4 0xea 0xa
-               0x5 0x0 0xa 0x7 0x19 0x24 0xa 0x7
-               0x5 0xa 0x5 0x200 0x5 0x10 0x40 0x0
-               0x1 0x7 0x7 0x4 0xc 0x43 0x100 0x0
-               0x5 0x0>;
-       rockchip,phy-timing = <0x48f9aab4 0xea0910 0x1002c200
-               0xa60 0x40 0x10 0x0>;
-       rockchip,sdram-channel = /bits/ 8 <0x1 0xa 0x3 0x2 0x1 0x0 0xf 0xf>;
-       rockchip,sdram-params = <0x30B25564 0x627 3 666000000 3 9 1>;
 };
 
 &efuse {
@@ -320,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>;
        };
@@ -332,6 +315,7 @@
        clock-frequency = <400000>;
        i2c-scl-falling-time-ns = <50>;         /* 2.5ns measured */
        i2c-scl-rising-time-ns = <100>;         /* 45ns measured */
+       u-boot,dm-pre-reloc;
 
        rk808: pmic@1b {
                compatible = "rockchip,rk808";
@@ -344,6 +328,7 @@
                rockchip,system-power-controller;
                wakeup-source;
                #clock-cells = <1>;
+               u-boot,dm-pre-reloc;
 
                vcc1-supply = <&vcc33_sys>;
                vcc2-supply = <&vcc33_sys>;
@@ -495,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";
@@ -715,7 +701,10 @@
 
        pmic {
                pmic_int_l: pmic-int-l {
-                       rockchip,pins = <RK_GPIO0 4 RK_FUNC_GPIO &pcfg_pull_up>;
+                       /*
+                        * Causes jerry to hang when probing bus 0
+                        * rockchip,pins = <RK_GPIO0 4 RK_FUNC_GPIO &pcfg_pull_up>;
+                        */
                };
        };