From patchwork Wed Jul 9 08:50:25 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 33266 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-pd0-f197.google.com (mail-pd0-f197.google.com [209.85.192.197]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 4E22F208CF for ; Wed, 9 Jul 2014 08:55:38 +0000 (UTC) Received: by mail-pd0-f197.google.com with SMTP id fp1sf45649958pdb.4 for ; Wed, 09 Jul 2014 01:55:37 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:from:to:date:message-id:subject:cc :precedence:list-id:list-unsubscribe:list-archive:list-post :list-help:list-subscribe:mime-version:sender:errors-to :x-original-sender:x-original-authentication-results:mailing-list :content-type:content-transfer-encoding; bh=j+6sOrFvGAhWomKY7WoLBrplZZE0g4q4njTvG4xuGDU=; b=D5mXzU/+CRtwoWr2iNJYsKbKfNGRdzqnk8NLI1SUa0VNWBygNmm6JCdNgymfiiyZ66 rL+xwLvJFdLvi3Z9XgnR8EskYJ3BjaILipt1xuWkE2gtVkDZajRxkCG71dSsDmrpU/yV 9TwspAEX9cQzjWyw94JuOIT3z5PfJdenSnuWcY7p1dUvnyWW/FQDe2nSKU0/DTA4BwGm yKm++ERYc5l/BiHj+rAZjqG3OLv+dpyF0Wcfj2nCh3zVb/WHea5nXZS4s3neBhdEiz/H tYY/lxYV9UCx6hQ9Ff5bffliBxXywSl0oPkHxQndoZJFcgfWEFHIm+NSh7VkLZ62B/2m VZGw== X-Gm-Message-State: ALoCoQntEH7SsiEnpbEBWpI4LjWgc+1727MeNrpKaLNVqS8cRl2/igKqupionHF75shsXDiUpUWj X-Received: by 10.68.133.138 with SMTP id pc10mr19683095pbb.5.1404896137051; Wed, 09 Jul 2014 01:55:37 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.105.136 with SMTP id c8ls2414440qgf.76.gmail; Wed, 09 Jul 2014 01:55:36 -0700 (PDT) X-Received: by 10.52.244.81 with SMTP id xe17mr32065393vdc.24.1404896136890; Wed, 09 Jul 2014 01:55:36 -0700 (PDT) Received: from mail-ve0-f176.google.com (mail-ve0-f176.google.com [209.85.128.176]) by mx.google.com with ESMTPS id uh4si21245699vcb.27.2014.07.09.01.55.36 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 09 Jul 2014 01:55:36 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.128.176 as permitted sender) client-ip=209.85.128.176; Received: by mail-ve0-f176.google.com with SMTP id us18so2244127veb.7 for ; Wed, 09 Jul 2014 01:55:36 -0700 (PDT) X-Received: by 10.52.231.8 with SMTP id tc8mr19777803vdc.35.1404896136740; Wed, 09 Jul 2014 01:55:36 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.221.37.5 with SMTP id tc5csp28597vcb; Wed, 9 Jul 2014 01:55:36 -0700 (PDT) X-Received: by 10.70.88.17 with SMTP id bc17mr9985179pdb.45.1404896135275; Wed, 09 Jul 2014 01:55:35 -0700 (PDT) Received: from bombadil.infradead.org (bombadil.infradead.org. [2001:1868:205::9]) by mx.google.com with ESMTPS id xs3si45465216pbb.247.2014.07.09.01.55.34 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 09 Jul 2014 01:55:35 -0700 (PDT) Received-SPF: none (google.com: linux-arm-kernel-bounces+patch=linaro.org@lists.infradead.org does not designate permitted sender hosts) client-ip=2001:1868:205::9; 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 1X4ndp-0003to-8k; Wed, 09 Jul 2014 08:54:17 +0000 Received: from mezzanine.sirena.org.uk ([2400:8900::f03c:91ff:fedb:4f4]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1X4ndl-0003lV-7L; Wed, 09 Jul 2014 08:54:14 +0000 Received: from lputeaux-656-01-48-212.w82-127.abo.wanadoo.fr ([82.127.83.212] helo=finisterre) by mezzanine.sirena.org.uk with esmtpsa (TLS1.2:RSA_AES_128_CBC_SHA1:128) (Exim 4.80) (envelope-from ) id 1X4ndI-0001Uq-TI; Wed, 09 Jul 2014 08:53:46 +0000 Received: from broonie by finisterre with local (Exim 4.82_1-5b7a7c0-XX) (envelope-from ) id 1X4nc3-0006hG-Kx; Wed, 09 Jul 2014 10:52:27 +0200 From: Mark Brown To: Stephen Warren Date: Wed, 9 Jul 2014 10:50:25 +0200 Message-Id: <1404895825-25668-1-git-send-email-broonie@kernel.org> X-Mailer: git-send-email 2.0.0 X-SA-Exim-Connect-IP: 82.127.83.212 X-SA-Exim-Mail-From: broonie@sirena.org.uk X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on mezzanine.sirena.org.uk X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=ALL_TRUSTED,BAYES_00 autolearn=ham version=3.3.2 Subject: [PATCH] BCM2835: Add I2S driver to device tree X-SA-Exim-Version: 4.2.1 (built Mon, 26 Dec 2011 16:24:06 +0000) X-SA-Exim-Scanned: Yes (on mezzanine.sirena.org.uk) X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20140709_015413_364954_E015349D X-CRM114-Status: GOOD ( 10.53 ) X-Spam-Score: -0.7 (/) X-Spam-Report: SpamAssassin version 3.4.0 on bombadil.infradead.org summary: Content analysis details: (-0.7 points) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 HEADER_FROM_DIFFERENT_DOMAINS From and EnvelopeFrom 2nd level mail domains are different -0.0 SPF_PASS SPF: sender matches SPF record -0.7 RP_MATCHES_RCVD Envelope sender domain matches handover relay domain Cc: Florian Meier , linux-rpi-kernel@lists.infradead.org, linux-arm-kernel@lists.infradead.org, Mark Brown 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+patch=linaro.org@lists.infradead.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: broonie@kernel.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.128.176 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 From: Mark Brown [Tweaked slightly to disable by default -- broonie] Signed-off-by: Florian Meier Signed-off-by: Mark Brown --- arch/arm/boot/dts/bcm2835-rpi-b.dts | 8 +++++++- arch/arm/boot/dts/bcm2835.dtsi | 11 +++++++++++ 2 files changed, 18 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..58a0d60 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,12 @@ 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 */ + }; }; &i2c0 { diff --git a/arch/arm/boot/dts/bcm2835.dtsi b/arch/arm/boot/dts/bcm2835.dtsi index b8473c4..a0aff1f 100644 --- a/arch/arm/boot/dts/bcm2835.dtsi +++ b/arch/arm/boot/dts/bcm2835.dtsi @@ -99,6 +99,7 @@ dmas = <&dma 2>, <&dma 3>; dma-names = "tx", "rx"; + status = "disabled"; }; spi: spi@7e204000 { @@ -148,6 +149,16 @@ arm-pmu { compatible = "arm,arm1176-pmu"; }; + + bcm2835_i2s: i2s@7e203000 { + compatible = "brcm,bcm2835-i2s"; + reg = <0x7e203000 0x20>, + <0x7e101098 0x02>; + + dmas = <&dma 2>, + <&dma 3>; + dma-names = "tx", "rx"; + }; }; clocks {