From patchwork Wed Sep 17 01:51:36 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Warren X-Patchwork-Id: 37502 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-la0-f69.google.com (mail-la0-f69.google.com [209.85.215.69]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 69A8B2057E for ; Wed, 17 Sep 2014 01:53:55 +0000 (UTC) Received: by mail-la0-f69.google.com with SMTP id ty20sf374260lab.4 for ; Tue, 16 Sep 2014 18:53:53 -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:subject:date:message-id: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=Ew9DADyURItnFrdsk7mLGO6iBn7WLpNCvr0x/R7sJfY=; b=DWfQzX5BITZy3eBGw3uIYV4JExptmO7O6ZrVPZ9tmSI8co0XiBXBYwmmqQVY7ZBy/a XJHGZPhDUPKZYrSiYjES6GTeFXMsuFKmp6OKWg8XkuvdpGqRcWweRpzudWwg0ssKE6Ds f+4D3QUQ/JiW3sHVGqokSaPJ5qzwzvkO1r4PpZDXSbcymqop6tEPHzF8Dwd7E9Xbw0Z3 Rn18+OEg2OaIFqlLYrAAj7PnGbGgybz3Ds2txK4sNcOVIeoxNIPgaAQh0x0UD7uwLmNb o0K+o6GQJbAKnvYt4dybObiNob6FBeWDvki009XwBIEoYAWIdEPhDCN+GhObiuOukuvb zBBQ== X-Gm-Message-State: ALoCoQnDscBgWLPH7QrxPB4EiR5nm+YLJS+r4ICnTNwvovx1Z/7jhWgF6E8jNnK7dG1xW9kOe0SQ X-Received: by 10.194.203.40 with SMTP id kn8mr110274wjc.4.1410918833945; Tue, 16 Sep 2014 18:53:53 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.37.74 with SMTP id w10ls61642laj.99.gmail; Tue, 16 Sep 2014 18:53:53 -0700 (PDT) X-Received: by 10.112.35.138 with SMTP id h10mr36627426lbj.65.1410918833506; Tue, 16 Sep 2014 18:53:53 -0700 (PDT) Received: from mail-lb0-f173.google.com (mail-lb0-f173.google.com [209.85.217.173]) by mx.google.com with ESMTPS id bh7si152597lbb.91.2014.09.16.18.53.53 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 16 Sep 2014 18:53:53 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.173 as permitted sender) client-ip=209.85.217.173; Received: by mail-lb0-f173.google.com with SMTP id w7so924411lbi.4 for ; Tue, 16 Sep 2014 18:53:53 -0700 (PDT) X-Received: by 10.112.130.101 with SMTP id od5mr20046191lbb.76.1410918833108; Tue, 16 Sep 2014 18:53:53 -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.112.130.169 with SMTP id of9csp498468lbb; Tue, 16 Sep 2014 18:53:52 -0700 (PDT) X-Received: by 10.67.4.1 with SMTP id ca1mr55055003pad.50.1410918831625; Tue, 16 Sep 2014 18:53:51 -0700 (PDT) Received: from bombadil.infradead.org (bombadil.infradead.org. [2001:1868:205::9]) by mx.google.com with ESMTPS id sn3si32464230pab.106.2014.09.16.18.53.50 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 16 Sep 2014 18:53:51 -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 1XU4Pq-0008JR-BV; Wed, 17 Sep 2014 01:52:18 +0000 Received: from avon.wwwdotorg.org ([70.85.31.133]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1XU4Pn-00084Q-2b; Wed, 17 Sep 2014 01:52:15 +0000 Received: from severn.wwwdotorg.org (unknown [192.168.65.5]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by avon.wwwdotorg.org (Postfix) with ESMTPS id 2B526644B; Tue, 16 Sep 2014 19:51:53 -0600 (MDT) Received: from dart.wwwdotorg.org (localhost [127.0.0.1]) (using TLSv1 with cipher AES128-SHA (128/128 bits)) (No client certificate requested) by severn.wwwdotorg.org (Postfix) with ESMTPSA id D4D68E4100; Tue, 16 Sep 2014 19:51:47 -0600 (MDT) From: Stephen Warren To: arm@kernel.org Subject: [PATCH] ARM: bcm2835: add I2S pinctrl to device tree Date: Tue, 16 Sep 2014 19:51:36 -0600 Message-Id: <1410918696-22696-1-git-send-email-swarren@wwwdotorg.org> X-Mailer: git-send-email 1.9.1 X-NVConfidentiality: public X-Virus-Scanned: clamav-milter 0.97.8 at avon.wwwdotorg.org X-Virus-Status: Clean X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20140916_185215_169424_AA1D9F47 X-CRM114-Status: UNSURE ( 9.48 ) X-CRM114-Notice: Please train this message. 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.7 RP_MATCHES_RCVD Envelope sender domain matches handover relay domain -0.0 SPF_PASS SPF: sender matches SPF record Cc: Stephen Warren , 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: swarren@wwwdotorg.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.217.173 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 Signed-off-by: Florian Meier [Tweaked slightly to disable by default -- broonie] Signed-off-by: Mark Brown [swarren, removed duplicate i2s node] Signed-off-by: Stephen Warren --- These two patches are all I expect to have for RPi for 3.18, so I figure it's easiest to just forward them on to you rather than sending tiny pull requests. arch/arm/boot/dts/bcm2835-rpi-b.dts | 8 +++++++- arch/arm/boot/dts/bcm2835.dtsi | 1 + 2 files changed, 8 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..3342cb1 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 {