From patchwork Wed Feb 12 17:20:58 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Petazzoni X-Patchwork-Id: 3639441 Return-Path: X-Original-To: patchwork-alsa-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id A61B5BF13A for ; Wed, 12 Feb 2014 17:23:23 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id D141C20160 for ; Wed, 12 Feb 2014 17:23:22 +0000 (UTC) Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) by mail.kernel.org (Postfix) with ESMTP id AD24920127 for ; Wed, 12 Feb 2014 17:23:21 +0000 (UTC) Received: by alsa0.perex.cz (Postfix, from userid 1000) id C3E8B26528D; Wed, 12 Feb 2014 18:23:20 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Spam-Level: X-Spam-Status: No, score=1.1 required=5.0 tests=BAYES_00,KHOP_BIG_TO_CC, NO_DNS_FOR_FROM,UNPARSEABLE_RELAY autolearn=no version=3.3.1 Received: from alsa0.perex.cz (localhost [IPv6:::1]) by alsa0.perex.cz (Postfix) with ESMTP id E34BD265148; Wed, 12 Feb 2014 18:21:16 +0100 (CET) X-Original-To: alsa-devel@alsa-project.org Delivered-To: alsa-devel@alsa-project.org Received: by alsa0.perex.cz (Postfix, from userid 1000) id AF2812650D5; Wed, 12 Feb 2014 18:21:14 +0100 (CET) Received: from mail.free-electrons.com (top.free-electrons.com [176.31.233.9]) by alsa0.perex.cz (Postfix) with ESMTP id B23E4260863 for ; Wed, 12 Feb 2014 18:21:05 +0100 (CET) Received: by mail.free-electrons.com (Postfix, from userid 106) id CBE6287B; Wed, 12 Feb 2014 18:21:13 +0100 (CET) Received: from localhost (AToulouse-651-1-134-190.w109-222.abo.wanadoo.fr [109.222.213.190]) by mail.free-electrons.com (Postfix) with ESMTPSA id 853F47BA; Wed, 12 Feb 2014 18:21:13 +0100 (CET) From: Thomas Petazzoni To: Liam Girdwood , Mark Brown , Jason Cooper , Gregory Clement , Andrew Lunn , Sebastian Hesselbarth Date: Wed, 12 Feb 2014 18:20:58 +0100 Message-Id: <1392225662-20431-4-git-send-email-thomas.petazzoni@free-electrons.com> X-Mailer: git-send-email 1.8.3.2 In-Reply-To: <1392225662-20431-1-git-send-email-thomas.petazzoni@free-electrons.com> References: <1392225662-20431-1-git-send-email-thomas.petazzoni@free-electrons.com> Cc: Lior Amsalem , alsa-devel@alsa-project.org, Tawfik Bayouk , Ezequiel Garcia , linux-arm-kernel@lists.infradead.org Subject: [alsa-devel] [PATCH v2 3/7] ARM: mvebu: add audio I2S controller to Armada 370 Device Tree X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: alsa-devel-bounces@alsa-project.org Sender: alsa-devel-bounces@alsa-project.org X-Spam-Level: * X-Virus-Scanned: ClamAV using ClamSMTP The Armada 370 SoC has an I2S audio controller. This commit adds the description of this controller to the Device Tree describing this SoC, as well as two possible muxing configurations for the I2S bus pins. Signed-off-by: Thomas Petazzoni --- arch/arm/boot/dts/armada-370.dtsi | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/arch/arm/boot/dts/armada-370.dtsi b/arch/arm/boot/dts/armada-370.dtsi index 0d8530c..e3f4c18 100644 --- a/arch/arm/boot/dts/armada-370.dtsi +++ b/arch/arm/boot/dts/armada-370.dtsi @@ -132,6 +132,20 @@ "mpp51", "mpp52", "mpp53"; marvell,function = "sd0"; }; + + i2s_pins1: i2s-pins1 { + marvell,pins = "mpp5", "mpp6", "mpp7", + "mpp8", "mpp9", "mpp10", + "mpp12", "mpp13"; + marvell,function = "audio"; + }; + + i2s_pins2: i2s-pins2 { + marvell,pins = "mpp49", "mpp47", "mpp50", + "mpp59", "mpp57", "mpp61", + "mpp62", "mpp60", "mpp58"; + marvell,function = "audio"; + }; }; gpio0: gpio@18100 { @@ -196,6 +210,15 @@ clocks = <&coreclk 2>; }; + audio_controller: audio-controller@30000 { + compatible = "marvell,armada370-audio"; + reg = <0x30000 0x4000>; + interrupts = <93>; + clocks = <&gateclk 0>; + clock-names = "internal"; + status = "disabled"; + }; + usb@50000 { clocks = <&coreclk 0>; };