ipq806x: remove mac-address-increment

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

diff --git a/target/linux/ipq806x/files/arch/arm/boot/dts/qcom-ipq8064-unifi-ac-hd.dts b/target/linux/ipq806x/files/arch/arm/boot/dts/qcom-ipq8064-unifi-ac-hd.dts
index 70c51b90f316b33ea18bb69a10746f2eabbf81ac..fac41897d4fcb2ebc5efa6c1771377839b97af99 100644 (file)
--- a/target/linux/ipq806x/files/arch/arm/boot/dts/qcom-ipq8064-unifi-ac-hd.dts
+++ b/target/linux/ipq806x/files/arch/arm/boot/dts/qcom-ipq8064-unifi-ac-hd.dts
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-2.0-or-later OR MIT
 
-#include "qcom-ipq8064-v2.0.dtsi"
+#include "qcom-ipq8064-v2.0-smb208.dtsi"
 
 #include <dt-bindings/gpio/gpio.h>
 #include <dt-bindings/input/input.h>
@@ -16,8 +16,8 @@
                led-running = &led_dome_blue;
                led-upgrade = &led_dome_blue;
                mdio-gpio0 = &mdio0;
-               ethernet0 = &gmac1;
-               ethernet1 = &gmac2;
+               ethernet0 = &gmac2;
+               ethernet1 = &gmac1;
        };
 
        leds {
@@ -46,6 +46,7 @@
                        gpios = <&qcom_pinmux 68 GPIO_ACTIVE_LOW>;
                        linux,code = <KEY_RESTART>;
                        debounce-interval = <60>;
+                       wakeup-source;
                };
        };
 };
@@ -178,6 +179,20 @@
                                        label = "EEPROM";
                                        reg = <0x1c0000 0x10000>;
                                        read-only;
+
+                                       nvmem-layout {
+                                               compatible = "fixed-layout";
+                                               #address-cells = <1>;
+                                               #size-cells = <1>;
+
+                                               macaddr_eeprom_0: macaddr@0 {
+                                                       reg = <0x0 0x6>;
+                                               };
+
+                                               macaddr_eeprom_6: macaddr@6 {
+                                                       reg = <0x6 0x6>;
+                                               };
+                                       };
                                };
 
                                partition@1d0000 {
@@ -217,11 +232,9 @@
        status = "okay";
 };
 
-&nand_controller {
+&nand {
        status = "okay";
 
-       pinctrl-0 = <&nand_pins>;
-       pinctrl-names = "default";
        nand-ecc-strength = <4>;
        nand-bus-width = <8>;
 };
@@ -249,7 +262,8 @@
        phy-mode = "sgmii";
        qcom,id = <1>;
 
-       mtd-mac-address = <&eeprom 0x6>;
+       nvmem-cells = <&macaddr_eeprom_6>;
+       nvmem-cell-names = "mac-address";
 };
 
 &gmac2 {
@@ -260,7 +274,8 @@
        phy-mode = "sgmii";
        qcom,id = <2>;
 
-       mtd-mac-address = <&eeprom 0x0>;
+       nvmem-cells = <&macaddr_eeprom_0>;
+       nvmem-cell-names = "mac-address";
 };
 
 &pcie0 {