ARM: dts: aspeed: bletchley: Use generic node names

Use generic node names to fix dt-schema warnings:
- spi1_gpio: rename to generic "spi" node name
- LED nodes: rename to led-N and move names to label properties
- GPIO key nodes: add "-switch" suffix to node names

Signed-off-by: Cosmo Chou <chou.cosmo@gmail.com>
Signed-off-by: Andrew Jeffery <andrew@codeconstruct.com.au>

diff --git a/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-bletchley.dts b/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-bletchley.dts
index abdb1562115ac0ac2d9a8ef71fa02fd916526555..9cb01381e4827f9e205a1afd0c51312467090acd 100644 (file)
--- a/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-bletchley.dts
+++ b/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-bletchley.dts
@@ -34,7 +34,7 @@
                        <&adc1 4>, <&adc1 5>, <&adc1 6>, <&adc1 7>;
        };
 
-       spi1_gpio: spi1-gpio {
+       spi1_gpio: spi {
                compatible = "spi-gpio";
                #address-cells = <1>;
                #size-cells = <0>;
@@ -54,7 +54,8 @@
 
        front_gpio_leds {
                compatible = "gpio-leds";
-               sys_log_id {
+               led-0 {
+                       label = "sys_log_id";
                        default-state = "off";
                        gpios = <&front_leds 0 GPIO_ACTIVE_LOW>;
                };
@@ -62,42 +63,50 @@
 
        fan_gpio_leds {
                compatible = "gpio-leds";
-               fan0_blue {
+               led-0 {
+                       label = "fan0_blue";
                        retain-state-shutdown;
                        default-state = "on";
                        gpios = <&fan_leds 8 GPIO_ACTIVE_HIGH>;
                };
-               fan1_blue {
+               led-1 {
+                       label = "fan1_blue";
                        retain-state-shutdown;
                        default-state = "on";
                        gpios = <&fan_leds 9 GPIO_ACTIVE_HIGH>;
                };
-               fan2_blue {
+               led-2 {
+                       label = "fan2_blue";
                        retain-state-shutdown;
                        default-state = "on";
                        gpios = <&fan_leds 10 GPIO_ACTIVE_HIGH>;
                };
-               fan3_blue {
+               led-3 {
+                       label = "fan3_blue";
                        retain-state-shutdown;
                        default-state = "on";
                        gpios = <&fan_leds 11 GPIO_ACTIVE_HIGH>;
                };
-               fan0_amber {
+               led-4 {
+                       label = "fan0_amber";
                        retain-state-shutdown;
                        default-state = "off";
                        gpios = <&fan_leds 12 GPIO_ACTIVE_HIGH>;
                };
-               fan1_amber {
+               led-5 {
+                       label = "fan1_amber";
                        retain-state-shutdown;
                        default-state = "off";
                        gpios = <&fan_leds 13 GPIO_ACTIVE_HIGH>;
                };
-               fan2_amber {
+               led-6 {
+                       label = "fan2_amber";
                        retain-state-shutdown;
                        default-state = "off";
                        gpios = <&fan_leds 14 GPIO_ACTIVE_HIGH>;
                };
-               fan3_amber {
+               led-7 {
+                       label = "fan3_amber";
                        retain-state-shutdown;
                        default-state = "off";
                        gpios = <&fan_leds 15 GPIO_ACTIVE_HIGH>;
@@ -106,12 +115,14 @@
 
        sled1_gpio_leds {
                compatible = "gpio-leds";
-               sled1_amber {
+               led-0 {
+                       label = "sled1_amber";
                        retain-state-shutdown;
                        default-state = "keep";
                        gpios = <&sled1_leds 0 GPIO_ACTIVE_LOW>;
                };
-               sled1_blue {
+               led-1 {
+                       label = "sled1_blue";
                        retain-state-shutdown;
                        default-state = "keep";
                        gpios = <&sled1_leds 1 GPIO_ACTIVE_LOW>;
@@ -120,12 +131,14 @@
 
        sled2_gpio_leds {
                compatible = "gpio-leds";
-               sled2_amber {
+               led-0 {
+                       label = "sled2_amber";
                        retain-state-shutdown;
                        default-state = "keep";
                        gpios = <&sled2_leds 0 GPIO_ACTIVE_LOW>;
                };
-               sled2_blue {
+               led-1 {
+                       label = "sled2_blue";
                        retain-state-shutdown;
                        default-state = "keep";
                        gpios = <&sled2_leds 1 GPIO_ACTIVE_LOW>;
@@ -134,12 +147,14 @@
 
        sled3_gpio_leds {
                compatible = "gpio-leds";
-               sled3_amber {
+               led-0 {
+                       label = "sled3_amber";
                        retain-state-shutdown;
                        default-state = "keep";
                        gpios = <&sled3_leds 0 GPIO_ACTIVE_LOW>;
                };
-               sled3_blue {
+               led-1 {
+                       label = "sled3_blue";
                        retain-state-shutdown;
                        default-state = "keep";
                        gpios = <&sled3_leds 1 GPIO_ACTIVE_LOW>;
@@ -148,12 +163,14 @@
 
        sled4_gpio_leds {
                compatible = "gpio-leds";
-               sled4_amber {
+               led-0 {
+                       label = "sled4_amber";
                        retain-state-shutdown;
                        default-state = "keep";
                        gpios = <&sled4_leds 0 GPIO_ACTIVE_LOW>;
                };
-               sled4_blue {
+               led-1 {
+                       label = "sled4_blue";
                        retain-state-shutdown;
                        default-state = "keep";
                        gpios = <&sled4_leds 1 GPIO_ACTIVE_LOW>;
@@ -162,12 +179,14 @@
 
        sled5_gpio_leds {
                compatible = "gpio-leds";
-               sled5_amber {
+               led-0 {
+                       label = "sled5_amber";
                        retain-state-shutdown;
                        default-state = "keep";
                        gpios = <&sled5_leds 0 GPIO_ACTIVE_LOW>;
                };
-               sled5_blue {
+               led-1 {
+                       label = "sled5_blue";
                        retain-state-shutdown;
                        default-state = "keep";
                        gpios = <&sled5_leds 1 GPIO_ACTIVE_LOW>;
@@ -176,12 +195,14 @@
 
        sled6_gpio_leds {
                compatible = "gpio-leds";
-               sled6_amber {
+               led-0 {
+                       label = "sled6_amber";
                        retain-state-shutdown;
                        default-state = "keep";
                        gpios = <&sled6_leds 0 GPIO_ACTIVE_LOW>;
                };
-               sled6_blue {
+               led-1 {
+                       label = "sled6_blue";
                        retain-state-shutdown;
                        default-state = "keep";
                        gpios = <&sled6_leds 1 GPIO_ACTIVE_LOW>;
@@ -191,32 +212,32 @@
        gpio-keys {
                compatible = "gpio-keys";
 
-               presence-sled1 {
+               presence-sled1-switch {
                        label = "presence-sled1";
                        gpios = <&gpio0 ASPEED_GPIO(H, 2) GPIO_ACTIVE_LOW>;
                        linux,code = <ASPEED_GPIO(H, 2)>;
                };
-               presence-sled2 {
+               presence-sled2-switch {
                        label = "presence-sled2";
                        gpios = <&gpio0 ASPEED_GPIO(H, 3) GPIO_ACTIVE_LOW>;
                        linux,code = <ASPEED_GPIO(H, 3)>;
                };
-               presence-sled3 {
+               presence-sled3-switch {
                        label = "presence-sled3";
                        gpios = <&gpio0 ASPEED_GPIO(H, 4) GPIO_ACTIVE_LOW>;
                        linux,code = <ASPEED_GPIO(H, 4)>;
                };
-               presence-sled4 {
+               presence-sled4-switch {
                        label = "presence-sled4";
                        gpios = <&gpio0 ASPEED_GPIO(H, 5) GPIO_ACTIVE_LOW>;
                        linux,code = <ASPEED_GPIO(H, 5)>;
                };
-               presence-sled5 {
+               presence-sled5-switch {
                        label = "presence-sled5";
                        gpios = <&gpio0 ASPEED_GPIO(H, 6) GPIO_ACTIVE_LOW>;
                        linux,code = <ASPEED_GPIO(H, 6)>;
                };
-               presence-sled6 {
+               presence-sled6-switch {
                        label = "presence-sled6";
                        gpios = <&gpio0 ASPEED_GPIO(H, 7) GPIO_ACTIVE_LOW>;
                        linux,code = <ASPEED_GPIO(H, 7)>;