* [PATCH 0/6] ARM: dts: bcm283x: Adjust GPIO line names
@ 2022-04-11 20:01 ` Stefan Wahren
0 siblings, 0 replies; 26+ messages in thread
From: Stefan Wahren @ 2022-04-11 20:01 UTC (permalink / raw)
To: Florian Fainelli, Ray Jui, Scott Branden, Rob Herring,
Krzysztof Kozlowski
Cc: bcm-kernel-feedback-list, Nicolas Saenz Julienne, Linus Walleij,
devicetree, linux-rpi-kernel, linux-arm-kernel, Stefan Wahren
Recently the GPIO line names has been added to the vendor tree
DTB [1], which include some fixes (all patches except #5).
While we are at this remove those Not Connected (NC) line names.
[1] - https://github.com/raspberrypi/linux/issues/2760
Phil Elwell (4):
ARM: dts: bcm2835-rpi-zero-w: Fix GPIO line name for Wifi/BT
ARM: dts: bcm2837-rpi-cm3-io3: Fix GPIO line names for SMPS I2C
ARM: dts: bcm2837-rpi-3-b-plus: Fix GPIO line name of power LED
ARM: dts: bcm283x: Align ETH_CLK GPIO line name
Stefan Wahren (2):
ARM: dts: bcm2835-rpi-b: Fix GPIO line names
ARM: dts: bcm283x: Remove gpio line name NC
arch/arm/boot/dts/bcm2835-rpi-a-plus.dts | 21 +++++-----
arch/arm/boot/dts/bcm2835-rpi-a.dts | 35 ++++++++--------
arch/arm/boot/dts/bcm2835-rpi-b-plus.dts | 19 ++++-----
arch/arm/boot/dts/bcm2835-rpi-b-rev2.dts | 35 ++++++++--------
arch/arm/boot/dts/bcm2835-rpi-b.dts | 48 +++++++++++-----------
arch/arm/boot/dts/bcm2835-rpi-cm1-io1.dts | 1 -
arch/arm/boot/dts/bcm2835-rpi-zero-w.dts | 25 +++++------
arch/arm/boot/dts/bcm2835-rpi-zero.dts | 29 +++++++------
arch/arm/boot/dts/bcm2836-rpi-2-b.dts | 3 +-
arch/arm/boot/dts/bcm2837-rpi-3-a-plus.dts | 1 -
arch/arm/boot/dts/bcm2837-rpi-3-b-plus.dts | 5 +--
arch/arm/boot/dts/bcm2837-rpi-3-b.dts | 3 +-
arch/arm/boot/dts/bcm2837-rpi-cm3-io3.dts | 5 +--
arch/arm/boot/dts/bcm2837-rpi-cm3.dtsi | 12 +++---
14 files changed, 115 insertions(+), 127 deletions(-)
--
2.25.1
^ permalink raw reply [flat|nested] 26+ messages in thread
* [PATCH 0/6] ARM: dts: bcm283x: Adjust GPIO line names
@ 2022-04-11 20:01 ` Stefan Wahren
0 siblings, 0 replies; 26+ messages in thread
From: Stefan Wahren @ 2022-04-11 20:01 UTC (permalink / raw)
To: Florian Fainelli, Ray Jui, Scott Branden, Rob Herring,
Krzysztof Kozlowski
Cc: bcm-kernel-feedback-list, Nicolas Saenz Julienne, Linus Walleij,
devicetree, linux-rpi-kernel, linux-arm-kernel, Stefan Wahren
Recently the GPIO line names has been added to the vendor tree
DTB [1], which include some fixes (all patches except #5).
While we are at this remove those Not Connected (NC) line names.
[1] - https://github.com/raspberrypi/linux/issues/2760
Phil Elwell (4):
ARM: dts: bcm2835-rpi-zero-w: Fix GPIO line name for Wifi/BT
ARM: dts: bcm2837-rpi-cm3-io3: Fix GPIO line names for SMPS I2C
ARM: dts: bcm2837-rpi-3-b-plus: Fix GPIO line name of power LED
ARM: dts: bcm283x: Align ETH_CLK GPIO line name
Stefan Wahren (2):
ARM: dts: bcm2835-rpi-b: Fix GPIO line names
ARM: dts: bcm283x: Remove gpio line name NC
arch/arm/boot/dts/bcm2835-rpi-a-plus.dts | 21 +++++-----
arch/arm/boot/dts/bcm2835-rpi-a.dts | 35 ++++++++--------
arch/arm/boot/dts/bcm2835-rpi-b-plus.dts | 19 ++++-----
arch/arm/boot/dts/bcm2835-rpi-b-rev2.dts | 35 ++++++++--------
arch/arm/boot/dts/bcm2835-rpi-b.dts | 48 +++++++++++-----------
arch/arm/boot/dts/bcm2835-rpi-cm1-io1.dts | 1 -
arch/arm/boot/dts/bcm2835-rpi-zero-w.dts | 25 +++++------
arch/arm/boot/dts/bcm2835-rpi-zero.dts | 29 +++++++------
arch/arm/boot/dts/bcm2836-rpi-2-b.dts | 3 +-
arch/arm/boot/dts/bcm2837-rpi-3-a-plus.dts | 1 -
arch/arm/boot/dts/bcm2837-rpi-3-b-plus.dts | 5 +--
arch/arm/boot/dts/bcm2837-rpi-3-b.dts | 3 +-
arch/arm/boot/dts/bcm2837-rpi-cm3-io3.dts | 5 +--
arch/arm/boot/dts/bcm2837-rpi-cm3.dtsi | 12 +++---
14 files changed, 115 insertions(+), 127 deletions(-)
--
2.25.1
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 26+ messages in thread
* [PATCH 1/6] ARM: dts: bcm2835-rpi-zero-w: Fix GPIO line name for Wifi/BT
2022-04-11 20:01 ` Stefan Wahren
@ 2022-04-11 20:01 ` Stefan Wahren
-1 siblings, 0 replies; 26+ messages in thread
From: Stefan Wahren @ 2022-04-11 20:01 UTC (permalink / raw)
To: Florian Fainelli, Ray Jui, Scott Branden, Rob Herring,
Krzysztof Kozlowski
Cc: bcm-kernel-feedback-list, Nicolas Saenz Julienne, Linus Walleij,
devicetree, linux-rpi-kernel, linux-arm-kernel, Phil Elwell,
Stefan Wahren
From: Phil Elwell <phil@raspberrypi.com>
The GPIOs 30 to 39 are connected to the Cypress CYW43438 (Wifi/BT).
So fix the GPIO line names accordingly.
Fixes: 2c7c040c73e9 ("ARM: dts: bcm2835: Add Raspberry Pi Zero W")
Signed-off-by: Phil Elwell <phil@raspberrypi.com>
Signed-off-by: Stefan Wahren <stefan.wahren@i2se.com>
---
arch/arm/boot/dts/bcm2835-rpi-zero-w.dts | 22 ++++++++++++----------
1 file changed, 12 insertions(+), 10 deletions(-)
diff --git a/arch/arm/boot/dts/bcm2835-rpi-zero-w.dts b/arch/arm/boot/dts/bcm2835-rpi-zero-w.dts
index 243236bc1e00..8b043ab62dc8 100644
--- a/arch/arm/boot/dts/bcm2835-rpi-zero-w.dts
+++ b/arch/arm/boot/dts/bcm2835-rpi-zero-w.dts
@@ -74,16 +74,18 @@ &gpio {
"GPIO27",
"SDA0",
"SCL0",
- "NC", /* GPIO30 */
- "NC", /* GPIO31 */
- "NC", /* GPIO32 */
- "NC", /* GPIO33 */
- "NC", /* GPIO34 */
- "NC", /* GPIO35 */
- "NC", /* GPIO36 */
- "NC", /* GPIO37 */
- "NC", /* GPIO38 */
- "NC", /* GPIO39 */
+ /* Used by BT module */
+ "CTS0",
+ "RTS0",
+ "TXD0",
+ "RXD0",
+ /* Used by Wifi */
+ "SD1_CLK",
+ "SD1_CMD",
+ "SD1_DATA0",
+ "SD1_DATA1",
+ "SD1_DATA2",
+ "SD1_DATA3",
"CAM_GPIO1", /* GPIO40 */
"WL_ON", /* GPIO41 */
"NC", /* GPIO42 */
--
2.25.1
^ permalink raw reply related [flat|nested] 26+ messages in thread
* [PATCH 1/6] ARM: dts: bcm2835-rpi-zero-w: Fix GPIO line name for Wifi/BT
@ 2022-04-11 20:01 ` Stefan Wahren
0 siblings, 0 replies; 26+ messages in thread
From: Stefan Wahren @ 2022-04-11 20:01 UTC (permalink / raw)
To: Florian Fainelli, Ray Jui, Scott Branden, Rob Herring,
Krzysztof Kozlowski
Cc: bcm-kernel-feedback-list, Nicolas Saenz Julienne, Linus Walleij,
devicetree, linux-rpi-kernel, linux-arm-kernel, Phil Elwell,
Stefan Wahren
From: Phil Elwell <phil@raspberrypi.com>
The GPIOs 30 to 39 are connected to the Cypress CYW43438 (Wifi/BT).
So fix the GPIO line names accordingly.
Fixes: 2c7c040c73e9 ("ARM: dts: bcm2835: Add Raspberry Pi Zero W")
Signed-off-by: Phil Elwell <phil@raspberrypi.com>
Signed-off-by: Stefan Wahren <stefan.wahren@i2se.com>
---
arch/arm/boot/dts/bcm2835-rpi-zero-w.dts | 22 ++++++++++++----------
1 file changed, 12 insertions(+), 10 deletions(-)
diff --git a/arch/arm/boot/dts/bcm2835-rpi-zero-w.dts b/arch/arm/boot/dts/bcm2835-rpi-zero-w.dts
index 243236bc1e00..8b043ab62dc8 100644
--- a/arch/arm/boot/dts/bcm2835-rpi-zero-w.dts
+++ b/arch/arm/boot/dts/bcm2835-rpi-zero-w.dts
@@ -74,16 +74,18 @@ &gpio {
"GPIO27",
"SDA0",
"SCL0",
- "NC", /* GPIO30 */
- "NC", /* GPIO31 */
- "NC", /* GPIO32 */
- "NC", /* GPIO33 */
- "NC", /* GPIO34 */
- "NC", /* GPIO35 */
- "NC", /* GPIO36 */
- "NC", /* GPIO37 */
- "NC", /* GPIO38 */
- "NC", /* GPIO39 */
+ /* Used by BT module */
+ "CTS0",
+ "RTS0",
+ "TXD0",
+ "RXD0",
+ /* Used by Wifi */
+ "SD1_CLK",
+ "SD1_CMD",
+ "SD1_DATA0",
+ "SD1_DATA1",
+ "SD1_DATA2",
+ "SD1_DATA3",
"CAM_GPIO1", /* GPIO40 */
"WL_ON", /* GPIO41 */
"NC", /* GPIO42 */
--
2.25.1
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 26+ messages in thread
* [PATCH 2/6] ARM: dts: bcm2837-rpi-cm3-io3: Fix GPIO line names for SMPS I2C
2022-04-11 20:01 ` Stefan Wahren
@ 2022-04-11 20:01 ` Stefan Wahren
-1 siblings, 0 replies; 26+ messages in thread
From: Stefan Wahren @ 2022-04-11 20:01 UTC (permalink / raw)
To: Florian Fainelli, Ray Jui, Scott Branden, Rob Herring,
Krzysztof Kozlowski
Cc: bcm-kernel-feedback-list, Nicolas Saenz Julienne, Linus Walleij,
devicetree, linux-rpi-kernel, linux-arm-kernel, Phil Elwell,
Stefan Wahren
From: Phil Elwell <phil@raspberrypi.com>
The GPIOs 46 & 47 are already used for a I2C interface to a SMPS.
So fix the GPIO line names accordingly.
Fixes: a54fe8a6cf66 ("ARM: dts: add Raspberry Pi Compute Module 3 and IO board")
Signed-off-by: Phil Elwell <phil@raspberrypi.com>
Signed-off-by: Stefan Wahren <stefan.wahren@i2se.com>
---
arch/arm/boot/dts/bcm2837-rpi-cm3-io3.dts | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/arm/boot/dts/bcm2837-rpi-cm3-io3.dts b/arch/arm/boot/dts/bcm2837-rpi-cm3-io3.dts
index 588d9411ceb6..3dfce4312dfc 100644
--- a/arch/arm/boot/dts/bcm2837-rpi-cm3-io3.dts
+++ b/arch/arm/boot/dts/bcm2837-rpi-cm3-io3.dts
@@ -63,8 +63,8 @@ &gpio {
"GPIO43",
"GPIO44",
"GPIO45",
- "GPIO46",
- "GPIO47",
+ "SMPS_SCL",
+ "SMPS_SDA",
/* Used by eMMC */
"SD_CLK_R",
"SD_CMD_R",
--
2.25.1
^ permalink raw reply related [flat|nested] 26+ messages in thread
* [PATCH 2/6] ARM: dts: bcm2837-rpi-cm3-io3: Fix GPIO line names for SMPS I2C
@ 2022-04-11 20:01 ` Stefan Wahren
0 siblings, 0 replies; 26+ messages in thread
From: Stefan Wahren @ 2022-04-11 20:01 UTC (permalink / raw)
To: Florian Fainelli, Ray Jui, Scott Branden, Rob Herring,
Krzysztof Kozlowski
Cc: bcm-kernel-feedback-list, Nicolas Saenz Julienne, Linus Walleij,
devicetree, linux-rpi-kernel, linux-arm-kernel, Phil Elwell,
Stefan Wahren
From: Phil Elwell <phil@raspberrypi.com>
The GPIOs 46 & 47 are already used for a I2C interface to a SMPS.
So fix the GPIO line names accordingly.
Fixes: a54fe8a6cf66 ("ARM: dts: add Raspberry Pi Compute Module 3 and IO board")
Signed-off-by: Phil Elwell <phil@raspberrypi.com>
Signed-off-by: Stefan Wahren <stefan.wahren@i2se.com>
---
arch/arm/boot/dts/bcm2837-rpi-cm3-io3.dts | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/arm/boot/dts/bcm2837-rpi-cm3-io3.dts b/arch/arm/boot/dts/bcm2837-rpi-cm3-io3.dts
index 588d9411ceb6..3dfce4312dfc 100644
--- a/arch/arm/boot/dts/bcm2837-rpi-cm3-io3.dts
+++ b/arch/arm/boot/dts/bcm2837-rpi-cm3-io3.dts
@@ -63,8 +63,8 @@ &gpio {
"GPIO43",
"GPIO44",
"GPIO45",
- "GPIO46",
- "GPIO47",
+ "SMPS_SCL",
+ "SMPS_SDA",
/* Used by eMMC */
"SD_CLK_R",
"SD_CMD_R",
--
2.25.1
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 26+ messages in thread
* [PATCH 3/6] ARM: dts: bcm2837-rpi-3-b-plus: Fix GPIO line name of power LED
2022-04-11 20:01 ` Stefan Wahren
@ 2022-04-11 20:01 ` Stefan Wahren
-1 siblings, 0 replies; 26+ messages in thread
From: Stefan Wahren @ 2022-04-11 20:01 UTC (permalink / raw)
To: Florian Fainelli, Ray Jui, Scott Branden, Rob Herring,
Krzysztof Kozlowski
Cc: bcm-kernel-feedback-list, Nicolas Saenz Julienne, Linus Walleij,
devicetree, linux-rpi-kernel, linux-arm-kernel, Phil Elwell,
Stefan Wahren
From: Phil Elwell <phil@raspberrypi.com>
The red LED on the Raspberry Pi 3 B Plus is the power LED.
So fix the GPIO line name accordingly.
Fixes: 71c0cd2283f2 ("ARM: dts: bcm2837: Add Raspberry Pi 3 B+")
Signed-off-by: Phil Elwell <phil@raspberrypi.com>
Signed-off-by: Stefan Wahren <stefan.wahren@i2se.com>
---
arch/arm/boot/dts/bcm2837-rpi-3-b-plus.dts | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/arm/boot/dts/bcm2837-rpi-3-b-plus.dts b/arch/arm/boot/dts/bcm2837-rpi-3-b-plus.dts
index e12938baaf12..c263f5b48b96 100644
--- a/arch/arm/boot/dts/bcm2837-rpi-3-b-plus.dts
+++ b/arch/arm/boot/dts/bcm2837-rpi-3-b-plus.dts
@@ -45,7 +45,7 @@ expgpio: gpio {
#gpio-cells = <2>;
gpio-line-names = "BT_ON",
"WL_ON",
- "STATUS_LED_R",
+ "PWR_LED_R",
"LAN_RUN",
"",
"CAM_GPIO0",
--
2.25.1
^ permalink raw reply related [flat|nested] 26+ messages in thread
* [PATCH 3/6] ARM: dts: bcm2837-rpi-3-b-plus: Fix GPIO line name of power LED
@ 2022-04-11 20:01 ` Stefan Wahren
0 siblings, 0 replies; 26+ messages in thread
From: Stefan Wahren @ 2022-04-11 20:01 UTC (permalink / raw)
To: Florian Fainelli, Ray Jui, Scott Branden, Rob Herring,
Krzysztof Kozlowski
Cc: bcm-kernel-feedback-list, Nicolas Saenz Julienne, Linus Walleij,
devicetree, linux-rpi-kernel, linux-arm-kernel, Phil Elwell,
Stefan Wahren
From: Phil Elwell <phil@raspberrypi.com>
The red LED on the Raspberry Pi 3 B Plus is the power LED.
So fix the GPIO line name accordingly.
Fixes: 71c0cd2283f2 ("ARM: dts: bcm2837: Add Raspberry Pi 3 B+")
Signed-off-by: Phil Elwell <phil@raspberrypi.com>
Signed-off-by: Stefan Wahren <stefan.wahren@i2se.com>
---
arch/arm/boot/dts/bcm2837-rpi-3-b-plus.dts | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/arm/boot/dts/bcm2837-rpi-3-b-plus.dts b/arch/arm/boot/dts/bcm2837-rpi-3-b-plus.dts
index e12938baaf12..c263f5b48b96 100644
--- a/arch/arm/boot/dts/bcm2837-rpi-3-b-plus.dts
+++ b/arch/arm/boot/dts/bcm2837-rpi-3-b-plus.dts
@@ -45,7 +45,7 @@ expgpio: gpio {
#gpio-cells = <2>;
gpio-line-names = "BT_ON",
"WL_ON",
- "STATUS_LED_R",
+ "PWR_LED_R",
"LAN_RUN",
"",
"CAM_GPIO0",
--
2.25.1
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 26+ messages in thread
* [PATCH 4/6] ARM: dts: bcm2835-rpi-b: Fix GPIO line names
2022-04-11 20:01 ` Stefan Wahren
@ 2022-04-11 20:01 ` Stefan Wahren
-1 siblings, 0 replies; 26+ messages in thread
From: Stefan Wahren @ 2022-04-11 20:01 UTC (permalink / raw)
To: Florian Fainelli, Ray Jui, Scott Branden, Rob Herring,
Krzysztof Kozlowski
Cc: bcm-kernel-feedback-list, Nicolas Saenz Julienne, Linus Walleij,
devicetree, linux-rpi-kernel, linux-arm-kernel, Stefan Wahren,
Phil Elwell
Recently this has been fixed in the vendor tree, so upstream this.
Fixes: 731b26a6ac17 ("ARM: bcm2835: Add names for the Raspberry Pi GPIO lines")
Signed-off-by: Phil Elwell <phil@raspberrypi.com>
Signed-off-by: Stefan Wahren <stefan.wahren@i2se.com>
---
arch/arm/boot/dts/bcm2835-rpi-b.dts | 13 ++++++-------
1 file changed, 6 insertions(+), 7 deletions(-)
diff --git a/arch/arm/boot/dts/bcm2835-rpi-b.dts b/arch/arm/boot/dts/bcm2835-rpi-b.dts
index 1b63d6b19750..25d87212cefd 100644
--- a/arch/arm/boot/dts/bcm2835-rpi-b.dts
+++ b/arch/arm/boot/dts/bcm2835-rpi-b.dts
@@ -53,18 +53,17 @@ &gpio {
"GPIO18",
"NC", /* GPIO19 */
"NC", /* GPIO20 */
- "GPIO21",
+ "CAM_GPIO0",
"GPIO22",
"GPIO23",
"GPIO24",
"GPIO25",
"NC", /* GPIO26 */
- "CAM_GPIO0",
- /* Binary number representing build/revision */
- "CONFIG0",
- "CONFIG1",
- "CONFIG2",
- "CONFIG3",
+ "GPIO27",
+ "GPIO28",
+ "GPIO29",
+ "GPIO30",
+ "GPIO31",
"NC", /* GPIO32 */
"NC", /* GPIO33 */
"NC", /* GPIO34 */
--
2.25.1
^ permalink raw reply related [flat|nested] 26+ messages in thread
* [PATCH 4/6] ARM: dts: bcm2835-rpi-b: Fix GPIO line names
@ 2022-04-11 20:01 ` Stefan Wahren
0 siblings, 0 replies; 26+ messages in thread
From: Stefan Wahren @ 2022-04-11 20:01 UTC (permalink / raw)
To: Florian Fainelli, Ray Jui, Scott Branden, Rob Herring,
Krzysztof Kozlowski
Cc: bcm-kernel-feedback-list, Nicolas Saenz Julienne, Linus Walleij,
devicetree, linux-rpi-kernel, linux-arm-kernel, Stefan Wahren,
Phil Elwell
Recently this has been fixed in the vendor tree, so upstream this.
Fixes: 731b26a6ac17 ("ARM: bcm2835: Add names for the Raspberry Pi GPIO lines")
Signed-off-by: Phil Elwell <phil@raspberrypi.com>
Signed-off-by: Stefan Wahren <stefan.wahren@i2se.com>
---
arch/arm/boot/dts/bcm2835-rpi-b.dts | 13 ++++++-------
1 file changed, 6 insertions(+), 7 deletions(-)
diff --git a/arch/arm/boot/dts/bcm2835-rpi-b.dts b/arch/arm/boot/dts/bcm2835-rpi-b.dts
index 1b63d6b19750..25d87212cefd 100644
--- a/arch/arm/boot/dts/bcm2835-rpi-b.dts
+++ b/arch/arm/boot/dts/bcm2835-rpi-b.dts
@@ -53,18 +53,17 @@ &gpio {
"GPIO18",
"NC", /* GPIO19 */
"NC", /* GPIO20 */
- "GPIO21",
+ "CAM_GPIO0",
"GPIO22",
"GPIO23",
"GPIO24",
"GPIO25",
"NC", /* GPIO26 */
- "CAM_GPIO0",
- /* Binary number representing build/revision */
- "CONFIG0",
- "CONFIG1",
- "CONFIG2",
- "CONFIG3",
+ "GPIO27",
+ "GPIO28",
+ "GPIO29",
+ "GPIO30",
+ "GPIO31",
"NC", /* GPIO32 */
"NC", /* GPIO33 */
"NC", /* GPIO34 */
--
2.25.1
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 26+ messages in thread
* [PATCH 5/6] ARM: dts: bcm283x: Remove gpio line name NC
2022-04-11 20:01 ` Stefan Wahren
@ 2022-04-11 20:01 ` Stefan Wahren
-1 siblings, 0 replies; 26+ messages in thread
From: Stefan Wahren @ 2022-04-11 20:01 UTC (permalink / raw)
To: Florian Fainelli, Ray Jui, Scott Branden, Rob Herring,
Krzysztof Kozlowski
Cc: bcm-kernel-feedback-list, Nicolas Saenz Julienne, Linus Walleij,
devicetree, linux-rpi-kernel, linux-arm-kernel, Stefan Wahren
The convention to name not connected GPIOs with NC has never been
adapted. Also newer Raspberry Pi boards like RPi 4 never did. So fix
this inconsistency by removing all of the NC names.
Signed-off-by: Stefan Wahren <stefan.wahren@i2se.com>
---
arch/arm/boot/dts/bcm2835-rpi-a-plus.dts | 21 +++++++------
arch/arm/boot/dts/bcm2835-rpi-a.dts | 35 +++++++++++-----------
arch/arm/boot/dts/bcm2835-rpi-b-plus.dts | 17 +++++------
arch/arm/boot/dts/bcm2835-rpi-b-rev2.dts | 35 +++++++++++-----------
arch/arm/boot/dts/bcm2835-rpi-b.dts | 35 +++++++++++-----------
arch/arm/boot/dts/bcm2835-rpi-cm1-io1.dts | 1 -
arch/arm/boot/dts/bcm2835-rpi-zero-w.dts | 3 +-
arch/arm/boot/dts/bcm2835-rpi-zero.dts | 29 +++++++++---------
arch/arm/boot/dts/bcm2836-rpi-2-b.dts | 1 -
arch/arm/boot/dts/bcm2837-rpi-3-a-plus.dts | 1 -
arch/arm/boot/dts/bcm2837-rpi-3-b-plus.dts | 1 -
arch/arm/boot/dts/bcm2837-rpi-3-b.dts | 1 -
arch/arm/boot/dts/bcm2837-rpi-cm3-io3.dts | 1 -
arch/arm/boot/dts/bcm2837-rpi-cm3.dtsi | 12 ++++----
14 files changed, 90 insertions(+), 103 deletions(-)
diff --git a/arch/arm/boot/dts/bcm2835-rpi-a-plus.dts b/arch/arm/boot/dts/bcm2835-rpi-a-plus.dts
index 40b9405f1a8e..9b9a18bbb20a 100644
--- a/arch/arm/boot/dts/bcm2835-rpi-a-plus.dts
+++ b/arch/arm/boot/dts/bcm2835-rpi-a-plus.dts
@@ -32,7 +32,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
*/
@@ -67,21 +66,21 @@ &gpio {
"GPIO27",
"SDA0",
"SCL0",
- "NC", /* GPIO30 */
- "NC", /* GPIO31 */
+ "", /* GPIO30 */
+ "", /* GPIO31 */
"CAM_GPIO1", /* GPIO32 */
- "NC", /* GPIO33 */
- "NC", /* GPIO34 */
+ "", /* GPIO33 */
+ "", /* GPIO34 */
"PWR_LOW_N", /* GPIO35 */
- "NC", /* GPIO36 */
- "NC", /* GPIO37 */
+ "", /* GPIO36 */
+ "", /* GPIO37 */
"USB_LIMIT", /* GPIO38 */
- "NC", /* GPIO39 */
+ "", /* GPIO39 */
"PWM0_OUT", /* GPIO40 */
"CAM_GPIO0", /* GPIO41 */
- "NC", /* GPIO42 */
- "NC", /* GPIO43 */
- "NC", /* GPIO44 */
+ "", /* GPIO42 */
+ "", /* GPIO43 */
+ "", /* GPIO44 */
"PWM1_OUT", /* GPIO45 */
"HDMI_HPD_N",
"STATUS_LED",
diff --git a/arch/arm/boot/dts/bcm2835-rpi-a.dts b/arch/arm/boot/dts/bcm2835-rpi-a.dts
index 11edb581dbaf..f664e4fced93 100644
--- a/arch/arm/boot/dts/bcm2835-rpi-a.dts
+++ b/arch/arm/boot/dts/bcm2835-rpi-a.dts
@@ -26,7 +26,6 @@ &gpio {
* RPI00021 sheet 02
*
* 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
*/
@@ -42,41 +41,41 @@ &gpio {
"SPI_MISO",
"SPI_MOSI",
"SPI_SCLK",
- "NC", /* GPIO12 */
- "NC", /* GPIO13 */
+ "", /* GPIO12 */
+ "", /* GPIO13 */
/* Serial port */
"TXD0",
"RXD0",
"STATUS_LED_N",
"GPIO17",
"GPIO18",
- "NC", /* GPIO19 */
- "NC", /* GPIO20 */
+ "", /* GPIO19 */
+ "", /* GPIO20 */
"GPIO21",
"GPIO22",
"GPIO23",
"GPIO24",
"GPIO25",
- "NC", /* GPIO26 */
+ "", /* GPIO26 */
"CAM_GPIO0",
/* Binary number representing build/revision */
"CONFIG0",
"CONFIG1",
"CONFIG2",
"CONFIG3",
- "NC", /* GPIO32 */
- "NC", /* GPIO33 */
- "NC", /* GPIO34 */
- "NC", /* GPIO35 */
- "NC", /* GPIO36 */
- "NC", /* GPIO37 */
- "NC", /* GPIO38 */
- "NC", /* GPIO39 */
+ "", /* GPIO32 */
+ "", /* GPIO33 */
+ "", /* GPIO34 */
+ "", /* GPIO35 */
+ "", /* GPIO36 */
+ "", /* GPIO37 */
+ "", /* GPIO38 */
+ "", /* GPIO39 */
"PWM0_OUT",
- "NC", /* GPIO41 */
- "NC", /* GPIO42 */
- "NC", /* GPIO43 */
- "NC", /* GPIO44 */
+ "", /* GPIO41 */
+ "", /* GPIO42 */
+ "", /* GPIO43 */
+ "", /* GPIO44 */
"PWM1_OUT",
"HDMI_HPD_P",
"SD_CARD_DET",
diff --git a/arch/arm/boot/dts/bcm2835-rpi-b-plus.dts b/arch/arm/boot/dts/bcm2835-rpi-b-plus.dts
index 1b435c64bd9c..7b7c363e5ee8 100644
--- a/arch/arm/boot/dts/bcm2835-rpi-b-plus.dts
+++ b/arch/arm/boot/dts/bcm2835-rpi-b-plus.dts
@@ -34,7 +34,6 @@ &gpio {
* RPI-BPLUS sheet 1
*
* 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
*/
@@ -69,20 +68,20 @@ &gpio {
"GPIO27",
"SDA0",
"SCL0",
- "NC", /* GPIO30 */
+ "", /* GPIO30 */
"LAN_RUN", /* GPIO31 */
"CAM_GPIO1", /* GPIO32 */
- "NC", /* GPIO33 */
- "NC", /* GPIO34 */
+ "", /* GPIO33 */
+ "", /* GPIO34 */
"PWR_LOW_N", /* GPIO35 */
- "NC", /* GPIO36 */
- "NC", /* GPIO37 */
+ "", /* GPIO36 */
+ "", /* GPIO37 */
"USB_LIMIT", /* GPIO38 */
- "NC", /* GPIO39 */
+ "", /* GPIO39 */
"PWM0_OUT", /* GPIO40 */
"CAM_GPIO0", /* GPIO41 */
- "NC", /* GPIO42 */
- "NC", /* GPIO43 */
+ "", /* GPIO42 */
+ "", /* GPIO43 */
"ETHCLK", /* GPIO44 */
"PWM1_OUT", /* GPIO45 */
"HDMI_HPD_N",
diff --git a/arch/arm/boot/dts/bcm2835-rpi-b-rev2.dts b/arch/arm/boot/dts/bcm2835-rpi-b-rev2.dts
index a23c25c00eea..f5b66d3f4ff3 100644
--- a/arch/arm/boot/dts/bcm2835-rpi-b-rev2.dts
+++ b/arch/arm/boot/dts/bcm2835-rpi-b-rev2.dts
@@ -27,7 +27,6 @@ &gpio {
* RPI00022 sheet 02
*
* 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
*/
@@ -43,40 +42,40 @@ &gpio {
"SPI_MISO",
"SPI_MOSI",
"SPI_SCLK",
- "NC", /* GPIO12 */
- "NC", /* GPIO13 */
+ "", /* GPIO12 */
+ "", /* GPIO13 */
/* Serial port */
"TXD0",
"RXD0",
"STATUS_LED_N",
"GPIO17",
"GPIO18",
- "NC", /* GPIO19 */
- "NC", /* GPIO20 */
+ "", /* GPIO19 */
+ "", /* GPIO20 */
"CAM_GPIO",
"GPIO22",
"GPIO23",
"GPIO24",
"GPIO25",
- "NC", /* GPIO26 */
+ "", /* GPIO26 */
"GPIO27",
"GPIO28",
"GPIO29",
"GPIO30",
"GPIO31",
- "NC", /* GPIO32 */
- "NC", /* GPIO33 */
- "NC", /* GPIO34 */
- "NC", /* GPIO35 */
- "NC", /* GPIO36 */
- "NC", /* GPIO37 */
- "NC", /* GPIO38 */
- "NC", /* GPIO39 */
+ "", /* GPIO32 */
+ "", /* GPIO33 */
+ "", /* GPIO34 */
+ "", /* GPIO35 */
+ "", /* GPIO36 */
+ "", /* GPIO37 */
+ "", /* GPIO38 */
+ "", /* GPIO39 */
"PWM0_OUT",
- "NC", /* GPIO41 */
- "NC", /* GPIO42 */
- "NC", /* GPIO43 */
- "NC", /* GPIO44 */
+ "", /* GPIO41 */
+ "", /* GPIO42 */
+ "", /* GPIO43 */
+ "", /* GPIO44 */
"PWM1_OUT",
"HDMI_HPD_P",
"SD_CARD_DET",
diff --git a/arch/arm/boot/dts/bcm2835-rpi-b.dts b/arch/arm/boot/dts/bcm2835-rpi-b.dts
index 25d87212cefd..f589bede2b11 100644
--- a/arch/arm/boot/dts/bcm2835-rpi-b.dts
+++ b/arch/arm/boot/dts/bcm2835-rpi-b.dts
@@ -27,7 +27,6 @@ &gpio {
* RPI00021 sheet 02
*
* 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
*/
@@ -43,40 +42,40 @@ &gpio {
"SPI_MISO",
"SPI_MOSI",
"SPI_SCLK",
- "NC", /* GPIO12 */
- "NC", /* GPIO13 */
+ "", /* GPIO12 */
+ "", /* GPIO13 */
/* Serial port */
"TXD0",
"RXD0",
"STATUS_LED_N",
"GPIO17",
"GPIO18",
- "NC", /* GPIO19 */
- "NC", /* GPIO20 */
+ "", /* GPIO19 */
+ "", /* GPIO20 */
"CAM_GPIO0",
"GPIO22",
"GPIO23",
"GPIO24",
"GPIO25",
- "NC", /* GPIO26 */
+ "", /* GPIO26 */
"GPIO27",
"GPIO28",
"GPIO29",
"GPIO30",
"GPIO31",
- "NC", /* GPIO32 */
- "NC", /* GPIO33 */
- "NC", /* GPIO34 */
- "NC", /* GPIO35 */
- "NC", /* GPIO36 */
- "NC", /* GPIO37 */
- "NC", /* GPIO38 */
- "NC", /* GPIO39 */
+ "", /* GPIO32 */
+ "", /* GPIO33 */
+ "", /* GPIO34 */
+ "", /* GPIO35 */
+ "", /* GPIO36 */
+ "", /* GPIO37 */
+ "", /* GPIO38 */
+ "", /* GPIO39 */
"PWM0_OUT",
- "NC", /* GPIO41 */
- "NC", /* GPIO42 */
- "NC", /* GPIO43 */
- "NC", /* GPIO44 */
+ "", /* GPIO41 */
+ "", /* GPIO42 */
+ "", /* GPIO43 */
+ "", /* GPIO44 */
"PWM1_OUT",
"HDMI_HPD_P",
"SD_CARD_DET",
diff --git a/arch/arm/boot/dts/bcm2835-rpi-cm1-io1.dts b/arch/arm/boot/dts/bcm2835-rpi-cm1-io1.dts
index a75c882e6575..87958a96c3e0 100644
--- a/arch/arm/boot/dts/bcm2835-rpi-cm1-io1.dts
+++ b/arch/arm/boot/dts/bcm2835-rpi-cm1-io1.dts
@@ -13,7 +13,6 @@ &gpio {
* This is based on the official GPU firmware DT blob.
*
* 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
*/
diff --git a/arch/arm/boot/dts/bcm2835-rpi-zero-w.dts b/arch/arm/boot/dts/bcm2835-rpi-zero-w.dts
index 8b043ab62dc8..596bb1ef994e 100644
--- a/arch/arm/boot/dts/bcm2835-rpi-zero-w.dts
+++ b/arch/arm/boot/dts/bcm2835-rpi-zero-w.dts
@@ -39,7 +39,6 @@ &gpio {
* This is based on the official GPU firmware DT blob.
*
* 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
*/
@@ -88,7 +87,7 @@ &gpio {
"SD1_DATA3",
"CAM_GPIO1", /* GPIO40 */
"WL_ON", /* GPIO41 */
- "NC", /* GPIO42 */
+ "", /* GPIO42 */
"WIFI_CLK", /* GPIO43 */
"CAM_GPIO0", /* GPIO44 */
"BT_ON", /* GPIO45 */
diff --git a/arch/arm/boot/dts/bcm2835-rpi-zero.dts b/arch/arm/boot/dts/bcm2835-rpi-zero.dts
index 6f9b3a908f28..a65c2bca69ea 100644
--- a/arch/arm/boot/dts/bcm2835-rpi-zero.dts
+++ b/arch/arm/boot/dts/bcm2835-rpi-zero.dts
@@ -29,7 +29,6 @@ &gpio {
* This is based on the official GPU firmware DT blob.
*
* 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
*/
@@ -64,22 +63,22 @@ &gpio {
"GPIO27",
"SDA0",
"SCL0",
- "NC", /* GPIO30 */
- "NC", /* GPIO31 */
+ "", /* GPIO30 */
+ "", /* GPIO31 */
"CAM_GPIO1", /* GPIO32 */
- "NC", /* GPIO33 */
- "NC", /* GPIO34 */
- "NC", /* GPIO35 */
- "NC", /* GPIO36 */
- "NC", /* GPIO37 */
- "NC", /* GPIO38 */
- "NC", /* GPIO39 */
- "NC", /* GPIO40 */
+ "", /* GPIO33 */
+ "", /* GPIO34 */
+ "", /* GPIO35 */
+ "", /* GPIO36 */
+ "", /* GPIO37 */
+ "", /* GPIO38 */
+ "", /* GPIO39 */
+ "", /* GPIO40 */
"CAM_GPIO0", /* GPIO41 */
- "NC", /* GPIO42 */
- "NC", /* GPIO43 */
- "NC", /* GPIO44 */
- "NC", /* GPIO45 */
+ "", /* GPIO42 */
+ "", /* GPIO43 */
+ "", /* GPIO44 */
+ "", /* GPIO45 */
"HDMI_HPD_N",
"STATUS_LED_N",
/* Used by SD Card */
diff --git a/arch/arm/boot/dts/bcm2836-rpi-2-b.dts b/arch/arm/boot/dts/bcm2836-rpi-2-b.dts
index d8af8eeac7b6..c824a2cea02e 100644
--- a/arch/arm/boot/dts/bcm2836-rpi-2-b.dts
+++ b/arch/arm/boot/dts/bcm2836-rpi-2-b.dts
@@ -34,7 +34,6 @@ &gpio {
* the official GPU firmware DT blob.
*
* 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
*/
diff --git a/arch/arm/boot/dts/bcm2837-rpi-3-a-plus.dts b/arch/arm/boot/dts/bcm2837-rpi-3-a-plus.dts
index d73daf5bff1d..f7222a28903e 100644
--- a/arch/arm/boot/dts/bcm2837-rpi-3-a-plus.dts
+++ b/arch/arm/boot/dts/bcm2837-rpi-3-a-plus.dts
@@ -55,7 +55,6 @@ &gpio {
* This is mostly based on the official GPU firmware DT blob.
*
* 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
*/
diff --git a/arch/arm/boot/dts/bcm2837-rpi-3-b-plus.dts b/arch/arm/boot/dts/bcm2837-rpi-3-b-plus.dts
index c263f5b48b96..fd4ac6f2d077 100644
--- a/arch/arm/boot/dts/bcm2837-rpi-3-b-plus.dts
+++ b/arch/arm/boot/dts/bcm2837-rpi-3-b-plus.dts
@@ -61,7 +61,6 @@ &gpio {
* the official GPU firmware DT blob.
*
* 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
*/
diff --git a/arch/arm/boot/dts/bcm2837-rpi-3-b.dts b/arch/arm/boot/dts/bcm2837-rpi-3-b.dts
index 42b5383b55d8..00ea439d601d 100644
--- a/arch/arm/boot/dts/bcm2837-rpi-3-b.dts
+++ b/arch/arm/boot/dts/bcm2837-rpi-3-b.dts
@@ -54,7 +54,6 @@ &gpio {
* the official GPU firmware DT blob.
*
* 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
*/
diff --git a/arch/arm/boot/dts/bcm2837-rpi-cm3-io3.dts b/arch/arm/boot/dts/bcm2837-rpi-cm3-io3.dts
index 3dfce4312dfc..cf84e69fced8 100644
--- a/arch/arm/boot/dts/bcm2837-rpi-cm3-io3.dts
+++ b/arch/arm/boot/dts/bcm2837-rpi-cm3-io3.dts
@@ -13,7 +13,6 @@ &gpio {
* This is based on the official GPU firmware DT blob.
*
* 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
*/
diff --git a/arch/arm/boot/dts/bcm2837-rpi-cm3.dtsi b/arch/arm/boot/dts/bcm2837-rpi-cm3.dtsi
index 828a20561b96..f57b4ca145dd 100644
--- a/arch/arm/boot/dts/bcm2837-rpi-cm3.dtsi
+++ b/arch/arm/boot/dts/bcm2837-rpi-cm3.dtsi
@@ -41,12 +41,12 @@ expgpio: gpio {
#gpio-cells = <2>;
gpio-line-names = "HDMI_HPD_N",
"EMMC_EN_N",
- "NC",
- "NC",
- "NC",
- "NC",
- "NC",
- "NC";
+ "",
+ "",
+ "",
+ "",
+ "",
+ "";
status = "okay";
};
};
--
2.25.1
^ permalink raw reply related [flat|nested] 26+ messages in thread
* [PATCH 5/6] ARM: dts: bcm283x: Remove gpio line name NC
@ 2022-04-11 20:01 ` Stefan Wahren
0 siblings, 0 replies; 26+ messages in thread
From: Stefan Wahren @ 2022-04-11 20:01 UTC (permalink / raw)
To: Florian Fainelli, Ray Jui, Scott Branden, Rob Herring,
Krzysztof Kozlowski
Cc: bcm-kernel-feedback-list, Nicolas Saenz Julienne, Linus Walleij,
devicetree, linux-rpi-kernel, linux-arm-kernel, Stefan Wahren
The convention to name not connected GPIOs with NC has never been
adapted. Also newer Raspberry Pi boards like RPi 4 never did. So fix
this inconsistency by removing all of the NC names.
Signed-off-by: Stefan Wahren <stefan.wahren@i2se.com>
---
arch/arm/boot/dts/bcm2835-rpi-a-plus.dts | 21 +++++++------
arch/arm/boot/dts/bcm2835-rpi-a.dts | 35 +++++++++++-----------
arch/arm/boot/dts/bcm2835-rpi-b-plus.dts | 17 +++++------
arch/arm/boot/dts/bcm2835-rpi-b-rev2.dts | 35 +++++++++++-----------
arch/arm/boot/dts/bcm2835-rpi-b.dts | 35 +++++++++++-----------
arch/arm/boot/dts/bcm2835-rpi-cm1-io1.dts | 1 -
arch/arm/boot/dts/bcm2835-rpi-zero-w.dts | 3 +-
arch/arm/boot/dts/bcm2835-rpi-zero.dts | 29 +++++++++---------
arch/arm/boot/dts/bcm2836-rpi-2-b.dts | 1 -
arch/arm/boot/dts/bcm2837-rpi-3-a-plus.dts | 1 -
arch/arm/boot/dts/bcm2837-rpi-3-b-plus.dts | 1 -
arch/arm/boot/dts/bcm2837-rpi-3-b.dts | 1 -
arch/arm/boot/dts/bcm2837-rpi-cm3-io3.dts | 1 -
arch/arm/boot/dts/bcm2837-rpi-cm3.dtsi | 12 ++++----
14 files changed, 90 insertions(+), 103 deletions(-)
diff --git a/arch/arm/boot/dts/bcm2835-rpi-a-plus.dts b/arch/arm/boot/dts/bcm2835-rpi-a-plus.dts
index 40b9405f1a8e..9b9a18bbb20a 100644
--- a/arch/arm/boot/dts/bcm2835-rpi-a-plus.dts
+++ b/arch/arm/boot/dts/bcm2835-rpi-a-plus.dts
@@ -32,7 +32,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
*/
@@ -67,21 +66,21 @@ &gpio {
"GPIO27",
"SDA0",
"SCL0",
- "NC", /* GPIO30 */
- "NC", /* GPIO31 */
+ "", /* GPIO30 */
+ "", /* GPIO31 */
"CAM_GPIO1", /* GPIO32 */
- "NC", /* GPIO33 */
- "NC", /* GPIO34 */
+ "", /* GPIO33 */
+ "", /* GPIO34 */
"PWR_LOW_N", /* GPIO35 */
- "NC", /* GPIO36 */
- "NC", /* GPIO37 */
+ "", /* GPIO36 */
+ "", /* GPIO37 */
"USB_LIMIT", /* GPIO38 */
- "NC", /* GPIO39 */
+ "", /* GPIO39 */
"PWM0_OUT", /* GPIO40 */
"CAM_GPIO0", /* GPIO41 */
- "NC", /* GPIO42 */
- "NC", /* GPIO43 */
- "NC", /* GPIO44 */
+ "", /* GPIO42 */
+ "", /* GPIO43 */
+ "", /* GPIO44 */
"PWM1_OUT", /* GPIO45 */
"HDMI_HPD_N",
"STATUS_LED",
diff --git a/arch/arm/boot/dts/bcm2835-rpi-a.dts b/arch/arm/boot/dts/bcm2835-rpi-a.dts
index 11edb581dbaf..f664e4fced93 100644
--- a/arch/arm/boot/dts/bcm2835-rpi-a.dts
+++ b/arch/arm/boot/dts/bcm2835-rpi-a.dts
@@ -26,7 +26,6 @@ &gpio {
* RPI00021 sheet 02
*
* 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
*/
@@ -42,41 +41,41 @@ &gpio {
"SPI_MISO",
"SPI_MOSI",
"SPI_SCLK",
- "NC", /* GPIO12 */
- "NC", /* GPIO13 */
+ "", /* GPIO12 */
+ "", /* GPIO13 */
/* Serial port */
"TXD0",
"RXD0",
"STATUS_LED_N",
"GPIO17",
"GPIO18",
- "NC", /* GPIO19 */
- "NC", /* GPIO20 */
+ "", /* GPIO19 */
+ "", /* GPIO20 */
"GPIO21",
"GPIO22",
"GPIO23",
"GPIO24",
"GPIO25",
- "NC", /* GPIO26 */
+ "", /* GPIO26 */
"CAM_GPIO0",
/* Binary number representing build/revision */
"CONFIG0",
"CONFIG1",
"CONFIG2",
"CONFIG3",
- "NC", /* GPIO32 */
- "NC", /* GPIO33 */
- "NC", /* GPIO34 */
- "NC", /* GPIO35 */
- "NC", /* GPIO36 */
- "NC", /* GPIO37 */
- "NC", /* GPIO38 */
- "NC", /* GPIO39 */
+ "", /* GPIO32 */
+ "", /* GPIO33 */
+ "", /* GPIO34 */
+ "", /* GPIO35 */
+ "", /* GPIO36 */
+ "", /* GPIO37 */
+ "", /* GPIO38 */
+ "", /* GPIO39 */
"PWM0_OUT",
- "NC", /* GPIO41 */
- "NC", /* GPIO42 */
- "NC", /* GPIO43 */
- "NC", /* GPIO44 */
+ "", /* GPIO41 */
+ "", /* GPIO42 */
+ "", /* GPIO43 */
+ "", /* GPIO44 */
"PWM1_OUT",
"HDMI_HPD_P",
"SD_CARD_DET",
diff --git a/arch/arm/boot/dts/bcm2835-rpi-b-plus.dts b/arch/arm/boot/dts/bcm2835-rpi-b-plus.dts
index 1b435c64bd9c..7b7c363e5ee8 100644
--- a/arch/arm/boot/dts/bcm2835-rpi-b-plus.dts
+++ b/arch/arm/boot/dts/bcm2835-rpi-b-plus.dts
@@ -34,7 +34,6 @@ &gpio {
* RPI-BPLUS sheet 1
*
* 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
*/
@@ -69,20 +68,20 @@ &gpio {
"GPIO27",
"SDA0",
"SCL0",
- "NC", /* GPIO30 */
+ "", /* GPIO30 */
"LAN_RUN", /* GPIO31 */
"CAM_GPIO1", /* GPIO32 */
- "NC", /* GPIO33 */
- "NC", /* GPIO34 */
+ "", /* GPIO33 */
+ "", /* GPIO34 */
"PWR_LOW_N", /* GPIO35 */
- "NC", /* GPIO36 */
- "NC", /* GPIO37 */
+ "", /* GPIO36 */
+ "", /* GPIO37 */
"USB_LIMIT", /* GPIO38 */
- "NC", /* GPIO39 */
+ "", /* GPIO39 */
"PWM0_OUT", /* GPIO40 */
"CAM_GPIO0", /* GPIO41 */
- "NC", /* GPIO42 */
- "NC", /* GPIO43 */
+ "", /* GPIO42 */
+ "", /* GPIO43 */
"ETHCLK", /* GPIO44 */
"PWM1_OUT", /* GPIO45 */
"HDMI_HPD_N",
diff --git a/arch/arm/boot/dts/bcm2835-rpi-b-rev2.dts b/arch/arm/boot/dts/bcm2835-rpi-b-rev2.dts
index a23c25c00eea..f5b66d3f4ff3 100644
--- a/arch/arm/boot/dts/bcm2835-rpi-b-rev2.dts
+++ b/arch/arm/boot/dts/bcm2835-rpi-b-rev2.dts
@@ -27,7 +27,6 @@ &gpio {
* RPI00022 sheet 02
*
* 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
*/
@@ -43,40 +42,40 @@ &gpio {
"SPI_MISO",
"SPI_MOSI",
"SPI_SCLK",
- "NC", /* GPIO12 */
- "NC", /* GPIO13 */
+ "", /* GPIO12 */
+ "", /* GPIO13 */
/* Serial port */
"TXD0",
"RXD0",
"STATUS_LED_N",
"GPIO17",
"GPIO18",
- "NC", /* GPIO19 */
- "NC", /* GPIO20 */
+ "", /* GPIO19 */
+ "", /* GPIO20 */
"CAM_GPIO",
"GPIO22",
"GPIO23",
"GPIO24",
"GPIO25",
- "NC", /* GPIO26 */
+ "", /* GPIO26 */
"GPIO27",
"GPIO28",
"GPIO29",
"GPIO30",
"GPIO31",
- "NC", /* GPIO32 */
- "NC", /* GPIO33 */
- "NC", /* GPIO34 */
- "NC", /* GPIO35 */
- "NC", /* GPIO36 */
- "NC", /* GPIO37 */
- "NC", /* GPIO38 */
- "NC", /* GPIO39 */
+ "", /* GPIO32 */
+ "", /* GPIO33 */
+ "", /* GPIO34 */
+ "", /* GPIO35 */
+ "", /* GPIO36 */
+ "", /* GPIO37 */
+ "", /* GPIO38 */
+ "", /* GPIO39 */
"PWM0_OUT",
- "NC", /* GPIO41 */
- "NC", /* GPIO42 */
- "NC", /* GPIO43 */
- "NC", /* GPIO44 */
+ "", /* GPIO41 */
+ "", /* GPIO42 */
+ "", /* GPIO43 */
+ "", /* GPIO44 */
"PWM1_OUT",
"HDMI_HPD_P",
"SD_CARD_DET",
diff --git a/arch/arm/boot/dts/bcm2835-rpi-b.dts b/arch/arm/boot/dts/bcm2835-rpi-b.dts
index 25d87212cefd..f589bede2b11 100644
--- a/arch/arm/boot/dts/bcm2835-rpi-b.dts
+++ b/arch/arm/boot/dts/bcm2835-rpi-b.dts
@@ -27,7 +27,6 @@ &gpio {
* RPI00021 sheet 02
*
* 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
*/
@@ -43,40 +42,40 @@ &gpio {
"SPI_MISO",
"SPI_MOSI",
"SPI_SCLK",
- "NC", /* GPIO12 */
- "NC", /* GPIO13 */
+ "", /* GPIO12 */
+ "", /* GPIO13 */
/* Serial port */
"TXD0",
"RXD0",
"STATUS_LED_N",
"GPIO17",
"GPIO18",
- "NC", /* GPIO19 */
- "NC", /* GPIO20 */
+ "", /* GPIO19 */
+ "", /* GPIO20 */
"CAM_GPIO0",
"GPIO22",
"GPIO23",
"GPIO24",
"GPIO25",
- "NC", /* GPIO26 */
+ "", /* GPIO26 */
"GPIO27",
"GPIO28",
"GPIO29",
"GPIO30",
"GPIO31",
- "NC", /* GPIO32 */
- "NC", /* GPIO33 */
- "NC", /* GPIO34 */
- "NC", /* GPIO35 */
- "NC", /* GPIO36 */
- "NC", /* GPIO37 */
- "NC", /* GPIO38 */
- "NC", /* GPIO39 */
+ "", /* GPIO32 */
+ "", /* GPIO33 */
+ "", /* GPIO34 */
+ "", /* GPIO35 */
+ "", /* GPIO36 */
+ "", /* GPIO37 */
+ "", /* GPIO38 */
+ "", /* GPIO39 */
"PWM0_OUT",
- "NC", /* GPIO41 */
- "NC", /* GPIO42 */
- "NC", /* GPIO43 */
- "NC", /* GPIO44 */
+ "", /* GPIO41 */
+ "", /* GPIO42 */
+ "", /* GPIO43 */
+ "", /* GPIO44 */
"PWM1_OUT",
"HDMI_HPD_P",
"SD_CARD_DET",
diff --git a/arch/arm/boot/dts/bcm2835-rpi-cm1-io1.dts b/arch/arm/boot/dts/bcm2835-rpi-cm1-io1.dts
index a75c882e6575..87958a96c3e0 100644
--- a/arch/arm/boot/dts/bcm2835-rpi-cm1-io1.dts
+++ b/arch/arm/boot/dts/bcm2835-rpi-cm1-io1.dts
@@ -13,7 +13,6 @@ &gpio {
* This is based on the official GPU firmware DT blob.
*
* 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
*/
diff --git a/arch/arm/boot/dts/bcm2835-rpi-zero-w.dts b/arch/arm/boot/dts/bcm2835-rpi-zero-w.dts
index 8b043ab62dc8..596bb1ef994e 100644
--- a/arch/arm/boot/dts/bcm2835-rpi-zero-w.dts
+++ b/arch/arm/boot/dts/bcm2835-rpi-zero-w.dts
@@ -39,7 +39,6 @@ &gpio {
* This is based on the official GPU firmware DT blob.
*
* 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
*/
@@ -88,7 +87,7 @@ &gpio {
"SD1_DATA3",
"CAM_GPIO1", /* GPIO40 */
"WL_ON", /* GPIO41 */
- "NC", /* GPIO42 */
+ "", /* GPIO42 */
"WIFI_CLK", /* GPIO43 */
"CAM_GPIO0", /* GPIO44 */
"BT_ON", /* GPIO45 */
diff --git a/arch/arm/boot/dts/bcm2835-rpi-zero.dts b/arch/arm/boot/dts/bcm2835-rpi-zero.dts
index 6f9b3a908f28..a65c2bca69ea 100644
--- a/arch/arm/boot/dts/bcm2835-rpi-zero.dts
+++ b/arch/arm/boot/dts/bcm2835-rpi-zero.dts
@@ -29,7 +29,6 @@ &gpio {
* This is based on the official GPU firmware DT blob.
*
* 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
*/
@@ -64,22 +63,22 @@ &gpio {
"GPIO27",
"SDA0",
"SCL0",
- "NC", /* GPIO30 */
- "NC", /* GPIO31 */
+ "", /* GPIO30 */
+ "", /* GPIO31 */
"CAM_GPIO1", /* GPIO32 */
- "NC", /* GPIO33 */
- "NC", /* GPIO34 */
- "NC", /* GPIO35 */
- "NC", /* GPIO36 */
- "NC", /* GPIO37 */
- "NC", /* GPIO38 */
- "NC", /* GPIO39 */
- "NC", /* GPIO40 */
+ "", /* GPIO33 */
+ "", /* GPIO34 */
+ "", /* GPIO35 */
+ "", /* GPIO36 */
+ "", /* GPIO37 */
+ "", /* GPIO38 */
+ "", /* GPIO39 */
+ "", /* GPIO40 */
"CAM_GPIO0", /* GPIO41 */
- "NC", /* GPIO42 */
- "NC", /* GPIO43 */
- "NC", /* GPIO44 */
- "NC", /* GPIO45 */
+ "", /* GPIO42 */
+ "", /* GPIO43 */
+ "", /* GPIO44 */
+ "", /* GPIO45 */
"HDMI_HPD_N",
"STATUS_LED_N",
/* Used by SD Card */
diff --git a/arch/arm/boot/dts/bcm2836-rpi-2-b.dts b/arch/arm/boot/dts/bcm2836-rpi-2-b.dts
index d8af8eeac7b6..c824a2cea02e 100644
--- a/arch/arm/boot/dts/bcm2836-rpi-2-b.dts
+++ b/arch/arm/boot/dts/bcm2836-rpi-2-b.dts
@@ -34,7 +34,6 @@ &gpio {
* the official GPU firmware DT blob.
*
* 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
*/
diff --git a/arch/arm/boot/dts/bcm2837-rpi-3-a-plus.dts b/arch/arm/boot/dts/bcm2837-rpi-3-a-plus.dts
index d73daf5bff1d..f7222a28903e 100644
--- a/arch/arm/boot/dts/bcm2837-rpi-3-a-plus.dts
+++ b/arch/arm/boot/dts/bcm2837-rpi-3-a-plus.dts
@@ -55,7 +55,6 @@ &gpio {
* This is mostly based on the official GPU firmware DT blob.
*
* 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
*/
diff --git a/arch/arm/boot/dts/bcm2837-rpi-3-b-plus.dts b/arch/arm/boot/dts/bcm2837-rpi-3-b-plus.dts
index c263f5b48b96..fd4ac6f2d077 100644
--- a/arch/arm/boot/dts/bcm2837-rpi-3-b-plus.dts
+++ b/arch/arm/boot/dts/bcm2837-rpi-3-b-plus.dts
@@ -61,7 +61,6 @@ &gpio {
* the official GPU firmware DT blob.
*
* 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
*/
diff --git a/arch/arm/boot/dts/bcm2837-rpi-3-b.dts b/arch/arm/boot/dts/bcm2837-rpi-3-b.dts
index 42b5383b55d8..00ea439d601d 100644
--- a/arch/arm/boot/dts/bcm2837-rpi-3-b.dts
+++ b/arch/arm/boot/dts/bcm2837-rpi-3-b.dts
@@ -54,7 +54,6 @@ &gpio {
* the official GPU firmware DT blob.
*
* 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
*/
diff --git a/arch/arm/boot/dts/bcm2837-rpi-cm3-io3.dts b/arch/arm/boot/dts/bcm2837-rpi-cm3-io3.dts
index 3dfce4312dfc..cf84e69fced8 100644
--- a/arch/arm/boot/dts/bcm2837-rpi-cm3-io3.dts
+++ b/arch/arm/boot/dts/bcm2837-rpi-cm3-io3.dts
@@ -13,7 +13,6 @@ &gpio {
* This is based on the official GPU firmware DT blob.
*
* 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
*/
diff --git a/arch/arm/boot/dts/bcm2837-rpi-cm3.dtsi b/arch/arm/boot/dts/bcm2837-rpi-cm3.dtsi
index 828a20561b96..f57b4ca145dd 100644
--- a/arch/arm/boot/dts/bcm2837-rpi-cm3.dtsi
+++ b/arch/arm/boot/dts/bcm2837-rpi-cm3.dtsi
@@ -41,12 +41,12 @@ expgpio: gpio {
#gpio-cells = <2>;
gpio-line-names = "HDMI_HPD_N",
"EMMC_EN_N",
- "NC",
- "NC",
- "NC",
- "NC",
- "NC",
- "NC";
+ "",
+ "",
+ "",
+ "",
+ "",
+ "";
status = "okay";
};
};
--
2.25.1
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 26+ messages in thread
* [PATCH 6/6] ARM: dts: bcm283x: Align ETH_CLK GPIO line name
2022-04-11 20:01 ` Stefan Wahren
@ 2022-04-11 20:01 ` Stefan Wahren
-1 siblings, 0 replies; 26+ messages in thread
From: Stefan Wahren @ 2022-04-11 20:01 UTC (permalink / raw)
To: Florian Fainelli, Ray Jui, Scott Branden, Rob Herring,
Krzysztof Kozlowski
Cc: bcm-kernel-feedback-list, Nicolas Saenz Julienne, Linus Walleij,
devicetree, linux-rpi-kernel, linux-arm-kernel, Phil Elwell,
Stefan Wahren
From: Phil Elwell <phil@raspberrypi.com>
The GPIO line name ETHCLK is not aligned with the other signals like
WIFI_CLK. Recently this has been fixed in the vendor tree, so upstream
this change.
Signed-off-by: Phil Elwell <phil@raspberrypi.com>
Signed-off-by: Stefan Wahren <stefan.wahren@i2se.com>
---
arch/arm/boot/dts/bcm2835-rpi-b-plus.dts | 2 +-
arch/arm/boot/dts/bcm2836-rpi-2-b.dts | 2 +-
arch/arm/boot/dts/bcm2837-rpi-3-b-plus.dts | 2 +-
arch/arm/boot/dts/bcm2837-rpi-3-b.dts | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/arch/arm/boot/dts/bcm2835-rpi-b-plus.dts b/arch/arm/boot/dts/bcm2835-rpi-b-plus.dts
index 7b7c363e5ee8..248feb2ed23d 100644
--- a/arch/arm/boot/dts/bcm2835-rpi-b-plus.dts
+++ b/arch/arm/boot/dts/bcm2835-rpi-b-plus.dts
@@ -82,7 +82,7 @@ &gpio {
"CAM_GPIO0", /* GPIO41 */
"", /* GPIO42 */
"", /* GPIO43 */
- "ETHCLK", /* GPIO44 */
+ "ETH_CLK", /* GPIO44 */
"PWM1_OUT", /* GPIO45 */
"HDMI_HPD_N",
"STATUS_LED",
diff --git a/arch/arm/boot/dts/bcm2836-rpi-2-b.dts b/arch/arm/boot/dts/bcm2836-rpi-2-b.dts
index c824a2cea02e..3635502b1e0a 100644
--- a/arch/arm/boot/dts/bcm2836-rpi-2-b.dts
+++ b/arch/arm/boot/dts/bcm2836-rpi-2-b.dts
@@ -82,7 +82,7 @@ &gpio {
"CAM_GPIO0",
"SMPS_SCL",
"SMPS_SDA",
- "ETHCLK",
+ "ETH_CLK",
"PWM1_OUT",
"HDMI_HPD_N",
"STATUS_LED",
diff --git a/arch/arm/boot/dts/bcm2837-rpi-3-b-plus.dts b/arch/arm/boot/dts/bcm2837-rpi-3-b-plus.dts
index fd4ac6f2d077..ec721d323ac5 100644
--- a/arch/arm/boot/dts/bcm2837-rpi-3-b-plus.dts
+++ b/arch/arm/boot/dts/bcm2837-rpi-3-b-plus.dts
@@ -109,7 +109,7 @@ &gpio {
"SD1_DATA3",
"PWM0_OUT",
"PWM1_OUT",
- "ETHCLK",
+ "ETH_CLK",
"WIFI_CLK",
"SDA0",
"SCL0",
diff --git a/arch/arm/boot/dts/bcm2837-rpi-3-b.dts b/arch/arm/boot/dts/bcm2837-rpi-3-b.dts
index 00ea439d601d..fb6a417d73e7 100644
--- a/arch/arm/boot/dts/bcm2837-rpi-3-b.dts
+++ b/arch/arm/boot/dts/bcm2837-rpi-3-b.dts
@@ -102,7 +102,7 @@ &gpio {
"SD1_DATA3",
"PWM0_OUT",
"PWM1_OUT",
- "ETHCLK",
+ "ETH_CLK",
"WIFI_CLK",
"SDA0",
"SCL0",
--
2.25.1
^ permalink raw reply related [flat|nested] 26+ messages in thread
* [PATCH 6/6] ARM: dts: bcm283x: Align ETH_CLK GPIO line name
@ 2022-04-11 20:01 ` Stefan Wahren
0 siblings, 0 replies; 26+ messages in thread
From: Stefan Wahren @ 2022-04-11 20:01 UTC (permalink / raw)
To: Florian Fainelli, Ray Jui, Scott Branden, Rob Herring,
Krzysztof Kozlowski
Cc: bcm-kernel-feedback-list, Nicolas Saenz Julienne, Linus Walleij,
devicetree, linux-rpi-kernel, linux-arm-kernel, Phil Elwell,
Stefan Wahren
From: Phil Elwell <phil@raspberrypi.com>
The GPIO line name ETHCLK is not aligned with the other signals like
WIFI_CLK. Recently this has been fixed in the vendor tree, so upstream
this change.
Signed-off-by: Phil Elwell <phil@raspberrypi.com>
Signed-off-by: Stefan Wahren <stefan.wahren@i2se.com>
---
arch/arm/boot/dts/bcm2835-rpi-b-plus.dts | 2 +-
arch/arm/boot/dts/bcm2836-rpi-2-b.dts | 2 +-
arch/arm/boot/dts/bcm2837-rpi-3-b-plus.dts | 2 +-
arch/arm/boot/dts/bcm2837-rpi-3-b.dts | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/arch/arm/boot/dts/bcm2835-rpi-b-plus.dts b/arch/arm/boot/dts/bcm2835-rpi-b-plus.dts
index 7b7c363e5ee8..248feb2ed23d 100644
--- a/arch/arm/boot/dts/bcm2835-rpi-b-plus.dts
+++ b/arch/arm/boot/dts/bcm2835-rpi-b-plus.dts
@@ -82,7 +82,7 @@ &gpio {
"CAM_GPIO0", /* GPIO41 */
"", /* GPIO42 */
"", /* GPIO43 */
- "ETHCLK", /* GPIO44 */
+ "ETH_CLK", /* GPIO44 */
"PWM1_OUT", /* GPIO45 */
"HDMI_HPD_N",
"STATUS_LED",
diff --git a/arch/arm/boot/dts/bcm2836-rpi-2-b.dts b/arch/arm/boot/dts/bcm2836-rpi-2-b.dts
index c824a2cea02e..3635502b1e0a 100644
--- a/arch/arm/boot/dts/bcm2836-rpi-2-b.dts
+++ b/arch/arm/boot/dts/bcm2836-rpi-2-b.dts
@@ -82,7 +82,7 @@ &gpio {
"CAM_GPIO0",
"SMPS_SCL",
"SMPS_SDA",
- "ETHCLK",
+ "ETH_CLK",
"PWM1_OUT",
"HDMI_HPD_N",
"STATUS_LED",
diff --git a/arch/arm/boot/dts/bcm2837-rpi-3-b-plus.dts b/arch/arm/boot/dts/bcm2837-rpi-3-b-plus.dts
index fd4ac6f2d077..ec721d323ac5 100644
--- a/arch/arm/boot/dts/bcm2837-rpi-3-b-plus.dts
+++ b/arch/arm/boot/dts/bcm2837-rpi-3-b-plus.dts
@@ -109,7 +109,7 @@ &gpio {
"SD1_DATA3",
"PWM0_OUT",
"PWM1_OUT",
- "ETHCLK",
+ "ETH_CLK",
"WIFI_CLK",
"SDA0",
"SCL0",
diff --git a/arch/arm/boot/dts/bcm2837-rpi-3-b.dts b/arch/arm/boot/dts/bcm2837-rpi-3-b.dts
index 00ea439d601d..fb6a417d73e7 100644
--- a/arch/arm/boot/dts/bcm2837-rpi-3-b.dts
+++ b/arch/arm/boot/dts/bcm2837-rpi-3-b.dts
@@ -102,7 +102,7 @@ &gpio {
"SD1_DATA3",
"PWM0_OUT",
"PWM1_OUT",
- "ETHCLK",
+ "ETH_CLK",
"WIFI_CLK",
"SDA0",
"SCL0",
--
2.25.1
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 26+ messages in thread
* Re: [PATCH 1/6] ARM: dts: bcm2835-rpi-zero-w: Fix GPIO line name for Wifi/BT
2022-04-11 20:01 ` Stefan Wahren
@ 2022-04-19 18:27 ` Florian Fainelli
-1 siblings, 0 replies; 26+ messages in thread
From: Florian Fainelli @ 2022-04-19 18:27 UTC (permalink / raw)
To: bcm-kernel-feedback-list, Stefan Wahren, Ray Jui, Scott Branden,
Rob Herring, Krzysztof Kozlowski
Cc: Nicolas Saenz Julienne, Linus Walleij, devicetree,
linux-rpi-kernel, linux-arm-kernel, Phil Elwell
On Mon, 11 Apr 2022 22:01:38 +0200, Stefan Wahren <stefan.wahren@i2se.com> wrote:
> From: Phil Elwell <phil@raspberrypi.com>
>
> The GPIOs 30 to 39 are connected to the Cypress CYW43438 (Wifi/BT).
> So fix the GPIO line names accordingly.
>
> Fixes: 2c7c040c73e9 ("ARM: dts: bcm2835: Add Raspberry Pi Zero W")
> Signed-off-by: Phil Elwell <phil@raspberrypi.com>
> Signed-off-by: Stefan Wahren <stefan.wahren@i2se.com>
> ---
Applied to https://github.com/Broadcom/stblinux/commits/devicetree/next, thanks!
--
Florian
^ permalink raw reply [flat|nested] 26+ messages in thread
* Re: [PATCH 1/6] ARM: dts: bcm2835-rpi-zero-w: Fix GPIO line name for Wifi/BT
@ 2022-04-19 18:27 ` Florian Fainelli
0 siblings, 0 replies; 26+ messages in thread
From: Florian Fainelli @ 2022-04-19 18:27 UTC (permalink / raw)
To: bcm-kernel-feedback-list, Stefan Wahren, Ray Jui, Scott Branden,
Rob Herring, Krzysztof Kozlowski
Cc: Nicolas Saenz Julienne, Linus Walleij, devicetree,
linux-rpi-kernel, linux-arm-kernel, Phil Elwell
On Mon, 11 Apr 2022 22:01:38 +0200, Stefan Wahren <stefan.wahren@i2se.com> wrote:
> From: Phil Elwell <phil@raspberrypi.com>
>
> The GPIOs 30 to 39 are connected to the Cypress CYW43438 (Wifi/BT).
> So fix the GPIO line names accordingly.
>
> Fixes: 2c7c040c73e9 ("ARM: dts: bcm2835: Add Raspberry Pi Zero W")
> Signed-off-by: Phil Elwell <phil@raspberrypi.com>
> Signed-off-by: Stefan Wahren <stefan.wahren@i2se.com>
> ---
Applied to https://github.com/Broadcom/stblinux/commits/devicetree/next, thanks!
--
Florian
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 26+ messages in thread
* Re: [PATCH 2/6] ARM: dts: bcm2837-rpi-cm3-io3: Fix GPIO line names for SMPS I2C
2022-04-11 20:01 ` Stefan Wahren
@ 2022-04-19 18:28 ` Florian Fainelli
-1 siblings, 0 replies; 26+ messages in thread
From: Florian Fainelli @ 2022-04-19 18:28 UTC (permalink / raw)
To: bcm-kernel-feedback-list, Stefan Wahren, Ray Jui, Scott Branden,
Rob Herring, Krzysztof Kozlowski
Cc: Nicolas Saenz Julienne, Linus Walleij, devicetree,
linux-rpi-kernel, linux-arm-kernel, Phil Elwell
On Mon, 11 Apr 2022 22:01:39 +0200, Stefan Wahren <stefan.wahren@i2se.com> wrote:
> From: Phil Elwell <phil@raspberrypi.com>
>
> The GPIOs 46 & 47 are already used for a I2C interface to a SMPS.
> So fix the GPIO line names accordingly.
>
> Fixes: a54fe8a6cf66 ("ARM: dts: add Raspberry Pi Compute Module 3 and IO board")
> Signed-off-by: Phil Elwell <phil@raspberrypi.com>
> Signed-off-by: Stefan Wahren <stefan.wahren@i2se.com>
> ---
Applied to https://github.com/Broadcom/stblinux/commits/devicetree/next, thanks!
--
Florian
^ permalink raw reply [flat|nested] 26+ messages in thread
* Re: [PATCH 2/6] ARM: dts: bcm2837-rpi-cm3-io3: Fix GPIO line names for SMPS I2C
@ 2022-04-19 18:28 ` Florian Fainelli
0 siblings, 0 replies; 26+ messages in thread
From: Florian Fainelli @ 2022-04-19 18:28 UTC (permalink / raw)
To: bcm-kernel-feedback-list, Stefan Wahren, Ray Jui, Scott Branden,
Rob Herring, Krzysztof Kozlowski
Cc: Nicolas Saenz Julienne, Linus Walleij, devicetree,
linux-rpi-kernel, linux-arm-kernel, Phil Elwell
On Mon, 11 Apr 2022 22:01:39 +0200, Stefan Wahren <stefan.wahren@i2se.com> wrote:
> From: Phil Elwell <phil@raspberrypi.com>
>
> The GPIOs 46 & 47 are already used for a I2C interface to a SMPS.
> So fix the GPIO line names accordingly.
>
> Fixes: a54fe8a6cf66 ("ARM: dts: add Raspberry Pi Compute Module 3 and IO board")
> Signed-off-by: Phil Elwell <phil@raspberrypi.com>
> Signed-off-by: Stefan Wahren <stefan.wahren@i2se.com>
> ---
Applied to https://github.com/Broadcom/stblinux/commits/devicetree/next, thanks!
--
Florian
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 26+ messages in thread
* Re: [PATCH 3/6] ARM: dts: bcm2837-rpi-3-b-plus: Fix GPIO line name of power LED
2022-04-11 20:01 ` Stefan Wahren
@ 2022-04-19 18:28 ` Florian Fainelli
-1 siblings, 0 replies; 26+ messages in thread
From: Florian Fainelli @ 2022-04-19 18:28 UTC (permalink / raw)
To: bcm-kernel-feedback-list, Stefan Wahren, Ray Jui, Scott Branden,
Rob Herring, Krzysztof Kozlowski
Cc: Nicolas Saenz Julienne, Linus Walleij, devicetree,
linux-rpi-kernel, linux-arm-kernel, Phil Elwell
On Mon, 11 Apr 2022 22:01:40 +0200, Stefan Wahren <stefan.wahren@i2se.com> wrote:
> From: Phil Elwell <phil@raspberrypi.com>
>
> The red LED on the Raspberry Pi 3 B Plus is the power LED.
> So fix the GPIO line name accordingly.
>
> Fixes: 71c0cd2283f2 ("ARM: dts: bcm2837: Add Raspberry Pi 3 B+")
> Signed-off-by: Phil Elwell <phil@raspberrypi.com>
> Signed-off-by: Stefan Wahren <stefan.wahren@i2se.com>
> ---
Applied to https://github.com/Broadcom/stblinux/commits/devicetree/next, thanks!
--
Florian
^ permalink raw reply [flat|nested] 26+ messages in thread
* Re: [PATCH 3/6] ARM: dts: bcm2837-rpi-3-b-plus: Fix GPIO line name of power LED
@ 2022-04-19 18:28 ` Florian Fainelli
0 siblings, 0 replies; 26+ messages in thread
From: Florian Fainelli @ 2022-04-19 18:28 UTC (permalink / raw)
To: bcm-kernel-feedback-list, Stefan Wahren, Ray Jui, Scott Branden,
Rob Herring, Krzysztof Kozlowski
Cc: Nicolas Saenz Julienne, Linus Walleij, devicetree,
linux-rpi-kernel, linux-arm-kernel, Phil Elwell
On Mon, 11 Apr 2022 22:01:40 +0200, Stefan Wahren <stefan.wahren@i2se.com> wrote:
> From: Phil Elwell <phil@raspberrypi.com>
>
> The red LED on the Raspberry Pi 3 B Plus is the power LED.
> So fix the GPIO line name accordingly.
>
> Fixes: 71c0cd2283f2 ("ARM: dts: bcm2837: Add Raspberry Pi 3 B+")
> Signed-off-by: Phil Elwell <phil@raspberrypi.com>
> Signed-off-by: Stefan Wahren <stefan.wahren@i2se.com>
> ---
Applied to https://github.com/Broadcom/stblinux/commits/devicetree/next, thanks!
--
Florian
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 26+ messages in thread
* Re: [PATCH 4/6] ARM: dts: bcm2835-rpi-b: Fix GPIO line names
2022-04-11 20:01 ` Stefan Wahren
@ 2022-04-19 18:28 ` Florian Fainelli
-1 siblings, 0 replies; 26+ messages in thread
From: Florian Fainelli @ 2022-04-19 18:28 UTC (permalink / raw)
To: bcm-kernel-feedback-list, Stefan Wahren, Ray Jui, Scott Branden,
Rob Herring, Krzysztof Kozlowski
Cc: Nicolas Saenz Julienne, Linus Walleij, devicetree,
linux-rpi-kernel, linux-arm-kernel, Phil Elwell
On Mon, 11 Apr 2022 22:01:41 +0200, Stefan Wahren <stefan.wahren@i2se.com> wrote:
> Recently this has been fixed in the vendor tree, so upstream this.
>
> Fixes: 731b26a6ac17 ("ARM: bcm2835: Add names for the Raspberry Pi GPIO lines")
> Signed-off-by: Phil Elwell <phil@raspberrypi.com>
> Signed-off-by: Stefan Wahren <stefan.wahren@i2se.com>
> ---
Applied to https://github.com/Broadcom/stblinux/commits/devicetree/next, thanks!
--
Florian
^ permalink raw reply [flat|nested] 26+ messages in thread
* Re: [PATCH 4/6] ARM: dts: bcm2835-rpi-b: Fix GPIO line names
@ 2022-04-19 18:28 ` Florian Fainelli
0 siblings, 0 replies; 26+ messages in thread
From: Florian Fainelli @ 2022-04-19 18:28 UTC (permalink / raw)
To: bcm-kernel-feedback-list, Stefan Wahren, Ray Jui, Scott Branden,
Rob Herring, Krzysztof Kozlowski
Cc: Nicolas Saenz Julienne, Linus Walleij, devicetree,
linux-rpi-kernel, linux-arm-kernel, Phil Elwell
On Mon, 11 Apr 2022 22:01:41 +0200, Stefan Wahren <stefan.wahren@i2se.com> wrote:
> Recently this has been fixed in the vendor tree, so upstream this.
>
> Fixes: 731b26a6ac17 ("ARM: bcm2835: Add names for the Raspberry Pi GPIO lines")
> Signed-off-by: Phil Elwell <phil@raspberrypi.com>
> Signed-off-by: Stefan Wahren <stefan.wahren@i2se.com>
> ---
Applied to https://github.com/Broadcom/stblinux/commits/devicetree/next, thanks!
--
Florian
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 26+ messages in thread
* Re: [PATCH 5/6] ARM: dts: bcm283x: Remove gpio line name NC
2022-04-11 20:01 ` Stefan Wahren
@ 2022-04-19 18:28 ` Florian Fainelli
-1 siblings, 0 replies; 26+ messages in thread
From: Florian Fainelli @ 2022-04-19 18:28 UTC (permalink / raw)
To: bcm-kernel-feedback-list, Stefan Wahren, Ray Jui, Scott Branden,
Rob Herring, Krzysztof Kozlowski
Cc: Nicolas Saenz Julienne, Linus Walleij, devicetree,
linux-rpi-kernel, linux-arm-kernel
On Mon, 11 Apr 2022 22:01:42 +0200, Stefan Wahren <stefan.wahren@i2se.com> wrote:
> The convention to name not connected GPIOs with NC has never been
> adapted. Also newer Raspberry Pi boards like RPi 4 never did. So fix
> this inconsistency by removing all of the NC names.
>
> Signed-off-by: Stefan Wahren <stefan.wahren@i2se.com>
> ---
Applied to https://github.com/Broadcom/stblinux/commits/devicetree/next, thanks!
--
Florian
^ permalink raw reply [flat|nested] 26+ messages in thread
* Re: [PATCH 5/6] ARM: dts: bcm283x: Remove gpio line name NC
@ 2022-04-19 18:28 ` Florian Fainelli
0 siblings, 0 replies; 26+ messages in thread
From: Florian Fainelli @ 2022-04-19 18:28 UTC (permalink / raw)
To: bcm-kernel-feedback-list, Stefan Wahren, Ray Jui, Scott Branden,
Rob Herring, Krzysztof Kozlowski
Cc: Nicolas Saenz Julienne, Linus Walleij, devicetree,
linux-rpi-kernel, linux-arm-kernel
On Mon, 11 Apr 2022 22:01:42 +0200, Stefan Wahren <stefan.wahren@i2se.com> wrote:
> The convention to name not connected GPIOs with NC has never been
> adapted. Also newer Raspberry Pi boards like RPi 4 never did. So fix
> this inconsistency by removing all of the NC names.
>
> Signed-off-by: Stefan Wahren <stefan.wahren@i2se.com>
> ---
Applied to https://github.com/Broadcom/stblinux/commits/devicetree/next, thanks!
--
Florian
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 26+ messages in thread
* Re: [PATCH 6/6] ARM: dts: bcm283x: Align ETH_CLK GPIO line name
2022-04-11 20:01 ` Stefan Wahren
@ 2022-04-19 18:29 ` Florian Fainelli
-1 siblings, 0 replies; 26+ messages in thread
From: Florian Fainelli @ 2022-04-19 18:29 UTC (permalink / raw)
To: bcm-kernel-feedback-list, Stefan Wahren, Ray Jui, Scott Branden,
Rob Herring, Krzysztof Kozlowski
Cc: Nicolas Saenz Julienne, Linus Walleij, devicetree,
linux-rpi-kernel, linux-arm-kernel, Phil Elwell
On Mon, 11 Apr 2022 22:01:43 +0200, Stefan Wahren <stefan.wahren@i2se.com> wrote:
> From: Phil Elwell <phil@raspberrypi.com>
>
> The GPIO line name ETHCLK is not aligned with the other signals like
> WIFI_CLK. Recently this has been fixed in the vendor tree, so upstream
> this change.
>
> Signed-off-by: Phil Elwell <phil@raspberrypi.com>
> Signed-off-by: Stefan Wahren <stefan.wahren@i2se.com>
> ---
Applied to https://github.com/Broadcom/stblinux/commits/devicetree/next, thanks!
--
Florian
^ permalink raw reply [flat|nested] 26+ messages in thread
* Re: [PATCH 6/6] ARM: dts: bcm283x: Align ETH_CLK GPIO line name
@ 2022-04-19 18:29 ` Florian Fainelli
0 siblings, 0 replies; 26+ messages in thread
From: Florian Fainelli @ 2022-04-19 18:29 UTC (permalink / raw)
To: bcm-kernel-feedback-list, Stefan Wahren, Ray Jui, Scott Branden,
Rob Herring, Krzysztof Kozlowski
Cc: Nicolas Saenz Julienne, Linus Walleij, devicetree,
linux-rpi-kernel, linux-arm-kernel, Phil Elwell
On Mon, 11 Apr 2022 22:01:43 +0200, Stefan Wahren <stefan.wahren@i2se.com> wrote:
> From: Phil Elwell <phil@raspberrypi.com>
>
> The GPIO line name ETHCLK is not aligned with the other signals like
> WIFI_CLK. Recently this has been fixed in the vendor tree, so upstream
> this change.
>
> Signed-off-by: Phil Elwell <phil@raspberrypi.com>
> Signed-off-by: Stefan Wahren <stefan.wahren@i2se.com>
> ---
Applied to https://github.com/Broadcom/stblinux/commits/devicetree/next, thanks!
--
Florian
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 26+ messages in thread
end of thread, other threads:[~2022-04-19 18:47 UTC | newest]
Thread overview: 26+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-04-11 20:01 [PATCH 0/6] ARM: dts: bcm283x: Adjust GPIO line names Stefan Wahren
2022-04-11 20:01 ` Stefan Wahren
2022-04-11 20:01 ` [PATCH 1/6] ARM: dts: bcm2835-rpi-zero-w: Fix GPIO line name for Wifi/BT Stefan Wahren
2022-04-11 20:01 ` Stefan Wahren
2022-04-19 18:27 ` Florian Fainelli
2022-04-19 18:27 ` Florian Fainelli
2022-04-11 20:01 ` [PATCH 2/6] ARM: dts: bcm2837-rpi-cm3-io3: Fix GPIO line names for SMPS I2C Stefan Wahren
2022-04-11 20:01 ` Stefan Wahren
2022-04-19 18:28 ` Florian Fainelli
2022-04-19 18:28 ` Florian Fainelli
2022-04-11 20:01 ` [PATCH 3/6] ARM: dts: bcm2837-rpi-3-b-plus: Fix GPIO line name of power LED Stefan Wahren
2022-04-11 20:01 ` Stefan Wahren
2022-04-19 18:28 ` Florian Fainelli
2022-04-19 18:28 ` Florian Fainelli
2022-04-11 20:01 ` [PATCH 4/6] ARM: dts: bcm2835-rpi-b: Fix GPIO line names Stefan Wahren
2022-04-11 20:01 ` Stefan Wahren
2022-04-19 18:28 ` Florian Fainelli
2022-04-19 18:28 ` Florian Fainelli
2022-04-11 20:01 ` [PATCH 5/6] ARM: dts: bcm283x: Remove gpio line name NC Stefan Wahren
2022-04-11 20:01 ` Stefan Wahren
2022-04-19 18:28 ` Florian Fainelli
2022-04-19 18:28 ` Florian Fainelli
2022-04-11 20:01 ` [PATCH 6/6] ARM: dts: bcm283x: Align ETH_CLK GPIO line name Stefan Wahren
2022-04-11 20:01 ` Stefan Wahren
2022-04-19 18:29 ` Florian Fainelli
2022-04-19 18:29 ` Florian Fainelli
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.