diff options
| author | Markus Reichl <m.reichl@fivetechno.de> | 2016-11-28 13:48:06 +0100 |
|---|---|---|
| committer | Krzysztof Kozlowski <krzk@kernel.org> | 2016-12-28 19:29:01 +0200 |
| commit | 287dad02e6590b00e4d8d5219993a2dca752b800 (patch) | |
| tree | 4b17e0300ad00ea879153d7b8d2170308734a84c | |
| parent | f3a3a3bf7103faa0c6bd16a26caef0118fc58163 (diff) | |
| download | linux-287dad02e6590b00e4d8d5219993a2dca752b800.tar.gz linux-287dad02e6590b00e4d8d5219993a2dca752b800.tar.bz2 linux-287dad02e6590b00e4d8d5219993a2dca752b800.zip | |
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>
| -rw-r--r-- | arch/arm/boot/dts/exynos4412-odroidx.dts | 13 | ||||
| -rw-r--r-- | 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 153a75fe6e24..46b931eec228 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 4d228858f172..083647402d74 100644 --- 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"; -}; |