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

[oweals/u-boot.git] / arch / arm / dts / exynos5420-peach-pit.dts

diff --git a/arch/arm/dts/exynos5420-peach-pit.dts b/arch/arm/dts/exynos5420-peach-pit.dts
index 2db4ad2dbd0a98f774c1449a30b96da4cd6cf8ea..a68c3b517460f6483ba6984efd423290caaf7fed 100644 (file)
--- a/arch/arm/dts/exynos5420-peach-pit.dts
+++ b/arch/arm/dts/exynos5420-peach-pit.dts
@@ -1,10 +1,9 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * SAMSUNG/GOOGLE Peach-Pit board device tree source
  *
  * Copyright (c) 2013 Samsung Electronics Co., Ltd.
  *             http://www.samsung.com
- *
- * SPDX-License-Identifier:    GPL-2.0+
  */
 
 /dts-v1/;
@@ -68,12 +67,28 @@
                };
        };
 
+       sound {
+               compatible = "google,peach-audio-max98090";
+
+               samsung,model = "PEACH-I2S-MAX98090";
+               samsung,audio-codec = <&max98090>;
+
+               cpu {
+                       sound-dai = <&i2s0 0>;
+               };
+
+               codec {
+                       sound-dai = <&max98090 0>;
+               };
+       };
+
        i2c@12CD0000 { /* i2c7 */
                clock-frequency = <100000>;
-              soundcodec@20 {
-                     reg = <0x20>;
-                     compatible = "maxim,max98090-codec";
-              };
+               max98090: soundcodec@10 {
+                       reg = <0x10>;
+                       compatible = "maxim,max98090";
+                       #sound-dai-cells = <1>;
+               };
 
                edp-lvds-bridge@48 {
                        compatible = "parade,ps8625";
@@ -242,7 +257,7 @@
        spi@12d30000 { /* spi1 */
                spi-max-frequency = <50000000>;
                firmware_storage_spi: flash@0 {
-                       compatible = "spi-flash";
+                       compatible = "jedec,spi-nor";
                        reg = <0>;
 
                        /*