From patchwork Wed Nov 16 17:52:06 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Wahren X-Patchwork-Id: 9432297 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 5096C60471 for ; Wed, 16 Nov 2016 17:55:10 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4659829022 for ; Wed, 16 Nov 2016 17:55:10 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 3B0A52902D; Wed, 16 Nov 2016 17:55:10 +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, RCVD_IN_DNSWL_MED autolearn=unavailable version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id BEF6F29022 for ; Wed, 16 Nov 2016 17:55:09 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.85_2 #1 (Red Hat Linux)) id 1c74P0-0005uX-EW; Wed, 16 Nov 2016 17:53:42 +0000 Received: from mout.kundenserver.de ([212.227.17.13]) by bombadil.infradead.org with esmtps (Exim 4.85_2 #1 (Red Hat Linux)) id 1c74OE-0005R6-Tg; Wed, 16 Nov 2016 17:52:57 +0000 Received: from localhost.localdomain ([95.91.4.8]) by mrelayeu.kundenserver.de (mreue101 [212.227.15.183]) with ESMTPSA (Nemesis) id 0MgOVK-1cSZEn3GwY-00NiqE; Wed, 16 Nov 2016 18:52:24 +0100 From: Stefan Wahren To: Stephen Warren , Eric Anholt , Lee Jones , Linus Walleij Subject: [PATCH V2 1/2] ARM: bcm2835: Fix names for the Raspberry Pi GPIO lines Date: Wed, 16 Nov 2016 17:52:06 +0000 Message-Id: <1479318727-9425-2-git-send-email-stefan.wahren@i2se.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1479318727-9425-1-git-send-email-stefan.wahren@i2se.com> References: <1479318727-9425-1-git-send-email-stefan.wahren@i2se.com> X-Provags-ID: V03:K0:OjJCuh0tUeY6kKLFj68M8owJN17INw/hU7/ctwXcv78SZrfm7nl B5EA+HBpaSujnFU15P4qQ/67eYcQ0PjiPFetGYHnyW7rNqsAEx7uSvMO+Gb79N48wsxz+SY 3z2QxgzTBcC6C2vn1SsNv3OTHY65lSsK4XpzxHCHmC8lPVskKm6fHG/UU8UGD+gMQwivHPJ 0RWfHSoRqO+B7DXvPng6g== X-UI-Out-Filterresults: notjunk:1; V01:K0:BLVHOAFTj/Q=:eJ51wanL68slltmyBx8JQt 68J67N1KXZHeXu67SLQbuVANut4mqhaF7ZqLkBNppPi29orrIE69wPPKTGNg8WVqKrgOq3bDq hHU4ik2R8xomUUig1naxK8zk4+kuHd90hG9XntqRKYd5bBeKugZ71oQorZS/uR5uKZt0NAXoe N9IPhCP38V7KDmzvq1Aatf7Kt6u0UOeHOUNtZGnpPx+P+AIPG8SBb4oq4R6fec7gAgurVkh51 nJZYjepJjGiP47iX11XQTlHyrencEh4Uk3w/nWskEXcpORbbK3fAA+l9HRZWG27OvvgGpXoYN KtH++kE0AH8wsqV/1duN611wUpn0OMrHJbhJYIiSTKRA8AuZ0G6Lzk9BwfU3bfA+LhrRBzfRo WY8TSIK5XIkvwKkKwGaRQbXwPFDCv3SFfbnKHkUPZu8A90TCAVJobS7sHEf6B806mOJDI83aF JVIEH6O92IQQMKJPJ3Ckdhpo0IE/7xjSHwX0KvutqF2NrI++0cp8uogqGv/Fu1GEtHhnCAYx3 irXWGqefqL6W/gNznfFNHpY9sXSeJkR1tEJlYpFFeBKgkfnlh+YaWPHbf6JSnHDZMAoGIMo1x 5jwn5OOUaiRKXjkgLYM+mKxoPkX9e6cvfnn17+pm8DA7E4YSdxAdIxKeBzTpyleJH5YROzdYV hoj0Y3BKFfMJIb/F3zBvjuBNiTEh18wZ87aqZCcicsp4iMJuEXRB7WSaSKFYOihgQRM4= X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20161116_095255_364897_A1A40281 X-CRM114-Status: UNSURE ( 9.35 ) X-CRM114-Notice: Please train this message. X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Gottfried Haider , Stefan Wahren , linux-kernel@vger.kernel.org, bcm-kernel-feedback-list@broadcom.com, 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 There are some differences between the schematics and the official firmware DTS [1]. So based on these additional information the following has been changed: * use consistent "CAM_GPIO1" for camera LED * use consistent "CAM_GPIO0" for camera shutdown * add "USB_LIMIT" for USB current limit (0=600mA, 1=1200mA) [1] - https://github.com/raspberrypi/firmware/blob/master/extra/dt-blob.dts Signed-off-by: Stefan Wahren --- arch/arm/boot/dts/bcm2835-rpi-a-plus.dts | 4 ++-- arch/arm/boot/dts/bcm2835-rpi-a.dts | 4 ++-- arch/arm/boot/dts/bcm2835-rpi-b-plus.dts | 2 +- arch/arm/boot/dts/bcm2835-rpi-b.dts | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/arch/arm/boot/dts/bcm2835-rpi-a-plus.dts b/arch/arm/boot/dts/bcm2835-rpi-a-plus.dts index 5a22c79..d070454 100644 --- a/arch/arm/boot/dts/bcm2835-rpi-a-plus.dts +++ b/arch/arm/boot/dts/bcm2835-rpi-a-plus.dts @@ -63,13 +63,13 @@ "SCL0", "NC", /* GPIO30 */ "NC", /* GPIO31 */ - "NC", /* GPIO32 */ + "CAM_GPIO1", /* GPIO32 */ "NC", /* GPIO33 */ "NC", /* GPIO34 */ "PWR_LOW_N", /* GPIO35 */ "NC", /* GPIO36 */ "NC", /* GPIO37 */ - "NC", /* GPIO38 */ + "USB_LIMIT", /* GPIO38 */ "NC", /* GPIO39 */ "PWM0_OUT", /* GPIO40 */ "CAM_GPIO0", /* GPIO41 */ diff --git a/arch/arm/boot/dts/bcm2835-rpi-a.dts b/arch/arm/boot/dts/bcm2835-rpi-a.dts index 54f98c5..46d078e 100644 --- a/arch/arm/boot/dts/bcm2835-rpi-a.dts +++ b/arch/arm/boot/dts/bcm2835-rpi-a.dts @@ -29,7 +29,7 @@ "SDA1", "SCL1", "GPIO_GCLK", - "CAM_CLK", + "CAM_GPIO1", "LAN_RUN", "SPI_CE1_N", "SPI_CE0_N", @@ -52,7 +52,7 @@ "GPIO24", "GPIO25", "NC", /* GPIO26 */ - "CAM_GPIO", + "CAM_GPIO0", /* Binary number representing build/revision */ "CONFIG0", "CONFIG1", diff --git a/arch/arm/boot/dts/bcm2835-rpi-b-plus.dts b/arch/arm/boot/dts/bcm2835-rpi-b-plus.dts index b67587e..432088e 100644 --- a/arch/arm/boot/dts/bcm2835-rpi-b-plus.dts +++ b/arch/arm/boot/dts/bcm2835-rpi-b-plus.dts @@ -71,7 +71,7 @@ "PWR_LOW_N", /* GPIO35 */ "NC", /* GPIO36 */ "NC", /* GPIO37 */ - "NC", /* GPIO38 */ + "USB_LIMIT", /* GPIO38 */ "NC", /* GPIO39 */ "PWM0_OUT", /* GPIO40 */ "CAM_GPIO0", /* GPIO41 */ diff --git a/arch/arm/boot/dts/bcm2835-rpi-b.dts b/arch/arm/boot/dts/bcm2835-rpi-b.dts index 71f50e1..4d56fe3 100644 --- a/arch/arm/boot/dts/bcm2835-rpi-b.dts +++ b/arch/arm/boot/dts/bcm2835-rpi-b.dts @@ -30,7 +30,7 @@ "SDA1", "SCL1", "GPIO_GCLK", - "CAM_CLK", + "CAM_GPIO1", "LAN_RUN", "SPI_CE1_N", "SPI_CE0_N", @@ -53,7 +53,7 @@ "GPIO24", "GPIO25", "NC", /* GPIO26 */ - "CAM_GPIO", + "CAM_GPIO0", /* Binary number representing build/revision */ "CONFIG0", "CONFIG1",