lantiq: remove mac-address-increment

[openwrt/staging/hauke.git] / target / linux / lantiq / files / arch / mips / boot / dts / lantiq / ar9_avm_fritz7320.dts

diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/ar9_avm_fritz7320.dts b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/ar9_avm_fritz7320.dts
index 9fbac6fa1298aaae313a56eefb34c6b951b64468..b04efd8a846cc4b48010e8e84464c5dd00fe93cc 100644 (file)
--- a/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/ar9_avm_fritz7320.dts
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/ar9_avm_fritz7320.dts
@@ -1,6 +1,7 @@
 #include "ar9.dtsi"
 
 #include <dt-bindings/input/input.h>
+#include <dt-bindings/mtd/partitions/uimage.h>
 
 / {
        compatible = "avm,fritz7320", "lantiq,xway", "lantiq,ar9";
@@ -69,12 +70,73 @@
                        gpios = <&gpio 45 GPIO_ACTIVE_LOW>;
                };
        };
+
+       usb0_vbus: regulator-usb0-vbus {
+               compatible = "regulator-fixed";
+
+               regulator-name = "USB0_VBUS";
+
+               regulator-min-microvolt = <5000000>;
+               regulator-max-microvolt = <5000000>;
+
+               gpio = <&gpio 50 GPIO_ACTIVE_HIGH>;
+               enable-active-high;
+       };
+
+       usb1_vbus: regulator-usb1-vbus {
+               compatible = "regulator-fixed";
+
+               regulator-name = "USB1_VBUS";
+
+               regulator-min-microvolt = <5000000>;
+               regulator-max-microvolt = <5000000>;
+
+               gpio = <&gpio 51 GPIO_ACTIVE_HIGH>;
+               enable-active-high;
+       };
 };
 
 &gsw {
        phy-mode = "mii";
-       mtd-mac-address = <&ath9k_cal 0xa91>;
-       mtd-mac-address-increment = <(-2)>;
+       phy-handle = <&phy0>;
+       nvmem-cells = <&macaddr_ath9k_cal_a91 (-2)>;
+       nvmem-cell-names = "mac-address";
+
+       mdio-bus {
+               #address-cells = <1>;
+               #size-cells = <0>;
+
+               phy0: ethernet-phy@0 {
+                       reg = <0>;
+                       reset-gpios = <&gpio 36 GPIO_ACTIVE_LOW>;
+               };
+       };
+};
+
+&gpio {
+       pinctrl-names = "default";
+       pinctrl-0 = <&state_default>;
+
+       state_default: pinmux {
+               phy-rst {
+                       lantiq,pins = "io36";
+                       lantiq,pull = <0>;
+                       lantiq,open-drain;
+                       lantiq,output = <1>;
+               };
+               usb0_vbus {
+                       lantiq,pins = "io50";
+                       lantiq,pull = <0>;
+                       lantiq,open-drain = <0>;
+                       lantiq,output = <1>;
+               };
+               usb1_vbus {
+                       lantiq,pins = "io51";
+                       lantiq,pull = <0>;
+                       lantiq,open-drain = <0>;
+                       lantiq,output = <1>;
+               };
+       };
 };
 
 &localbus {
@@ -92,11 +154,26 @@
                                label = "urlader";
                                reg = <0x00000 0x20000>;
                                read-only;
+
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       macaddr_ath9k_cal_a91: macaddr@a91 {
+                                               compatible = "mac-base";
+                                               reg = <0xa91 0x6>;
+                                               #nvmem-cell-cells = <1>;
+                                       };
+                               };
                        };
 
                        partition@20000 {
+                               compatible = "openwrt,uimage", "denx,uimage";
                                label = "firmware";
                                reg = <0x20000 0xf60000>;
+                               openwrt,ih-magic = <IH_MAGIC_OKLI>;
+                               openwrt,offset = <0x11000>;
                        };
 
                        partition@f80000 {
@@ -142,8 +219,10 @@
 
 &usb0 {
        status = "okay";
+       vbus-supply = <&usb0_vbus>;
 };
 
 &usb1 {
        status = "okay";
+       vbus-supply = <&usb1_vbus>;
 };