ARM: dts: aspeed: tacoma: Fix gpio-key definitions

This patch was applied twice.

Signed-off-by: Joel Stanley <joel@jms.id.au>

diff --git a/arch/arm/boot/dts/aspeed-bmc-opp-tacoma.dts b/arch/arm/boot/dts/aspeed-bmc-opp-tacoma.dts
index ff1538cf9d51c87ca9d82d1ff3b696b51cc4e444..b70087c591da9a871909c8e5107488d751a3bc20 100644 (file)
--- a/arch/arm/boot/dts/aspeed-bmc-opp-tacoma.dts
+++ b/arch/arm/boot/dts/aspeed-bmc-opp-tacoma.dts
@@ -84,65 +84,6 @@
                };
        };
 
-       gpio-keys {
-               compatible = "gpio-keys";
-
-               air-water {
-                       label = "air-water";
-                       gpios = <&gpio0 ASPEED_GPIO(Q, 7) GPIO_ACTIVE_LOW>;
-                       linux,code = <ASPEED_GPIO(Q, 7)>;
-               };
-
-               checkstop {
-                       label = "checkstop";
-                       gpios = <&gpio0 ASPEED_GPIO(E, 3) GPIO_ACTIVE_LOW>;
-                       linux,code = <ASPEED_GPIO(E, 3)>;
-               };
-
-               ps0-presence {
-                       label = "ps0-presence";
-                       gpios = <&gpio0 ASPEED_GPIO(H, 3) GPIO_ACTIVE_LOW>;
-                       linux,code = <ASPEED_GPIO(H, 3)>;
-               };
-
-               ps1-presence {
-                       label = "ps1-presence";
-                       gpios = <&gpio0 ASPEED_GPIO(E, 5) GPIO_ACTIVE_LOW>;
-                       linux,code = <ASPEED_GPIO(E, 5)>;
-               };
-       };
-
-       gpio-keys-polled {
-               compatible = "gpio-keys-polled";
-               #address-cells = <1>;
-               #size-cells = <0>;
-               poll-interval = <1000>;
-
-               fan0-presence {
-                       label = "fan0-presence";
-                       gpios = <&pca0 4 GPIO_ACTIVE_LOW>;
-                       linux,code = <4>;
-               };
-
-               fan1-presence {
-                       label = "fan1-presence";
-                       gpios = <&pca0 5 GPIO_ACTIVE_LOW>;
-                       linux,code = <5>;
-               };
-
-               fan2-presence {
-                       label = "fan2-presence";
-                       gpios = <&pca0 6 GPIO_ACTIVE_LOW>;
-                       linux,code = <6>;
-               };
-
-               fan3-presence {
-                       label = "fan3-presence";
-                       gpios = <&pca0 7 GPIO_ACTIVE_LOW>;
-                       linux,code = <7>;
-               };
-       };
-
        iio-hwmon-dps310 {
                compatible = "iio-hwmon";
                io-channels = <&dps 0>;