Revert "mediatek: backport mt7622 dts fix for mt7531 switch id to 6.1"

[openwrt/openwrt.git] / target / linux / ath79 / dts / qca9558_dlink_dap-2695-a1.dts

diff --git a/target/linux/ath79/dts/qca9558_dlink_dap-2695-a1.dts b/target/linux/ath79/dts/qca9558_dlink_dap-2695-a1.dts
index 53b1e03da6346b36f12822c12470b12abf6d429d..6f23fbec46489c059aaa6966f8fcb644522cff01 100644 (file)
--- a/target/linux/ath79/dts/qca9558_dlink_dap-2695-a1.dts
+++ b/target/linux/ath79/dts/qca9558_dlink_dap-2695-a1.dts
@@ -1,9 +1,8 @@
 // SPDX-License-Identifier: GPL-2.0-or-later OR MIT
 
-#include "qca955x.dtsi"
+#include <dt-bindings/leds/common.h>
 
-#include <dt-bindings/gpio/gpio.h>
-#include <dt-bindings/input/input.h>
+#include "qca955x_dlink_dap-2xxx.dtsi"
 
 / {
        compatible = "dlink,dap-2695-a1", "qca,qca9558";
@@ -20,13 +19,15 @@
                compatible = "gpio-leds";
 
                led_power_green: power_green {
-                       label = "green:power";
+                       function = LED_FUNCTION_POWER;
+                       color = <LED_COLOR_ID_GREEN>;
                        gpios = <&gpio 23 GPIO_ACTIVE_LOW>;
                        default-state = "on";
                };
 
                led_power_red: power_red {
-                       label = "red:power";
+                       function = LED_FUNCTION_POWER;
+                       color = <LED_COLOR_ID_RED>;
                        gpios = <&gpio 14 GPIO_ACTIVE_LOW>;
                };
 
@@ -48,69 +49,23 @@
        };
 };
 
-&spi {
-       status = "okay";
+&partitions {
+       partition@70000 {
+               label = "firmware";
+               reg = <0x070000 0xf00000>;
+               compatible = "wrg";
+       };
 
-       flash@0 {
-               #address-cells = <1>;
-               #size-cells = <1>;
-               compatible = "mx25l12805d";
-               reg = <0>;
-               spi-max-frequency = <50000000>;
-
-               partitions {
-                       compatible = "fixed-partitions";
-                       #address-cells = <1>;
-                       #size-cells = <1>;
-
-                       partition@0 {
-                               label = "u-boot";
-                               reg = <0x000000 0x040000>;
-                               read-only;
-                       };
-
-                       partition@40000 {
-                               label = "bdcfg";
-                               reg = <0x040000 0x010000>;
-                               read-only;
-                       };
-
-                       partition@50000 {
-                               label = "rgdb";
-                               reg = <0x050000 0x010000>;
-                               read-only;
-                       };
-
-                       partition@60000 {
-                               label = "langpack";
-                               reg = <0x060000 0x010000>;
-                               read-only;
-                       };
-
-                       partition@70000 {
-                               compatible = "wrg";
-                               label = "firmware";
-                               reg = <0x070000 0xf00000>;
-                       };
-
-                       partition@f70000 {
-                               label = "captival";
-                               reg = <0xf70000 0x070000>;
-                               read-only;
-                       };
-
-                       partition@fe0000 {
-                               label = "certificate";
-                               reg = <0xfe0000 0x010000>;
-                               read-only;
-                       };
-
-                       art: partition@ff0000 {
-                               label = "art";
-                               reg = <0xff0000 0x010000>;
-                               read-only;
-                       };
-               };
+       partition@f70000 {
+               label = "captival";
+               reg = <0xf70000 0x070000>;
+               read-only;
+       };
+
+       partition@fe0000 {
+               label = "certificate";
+               reg = <0xfe0000 0x010000>;
+               read-only;
        };
 };
 
@@ -144,7 +99,6 @@
 &eth1 {
        status = "okay";
 
-       phy-mask = <0>;
        pll-data = <0x03000101 0x00000101 0x00001616>;
 
        fixed-link {
@@ -155,10 +109,28 @@
 
 &pcie0 {
        status = "okay";
+
+       wifi@0,0 {
+               compatible = "qcom,ath10k";
+               reg = <0 0 0 0 0>;
+
+               nvmem-cells = <&cal_ath10k>;
+               nvmem-cell-names = "calibration";
+       };
 };
 
-&wmac {
-       status = "okay";
+&art {
+       nvmem-layout {
+               compatible = "fixed-layout";
+               #address-cells = <1>;
+               #size-cells = <1>;
 
-       qca,no-eeprom;
+               cal_ath9k: calibration@1000 {
+                       reg = <0x1000 0x440>;
+               };
+
+               cal_ath10k: calibration@5000 {
+                       reg = <0x5000 0x844>;
+               };
+       };
 };