kernel: bump 4.14 to 4.14.41

[oweals/openwrt.git] / target / linux / ramips / dts / CY-SWR1100.dts

diff --git a/target/linux/ramips/dts/CY-SWR1100.dts b/target/linux/ramips/dts/CY-SWR1100.dts
index 031d8f00523e6c7b7d2cc93db463cfe5f9807aea..b5b594bf59ae421cc24a4d6727a2305e91e03804 100644 (file)
--- a/target/linux/ramips/dts/CY-SWR1100.dts
+++ b/target/linux/ramips/dts/CY-SWR1100.dts
@@ -2,8 +2,11 @@
 
 #include "rt3883.dtsi"
 
+#include <dt-bindings/gpio/gpio.h>
+#include <dt-bindings/input/input.h>
+
 / {
-       compatible = "CY-SWR1100", "ralink,rt3883-soc";
+       compatible = "samsung,cy-swr1100", "ralink,rt3883-soc";
        model = "Samsung CY-SWR1100";
 
        nor-flash@1c000000 {
@@ -50,8 +53,8 @@
 
        rtl8367 {
                compatible = "realtek,rtl8367";
-               gpio-sda = <&gpio0 1 0>;
-               gpio-sck = <&gpio0 2 0>;
+               gpio-sda = <&gpio0 1 GPIO_ACTIVE_HIGH>;
+               gpio-sck = <&gpio0 2 GPIO_ACTIVE_HIGH>;
                realtek,extif0 = <1 0 1 1 1 1 1 1 2>;
        };
 
@@ -63,14 +66,14 @@
 
                reset {
                        label = "reset";
-                       gpios = <&gpio0 6 1>;
-                       linux,code = <0x198>;
+                       gpios = <&gpio0 6 GPIO_ACTIVE_LOW>;
+                       linux,code = <KEY_RESTART>;
                };
 
                wps {
                        label = "wps";
-                       gpios = <&gpio0 3 1>;
-                       linux,code = <0x211>;
+                       gpios = <&gpio0 3 GPIO_ACTIVE_LOW>;
+                       linux,code = <KEY_WPS_BUTTON>;
                };
        };
 
@@ -79,12 +82,12 @@
 
                wps {
                        label = "cy-swr1100:blue:wps";
-                       gpios = <&gpio0 0 1>;
+                       gpios = <&gpio0 0 GPIO_ACTIVE_LOW>;
                };
 
                usb {
                        label = "cy-swr1100:blue:usb";
-                       gpios = <&gpio1 1 1>;
+                       gpios = <&gpio1 1 GPIO_ACTIVE_LOW>;
                };
        };
 };
@@ -125,11 +128,11 @@
                pci-bridge@1 {
                        status = "okay";
 
-                       wmac@0,0 {
+                       wifi@0,0 {
+                               compatible = "pci0,0";
+                               reg = <0x10000 0 0 0 0>;
                                ralink,5ghz = <0>;
-                               compatible = "ralink,rt2880-pci", "pciclass060400", "pciclass0604";
-                               reg = < 0x10000 0 0 0 0 >;
-                               ralink,eeprom = "rt2x00pci_1_0.eeprom";
+                               ralink,mtd-eeprom = <&factory 0x2000>;
                        };
                };
        };