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

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

diff --git a/arch/arm/dts/rk3288-veyron-jerry.dts b/arch/arm/dts/rk3288-veyron-jerry.dts
index da37ea8e7add5c9c1de1ffa9da2ba150bdab6ef3..c251d9d59424d5e40d98abec4623dfa45ce830aa 100644 (file)
--- a/arch/arm/dts/rk3288-veyron-jerry.dts
+++ b/arch/arm/dts/rk3288-veyron-jerry.dts
@@ -1,9 +1,8 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Google Veyron Jerry Rev 3+ board device tree source
  *
  * Copyright 2014 Google, Inc
- *
- * SPDX-License-Identifier:    GPL-2.0
  */
 
 /dts-v1/;
@@ -21,7 +20,7 @@
                 stdout-path = &uart2;
         };
 
-       panel_regulator: panel-regualtor {
+       panel_regulator: panel-regulator {
                compatible = "regulator-fixed";
                enable-active-high;
                gpio = <&gpio7 14 GPIO_ACTIVE_HIGH>;
@@ -53,6 +52,29 @@
                vin-supply = <&vcc33_sys>;
                startup-delay-us = <15000>;
        };
+
+       sound {
+               compatible = "rockchip,audio-max98090-jerry";
+
+               cpu {
+                       sound-dai = <&i2s 0>;
+               };
+
+               codec {
+                       sound-dai = <&max98090 0>;
+               };
+       };
+};
+
+&dmc {
+       rockchip,pctl-timing = <0x29a 0xc8 0x1f4 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-params = <0x30B25564 0x627 3 666000000 3 9 1>;
 };
 
 &gpio_keys {