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

[sfrench/cifs-2.6.git] / arch / arm / boot / dts / exynos4412-odroidx2.dts

diff --git a/arch/arm/boot/dts/exynos4412-odroidx2.dts b/arch/arm/boot/dts/exynos4412-odroidx2.dts
index 96b43f4497cc0eefb931456bc34be4365a66dcb6..6e33678562aebf5be0cc055831489073ca16270f 100644 (file)
--- a/arch/arm/boot/dts/exynos4412-odroidx2.dts
+++ b/arch/arm/boot/dts/exynos4412-odroidx2.dts
@@ -23,8 +23,12 @@
 };
 
 &sound {
-       samsung,model = "Odroid-X2";
-       samsung,audio-routing =
+       simple-audio-card,name = "Odroid-X2";
+       simple-audio-card,widgets =
+               "Headphone", "Headphone Jack",
+               "Microphone", "Mic Jack",
+               "Microphone", "DMIC";
+       simple-audio-card,routing =
                "Headphone Jack", "HPL",
                "Headphone Jack", "HPR",
                "IN1", "Mic Jack",