Merge git://git.denx.de/u-boot-usb

[oweals/u-boot.git] / arch / arm / dts / exynos5250-spring.dts

diff --git a/arch/arm/dts/exynos5250-spring.dts b/arch/arm/dts/exynos5250-spring.dts
index 693501e4c19ca8d7cf95aa798d97e12e4026be5d..77e7a6b9e45a61554c2996efe2e37d04d7bb014f 100644 (file)
--- a/arch/arm/dts/exynos5250-spring.dts
+++ b/arch/arm/dts/exynos5250-spring.dts
@@ -1,10 +1,9 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Google Spring board device tree source
  *
  * Copyright (c) 2013 Google, Inc
  * Copyright (c) 2014 SUSE LINUX Products GmbH
- *
- * SPDX-License-Identifier:    GPL-2.0
  */
 
 /dts-v1/;
@@ -32,19 +31,55 @@
                spi2 = "/spi@12d40000";
                spi3 = "/spi@131a0000";
                spi4 = "/spi@131b0000";
-               mmc0 = "/mmc@12000000";
+               mmc0 = "/mmc@12200000";
                serial0 = "/serial@12C30000";
                console = "/serial@12C30000";
-               i2s = "/sound@3830000";
        };
 
        memory {
                reg = <0x40000000 0x80000000>;
        };
 
+       iram {
+               reg = <0x02020000 0x60000>;
+       };
+
+       config {
+               samsung,bl1-offset = <0x1400>;
+               samsung,bl2-offset = <0x3400>;
+               u-boot-memory = "/memory";
+               u-boot-offset = <0x3e00000 0x100000>;
+       };
+
        flash@0 {
-               spl { /* spl size override */
-                       size = <0x8000>;
+               reg = <0 0x100000>;
+               #address-cells = <1>;
+               #size-cells = <1>;
+               pre-boot {
+                       label = "bl1 pre-boot";
+                       reg = <0 0x2000>;
+                       read-only;
+                       filename = "e5250.nbl1.bin";
+                       type = "blob exynos-bl1";
+                       required;
+               };
+
+               spl {
+                       label = "bl2 spl";
+                       reg = <0x2000 0x8000>;
+                       read-only;
+                       filename = "bl2.bin";
+                       type = "blob exynos-bl2 boot,dtb";
+                       payload = "/flash/ro-boot";
+                       required;
+               };
+
+               ro-boot {
+                       label = "u-boot";
+                       reg = <0xa000 0xb0000>;
+                       read-only;
+                       type = "blob boot,dtb";
+                       required;
                };
        };
 
@@ -95,10 +130,26 @@
                samsung,vbus-gpio = <&gpx2 7 GPIO_ACTIVE_HIGH>;
        };
 
+       sound {
+               compatible = "google,spring-audio-max98088";
+
+               samsung,model = "Spring-I2S-MAX98088";
+               samsung,audio-codec = <&max98088>;
+               codec-enable-gpio = <&gpx1 7 0>;
+
+               cpu {
+                       sound-dai = <&i2s1 0>;
+               };
+
+               codec {
+                       sound-dai = <&max98088 0>;
+               };
+       };
+
        spi@12d30000 {
                spi-max-frequency = <50000000>;
                firmware_storage_spi: flash@0 {
-                       compatible = "spi-flash";
+                       compatible = "jedec,spi-nor";
                        reg = <0>;
                };
        };
@@ -640,9 +691,10 @@
                };
        };
 
-       soundcodec@20 {
-               reg = <0x20>;
-               compatible = "maxim,max98088-codec";
+       max98088: soundcodec@10 {
+               reg = <0x10>;
+               compatible = "maxim,max98088";
+               #sound-dai-cells = <1>;
        };
 };