From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934897AbcKMSNT (ORCPT ); Sun, 13 Nov 2016 13:13:19 -0500 Received: from mout.kundenserver.de ([212.227.126.187]:54336 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753926AbcKMSNQ (ORCPT ); Sun, 13 Nov 2016 13:13:16 -0500 From: Stefan Wahren To: Stephen Warren , Eric Anholt , Lee Jones , Linus Walleij Cc: Gottfried Haider , linux-kernel@vger.kernel.org, bcm-kernel-feedback-list@broadcom.com, linux-arm-kernel@lists.infradead.org, linux-rpi-kernel@lists.infradead.org, Stefan Wahren 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= Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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", -- 1.7.9.5