git.openwrt.org Git - openwrt/staging/neocturne.git/blob

   1 From 6b9170887e1b912b657dab4597f8b44ae4dbdf50 Mon Sep 17 00:00:00 2001
   2 From: Stefan Wahren <stefan.wahren@i2se.com>
   3 Date: Wed, 16 Nov 2016 17:52:06 +0000
   4 Subject: [PATCH] ARM: bcm2835: Fix names for the Raspberry Pi GPIO lines
   5
   6 There are some differences between the schematics and the official firmware
   7 DTS [1]. So based on these additional information the following has been
   8 changed:
   9
  10 * use consistent "CAM_GPIO1" for camera LED
  11 * use consistent "CAM_GPIO0" for camera shutdown
  12 * add "USB_LIMIT" for USB current limit (0=600mA, 1=1200mA)
  13
  14 [1] - https://github.com/raspberrypi/firmware/blob/master/extra/dt-blob.dts
  15
  16 Signed-off-by: Stefan Wahren <stefan.wahren@i2se.com>
  17 Signed-off-by: Eric Anholt <eric@anholt.net>
  18 ---
  19  arch/arm/boot/dts/bcm2835-rpi-a-plus.dts | 4 ++--
  20  arch/arm/boot/dts/bcm2835-rpi-a.dts      | 4 ++--
  21  arch/arm/boot/dts/bcm2835-rpi-b-plus.dts | 2 +-
  22  arch/arm/boot/dts/bcm2835-rpi-b.dts      | 4 ++--
  23  4 files changed, 7 insertions(+), 7 deletions(-)
  24
  25 --- a/arch/arm/boot/dts/bcm2835-rpi-a-plus.dts
  26 +++ b/arch/arm/boot/dts/bcm2835-rpi-a-plus.dts
  27 @@ -63,13 +63,13 @@
  28                           "SCL0",
  29                           "NC", /* GPIO30 */
  30                           "NC", /* GPIO31 */
  31 -                         "NC", /* GPIO32 */
  32 +                         "CAM_GPIO1", /* GPIO32 */
  33                           "NC", /* GPIO33 */
  34                           "NC", /* GPIO34 */
  35                           "PWR_LOW_N", /* GPIO35 */
  36                           "NC", /* GPIO36 */
  37                           "NC", /* GPIO37 */
  38 -                         "NC", /* GPIO38 */
  39 +                         "USB_LIMIT", /* GPIO38 */
  40                           "NC", /* GPIO39 */
  41                           "PWM0_OUT", /* GPIO40 */
  42                           "CAM_GPIO0", /* GPIO41 */
  43 --- a/arch/arm/boot/dts/bcm2835-rpi-a.dts
  44 +++ b/arch/arm/boot/dts/bcm2835-rpi-a.dts
  45 @@ -29,7 +29,7 @@
  46                           "SDA1",
  47                           "SCL1",
  48                           "GPIO_GCLK",
  49 -                         "CAM_CLK",
  50 +                         "CAM_GPIO1",
  51                           "LAN_RUN",
  52                           "SPI_CE1_N",
  53                           "SPI_CE0_N",
  54 @@ -52,7 +52,7 @@
  55                           "GPIO24",
  56                           "GPIO25",
  57                           "NC", /* GPIO26 */
  58 -                         "CAM_GPIO",
  59 +                         "CAM_GPIO0",
  60                           /* Binary number representing build/revision */
  61                           "CONFIG0",
  62                           "CONFIG1",
  63 --- a/arch/arm/boot/dts/bcm2835-rpi-b-plus.dts
  64 +++ b/arch/arm/boot/dts/bcm2835-rpi-b-plus.dts
  65 @@ -71,7 +71,7 @@
  66                           "PWR_LOW_N", /* GPIO35 */
  67                           "NC", /* GPIO36 */
  68                           "NC", /* GPIO37 */
  69 -                         "NC", /* GPIO38 */
  70 +                         "USB_LIMIT", /* GPIO38 */
  71                           "NC", /* GPIO39 */
  72                           "PWM0_OUT", /* GPIO40 */
  73                           "CAM_GPIO0", /* GPIO41 */
  74 --- a/arch/arm/boot/dts/bcm2835-rpi-b.dts
  75 +++ b/arch/arm/boot/dts/bcm2835-rpi-b.dts
  76 @@ -30,7 +30,7 @@
  77                           "SDA1",
  78                           "SCL1",
  79                           "GPIO_GCLK",
  80 -                         "CAM_CLK",
  81 +                         "CAM_GPIO1",
  82                           "LAN_RUN",
  83                           "SPI_CE1_N",
  84                           "SPI_CE0_N",
  85 @@ -53,7 +53,7 @@
  86                           "GPIO24",
  87                           "GPIO25",
  88                           "NC", /* GPIO26 */
  89 -                         "CAM_GPIO",
  90 +                         "CAM_GPIO0",
  91                           /* Binary number representing build/revision */
  92                           "CONFIG0",
  93                           "CONFIG1",