ipq40xx: remove mac-address-increment

[openwrt/staging/hauke.git] / target / linux / ipq40xx / files / arch / arm / boot / dts / qcom-ipq4029-insect-common.dtsi

diff --git a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4029-insect-common.dtsi b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4029-insect-common.dtsi
index 47646e4b3cd9104410913550f91b0293aaea009a..dbf6c14b7246d5b64137304072b7ab10c55e8b38 100644 (file)
--- a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4029-insect-common.dtsi
+++ b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4029-insect-common.dtsi
@@ -86,19 +86,6 @@
                watchdog@b017000 {
                        status = "okay";
                };
-
-               ess-switch@c000000 {
-                       switch_mac_mode = <0x3>; /* mac mode for RGMII RMII */
-                       switch_lan_bmp = <0x0>; /* lan port bitmap */
-                       switch_wan_bmp = <0x10>; /* wan port bitmap */
-               };
-
-               edma@c080000 {
-                       qcom,single-phy;
-                       qcom,num_gmac = <1>;
-                       phy-mode = "rgmii-rxid";
-                       status = "okay";
-               };
        };
 
        keys {
@@ -136,21 +123,24 @@
        status = "okay";
 };
 
-&gmac0 {
-       qcom,phy_mdio_addr = <1>;
-       qcom,poll_required = <1>;
-       vlan_tag = <0 0x20>;
-};
-
 &blsp1_i2c3 {
        pinctrl-0 = <&i2c_0_pins>;
        pinctrl-names = "default";
        status = "okay";
-       at24@50 {
+
+       eeprom@50 {
                compatible = "atmel,24c64";
                pagesize = <32>;
                reg = <0x50>;
                read-only; /* This holds our MAC & Meraki board-data */
+               #address-cells = <1>;
+               #size-cells = <1>;
+
+               mac_address: mac-address@66 {
+                       compatible = "mac-base";
+                       reg = <0x66 0x6>;
+                       #nvmem-cell-cells = <1>;
+               };
        };
 };
 
@@ -296,6 +286,8 @@
                        compatible = "qcom,ath10k";
                        status = "okay";
                        reg = <0x00010000 0 0 0 0>;
+                       nvmem-cells = <&mac_address 1>;
+                       nvmem-cell-names = "mac-address";
                };
        };
 };
@@ -399,9 +391,53 @@
 &wifi0 {
        status = "okay";
        qcom,ath10k-calibration-variant = "Meraki-MR33";
+       nvmem-cells = <&mac_address 2>;
+       nvmem-cell-names = "mac-address";
 };
 
 &wifi1 {
        status = "okay";
        qcom,ath10k-calibration-variant = "Meraki-MR33";
+       nvmem-cells = <&mac_address 3>;
+       nvmem-cell-names = "mac-address";
+};
+
+&gmac {
+       status = "okay";
+       nvmem-cells = <&mac_address 0>;
+       nvmem-cell-names = "mac-address";
+};
+
+&switch {
+       status = "okay";
+
+       /delete-property/ psgmii-ethphy;
+};
+
+&swport5 {
+       status = "okay";
+
+       label = "lan";
+       phy-handle = <&ethphy1>;
+       phy-mode = "rgmii-rxid";
+};
+
+&ethphy0 {
+       status = "disabled";
+};
+
+&ethphy2 {
+       status = "disabled";
+};
+
+&ethphy3 {
+       status = "disabled";
+};
+
+&ethphy4 {
+       status = "disabled";
+};
+
+&psgmiiphy {
+       status = "disabled";
 };