ipq806x: remove mac-address-increment

[openwrt/staging/hauke.git] / target / linux / ipq806x / files / arch / arm / boot / dts / qcom-ipq8064-wg2600hp.dts

diff --git a/target/linux/ipq806x/files/arch/arm/boot/dts/qcom-ipq8064-wg2600hp.dts b/target/linux/ipq806x/files/arch/arm/boot/dts/qcom-ipq8064-wg2600hp.dts
index 431c9cd9af84805701a1d4995f2526322bb6d745..a376eb0e2fe9255e6b1b05a6d601534f2a5296b5 100644 (file)
--- a/target/linux/ipq806x/files/arch/arm/boot/dts/qcom-ipq8064-wg2600hp.dts
+++ b/target/linux/ipq806x/files/arch/arm/boot/dts/qcom-ipq8064-wg2600hp.dts
@@ -141,20 +141,103 @@
        pinctrl-0 = <&mdio0_pins>;
        pinctrl-names = "default";
 
-       ethernet-phy@0 {
-               reg = <0>;
-               qca,ar8327-initvals = <
-                       0x00004 0x06000000  /* PAD0_MODE */
-                       0x0000c 0x00080080  /* PAD6_MODE */
-                       0x000e4 0x0006a545  /* MAC_POWER_SEL */
-                       0x000e0 0xc74164de  /* SGMII_CTRL */
-                       0x0007c 0x0000004e  /* PORT0_STATUS */
-                       0x00094 0x0000004e  /* PORT6_STATUS */
-                       >;
-       };
+switch@10 {
+               compatible = "qca,qca8337";
+               #address-cells = <1>;
+               #size-cells = <0>;
+               reg = <0x10>;
+
+               ports {
+                       #address-cells = <1>;
+                       #size-cells = <0>;
+
+                       port@0 {
+                               reg = <0>;
+                               label = "cpu";
+                               ethernet = <&gmac1>;
+                               phy-mode = "rgmii";
+                               tx-internal-delay-ps = <1000>;
+
+                               fixed-link {
+                                       speed = <1000>;
+                                       full-duplex;
+                               };
+                       };
+
+                       port@1 {
+                               reg = <1>;
+                               label = "wan";
+                               phy-mode = "internal";
+                               phy-handle = <&phy_port1>;
+                       };
+
+                       port@2 {
+                               reg = <2>;
+                               label = "lan1";
+                               phy-mode = "internal";
+                               phy-handle = <&phy_port2>;
+                       };
+
+                       port@3 {
+                               reg = <3>;
+                               label = "lan2";
+                               phy-mode = "internal";
+                               phy-handle = <&phy_port3>;
+                       };
+
+                       port@4 {
+                               reg = <4>;
+                               label = "lan3";
+                               phy-mode = "internal";
+                               phy-handle = <&phy_port4>;
+                       };
+
+                       port@5 {
+                               reg = <5>;
+                               label = "lan4";
+                               phy-mode = "internal";
+                               phy-handle = <&phy_port5>;
+                       };
+
+                       port@6 {
+                               reg = <6>;
+                               label = "cpu";
+                               ethernet = <&gmac2>;
+                               phy-mode = "sgmii";
+                               qca,sgmii-enable-pll;
+                               qca,sgmii-rxclk-falling-edge;
+
+                               fixed-link {
+                                       speed = <1000>;
+                                       full-duplex;
+                               };
+                       };
+               };
+
+               mdio {
+                       #address-cells = <1>;
+                       #size-cells = <0>;
+
+                       phy_port1: phy@0 {
+                               reg = <0>;
+                       };
+
+                       phy_port2: phy@1 {
+                               reg = <1>;
+                       };
+
+                       phy_port3: phy@2 {
+                               reg = <2>;
+                       };
+
+                       phy_port4: phy@3 {
+                               reg = <3>;
+                       };
 
-       ethernet-phy@4 {
-               reg = <4>;
+                       phy_port5: phy@4 {
+                               reg = <4>;
+                       };
+               };
        };
 };
 
@@ -277,22 +360,47 @@
                                        label = "PRODUCTDATA";
                                        reg = <0x2b0000 0x30000>;
                                        read-only;
+
+                                       nvmem-layout {
+                                               compatible = "fixed-layout";
+                                               #address-cells = <1>;
+                                               #size-cells = <1>;
+
+                                               macaddr_PRODUCTDATA_0: macaddr@0 {
+                                                       reg = <0x0 0x6>;
+                                               };
+
+                                               macaddr_PRODUCTDATA_6: macaddr@6 {
+                                                       reg = <0x6 0x6>;
+                                               };
+
+                                               macaddr_PRODUCTDATA_c: macaddr@c {
+                                                       reg = <0xc 0x6>;
+                                               };
+
+                                               macaddr_PRODUCTDATA_12: macaddr@12 {
+                                                       reg = <0x12 0x6>;
+                                               };
+                                       };
                                };
 
                                ART@2e0000 {
                                        label = "ART";
                                        reg = <0x2e0000 0x40000>;
                                        read-only;
-                                       compatible = "nvmem-cells";
-                                       #address-cells = <1>;
-                                       #size-cells = <1>;
 
-                                       precal_ART_1000: precal@1000 {
-                                               reg = <0x1000 0x2f20>;
-                                       };
+                                       nvmem-layout {
+                                               compatible = "fixed-layout";
+                                               #address-cells = <1>;
+                                               #size-cells = <1>;
 
-                                       precal_ART_5000: precal@5000 {
-                                               reg = <0x5000 0x2f20>;
+                                               precal_ART_1000: precal@1000 {
+                                                       reg = <0x1000 0x2f20>;
+                                               };
+
+                                               precal_ART_5000: precal@5000 {
+                                                       reg = <0x5000 0x2f20>;
+                                               };
                                        };
                                };
 
@@ -439,25 +547,3 @@
                };
        };
 };
-
-&PRODUCTDATA {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       macaddr_PRODUCTDATA_0: macaddr@0 {
-               reg = <0x0 0x6>;
-       };
-
-       macaddr_PRODUCTDATA_6: macaddr@6 {
-               reg = <0x6 0x6>;
-       };
-
-       macaddr_PRODUCTDATA_c: macaddr@c {
-               reg = <0xc 0x6>;
-       };
-
-       macaddr_PRODUCTDATA_12: macaddr@12 {
-               reg = <0x12 0x6>;
-       };
-};