ipq40xx: convert GL-AP1300 to DSA

[openwrt/staging/dedeckeh.git] / target / linux / ipq40xx / files / arch / arm / boot / dts / qcom-ipq4018-gl-ap1300.dts

diff --git a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-gl-ap1300.dts b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-gl-ap1300.dts
index 3fd5406d39798270524b7eb88579d059ddb88079..6f5d4d8a5784f3aab5da92fd2b166f9f7f96889e 100644 (file)
--- a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-gl-ap1300.dts
+++ b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-gl-ap1300.dts
@@ -22,7 +22,7 @@
        };
 
        chosen {
-               bootargs-append = " ubi.mtd=ubi root=/dev/ubiblock0_1 clk_ignore_unused";
+               bootargs-append = " ubi.mtd=ubi root=/dev/ubiblock0_1";
        };
 
        soc {
@@ -34,10 +34,6 @@
                        status = "okay";
                };
 
-               ess-psgmii@98000 {
-                       status = "okay";
-               };
-
                tcsr@1949000 {
                        compatible = "qcom,tcsr";
                        reg = <0x1949000 0x100>;
@@ -79,16 +75,6 @@
                watchdog@b017000 {
                        status = "okay";
                };
-
-               ess-switch@c000000 {
-                       status = "okay";
-                       switch_lan_bmp = <0x18>;
-                       switch_wan_bmp = <0x20>;
-               };
-
-               edma@c080000 {
-                       status = "okay";
-               };
        };
 
        keys {
@@ -105,13 +91,13 @@
                compatible = "gpio-leds";
 
                led_power: power {
-                       label = "green:power";
+                       label = "white:power";
                        gpios = <&tlmm 2 GPIO_ACTIVE_HIGH>;
                        default-state = "on";
                };
 
                wan {
-                       label = "green:wan";
+                       label = "white:wan";
                        gpios = <&tlmm 3 GPIO_ACTIVE_HIGH>;
                };
        };
@@ -189,6 +175,25 @@
                                label = "ART";
                                reg = <0x00170000 0x00010000>;
                                read-only;
+                               compatible = "nvmem-cells";
+                               #address-cells = <1>;
+                               #size-cells = <1>;
+
+                               macaddr_art_0: mac-address@0 {
+                                       reg = <0x0 0x6>;
+                               };
+
+                               macaddr_art_6: mac-address@6 {
+                                       reg = <0x6 0x6>;
+                               };
+
+                               precal_art_1000: precal@1000 {
+                                       reg = <0x1000 0x2f20>;
+                               };
+
+                               precal_art_5000: precal@5000 {
+                                       reg = <0x5000 0x2f20>;
+                               };
                        };
                };
        };
@@ -258,12 +263,40 @@
        status = "okay";
 };
 
+&gmac {
+       status = "okay";
+};
+
+&switch {
+       status = "okay";
+};
+
+&swport4 {
+       status = "okay";
+       label = "lan";
+
+       nvmem-cells = <&macaddr_art_0>;
+       nvmem-cell-names = "mac-address";
+};
+
+&swport5 {
+       status = "okay";
+       label = "wan";
+
+       nvmem-cells = <&macaddr_art_6>;
+       nvmem-cell-names = "mac-address";
+};
+
 &wifi0 {
        status = "okay";
+       nvmem-cell-names = "pre-calibration";
+       nvmem-cells = <&precal_art_1000>;
        qcom,ath10k-calibration-variant = "GL-AP1300";
 };
 
 &wifi1 {
        status = "okay";
+       nvmem-cell-names = "pre-calibration";
+       nvmem-cells = <&precal_art_5000>;
        qcom,ath10k-calibration-variant = "GL-AP1300";
 };