From patchwork Mon Jan 13 11:13:50 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Meier X-Patchwork-Id: 3474571 Return-Path: X-Original-To: patchwork-linux-arm@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 DD2DCC02DC for ; Mon, 13 Jan 2014 11:14:27 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 15A3E20103 for ; Mon, 13 Jan 2014 11:14:27 +0000 (UTC) Received: from casper.infradead.org (casper.infradead.org [85.118.1.10]) (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 E14EC200FE for ; Mon, 13 Jan 2014 11:14:25 +0000 (UTC) Received: from merlin.infradead.org ([2001:4978:20e::2]) by casper.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1W2fTI-0004gW-D1; Mon, 13 Jan 2014 11:14:20 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1W2fTF-0003kv-Pb; Mon, 13 Jan 2014 11:14:17 +0000 Received: from mail-bk0-f50.google.com ([209.85.214.50]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1W2fTC-0003j8-Bj for linux-arm-kernel@lists.infradead.org; Mon, 13 Jan 2014 11:14:15 +0000 Received: by mail-bk0-f50.google.com with SMTP id e11so2387349bkh.37 for ; Mon, 13 Jan 2014 03:13:51 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:message-id:date:from:user-agent:mime-version:to :cc:subject:content-type:content-transfer-encoding; bh=IQedox/PJdrHzMUg9BIrY467PCJeqrqmCMxDykI7J6s=; b=HJnaEECJ9aQfsW348mNcKHuWZPeCb5h26JMF0EjnAh3jhsLEtBGRLEJ1wVxQOTKcaw 4sRvJj2+wyQqhXs3jeq+MuMBIYYZ+CJjaRADkv+nRxOCcrxt/1dtB0GsBGabw1hHy8Ov wSn57it04dhAueso7Uu+bdhRahpizGJYKtTSowUTJFYPMmcYYAvHLLHvXMSxh+ab8chC yGwEOuScuOOyVbstjAcQ/IdhBG57VwaBekkjxcIPwcX8EHxU48P4/To1SH8GywF0zNW2 iJ7x9aO763ujmGVoM9Flfu1w61eJZ6RyXls8NR+RknPwPc/cWrIjuwp+h8/CWOhHl3pt aYug== X-Gm-Message-State: ALoCoQmjDG4czPGtYzEDEazu8hh5pwBTSrrnmC0lu0l9qaMD991W0o79okwNEc24xXP6JbehDwfk X-Received: by 10.205.20.1 with SMTP id qm1mr814770bkb.80.1389611631623; Mon, 13 Jan 2014 03:13:51 -0800 (PST) Received: from [134.28.77.145] ([134.28.77.145]) by mx.google.com with ESMTPSA id it12sm15498602bkb.12.2014.01.13.03.13.50 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 13 Jan 2014 03:13:50 -0800 (PST) Message-ID: <52D3CA6E.1010803@koalo.de> Date: Mon, 13 Jan 2014 12:13:50 +0100 From: Florian Meier User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:24.0) Gecko/20100101 Thunderbird/24.2.0 MIME-Version: 1.0 To: Stephen Warren Subject: [PATCH 2/2] BCM2835: Add I2S driver to device tree X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20140113_061414_535916_F9ADE01F X-CRM114-Status: GOOD ( 11.82 ) X-Spam-Score: -2.6 (--) Cc: devicetree , linux-rpi-kernel , "linux-arm-kernel@lists.infradead.org" , "linux-kernel@vger.kernel.org" X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-4.3 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, 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 This adds the definitions for the BCM2835 I2S driver to the device tree. Some GPIO settings are needed for the correct pin functions. Signed-off-by: Florian Meier --- arch/arm/boot/dts/bcm2835-rpi-b.dts | 12 +++++++++++- arch/arm/boot/dts/bcm2835.dtsi | 10 ++++++++++ 2 files changed, 21 insertions(+), 1 deletion(-) diff --git a/arch/arm/boot/dts/bcm2835-rpi-b.dts b/arch/arm/boot/dts/bcm2835-rpi-b.dts index 2a3b1c1..e83ed2f 100644 --- a/arch/arm/boot/dts/bcm2835-rpi-b.dts +++ b/arch/arm/boot/dts/bcm2835-rpi-b.dts @@ -23,7 +23,7 @@ &gpio { pinctrl-names = "default"; - pinctrl-0 = <&gpioout &alt0 &alt3>; + pinctrl-0 = <&gpioout &alt0 &alt2 &alt3>; gpioout: gpioout { brcm,pins = <6>; @@ -39,6 +39,16 @@ brcm,pins = <48 49 50 51 52 53>; brcm,function = <7>; /* alt3 */ }; + + /* I2S interface */ + alt2: alt2 { + brcm,pins = <28 29 30 31>; + brcm,function = <6>; /* alt2 */ + }; +}; + +&bcm2835_i2s { + status = "okay"; }; &i2c0 { diff --git a/arch/arm/boot/dts/bcm2835.dtsi b/arch/arm/boot/dts/bcm2835.dtsi index 1da6b36..ca2259c 100644 --- a/arch/arm/boot/dts/bcm2835.dtsi +++ b/arch/arm/boot/dts/bcm2835.dtsi @@ -134,6 +134,16 @@ #dma-cells = <1>; brcm,dma-channel-mask = <0x7f35>; }; + + bcm2835_i2s: i2s@7e203000 { + compatible = "brcm,bcm2835-i2s"; + reg = <0x7e203000 0x20>, + <0x7e101098 0x02>; + + dmas = <&dma 2>, + <&dma 3>; + dma-names = "tx", "rx"; + }; }; clocks {