From patchwork Sun Nov 13 18:12:08 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Wahren X-Patchwork-Id: 9424891 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 C88A660233 for ; Sun, 13 Nov 2016 18:17:02 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id BFAA528917 for ; Sun, 13 Nov 2016 18:17:02 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id B497A2891D; Sun, 13 Nov 2016 18:17:02 +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=-3.7 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, RCVD_IN_SORBS_SPAM 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 5C07228917 for ; Sun, 13 Nov 2016 18:17:02 +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 1c5zHW-0004qk-59; Sun, 13 Nov 2016 18:13:30 +0000 Received: from mout.kundenserver.de ([212.227.126.187]) by bombadil.infradead.org with esmtps (Exim 4.85_2 #1 (Red Hat Linux)) id 1c5zH8-0004nN-5Z; Sun, 13 Nov 2016 18:13:10 +0000 Received: from localhost.localdomain ([95.91.4.8]) by mrelayeu.kundenserver.de (mreue001 [212.227.15.167]) with ESMTPSA (Nemesis) id 0MAHcX-1bvDdO0Nib-00BKnH; Sun, 13 Nov 2016 19:12:31 +0100 From: Stefan Wahren To: Stephen Warren , Eric Anholt , Lee Jones , Linus Walleij Subject: [PATCH 1/2] ARM: bcm2835: Fix names for the Raspberry Pi GPIO lines Date: Sun, 13 Nov 2016 18:12:08 +0000 Message-Id: <1479060729-25769-2-git-send-email-stefan.wahren@i2se.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1479060729-25769-1-git-send-email-stefan.wahren@i2se.com> References: <1479060729-25769-1-git-send-email-stefan.wahren@i2se.com> X-Provags-ID: V03:K0:OhH3E8XmKAu91q8rxbdzOmQ1Cu+EHrnPK3N7JfToFKw9ghSKlIX rPwp/7noHoBHmI5f/9nY1ouiwQtXcuG5L1pi9T7wAkEe60CaOP1T/FbZnYYkkYIxKwTz03k /KqAXK9q22R6lIcAJyHeaVV6Rmz/ktLNsPipewIGddZCmE6QHxvKVzGoN+vCZs5RaWwz540 wc0m4Vg0a6wWCE335Chlw== X-UI-Out-Filterresults: notjunk:1; V01:K0:t7F4IIhLQ6k=:5afBVePFqhPHskeRGgBvYm +S5E+2eVZKmFqQwepy17fAKL/yepbpzJE6QPT56l6ofWWFCdMFG+g2FSjbwTLUu7dMANDWin1 gCqRE8d9nooLXjcECoTYuKqxXVDPheJ9ZdbNjmL/krCiFQ1Ki3fvwtjYdNPfrzlTtLSfj8Vvs j1HeoeQQDKrFzLGmanLMtw7am++nkBH11LeHSxWUpRfVk0d/kkpJwR6Hf0rQCMJHKgyz7KnQK LlSNBrzTPZ4MQRlsms1AGXI7G0eTdXkPgdqwALiSUYmjOmGMS4XonWVwUblYf/T1souno7P/v JoxfCfPSaJkQ4xitZ/FDgpLTvE32ge0beuQIjujkiKqLq+PQVFrMQ1UVOsn+ngpwCfVns61Sw 9b/KOz1+ZGo8fjL/Yp2xwAZV+wA5X9iAOtRQph5uS/82sYMsY3CEh9b+FDa6FOpDseHjsb9Hm bvadyKsR0INnnkmeP39A6FnfaJXUI7ldohoEj1Yhr2z1QxWtD6qcrjTIaFRUbovD+74S2C5CS 6d5iJo0Evv0bav6sO5hJo59Ibv8YAZNjEoPlEnGWQX3P474YsXIf7eKhTa1KIVcZokSRV4E4U ufXNABfNucUE8w67WvfGnZELPKO5dKXTaPhmRY/PCOSVTf0MCuxHCjCInY2CyOtx1pcdS0nXx MdZbaEU9lUr3CW5+y2sSQccEn+bL7T/dlIQf4cW1r1XM0VhXoJoOnZ+kqxwrXKnWPq00= X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20161113_101306_553128_0F285A91 X-CRM114-Status: UNSURE ( 9.13 ) 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/documentation/blob/master/configuration/images/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",