From patchwork Mon Nov 28 12:48:06 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Markus Reichl X-Patchwork-Id: 9449515 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id B4C3260235 for ; Mon, 28 Nov 2016 12:48:26 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9FA3E26E64 for ; Mon, 28 Nov 2016 12:48:26 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 945BA27829; Mon, 28 Nov 2016 12:48:26 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C056226E64 for ; Mon, 28 Nov 2016 12:48:25 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754563AbcK1MsV (ORCPT ); Mon, 28 Nov 2016 07:48:21 -0500 Received: from wp126.webpack.hosteurope.de ([80.237.132.133]:54466 "EHLO wp126.webpack.hosteurope.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754466AbcK1MsT (ORCPT ); Mon, 28 Nov 2016 07:48:19 -0500 Received: from p5098d998.dip0.t-ipconnect.de ([80.152.217.152] helo=linuxbbg.five-lan.de); authenticated by wp126.webpack.hosteurope.de running ExIM with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) id 1cBLLt-00089V-TF; Mon, 28 Nov 2016 13:48:09 +0100 X-Virus-Scanned: by amavisd-new 2.9.1 using newest ClamAV at linuxbbg.five-lan.de Received: from [192.168.34.101] (reichl-x64.fritz.box [192.168.34.101]) (authenticated bits=0) by linuxbbg.five-lan.de (8.14.9/8.14.5/SuSE Linux 0.8) with ESMTP id uASCm6Ka022784 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES128-SHA bits=128 verify=NO); Mon, 28 Nov 2016 13:48:07 +0100 From: Markus Reichl Subject: [PATCH] ARM: dts: exynos: Cleanup exynos4412-odroidx2.dts and enable sound on odroid-x. To: linux-samsung-soc , Krzysztof Kozlowski , Kukjin Kim , Marek Szyprowski , Tobias Jakobi , Javier Martinez Canillas Organization: five technologies GmbH Message-ID: Date: Mon, 28 Nov 2016 13:48:06 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Thunderbird/45.4.0 MIME-Version: 1.0 X-bounce-key: webpack.hosteurope.de; m.reichl@fivetechno.de; 1480337299; 905fc293; Sender: linux-samsung-soc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-samsung-soc@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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 Reviewed-by: Krzysztof Kozlowski --- 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"; -};