realtek: Switch DGS-1210-10P DTS to gpio.dtsi

The DTS file for the DGS-1210-10P is slightly different from the other
DGS-1210 devices, in that it didn't specify a gpio-restart node when it
was added. The gpio-restart has been found to work on the DGS-1210-10P
as well, so switch it over to the common definitions.

This converts the last device from the product family to the common
definition for the (external) GPIOs.

Tested-by: Michel Thill <jmthill@gmail.com>
Signed-off-by: Sander Vanheule <sander@svanheule.net>

diff --git a/target/linux/realtek/dts/rtl8382_d-link_dgs-1210-10p.dts b/target/linux/realtek/dts/rtl8382_d-link_dgs-1210-10p.dts
index 1aef88afd4e165717a1869414b10558cf8a636a1..9365f94a50094432bb6d3161e281656e4d06ef92 100644 (file)
--- a/target/linux/realtek/dts/rtl8382_d-link_dgs-1210-10p.dts
+++ b/target/linux/realtek/dts/rtl8382_d-link_dgs-1210-10p.dts
@@ -2,6 +2,7 @@
 
 #include "rtl838x.dtsi"
 #include "rtl83xx_d-link_dgs-1210_common.dtsi"
+#include "rtl83xx_d-link_dgs-1210_gpio.dtsi"
 
 / {
        compatible = "d-link,dgs-1210-10p", "realtek,rtl838x-soc";
@@ -43,23 +44,6 @@
                tx-disable-gpio = <&gpio1 12 GPIO_ACTIVE_HIGH>;
        };
 
-       keys {
-               compatible = "gpio-keys-polled";
-               poll-interval = <20>;
-
-               mode {
-                       label = "mode";
-                       gpios = <&gpio1 30 GPIO_ACTIVE_LOW>;
-                       linux,code = <KEY_LIGHTS_TOGGLE>;
-               };
-
-               reset {
-                       label = "reset";
-                       gpios = <&gpio1 33 GPIO_ACTIVE_LOW>;
-                       linux,code = <KEY_RESTART>;
-               };
-       };
-
        leds {
                link_act {
                        label = "green:link_act";
@@ -76,12 +60,13 @@
                        gpios = <&gpio1 27 GPIO_ACTIVE_LOW>;
                };
        };
+};
 
-       gpio1: rtl8231-gpio {
-               compatible = "realtek,rtl8231-gpio";
-               #gpio-cells = <2>;
-               gpio-controller;
-               indirect-access-bus-id = <0>;
+&keys {
+       mode {
+               label = "mode";
+               gpios = <&gpio1 30 GPIO_ACTIVE_LOW>;
+               linux,code = <KEY_LIGHTS_TOGGLE>;
        };
 };