mediatek: use mac-base

[openwrt/staging/hauke.git] / target / linux / mediatek / dts / mt7622-xiaomi-redmi-router-ax6s.dts

diff --git a/target/linux/mediatek/dts/mt7622-xiaomi-redmi-router-ax6s.dts b/target/linux/mediatek/dts/mt7622-xiaomi-redmi-router-ax6s.dts
index 933d2c9275e0ee76f708628bd4ceab7771dff0d3..dcf851b2740a38f6a7aaec2f7844038a85cfdaf6 100644 (file)
--- a/target/linux/mediatek/dts/mt7622-xiaomi-redmi-router-ax6s.dts
+++ b/target/linux/mediatek/dts/mt7622-xiaomi-redmi-router-ax6s.dts
@@ -146,9 +146,8 @@
 
                phy-connection-type = "2500base-x";
 
-               nvmem-cells = <&macaddr_factory_4>;
+               nvmem-cells = <&macaddr_factory_4 (-1)>;
                nvmem-cell-names = "mac-address";
-               mac-address-increment = <(-1)>;
 
                fixed-link {
                        speed = <2500>;
@@ -196,7 +195,6 @@
 
                                port@6 {
                                        reg = <6>;
-                                       label = "cpu";
                                        ethernet = <&gmac0>;
                                        phy-mode = "2500base-x";
 
@@ -211,94 +209,108 @@
        };
 };
 
-&snand {
+&bch {
+       status = "okay";
+};
+
+&snfi {
        pinctrl-names = "default";
        pinctrl-0 = <&serial_nand_pins>;
        status = "okay";
 
-       mediatek,bmt-v2;
-       mediatek,bmt-table-size = <0x1000>;
-       mediatek,bmt-remap-range = <0x0 0x6c0000>;
+       flash@0 {
+               compatible = "spi-nand";
+               reg = <0>;
+               spi-tx-bus-width = <4>;
+               spi-rx-bus-width = <4>;
+               nand-ecc-engine = <&snfi>;
 
-       partitions {
-               compatible = "fixed-partitions";
-               #address-cells = <1>;
-               #size-cells = <1>;
+               mediatek,bmt-v2;
+               mediatek,bmt-table-size = <0x1000>;
+               mediatek,bmt-remap-range = <0x0 0x6c0000>;
 
-               partition@0 {
-                       label = "Preloader";
-                       reg = <0x0 0x80000>;
-                       read-only;
-               };
+               partitions {
+                       compatible = "fixed-partitions";
+                       #address-cells = <1>;
+                       #size-cells = <1>;
 
-               partition@80000 {
-                       label = "ATF";
-                       reg = <0x80000 0x40000>;
-                       read-only;
-               };
+                       partition@0 {
+                               label = "Preloader";
+                               reg = <0x0 0x80000>;
+                               read-only;
+                       };
 
-               partition@c0000 {
-                       label = "u-boot";
-                       reg = <0xc0000 0x80000>;
-                       read-only;
-               };
+                       partition@80000 {
+                               label = "ATF";
+                               reg = <0x80000 0x40000>;
+                               read-only;
+                       };
 
-               partition@140000 {
-                       label = "u-boot-env";
-                       reg = <0x140000 0x40000>;
-               };
+                       partition@c0000 {
+                               label = "u-boot";
+                               reg = <0xc0000 0x80000>;
+                               read-only;
+                       };
 
-               partition@180000 {
-                       label = "bdata";
-                       reg = <0x180000 0x40000>;
-               };
+                       partition@140000 {
+                               label = "u-boot-env";
+                               reg = <0x140000 0x40000>;
+                       };
 
-               factory: partition@1c0000 {
-                       label = "factory";
-                       reg = <0x1c0000 0x80000>;
-                       read-only;
+                       partition@180000 {
+                               label = "bdata";
+                               reg = <0x180000 0x40000>;
+                       };
 
-                       compatible = "nvmem-cells";
-                       #address-cells = <1>;
-                       #size-cells = <1>;
+                       factory: partition@1c0000 {
+                               label = "factory";
+                               reg = <0x1c0000 0x80000>;
+                               read-only;
 
-                       macaddr_factory_4: macaddr@4 {
-                               reg = <0x4 0x6>;
-                       };
-               };
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
 
-               partition@240000 {
-                       label = "crash";
-                       reg = <0x240000 0x40000>;
-                       read-only;
-               };
+                                       macaddr_factory_4: macaddr@4 {
+                                               compatible = "mac-base";
+                                               reg = <0x4 0x6>;
+                                               #nvmem-cell-cells = <1>;
+                                       };
+                               };
+                       };
 
-               partition@280000 {
-                       label = "crash_log";
-                       reg = <0x280000 0x40000>;
-                       read-only;
-               };
+                       partition@240000 {
+                               label = "crash";
+                               reg = <0x240000 0x40000>;
+                               read-only;
+                       };
 
-               /* Shrunk and renamed from "firmware"
-                * as to not break luci size checks
-                */
-               partition@2c0000 {
-                       label = "kernel";
-                       compatible = "denx,fit";
-                       reg = <0x2c0000 0x400000>;
-               };
+                       partition@280000 {
+                               label = "crash_log";
+                               reg = <0x280000 0x40000>;
+                               read-only;
+                       };
 
+                       /* Shrunk and renamed from "firmware"
+                        * as to not break luci size checks
+                        */
+                       partition@2c0000 {
+                               label = "kernel";
+                               reg = <0x2c0000 0x400000>;
+                       };
 
-               /* ubi partition is the result of squashing
-                * consecutive stock partitions:
-                * - firmware (partially)
-                * - firmware1
-                * - overlay
-                * - obr
-                */
-               partition@6c0000 {
-                       label = "ubi";
-                       reg = <0x6C0000 0x6f00000>;
+                       /* ubi partition is the result of squashing
+                        * consecutive stock partitions:
+                        * - firmware (partially)
+                        * - firmware1
+                        * - overlay
+                        * - obr
+                        */
+                       partition@6c0000 {
+                               label = "ubi";
+                               reg = <0x6C0000 0x6f00000>;
+                       };
                };
        };
 };
@@ -317,6 +329,7 @@
                reg = <0x0000 0 0 0 0>;
                mediatek,mtd-eeprom = <&factory 0x5000>;
                ieee80211-freq-limit = <5000000 6000000>;
+               mediatek,disable-radar-background;
        };
 };