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

[u-boot] / board / samsung / dts / exynos5250-snow.dts

diff --git a/board/samsung/dts/exynos5250-snow.dts b/board/samsung/dts/exynos5250-snow.dts
index 7832e4edda0b756e224ab223e43652dadc48eafe..9b7e57e43d5aa36d4a47f0ad96b74b2fde18c50c 100644 (file)
--- a/board/samsung/dts/exynos5250-snow.dts
+++ b/board/samsung/dts/exynos5250-snow.dts
@@ -36,6 +36,7 @@
                mmc3 = "/mmc@12230000";
                serial0 = "/serial@12C30000";
                console = "/serial@12C30000";
+               i2s = "/sound@3830000";
        };
 
        i2c4: i2c@12ca0000 {
@@ -65,16 +66,15 @@
                };
        };
 
-       sound@12d60000 {
-               samsung,i2s-epll-clock-frequency = <192000000>;
-               samsung,i2s-sampling-rate = <48000>;
-               samsung,i2s-bits-per-sample = <16>;
-               samsung,i2s-channels = <2>;
-               samsung,i2s-lr-clk-framesize = <256>;
-               samsung,i2s-bit-clk-framesize = <32>;
+       sound@3830000 {
                samsung,codec-type = "max98095";
+               codec-enable-gpio = <&gpio 0xb7 0>;
        };
 
+        sound@12d60000 {
+                status = "disabled";
+        };
+
        i2c@12cd0000 {
                soundcodec@22 {
                        reg = <0x22>;