Skip to content

Commit 566e0ec

Browse files
pelwellpelwell
committed
ARM: dts: Standardise downstream Pi GPIO pin names
Standardise the names of the pins on the 40-pin GPIO header. This makes it easier to use libgpiod (and the gpiod tools) for cross-platform GPIO manipulation. Signed-off-by: Phil Elwell <[email protected]>
1 parent 02b507a commit 566e0ec

12 files changed

+252
-137
lines changed

‎arch/arm/boot/dts/broadcom/bcm2708-rpi-b-plus.dts‎

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -24,21 +24,20 @@
2424
*/
2525
gpio-line-names = "ID_SDA",
2626
"ID_SCL",
27-
"SDA1",
28-
"SCL1",
29-
"GPIO_GCLK",
27+
"GPIO2",
28+
"GPIO3",
29+
"GPIO4",
3030
"GPIO5",
3131
"GPIO6",
32-
"SPI_CE1_N",
33-
"SPI_CE0_N",
34-
"SPI_MISO",
35-
"SPI_MOSI",
36-
"SPI_SCLK",
32+
"GPIO7",
33+
"GPIO8",
34+
"GPIO9",
35+
"GPIO10",
36+
"GPIO11",
3737
"GPIO12",
3838
"GPIO13",
39-
/* Serial port */
40-
"TXD0",
41-
"RXD0",
39+
"GPIO14",
40+
"GPIO15",
4241
"GPIO16",
4342
"GPIO17",
4443
"GPIO18",

‎arch/arm/boot/dts/broadcom/bcm2708-rpi-zero-w.dts‎

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -33,21 +33,20 @@
3333
*/
3434
gpio-line-names = "ID_SDA",
3535
"ID_SCL",
36-
"SDA1",
37-
"SCL1",
38-
"GPIO_GCLK",
36+
"GPIO2",
37+
"GPIO3",
38+
"GPIO4",
3939
"GPIO5",
4040
"GPIO6",
41-
"SPI_CE1_N",
42-
"SPI_CE0_N",
43-
"SPI_MISO",
44-
"SPI_MOSI",
45-
"SPI_SCLK",
41+
"GPIO7",
42+
"GPIO8",
43+
"GPIO9",
44+
"GPIO10",
45+
"GPIO11",
4646
"GPIO12",
4747
"GPIO13",
48-
/* Serial port */
49-
"TXD1",
50-
"RXD1",
48+
"GPIO14",
49+
"GPIO15",
5150
"GPIO16",
5251
"GPIO17",
5352
"GPIO18",

‎arch/arm/boot/dts/broadcom/bcm2708-rpi-zero.dts‎

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -22,21 +22,20 @@
2222
*/
2323
gpio-line-names = "ID_SDA",
2424
"ID_SCL",
25-
"SDA1",
26-
"SCL1",
27-
"GPIO_GCLK",
25+
"GPIO2",
26+
"GPIO3",
27+
"GPIO4",
2828
"GPIO5",
2929
"GPIO6",
30-
"SPI_CE1_N",
31-
"SPI_CE0_N",
32-
"SPI_MISO",
33-
"SPI_MOSI",
34-
"SPI_SCLK",
30+
"GPIO7",
31+
"GPIO8",
32+
"GPIO9",
33+
"GPIO10",
34+
"GPIO11",
3535
"GPIO12",
3636
"GPIO13",
37-
/* Serial port */
38-
"TXD0",
39-
"RXD0",
37+
"GPIO14",
38+
"GPIO15",
4039
"GPIO16",
4140
"GPIO17",
4241
"GPIO18",

‎arch/arm/boot/dts/broadcom/bcm2709-rpi-2-b.dts‎

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -24,21 +24,20 @@
2424
*/
2525
gpio-line-names = "ID_SDA",
2626
"ID_SCL",
27-
"SDA1",
28-
"SCL1",
29-
"GPIO_GCLK",
27+
"GPIO2",
28+
"GPIO3",
29+
"GPIO4",
3030
"GPIO5",
3131
"GPIO6",
32-
"SPI_CE1_N",
33-
"SPI_CE0_N",
34-
"SPI_MISO",
35-
"SPI_MOSI",
36-
"SPI_SCLK",
32+
"GPIO7",
33+
"GPIO8",
34+
"GPIO9",
35+
"GPIO10",
36+
"GPIO11",
3737
"GPIO12",
3838
"GPIO13",
39-
/* Serial port */
40-
"TXD0",
41-
"RXD0",
39+
"GPIO14",
40+
"GPIO15",
4241
"GPIO16",
4342
"GPIO17",
4443
"GPIO18",

‎arch/arm/boot/dts/broadcom/bcm2710-rpi-2-b.dts‎

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -24,21 +24,20 @@
2424
*/
2525
gpio-line-names = "ID_SDA",
2626
"ID_SCL",
27-
"SDA1",
28-
"SCL1",
29-
"GPIO_GCLK",
27+
"GPIO2",
28+
"GPIO3",
29+
"GPIO4",
3030
"GPIO5",
3131
"GPIO6",
32-
"SPI_CE1_N",
33-
"SPI_CE0_N",
34-
"SPI_MISO",
35-
"SPI_MOSI",
36-
"SPI_SCLK",
32+
"GPIO7",
33+
"GPIO8",
34+
"GPIO9",
35+
"GPIO10",
36+
"GPIO11",
3737
"GPIO12",
3838
"GPIO13",
39-
/* Serial port */
40-
"TXD0",
41-
"RXD0",
39+
"GPIO14",
40+
"GPIO15",
4241
"GPIO16",
4342
"GPIO17",
4443
"GPIO18",

‎arch/arm/boot/dts/broadcom/bcm2710-rpi-3-b-plus.dts‎

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -35,21 +35,20 @@
3535
*/
3636
gpio-line-names = "ID_SDA",
3737
"ID_SCL",
38-
"SDA1",
39-
"SCL1",
40-
"GPIO_GCLK",
38+
"GPIO2",
39+
"GPIO3",
40+
"GPIO4",
4141
"GPIO5",
4242
"GPIO6",
43-
"SPI_CE1_N",
44-
"SPI_CE0_N",
45-
"SPI_MISO",
46-
"SPI_MOSI",
47-
"SPI_SCLK",
43+
"GPIO7",
44+
"GPIO8",
45+
"GPIO9",
46+
"GPIO10",
47+
"GPIO11",
4848
"GPIO12",
4949
"GPIO13",
50-
/* Serial port */
51-
"TXD1",
52-
"RXD1",
50+
"GPIO14",
51+
"GPIO15",
5352
"GPIO16",
5453
"GPIO17",
5554
"GPIO18",

‎arch/arm/boot/dts/broadcom/bcm2710-rpi-3-b.dts‎

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -35,21 +35,20 @@
3535
*/
3636
gpio-line-names = "ID_SDA",
3737
"ID_SCL",
38-
"SDA1",
39-
"SCL1",
40-
"GPIO_GCLK",
38+
"GPIO2",
39+
"GPIO3",
40+
"GPIO4",
4141
"GPIO5",
4242
"GPIO6",
43-
"SPI_CE1_N",
44-
"SPI_CE0_N",
45-
"SPI_MISO",
46-
"SPI_MOSI",
47-
"SPI_SCLK",
43+
"GPIO7",
44+
"GPIO8",
45+
"GPIO9",
46+
"GPIO10",
47+
"GPIO11",
4848
"GPIO12",
4949
"GPIO13",
50-
/* Serial port */
51-
"TXD1",
52-
"RXD1",
50+
"GPIO14",
51+
"GPIO15",
5352
"GPIO16",
5453
"GPIO17",
5554
"GPIO18",

‎arch/arm/boot/dts/broadcom/bcm2710-rpi-zero-2-w.dts‎

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -33,21 +33,20 @@
3333
*/
3434
gpio-line-names = "ID_SDA",
3535
"ID_SCL",
36-
"SDA1",
37-
"SCL1",
38-
"GPIO_GCLK",
36+
"GPIO2",
37+
"GPIO3",
38+
"GPIO4",
3939
"GPIO5",
4040
"GPIO6",
41-
"SPI_CE1_N",
42-
"SPI_CE0_N",
43-
"SPI_MISO",
44-
"SPI_MOSI",
45-
"SPI_SCLK",
41+
"GPIO7",
42+
"GPIO8",
43+
"GPIO9",
44+
"GPIO10",
45+
"GPIO11",
4646
"GPIO12",
4747
"GPIO13",
48-
/* Serial port */
49-
"TXD1",
50-
"RXD1",
48+
"GPIO14",
49+
"GPIO15",
5150
"GPIO16",
5251
"GPIO17",
5352
"GPIO18",

‎arch/arm/boot/dts/broadcom/bcm2711-rpi-4-b.dts‎

Lines changed: 72 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -80,21 +80,21 @@
8080
*/
8181
gpio-line-names = "ID_SDA", /* 0 */
8282
"ID_SCL",
83-
"SDA1",
84-
"SCL1",
85-
"GPIO_GCLK",
83+
"GPIO2",
84+
"GPIO3",
85+
"GPIO4",
8686
"GPIO5", /* 5 */
8787
"GPIO6",
88-
"SPI_CE1_N",
89-
"SPI_CE0_N",
90-
"SPI_MISO",
91-
"SPI_MOSI", /* 10 */
92-
"SPI_SCLK",
88+
"GPIO7",
89+
"GPIO8",
90+
"GPIO9",
91+
"GPIO10", /* 10 */
92+
"GPIO11",
9393
"GPIO12",
9494
"GPIO13",
9595
/* Serial port */
96-
"TXD1",
97-
"RXD1", /* 15 */
96+
"GPIO14",
97+
"GPIO15", /* 15 */
9898
"GPIO16",
9999
"GPIO17",
100100
"GPIO18",
@@ -311,6 +311,68 @@
311311
};
312312

313313
&gpio {
314+
gpio-line-names = "ID_SDA",
315+
"ID_SCL",
316+
"GPIO2",
317+
"GPIO3",
318+
"GPIO4",
319+
"GPIO5",
320+
"GPIO6",
321+
"GPIO7",
322+
"GPIO8",
323+
"GPIO9",
324+
"GPIO10",
325+
"GPIO11",
326+
"GPIO12",
327+
"GPIO13",
328+
"GPIO14",
329+
"GPIO15",
330+
"GPIO16",
331+
"GPIO17",
332+
"GPIO18",
333+
"GPIO19",
334+
"GPIO20",
335+
"GPIO21",
336+
"GPIO22",
337+
"GPIO23",
338+
"GPIO24",
339+
"GPIO25",
340+
"GPIO26",
341+
"GPIO27",
342+
"RGMII_MDIO",
343+
"RGMIO_MDC",
344+
/* Used by BT module */
345+
"CTS0", /* 30 */
346+
"RTS0",
347+
"TXD0",
348+
"RXD0",
349+
/* Used by Wifi */
350+
"SD1_CLK",
351+
"SD1_CMD", /* 35 */
352+
"SD1_DATA0",
353+
"SD1_DATA1",
354+
"SD1_DATA2",
355+
"SD1_DATA3",
356+
/* Shared with SPI flash */
357+
"PWM0_MISO", /* 40 */
358+
"PWM1_MOSI",
359+
"STATUS_LED_G_CLK",
360+
"SPIFLASH_CE_N",
361+
"SDA0",
362+
"SCL0", /* 45 */
363+
"RGMII_RXCLK",
364+
"RGMII_RXCTL",
365+
"RGMII_RXD0",
366+
"RGMII_RXD1",
367+
"RGMII_RXD2", /* 50 */
368+
"RGMII_RXD3",
369+
"RGMII_TXCLK",
370+
"RGMII_TXCTL",
371+
"RGMII_TXD0",
372+
"RGMII_TXD1", /* 55 */
373+
"RGMII_TXD2",
374+
"RGMII_TXD3";
375+
314376
bt_pins: bt_pins {
315377
brcm,pins = "-"; // non-empty to keep btuart happy, //4 = 0
316378
// to fool pinctrl

0 commit comments

Comments
 (0)