Merge branch 'sprd/dt' into next/dt

[linux-2.6-block.git] / arch / arm / boot / dts / exynos4412-odroidx.dts

diff --git a/arch/arm/boot/dts/exynos4412-odroidx.dts b/arch/arm/boot/dts/exynos4412-odroidx.dts
index 2dff129bc2adbbc83fa931e6b8811bdeaae9476e..348556fcdd9d9dd010f71b65495bc8627a00b1d1 100644 (file)
--- a/arch/arm/boot/dts/exynos4412-odroidx.dts
+++ b/arch/arm/boot/dts/exynos4412-odroidx.dts
@@ -97,12 +97,12 @@
 };
 
 &sound {
-       simple-audio-card,name = "Odroid-X";
-       simple-audio-card,widgets =
+       model = "Odroid-X";
+       samsung,audio-widgets =
                "Headphone", "Headphone Jack",
                "Microphone", "Mic Jack",
                "Microphone", "DMIC";
-       simple-audio-card,routing =
+       samsung,audio-routing =
                "Headphone Jack", "HPL",
                "Headphone Jack", "HPR",
                "IN1", "Mic Jack",