Merge tag 'mmc-updates-for-3.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel...

[~andy/linux] / arch / arm / boot / dts / exynos5250-smdk5250.dts

diff --git a/arch/arm/boot/dts/exynos5250-smdk5250.dts b/arch/arm/boot/dts/exynos5250-smdk5250.dts
index e05b18f3c33d67d6e5202083bf60f8aa65b4344f..1b8d4106d33859c5f8e61ce94fc6d1c1f543f829 100644 (file)
--- a/arch/arm/boot/dts/exynos5250-smdk5250.dts
+++ b/arch/arm/boot/dts/exynos5250-smdk5250.dts
@@ -49,6 +49,11 @@
                        compatible = "samsung,s524ad0xd1";
                        reg = <0x51>;
                };
+
+               wm8994: wm8994@1a {
+                        compatible = "wlf,wm8994";
+                        reg = <0x1a>;
+               };
        };
 
        i2c@121D0000 {
@@ -146,6 +151,7 @@
                        reg = <0>;
                        bus-width = <4>;
                        samsung,cd-pinmux-gpio = <&gpc3 2 2 3 3>;
+                       disable-wp;
                        gpios = <&gpc3 0 2 0 3>, <&gpc3 1 2 0 3>,
                                <&gpc3 3 2 3 3>, <&gpc3 4 2 3 3>,
                                <&gpc3 5 2 3 3>, <&gpc3 6 2 3 3>,
@@ -204,4 +210,25 @@
                samsung,mfc-r = <0x43000000 0x800000>;
                samsung,mfc-l = <0x51000000 0x800000>;
        };
+
+       i2s0: i2s@03830000 {
+               gpios = <&gpz 0 2 0 0>, <&gpz 1 2 0 0>, <&gpz 2 2 0 0>,
+                       <&gpz 3 2 0 0>, <&gpz 4 2 0 0>, <&gpz 5 2 0 0>,
+                       <&gpz 6 2 0 0>;
+       };
+
+       i2s1: i2s@12D60000 {
+               status = "disabled";
+       };
+
+       i2s2: i2s@12D70000 {
+               status = "disabled";
+       };
+
+       sound {
+               compatible = "samsung,smdk-wm8994";
+
+               samsung,i2s-controller = <&i2s0>;
+               samsung,audio-codec = <&wm8994>;
+       };
 };