ARM: dts: bcm283x: Remove gpio line name NC

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>
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>

diff --git a/arch/arm/boot/dts/bcm2835-rpi-a-plus.dts b/arch/arm/boot/dts/bcm2835-rpi-a-plus.dts
index 40b9405..9b9a18b 100644 (file)
--- a/arch/arm/boot/dts/bcm2835-rpi-a-plus.dts
+++ b/arch/arm/boot/dts/bcm2835-rpi-a-plus.dts
@@ -32,7 +32,6 @@
         * 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 @@
                          "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 11edb58..f664e4f 100644 (file)
--- a/arch/arm/boot/dts/bcm2835-rpi-a.dts
+++ b/arch/arm/boot/dts/bcm2835-rpi-a.dts
@@ -26,7 +26,6 @@
         * 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 @@
                          "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 1b435c6..7b7c363 100644 (file)
--- a/arch/arm/boot/dts/bcm2835-rpi-b-plus.dts
+++ b/arch/arm/boot/dts/bcm2835-rpi-b-plus.dts
@@ -34,7 +34,6 @@
         * 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 @@
                          "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 a23c25c..f5b66d3 100644 (file)
--- a/arch/arm/boot/dts/bcm2835-rpi-b-rev2.dts
+++ b/arch/arm/boot/dts/bcm2835-rpi-b-rev2.dts
@@ -27,7 +27,6 @@
         * 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 @@
                          "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 25d8721..f589bed 100644 (file)
--- a/arch/arm/boot/dts/bcm2835-rpi-b.dts
+++ b/arch/arm/boot/dts/bcm2835-rpi-b.dts
@@ -27,7 +27,6 @@
         * 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 @@
                          "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 a75c882..87958a9 100644 (file)
--- a/arch/arm/boot/dts/bcm2835-rpi-cm1-io1.dts
+++ b/arch/arm/boot/dts/bcm2835-rpi-cm1-io1.dts
@@ -13,7 +13,6 @@
         * 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 8b043ab..596bb1e 100644 (file)
--- a/arch/arm/boot/dts/bcm2835-rpi-zero-w.dts
+++ b/arch/arm/boot/dts/bcm2835-rpi-zero-w.dts
@@ -39,7 +39,6 @@
         * 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 @@
                          "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 6f9b3a9..a65c2bc 100644 (file)
--- a/arch/arm/boot/dts/bcm2835-rpi-zero.dts
+++ b/arch/arm/boot/dts/bcm2835-rpi-zero.dts
@@ -29,7 +29,6 @@
         * 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 @@
                          "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 d8af8ee..c824a2c 100644 (file)
--- a/arch/arm/boot/dts/bcm2836-rpi-2-b.dts
+++ b/arch/arm/boot/dts/bcm2836-rpi-2-b.dts
@@ -34,7 +34,6 @@
         * 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 d73daf5..f7222a2 100644 (file)
--- 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 @@
         * 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 c263f5b..fd4ac6f 100644 (file)
--- 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 @@
         * 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 42b5383..00ea439 100644 (file)
--- a/arch/arm/boot/dts/bcm2837-rpi-3-b.dts
+++ b/arch/arm/boot/dts/bcm2837-rpi-3-b.dts
@@ -54,7 +54,6 @@
         * 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 3dfce43..cf84e69 100644 (file)
--- a/arch/arm/boot/dts/bcm2837-rpi-cm3-io3.dts
+++ b/arch/arm/boot/dts/bcm2837-rpi-cm3-io3.dts
@@ -13,7 +13,6 @@
         * 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 828a205..f57b4ca 100644 (file)
--- a/arch/arm/boot/dts/bcm2837-rpi-cm3.dtsi
+++ b/arch/arm/boot/dts/bcm2837-rpi-cm3.dtsi
@@ -41,12 +41,12 @@
                #gpio-cells = <2>;
                gpio-line-names = "HDMI_HPD_N",
                                  "EMMC_EN_N",
-                                 "NC",
-                                 "NC",
-                                 "NC",
-                                 "NC",
-                                 "NC",
-                                 "NC";
+                                 "",
+                                 "",
+                                 "",
+                                 "",
+                                 "",
+                                 "";
                status = "okay";
        };
 };