From patchwork Mon Jul 14 15:12:32 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Sylwester Nawrocki/Kernel \\(PLT\\) /SRPOL/Staff Engineer/Samsung Electronics" X-Patchwork-Id: 4547251 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 9EB309F295 for ; Mon, 14 Jul 2014 15:15:13 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id C9C162015E for ; Mon, 14 Jul 2014 15:15:12 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 005F320158 for ; Mon, 14 Jul 2014 15:15:11 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1X6hwM-0004MJ-20; Mon, 14 Jul 2014 15:13:18 +0000 Received: from mailout1.samsung.com ([203.254.224.24]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1X6hwE-00043Y-SQ for linux-arm-kernel@lists.infradead.org; Mon, 14 Jul 2014 15:13:15 +0000 Received: from epcpsbgm2.samsung.com (epcpsbgm2 [203.254.230.27]) by mailout1.samsung.com (Oracle Communications Messaging Server 7u4-24.01(7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTP id <0N8P009D9JLAP460@mailout1.samsung.com> for linux-arm-kernel@lists.infradead.org; Tue, 15 Jul 2014 00:12:46 +0900 (KST) X-AuditID: cbfee61b-f79f86d00000144c-1a-53c3f36e24f8 Received: from epmmp1.local.host ( [203.254.227.16]) by epcpsbgm2.samsung.com (EPCPMTA) with SMTP id 3B.9F.05196.E63F3C35; Tue, 15 Jul 2014 00:12:46 +0900 (KST) Received: from amdc1344.digital.local ([106.116.147.32]) by mmp1.samsung.com (Oracle Communications Messaging Server 7u4-24.01 (7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTPA id <0N8P00L9OJL33Y30@mmp1.samsung.com>; Tue, 15 Jul 2014 00:12:46 +0900 (KST) From: Sylwester Nawrocki To: kgene.kim@samsung.com Subject: [PATCH] ARM: dts: Add sound nodes for Odroid-X2/U3 boards Date: Mon, 14 Jul 2014 17:12:32 +0200 Message-id: <1405350752-25795-1-git-send-email-s.nawrocki@samsung.com> X-Mailer: git-send-email 1.7.9.5 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrAJMWRmVeSWpSXmKPExsVy+t9jAd28z4eDDbYdMrDoXXCVzWLT42us FjPO72OyOPymndWBxWPzknqPvi2rGD0+b5ILYI7isklJzcksSy3St0vgyri6s5up4KRYxbEv H5kaGM8KdTFyckgImEg8udjFDmGLSVy4t56ti5GLQ0hgEaPE7ANHoZwOJokfbf/BqtgEDCV6 j/YxgtgiApISTQ1/mLsYOTiYBaokmp+ogoSFBZwkvnT+ZAWxWQRUJVadmQJm8wq4SfxfMZ0d pFxCQEFiziSbCYzcCxgZVjGKphYkFxQnpeca6RUn5haX5qXrJefnbmIE+/uZ9A7GVQ0WhxgF OBiVeHgl3h0OFmJNLCuuzD3EKMHBrCTCe/QDUIg3JbGyKrUoP76oNCe1+BCjNAeLkjjvwVbr QCGB9MSS1OzU1ILUIpgsEwenVAPjzBvnS3UObru9vXryspQI4SiZPXdm3nhQd2OfoK1J9rkK jV2fNp+a8s1z40SWtYY/+iYe2h3Ic3z+S52C11ssj9YfiE1tnyDFFem0cUJv8RqFYxKTeLxt Ej9933u+557lwd+vfRMnKxzbxhP3h6UrwXCLSc6p624tXc1/d3y9at/X1V9RrhJxQYmlOCPR UIu5qDgRAIXohU3zAQAA X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20140714_081311_107733_729A8372 X-CRM114-Status: UNSURE ( 9.51 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -5.0 (-----) Cc: linux-samsung-soc@vger.kernel.org, Sylwester Nawrocki , linux-arm-kernel@lists.infradead.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Add MAX98090 audio codec, I2S interface and the sound complex nodes to enable audio on Odroid-X2/U3 boards. Signed-off-by: Sylwester Nawrocki --- This patch depends on the series from Marek [1] adding dt sources for Odroid X2/U3. My testing branch can be pulled from [2]. [1] http://www.spinics.net/lists/linux-samsung-soc/msg32544.html [2] git://linuxtv.org/snawrocki/samsung.git v3.16-rc5-odroid-sound arch/arm/boot/dts/exynos4412-odroid-common.dtsi | 27 +++++++++++++++++++++++ arch/arm/boot/dts/exynos4412-odroidu3.dts | 12 ++++++++++ arch/arm/boot/dts/exynos4412-odroidx2.dts | 9 ++++++++ 3 files changed, 48 insertions(+) -- 1.7.9.5 diff --git a/arch/arm/boot/dts/exynos4412-odroid-common.dtsi b/arch/arm/boot/dts/exynos4412-odroid-common.dtsi index 0bc1a9b..6d6d23c 100644 --- a/arch/arm/boot/dts/exynos4412-odroid-common.dtsi +++ b/arch/arm/boot/dts/exynos4412-odroid-common.dtsi @@ -32,6 +32,21 @@ }; }; + i2s0: i2s@03830000 { + pinctrl-0 = <&i2s0_bus>; + pinctrl-names = "default"; + status = "okay"; + clocks = <&clock_audss EXYNOS_I2S_BUS>, + <&clock_audss EXYNOS_DOUT_AUD_BUS>; + clock-names = "iis", "i2s_opclk0"; + }; + + sound: sound { + compatible = "samsung,odroidx2-audio"; + samsung,i2s-controller = <&i2s0>; + samsung,audio-codec = <&max98090>; + }; + mmc@12550000 { pinctrl-0 = <&sd4_clk &sd4_cmd &sd4_bus4 &sd4_bus8>; pinctrl-names = "default"; @@ -321,6 +336,18 @@ }; }; + i2c@13870000 { + pinctrl-names = "default"; + pinctrl-0 = <&i2c1_bus>; + status = "okay"; + max98090: max98090@10 { + compatible = "maxim,max98090"; + reg = <0x10>; + interrupt-parent = <&gpx0>; + interrupts = <0 0>; + }; + }; + exynos-usbphy@125B0000 { status = "okay"; }; diff --git a/arch/arm/boot/dts/exynos4412-odroidu3.dts b/arch/arm/boot/dts/exynos4412-odroidu3.dts index 287aa0d..c8a64be 100644 --- a/arch/arm/boot/dts/exynos4412-odroidu3.dts +++ b/arch/arm/boot/dts/exynos4412-odroidu3.dts @@ -47,3 +47,15 @@ status = "okay"; }; }; + +&sound { + compatible = "samsung,odroidu3-audio"; + samsung,model = "Odroid-U3"; + samsung,audio-routing = + "Headphone Jack", "HPL", + "Headphone Jack", "HPR", + "Headphone Jack", "MICBIAS", + "IN1", "Headphone Jack", + "Speakers", "SPKL", + "Speakers", "SPKR"; +}; diff --git a/arch/arm/boot/dts/exynos4412-odroidx2.dts b/arch/arm/boot/dts/exynos4412-odroidx2.dts index e9ae161..96b43f4 100644 --- a/arch/arm/boot/dts/exynos4412-odroidx2.dts +++ b/arch/arm/boot/dts/exynos4412-odroidx2.dts @@ -21,3 +21,12 @@ reg = <0x40000000 0x7FF00000>; }; }; + +&sound { + samsung,model = "Odroid-X2"; + samsung,audio-routing = + "Headphone Jack", "HPL", + "Headphone Jack", "HPR", + "IN1", "Mic Jack", + "Mic Jack", "MICBIAS"; +};