ARM: dts: exynos: Cleanup Odroid-X2 and enable sound on Odroid-X

Odroid-X2 differs from Odroid-X only in RAM and prime CPU.
Remove doubled nodes from exynos4412-odroidx2.dts and move
sound node to exynos4412-odroidx.dts to enable sound on both boards.

Signed-off-by: Markus Reichl <m.reichl@fivetechno.de>
Reviewed-by: Krzysztof Kozlowski <krzk@kernel.org>
Signed-off-by: Krzysztof Kozlowski <krzk@kernel.org>

diff --git a/arch/arm/boot/dts/exynos4412-odroidx.dts b/arch/arm/boot/dts/exynos4412-odroidx.dts
index 153a75fe6e24ec9efbc4062dfb345593ea95f15b..46b931eec22839a3980fe5981155967b7f0f8cfc 100644 (file)
--- a/arch/arm/boot/dts/exynos4412-odroidx.dts
+++ b/arch/arm/boot/dts/exynos4412-odroidx.dts
@@ -100,3 +100,16 @@
 &serial_3 {
        status = "okay";
 };
+
+&sound {
+       simple-audio-card,name = "Odroid-X";
+       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",
+               "Mic Jack", "MICBIAS";
+};

diff --git a/arch/arm/boot/dts/exynos4412-odroidx2.dts b/arch/arm/boot/dts/exynos4412-odroidx2.dts
index 4d228858f1727fbb24ccc625802b6598755f228f..083647402d741b22c1d9304c0777439a9f10b785 100644 (file)
--- a/arch/arm/boot/dts/exynos4412-odroidx2.dts
+++ b/arch/arm/boot/dts/exynos4412-odroidx2.dts
@@ -22,27 +22,3 @@
                reg = <0x40000000 0x7FF00000>;
        };
 };
-
-/* VDDQ for MSHC (eMMC card) */
-&buck8_reg {
-       regulator-name = "BUCK8_VDDQ_MMC4_2.8V";
-       regulator-min-microvolt = <2800000>;
-       regulator-max-microvolt = <2800000>;
-};
-
-&mshc_0 {
-       vqmmc-supply = <&buck8_reg>;
-};
-
-&sound {
-       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",
-               "Mic Jack", "MICBIAS";
-};