Merge tag 'dt-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

[linux-2.6-block.git] / arch / arm / boot / dts / exynos4412-odroid-common.dtsi

diff --git a/arch/arm/boot/dts/exynos4412-odroid-common.dtsi b/arch/arm/boot/dts/exynos4412-odroid-common.dtsi
index 3fbf588682b94fcf8f6b340ad266794741825f34..de80b5bba20454b3e504fd26228d581bcb725190 100644 (file)
--- a/arch/arm/boot/dts/exynos4412-odroid-common.dtsi
+++ b/arch/arm/boot/dts/exynos4412-odroid-common.dtsi
@@ -7,10 +7,15 @@
  * published by the Free Software Foundation.
 */
 
+#include <dt-bindings/sound/samsung-i2s.h>
 #include <dt-bindings/input/input.h>
 #include "exynos4412.dtsi"
 
 / {
+       chosen {
+               stdout-path = &serial_1;
+       };
+
        firmware@0204F000 {
                compatible = "samsung,secure-firmware";
                reg = <0x0204F000 0x1000>;
@@ -37,14 +42,13 @@
                pinctrl-names = "default";
                status = "okay";
                clocks = <&clock_audss EXYNOS_I2S_BUS>,
-                        <&clock_audss EXYNOS_DOUT_AUD_BUS>;
-               clock-names = "iis", "i2s_opclk0";
+                        <&clock_audss EXYNOS_DOUT_AUD_BUS>,
+                        <&clock_audss EXYNOS_SCLK_I2S>;
+               clock-names = "iis", "i2s_opclk0", "i2s_opclk1";
        };
 
        sound: sound {
-               compatible = "samsung,odroidx2-audio";
-               samsung,i2s-controller = <&i2s0>;
-               samsung,audio-codec = <&max98090>;
+               compatible = "simple-audio-card";
                assigned-clocks = <&clock_audss EXYNOS_MOUT_AUDSS>,
                                <&clock_audss EXYNOS_MOUT_I2S>,
                                <&clock_audss EXYNOS_DOUT_SRP>,
@@ -55,6 +59,20 @@
                                <0>,
                                <192000000>,
                                <19200000>;
+
+               simple-audio-card,format = "i2s";
+               simple-audio-card,bitclock-master = <&link0_codec>;
+               simple-audio-card,frame-master = <&link0_codec>;
+
+               simple-audio-card,cpu {
+                       sound-dai = <&i2s0 0>;
+                       system-clock-frequency = <19200000>;
+               };
+
+               link0_codec: simple-audio-card,codec {
+                       sound-dai = <&max98090>;
+                       clocks = <&i2s0 CLK_I2S_CDCLK>;
+               };
        };
 
        mmc@12550000 {
@@ -373,6 +391,9 @@
                        reg = <0x10>;
                        interrupt-parent = <&gpx0>;
                        interrupts = <0 0>;
+                       clocks = <&i2s0 CLK_I2S_CDCLK>;
+                       clock-names = "mclk";
+                       #sound-dai-cells = <0>;
                };
        };
 
@@ -381,6 +402,7 @@
        };
 
        hsotg@12480000 {
+               dr_mode = "peripheral";
                status = "okay";
                vusb_d-supply = <&ldo15_reg>;
                vusb_a-supply = <&ldo12_reg>;