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 47829a08aa2701ad3a6798479f75cf5d7b300098..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
@@ -199,21 +199,19 @@ switch@10 {
                                phy-handle = <&phy_port5>;
                        };
 
-                       /*
                        port@6 {
-                               reg = <0>;
+                               reg = <6>;
                                label = "cpu";
                                ethernet = <&gmac2>;
-                               phy-mode = "rgmii";
+                               phy-mode = "sgmii";
+                               qca,sgmii-enable-pll;
+                               qca,sgmii-rxclk-falling-edge;
 
                                fixed-link {
                                        speed = <1000>;
                                        full-duplex;
-                                       pause;
-                                       asym-pause;
                                };
                        };
-                       */
                };
 
                mdio {
@@ -362,22 +360,47 @@ switch@10 {
                                        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_1000: precal@1000 {
+                                                       reg = <0x1000 0x2f20>;
+                                               };
 
-                                       precal_ART_5000: precal@5000 {
-                                               reg = <0x5000 0x2f20>;
+                                               precal_ART_5000: precal@5000 {
+                                                       reg = <0x5000 0x2f20>;
+                                               };
                                        };
                                };
 
@@ -524,25 +547,3 @@ switch@10 {
                };
        };
 };
-
-&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>;
-       };
-};