Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]


Groups > linux.kernel > #1520635 > unrolled thread

[PATCH 0/2] ARM: bcm2835: Fix names for the Raspberry Pi GPIO lines

Started byStefan Wahren <stefan.wahren@i2se.com>
First post2016-11-13 19:20 +0100
Last post2016-11-16 17:40 +0100
Articles 4 — 2 participants

Back to article view | Back to linux.kernel


Contents

  [PATCH 0/2] ARM: bcm2835: Fix names for the Raspberry Pi GPIO lines Stefan Wahren <stefan.wahren@i2se.com> - 2016-11-13 19:20 +0100
    [PATCH 2/2] ARM: bcm2835: Add names for the Raspberry Pi Zero GPIO lines Stefan Wahren <stefan.wahren@i2se.com> - 2016-11-13 19:20 +0100
      Re: [PATCH 2/2] ARM: bcm2835: Add names for the Raspberry Pi Zero GPIO lines Eric Anholt <eric@anholt.net> - 2016-11-15 18:30 +0100
        Re: [PATCH 2/2] ARM: bcm2835: Add names for the Raspberry Pi Zero  GPIO lines Stefan Wahren <stefan.wahren@i2se.com> - 2016-11-16 17:40 +0100

#1520635 — [PATCH 0/2] ARM: bcm2835: Fix names for the Raspberry Pi GPIO lines

FromStefan Wahren <stefan.wahren@i2se.com>
Date2016-11-13 19:20 +0100
Subject[PATCH 0/2] ARM: bcm2835: Fix names for the Raspberry Pi GPIO lines
Message-ID<sD7xL-3VR-3@gated-at.bofh.it>
This patch series should fix and extend the patch V4 "ARM: bcm2835: Add names
for the Raspberry Pi GPIO lines" from Linus Walleij and Eric Anholt.

Stefan Wahren (2):
  ARM: bcm2835: Fix names for the Raspberry Pi GPIO lines
  ARM: bcm2835: Add names for the Raspberry Pi Zero GPIO lines

 arch/arm/boot/dts/bcm2835-rpi-a-plus-gpio.dtsi |   75 +++++++++++++++++++++++
 arch/arm/boot/dts/bcm2835-rpi-a-plus.dts       |   76 +-----------------------
 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 +-
 arch/arm/boot/dts/bcm2835-rpi-zero.dts         |   11 +---
 6 files changed, 82 insertions(+), 90 deletions(-)
 create mode 100644 arch/arm/boot/dts/bcm2835-rpi-a-plus-gpio.dtsi

-- 
1.7.9.5

[toc] | [next] | [standalone]


#1520636 — [PATCH 2/2] ARM: bcm2835: Add names for the Raspberry Pi Zero GPIO lines

FromStefan Wahren <stefan.wahren@i2se.com>
Date2016-11-13 19:20 +0100
Subject[PATCH 2/2] ARM: bcm2835: Add names for the Raspberry Pi Zero GPIO lines
Message-ID<sD7xM-3VR-9@gated-at.bofh.it>
In reply to#1520635
This adds the GPIO names for the Raspberry Pi Zero. Since there are no
schematics for the RPi Zero use the same as the Model A+.

Signed-off-by: Stefan Wahren <stefan.wahren@i2se.com>
---
 arch/arm/boot/dts/bcm2835-rpi-a-plus-gpio.dtsi |   75 +++++++++++++++++++++++
 arch/arm/boot/dts/bcm2835-rpi-a-plus.dts       |   76 +-----------------------
 arch/arm/boot/dts/bcm2835-rpi-zero.dts         |   11 +---
 3 files changed, 77 insertions(+), 85 deletions(-)
 create mode 100644 arch/arm/boot/dts/bcm2835-rpi-a-plus-gpio.dtsi

diff --git a/arch/arm/boot/dts/bcm2835-rpi-a-plus-gpio.dtsi b/arch/arm/boot/dts/bcm2835-rpi-a-plus-gpio.dtsi
new file mode 100644
index 0000000..741d64d
--- /dev/null
+++ b/arch/arm/boot/dts/bcm2835-rpi-a-plus-gpio.dtsi
@@ -0,0 +1,75 @@
+&gpio {
+	/*
+	 * This is based on the unreleased schematic for the Model A+.
+	 *
+	 * Legend:
+	 * "NC" = not connected (no rail from the SoC)
+	 * "FOO" = GPIO line named "FOO" on the schematic
+	 * "FOO_N" = GPIO line named "FOO" on schematic, active low
+	 */
+	gpio-line-names = "SDA0",
+			  "SCL0",
+			  "SDA1",
+			  "SCL1",
+			  "GPIO_GCLK",
+			  "GPIO5",
+			  "GPIO6",
+			  "SPI_CE1_N",
+			  "SPI_CE0_N",
+			  "SPI_MISO",
+			  "SPI_MOSI",
+			  "SPI_SCLK",
+			  "GPIO12",
+			  "GPIO13",
+			  /* Serial port */
+			  "TXD0",
+			  "RXD0",
+			  "GPIO16",
+			  "GPIO17",
+			  "GPIO18",
+			  "GPIO19",
+			  "GPIO20",
+			  "GPIO21",
+			  "GPIO22",
+			  "GPIO23",
+			  "GPIO24",
+			  "GPIO25",
+			  "GPIO26",
+			  "GPIO27",
+			  "SDA0",
+			  "SCL0",
+			  "NC", /* GPIO30 */
+			  "NC", /* GPIO31 */
+			  "CAM_GPIO1", /* GPIO32 */
+			  "NC", /* GPIO33 */
+			  "NC", /* GPIO34 */
+			  "PWR_LOW_N", /* GPIO35 */
+			  "NC", /* GPIO36 */
+			  "NC", /* GPIO37 */
+			  "USB_LIMIT", /* GPIO38 */
+			  "NC", /* GPIO39 */
+			  "PWM0_OUT", /* GPIO40 */
+			  "CAM_GPIO0", /* GPIO41 */
+			  "NC", /* GPIO42 */
+			  "NC", /* GPIO43 */
+			  "NC", /* GPIO44 */
+			  "PWM1_OUT", /* GPIO45 */
+			  "HDMI_HPD_N",
+			  "STATUS_LED",
+			  /* Used by SD Card */
+			  "SD_CLK_R",
+			  "SD_CMD_R",
+			  "SD_DATA0_R",
+			  "SD_DATA1_R",
+			  "SD_DATA2_R",
+			  "SD_DATA3_R";
+
+	pinctrl-0 = <&gpioout &alt0 &i2s_alt0>;
+
+	/* I2S interface */
+	i2s_alt0: i2s_alt0 {
+		brcm,pins = <18 19 20 21>;
+		brcm,function = <BCM2835_FSEL_ALT0>;
+	};
+};
+
diff --git a/arch/arm/boot/dts/bcm2835-rpi-a-plus.dts b/arch/arm/boot/dts/bcm2835-rpi-a-plus.dts
index d070454..9b665da 100644
--- a/arch/arm/boot/dts/bcm2835-rpi-a-plus.dts
+++ b/arch/arm/boot/dts/bcm2835-rpi-a-plus.dts
@@ -2,6 +2,7 @@
 #include "bcm2835.dtsi"
 #include "bcm2835-rpi.dtsi"
 #include "bcm283x-rpi-usb-host.dtsi"
+#include "bcm2835-rpi-a-plus-gpio.dtsi"
 
 / {
 	compatible = "raspberrypi,model-a-plus", "brcm,bcm2835";
@@ -21,81 +22,6 @@
 	};
 };
 
-&gpio {
-	/*
-	 * This is based on the unreleased schematic for the Model A+.
-	 *
-	 * Legend:
-	 * "NC" = not connected (no rail from the SoC)
-	 * "FOO" = GPIO line named "FOO" on the schematic
-	 * "FOO_N" = GPIO line named "FOO" on schematic, active low
-	 */
-	gpio-line-names = "SDA0",
-			  "SCL0",
-			  "SDA1",
-			  "SCL1",
-			  "GPIO_GCLK",
-			  "GPIO5",
-			  "GPIO6",
-			  "SPI_CE1_N",
-			  "SPI_CE0_N",
-			  "SPI_MISO",
-			  "SPI_MOSI",
-			  "SPI_SCLK",
-			  "GPIO12",
-			  "GPIO13",
-			  /* Serial port */
-			  "TXD0",
-			  "RXD0",
-			  "GPIO16",
-			  "GPIO17",
-			  "GPIO18",
-			  "GPIO19",
-			  "GPIO20",
-			  "GPIO21",
-			  "GPIO22",
-			  "GPIO23",
-			  "GPIO24",
-			  "GPIO25",
-			  "GPIO26",
-			  "GPIO27",
-			  "SDA0",
-			  "SCL0",
-			  "NC", /* GPIO30 */
-			  "NC", /* GPIO31 */
-			  "CAM_GPIO1", /* GPIO32 */
-			  "NC", /* GPIO33 */
-			  "NC", /* GPIO34 */
-			  "PWR_LOW_N", /* GPIO35 */
-			  "NC", /* GPIO36 */
-			  "NC", /* GPIO37 */
-			  "USB_LIMIT", /* GPIO38 */
-			  "NC", /* GPIO39 */
-			  "PWM0_OUT", /* GPIO40 */
-			  "CAM_GPIO0", /* GPIO41 */
-			  "NC", /* GPIO42 */
-			  "NC", /* GPIO43 */
-			  "NC", /* GPIO44 */
-			  "PWM1_OUT", /* GPIO45 */
-			  "HDMI_HPD_N",
-			  "STATUS_LED",
-			  /* Used by SD Card */
-			  "SD_CLK_R",
-			  "SD_CMD_R",
-			  "SD_DATA0_R",
-			  "SD_DATA1_R",
-			  "SD_DATA2_R",
-			  "SD_DATA3_R";
-
-	pinctrl-0 = <&gpioout &alt0 &i2s_alt0>;
-
-	/* I2S interface */
-	i2s_alt0: i2s_alt0 {
-		brcm,pins = <18 19 20 21>;
-		brcm,function = <BCM2835_FSEL_ALT0>;
-	};
-};
-
 &hdmi {
 	hpd-gpios = <&gpio 46 GPIO_ACTIVE_LOW>;
 };
diff --git a/arch/arm/boot/dts/bcm2835-rpi-zero.dts b/arch/arm/boot/dts/bcm2835-rpi-zero.dts
index 7c1c180..0154ae0 100644
--- a/arch/arm/boot/dts/bcm2835-rpi-zero.dts
+++ b/arch/arm/boot/dts/bcm2835-rpi-zero.dts
@@ -13,6 +13,7 @@
 #include "bcm2835.dtsi"
 #include "bcm2835-rpi.dtsi"
 #include "bcm283x-rpi-usb-host.dtsi"
+#include "bcm2835-rpi-a-plus-gpio.dtsi"
 
 / {
 	compatible = "raspberrypi,model-zero", "brcm,bcm2835";
@@ -25,16 +26,6 @@
 	};
 };
 
-&gpio {
-	pinctrl-0 = <&gpioout &alt0 &i2s_alt0>;
-
-	/* I2S interface */
-	i2s_alt0: i2s_alt0 {
-		brcm,pins = <18 19 20 21>;
-		brcm,function = <BCM2835_FSEL_ALT0>;
-	};
-};
-
 &hdmi {
 	hpd-gpios = <&gpio 46 GPIO_ACTIVE_LOW>;
 };
-- 
1.7.9.5

[toc] | [prev] | [next] | [standalone]


#1522935 — Re: [PATCH 2/2] ARM: bcm2835: Add names for the Raspberry Pi Zero GPIO lines

FromEric Anholt <eric@anholt.net>
Date2016-11-15 18:30 +0100
SubjectRe: [PATCH 2/2] ARM: bcm2835: Add names for the Raspberry Pi Zero GPIO lines
Message-ID<sDPIu-7SW-27@gated-at.bofh.it>
In reply to#1520636

[Multipart message — attachments visible in raw view] — view raw

Stefan Wahren <stefan.wahren@i2se.com> writes:

> This adds the GPIO names for the Raspberry Pi Zero. Since there are no
> schematics for the RPi Zero use the same as the Model A+.

These look good to me. I don't have a Zero schematic, but I compared to
dt-blob.

I've pulled these two to -next.

[toc] | [prev] | [next] | [standalone]


#1523645 — Re: [PATCH 2/2] ARM: bcm2835: Add names for the Raspberry Pi Zero GPIO lines

FromStefan Wahren <stefan.wahren@i2se.com>
Date2016-11-16 17:40 +0100
SubjectRe: [PATCH 2/2] ARM: bcm2835: Add names for the Raspberry Pi Zero GPIO lines
Message-ID<sEbpE-5g0-23@gated-at.bofh.it>
In reply to#1522935
> Eric Anholt <eric@anholt.net> hat am 15. November 2016 um 18:23 geschrieben:
> 
> 
> Stefan Wahren <stefan.wahren@i2se.com> writes:
> 
> > This adds the GPIO names for the Raspberry Pi Zero. Since there are no
> > schematics for the RPi Zero use the same as the Model A+.
> 
> These look good to me. I don't have a Zero schematic, but I compared to
> dt-blob.
> 
> I've pulled these two to -next.

Thanks. Unfortunately the link to the dt-blob is outdated. The newer ones [1]
contains the definition of the Raspberry Pi Zero and it differs from Model A+

Please drop the complete series and i'll send a V2. Sorry about this.

[1] - https://github.com/raspberrypi/firmware/blob/master/extra/dt-blob.dts

Stefan

[toc] | [prev] | [standalone]


Back to top | Article view | linux.kernel


csiph-web