[PATCH] ARM: dts: exynos: Cleanup exynos4412-odroidx2.dts and enable sound on odroid-x.

[PATCH] ARM: dts: exynos: Cleanup exynos4412-odroidx2.dts and enable sound on odroid-x.

[Markus Reichl]

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>
---
 arch/arm/boot/dts/exynos4412-odroidx.dts  | 13 +++++++++++++
 arch/arm/boot/dts/exynos4412-odroidx2.dts | 24 ------------------------
 2 files changed, 13 insertions(+), 24 deletions(-)

diff --git a/arch/arm/boot/dts/exynos4412-odroidx.dts b/arch/arm/boot/dts/exynos4412-odroidx.dts
index 153a75f..46b931e 100644
--- 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 d6e92eb..d867b2e 100644
--- a/arch/arm/boot/dts/exynos4412-odroidx2.dts
+++ b/arch/arm/boot/dts/exynos4412-odroidx2.dts
@@ -23,27 +23,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";
-};
-- 
2.1.4

Re: [PATCH] ARM: dts: exynos: Cleanup exynos4412-odroidx2.dts and enable sound on odroid-x.

[Krzysztof Kozlowski]

On Mon, Nov 28, 2016 at 01:48:06PM +0100, Markus Reichl wrote:
> 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>
> ---
>  arch/arm/boot/dts/exynos4412-odroidx.dts  | 13 +++++++++++++
>  arch/arm/boot/dts/exynos4412-odroidx2.dts | 24 ------------------------
>  2 files changed, 13 insertions(+), 24 deletions(-)
>

Looks correct. I won't be pushing anything more for v4.10 so I will
apply this for v4.11 after merge window. For the reference:
Reviewed-by: Krzysztof Kozlowski <krzk@kernel.org>

Best regards,
Krzysztof

Re: [PATCH] ARM: dts: exynos: Cleanup exynos4412-odroidx2.dts and enable sound on odroid-x.

[Krzysztof Kozlowski]

On Mon, Nov 28, 2016 at 01:48:06PM +0100, Markus Reichl wrote:
> 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>
> ---
>  arch/arm/boot/dts/exynos4412-odroidx.dts  | 13 +++++++++++++
>  arch/arm/boot/dts/exynos4412-odroidx2.dts | 24 ------------------------
>  2 files changed, 13 insertions(+), 24 deletions(-)
> 
Thanks, applied.

Best regards,
Krzysztof