lantiq: fix avm fritz box mac addresses

[openwrt/staging/florian.git] / target / linux / lantiq / dts / FRITZ7320.dts

diff --git a/target/linux/lantiq/dts/FRITZ7320.dts b/target/linux/lantiq/dts/FRITZ7320.dts
index 9884038867bbc5bd3f5fa366ef0c2bbff7d3aaaa..491baee7ea9a1c0e884a13df67175833e60f59c8 100644 (file)
--- a/target/linux/lantiq/dts/FRITZ7320.dts
+++ b/target/linux/lantiq/dts/FRITZ7320.dts
@@ -2,11 +2,13 @@
 
 #include "ar9.dtsi"
 
+#include <dt-bindings/input/input.h>
+
 / {
        model = "FRITZ7320 - 1&1 HomeServer";
 
        chosen {
-               bootargs = "console=ttyLTQ0,115200 init=/etc/preinit";
+               bootargs = "console=ttyLTQ0,115200";
        };
 
        aliases {
@@ -63,14 +65,6 @@
                        };
                };
 
-               ath9k_eep {
-                       compatible = "ath9k,eeprom";
-                       ath,eep-flash = <&ath9k_cal 0x985>;
-                       ath,device-id = /bits/ 16 <0xff1d 0x2d>;
-                       ath,eep-endian;
-                       ath,eep-swap;
-               };
-
                gpio: pinmux@E100B10 {
                        pinctrl-names = "default";
                        pinctrl-0 = <&state_default>;
@@ -96,22 +90,13 @@
 
                etop@E180000 {
                        phy-mode = "mii";
-                       mac-address = [ 00 11 22 33 44 55 ];
+                       mtd-mac-address = <&ath9k_cal 0xa91>;
+                       mtd-mac-address-increment = <(-2)>;
                };
 
                ifxhcd@E101000 {
                        status = "okay";
                };
-
-               pci@E105400 {
-                       status = "okay";
-                       req-mask = <0xf>;
-                       lantiq,bus-clock = <33333333>;
-                       interrupt-map-mask = <0xf800 0x0 0x0 0x7>;
-                       interrupt-map = <0x7000 0 0 1 &icu0 30 1>;
-                       gpio-reset = <&gpio 21 GPIO_ACTIVE_HIGH>;
-                       req-mask = <0xf>; /* GNT1 */
-               };
        };
 
        gpio-keys-polled {
@@ -128,7 +113,7 @@
                dect {
                        label = "dect";
                        gpios = <&gpio 2 GPIO_ACTIVE_LOW>;
-                       linux,code = <BTN_2>;
+                       linux,code = <KEY_PHONE>;
                };
        };
 
@@ -161,3 +146,15 @@
                };
        };
 };
+
+&pci0 {
+       status = "okay";
+       req-mask = <0xf>;
+       gpio-reset = <&gpio 21 GPIO_ACTIVE_HIGH>;
+
+       wifi@0,0 {
+               compatible = "pci0,0";
+               reg = <0x7000 0 0 0 0>;
+               qca,no-eeprom; /* load from ath9k-eeprom-pci-0000:00:0e.0.bin */
+       };
+};