From patchwork Sun Dec 31 15:12:48 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Baruch Siach X-Patchwork-Id: 10138207 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id B521E60362 for ; Sun, 31 Dec 2017 15:15:28 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9D0AC286EB for ; Sun, 31 Dec 2017 15:15:28 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 91C9C28771; Sun, 31 Dec 2017 15:15:28 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.2 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 74598286EB for ; Sun, 31 Dec 2017 15:15:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:Message-Id:Date: Subject:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To: References:List-Owner; bh=EEsEDe574sznYxWBsI/g60giu0MqZfeZRnHmx14BRn8=; b=fJf txeqsTtr1cfZwpSssbqOdG6OKDcu7UL+l1BoadJCummkVuYTv1EnTPPUkUaOwq1jlEverd87CpG7h nanN2ycAR2YzBfxAPFKglK4blYDUQ8yZ7bGO5XQGloKpOVsU0Zp5idpve4T5JLNQWShfVgp5P2BwG cbBPlyB9x4fkU4M2ayJpzYy8TCA+msl2zG17Vs1nGGrzzairMF92NHAK3Dogp4FJtpEz91th/E24k rGgQS+SbRu5WoO7fhIocejPhrDrs1TyFOexhdjpx28G9Dc78PdgVM5w8ifXlqrjvDeNX6DRC02tHZ X4D8SZmK6gxk461lRqH/LJYLqGeRzvg==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.89 #1 (Red Hat Linux)) id 1eVfKf-00085F-I9; Sun, 31 Dec 2017 15:15:25 +0000 Received: from guitar.tcltek.co.il ([192.115.133.116] helo=mx.tkos.co.il) by bombadil.infradead.org with esmtps (Exim 4.89 #1 (Red Hat Linux)) id 1eVfKb-0006jn-KN; Sun, 31 Dec 2017 15:15:24 +0000 Received: from sapphire.lan (unknown [10.0.4.3]) by mx.tkos.co.il (Postfix) with ESMTPA id 4DB1044004E; Sun, 31 Dec 2017 17:14:57 +0200 (IST) From: Baruch Siach To: Eric Anholt , Stefan Wahren Subject: [PATCH] ARM: dts: bcm2837-rpi-3-b: fix pwm1 pin Date: Sun, 31 Dec 2017 17:12:48 +0200 Message-Id: X-Mailer: git-send-email 2.15.1 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20171231_071521_891299_2944C960 X-CRM114-Status: UNSURE ( 5.57 ) X-CRM114-Notice: Please train this message. X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Baruch Siach , linux-rpi-kernel@lists.infradead.org, linux-arm-kernel@lists.infradead.org MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP Raspberry Pi 3 uses GPIO45 for I2C SCL0. pwm1 is on GPIO41. Update the DT description accordingly. Fix the following error that shows when GPIO44 and GPIO45 are configured to I2C: [ 1.751563] pinctrl-bcm2835 3f200000.gpio: pin gpio45 already requested by 3f205000.i2c; cannot claim for 3f20c000.pwm [ 1.762474] pinctrl-bcm2835 3f200000.gpio: pin-45 (3f20c000.pwm) status -22 [ 1.775176] pinctrl-bcm2835 3f200000.gpio: could not request pin 45 (gpio45) from group gpio45 on device pinctrl-bcm2835 [ 1.786344] bcm2835-pwm 3f20c000.pwm: Error applying setting, reverse things back [ 1.793980] bcm2835-pwm: probe of 3f20c000.pwm failed with error -22 Signed-off-by: Baruch Siach --- arch/arm/boot/dts/bcm2837-rpi-3-b.dts | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/arch/arm/boot/dts/bcm2837-rpi-3-b.dts b/arch/arm/boot/dts/bcm2837-rpi-3-b.dts index a8844d033b3f..b44b3b5af00d 100644 --- a/arch/arm/boot/dts/bcm2837-rpi-3-b.dts +++ b/arch/arm/boot/dts/bcm2837-rpi-3-b.dts @@ -60,3 +60,9 @@ status = "okay"; bus-width = <4>; }; + +&pwm { + pinctrl-names = "default"; + pinctrl-0 = <&pwm0_gpio40 &pwm1_gpio41>; + status = "okay"; +};