lantiq: rename gphy firmware

[openwrt/openwrt.git] / target / linux / lantiq / dts / FRITZ3370.dts

diff --git a/target/linux/lantiq/dts/FRITZ3370.dts b/target/linux/lantiq/dts/FRITZ3370.dts
index 35880f5e20d014f1a152e6e61ad5f7f4a9351061..ef3655de61cba323c1597754a243571d33b55720 100644 (file)
--- a/target/linux/lantiq/dts/FRITZ3370.dts
+++ b/target/linux/lantiq/dts/FRITZ3370.dts
@@ -1,9 +1,12 @@
 /dts-v1/;
 
-/include/ "vr9.dtsi"
+#include "vr9.dtsi"
+
+#include <dt-bindings/input/input.h>
 
 / {
-       model = "FRITZ3370 - Fritz!Box WLAN 3370";
+       compatible = "avm,fritz3370", "lantiq,xway", "lantiq,vr9";
+       model = "Fritz!Box WLAN 3370";
 
        chosen {
                bootargs = "console=ttyLTQ0,115200 ubi.mtd=1,512 root=/dev/mtdblock9";
@@ -26,7 +29,7 @@
        fpi@10000000 {
                localbus@0 {
                        nand-parts@0 {
-                               compatible = "gen_nand", "lantiq,nand-xway";
+                               compatible = "lantiq,nand-xway";
                                bank-width = <2>;
                                reg = <1 0x0 0x2000000>;
                                #address-cells = <1>;
@@ -110,22 +113,15 @@
 
                ifxhcd@E101000 {
                        status = "okay";
-                       gpios = <&gpio 5 0
-                               &gpio 14 0>;
+                       gpios = <&gpio 5 GPIO_ACTIVE_HIGH
+                               &gpio 14 GPIO_ACTIVE_HIGH>;
                        lantiq,portmask = <0x3>;
                };
        };
 
-       ath9k_eep {
-               compatible = "ath9k,eeprom";
-               ath,eep-flash = <&ath9k_cal 0x985>;
-               ath,eep-endian;
-               ath,eep-swap;
-       };
-
        gphy-xrx200 {
                compatible = "lantiq,phy-xrx200";
-               firmware = "lantiq/vr9_phy11g_a1x.bin";
+               firmware = "lantiq/xrx200_phy11g_a14.bin";
                phys = [ 00 01 ];
        };
 
@@ -136,13 +132,13 @@
                poll-interval = <100>;
                power {
                        label = "power";
-                       gpios = <&gpio 1 0>;
-                       linux,code = <0x100>;
+                       gpios = <&gpio 1 GPIO_ACTIVE_HIGH>;
+                       linux,code = <KEY_POWER>;
                };
 /*             wifi {
                        label = "wifi";
-                       gpios = <&gpio 29 0>;
-                       linux,code = <0x101>;
+                       gpios = <&gpio 29 GPIO_ACTIVE_HIGH>;
+                       linux,code = <BTN_1>;
                };*/
        };
 
@@ -151,32 +147,32 @@
 
                power_green: power {
                        label = "fritz3370:green:power";
-                       gpios = <&gpio 32 1>;
+                       gpios = <&gpio 32 GPIO_ACTIVE_LOW>;
                        default-state = "keep";
                };
                power_red: power2 {
                        label = "fritz3370:red:power";
-                       gpios = <&gpio 33 1>;
+                       gpios = <&gpio 33 GPIO_ACTIVE_LOW>;
                };
                info_red {
                        label = "fritz3370:red:info";
-                       gpios = <&gpio 34 1>;
+                       gpios = <&gpio 34 GPIO_ACTIVE_LOW>;
                };
                wifi: wifi {
                        label = "fritz3370:green:wlan";
-                       gpios = <&gpio 35 1>;
+                       gpios = <&gpio 35 GPIO_ACTIVE_LOW>;
                };
                dsl: dsl {
                        label = "fritz3370:green:dsl";
-                       gpios = <&gpio 36 1>;
+                       gpios = <&gpio 36 GPIO_ACTIVE_LOW>;
                };
                lan {
                        label = "fritz3370:green:lan";
-                       gpios = <&gpio 38 1>;
+                       gpios = <&gpio 38 GPIO_ACTIVE_LOW>;
                };
                info_green: info_green {
                        label = "fritz3370:green:info";
-                       gpios = <&gpio 47 1>;
+                       gpios = <&gpio 47 GPIO_ACTIVE_LOW>;
                };
        };
 };
@@ -194,7 +190,7 @@
                reg = <4 0>;
                spi-max-frequency = <1000000>;
 
-               ath9k_cal: partition@0 {
+               urlader: partition@0 {
                        reg = <0x0 0x20000>;
                        label = "urlader";
                        read-only;
@@ -220,7 +216,8 @@
                #address-cells = <1>;
                #size-cells = <0>;
                reg = <0>;
-               mac-address = [ 00 11 22 33 44 55 ];
+               mtd-mac-address = <&urlader 0x987>;
+               mtd-mac-address-increment = <(-2)>;
                lantiq,switch;
 
                ethernet@0 {
@@ -228,14 +225,14 @@
                        reg = <0>;
                        phy-mode = "rgmii";
                        phy-handle = <&phy0>;
-                       gpios = <&gpio 37 0>;
+                       gpios = <&gpio 37 GPIO_ACTIVE_HIGH>;
                };
                ethernet@1 {
                        compatible = "lantiq,xrx200-pdi-port";
                        reg = <1>;
                        phy-mode = "rgmii";
                        phy-handle = <&phy1>;
-                       gpios = <&gpio 44 0>;
+                       gpios = <&gpio 44 GPIO_ACTIVE_HIGH>;
                };
                ethernet@2 {
                        compatible = "lantiq,xrx200-pdi-port";
@@ -273,3 +270,19 @@
                };
        };
 };
+
+&pcie0 {
+       pcie@0 {
+               reg = <0 0 0 0 0>;
+               #interrupt-cells = <1>;
+               #size-cells = <2>;
+               #address-cells = <3>;
+               device_type = "pci";
+
+               wifi@0,0 {
+                       compatible = "pci0,0";
+                       reg = <0 0 0 0 0>;
+                       qca,no-eeprom; /* load from ath9k-eeprom-pci-0000:01:00.0.bin */
+               };
+       };
+};