ath79: fix nanobeam ac ethernet interface

[openwrt/openwrt.git] / target / linux / ath79 / dts / ar9344_netgear_wndr.dtsi

diff --git a/target/linux/ath79/dts/ar9344_netgear_wndr.dtsi b/target/linux/ath79/dts/ar9344_netgear_wndr.dtsi
index 16a4e3f6e86b39a6f1ef103b99af9db683d6227f..92b0beccd7c957be165e3e3da7d1bd7126cdb577 100644 (file)
--- a/target/linux/ath79/dts/ar9344_netgear_wndr.dtsi
+++ b/target/linux/ath79/dts/ar9344_netgear_wndr.dtsi
@@ -1,11 +1,10 @@
 // SPDX-License-Identifier: GPL-2.0-or-later OR MIT
-/dts-v1/;
+
+#include "ar9344.dtsi"
 
 #include <dt-bindings/gpio/gpio.h>
 #include <dt-bindings/input/input.h>
 
-#include "ar9344.dtsi"
-
 / {
        chosen {
                bootargs = "console=ttyS0,115200n8";
@@ -41,60 +40,59 @@
                };
        };
 
-       leds {
+       leds: leds {
                compatible = "gpio-leds";
 
                pinctrl-names = "default";
                pinctrl-0 = <&enable_gpio_11>;
 
                led_power_green: power_green {
-                       label = "netgear:green:power";
+                       label = "green:power";
                        gpios = <&gpio 0 GPIO_ACTIVE_LOW>;
                };
 
                led_power_amber: power_amber {
-                       label = "netgear:amber:power";
+                       label = "amber:power";
                        gpios = <&gpio 2 GPIO_ACTIVE_LOW>;
                        default-state = "keep";
                };
 
-               wan_green {
-                       label = "netgear:green:wan";
-                       gpios = <&gpio 1 GPIO_ACTIVE_LOW>;
-               };
-
-               wan_amber {
-                       label = "netgear:amber:wan";
-                       gpios = <&gpio 3 GPIO_ACTIVE_LOW>;
-               };
-
                wlan2g_green {
-                       label = "netgear:green:wlan2g";
+                       label = "green:wlan2g";
                        gpios = <&gpio 11 GPIO_ACTIVE_LOW>;
                        linux,default-trigger = "phy0tpt";
                };
 
                wlan5g_blue {
-                       label = "netgear:blue:wlan5g";
+                       label = "blue:wlan5g";
                        gpios = <&gpio 14 GPIO_ACTIVE_LOW>;
                        linux,default-trigger = "phy1tpt";
                };
 
                wps_green {
-                       label = "netgear:green:wps";
+                       label = "green:wps";
                        gpios = <&gpio 16 GPIO_ACTIVE_LOW>;
                };
 
                wps_amber {
-                       label = "netgear:amber:wps";
+                       label = "amber:wps";
                        gpios = <&gpio 17 GPIO_ACTIVE_LOW>;
                };
+       };
 
-               usb_green {
-                       label = "netgear:green:usb";
-                       gpios = <&gpio 13 GPIO_ACTIVE_LOW>;
-                       trigger-sources = <&hub_port>;
-                       linux,default-trigger = "usbport";
+       ubi-concat {
+               compatible = "mtd-concat";
+               devices = <&ubipart0 &ubipart1>;
+
+               partitions {
+                       compatible = "fixed-partitions";
+                       #address-cells = <1>;
+                       #size-cells = <1>;
+
+                       ubi@ac0000 {
+                               label = "ubi";
+                               reg = <0x0 0x7500000>;
+                       };
                };
        };
 };
@@ -124,7 +122,7 @@
                        reg = <0x40000 0x40000>;
                };
 
-               art: partition@80000 {
+               caldata: partition@80000 {
                        label = "caldata";
                        reg = <0x80000 0x40000>;
                        read-only;
@@ -152,12 +150,12 @@
 
                kernel@6c0000 {
                        label = "kernel";
-                       reg = <0x6c0000 0x200000>;
+                       reg = <0x6c0000 0x400000>;
                };
 
-               ubi@8c0000 {
-                       label = "ubi";
-                       reg = <0x8c0000 0x1700000>;
+               ubipart0: partition@ac0000 {
+                       label = "ubipart0";
+                       reg = <0xac0000 0x1500000>;
                };
 
                partition@6c0000 {
@@ -172,10 +170,9 @@
                        read-only;
                };
 
-               partition@2000000 {
-                       label = "reserved";
+               ubipart1: partition@2000000 {
+                       label = "ubipart1";
                        reg = <0x2000000 0x6000000>;
-                       read-only;
                };
        };
 };
@@ -219,15 +216,13 @@
        /* default for ar934x, except for 1000M */
        pll-data = <0x06000000 0x00000101 0x00001616>;
 
-       mtd-mac-address = <&art 0x0>;
+       mtd-mac-address = <&caldata 0x0>;
 
        phy-mode = "rgmii";
        phy-handle = <&phy0>;
 };
 
 &gpio {
-       status = "okay";
-
        lna0 {
                gpio-hog;
                line-name = "netgear:ext:lna0";
@@ -246,7 +241,7 @@
 &wmac {
        status = "okay";
 
-       mtd-mac-address = <&art 0x0>;
+       mtd-mac-address = <&caldata 0x0>;
        qca,no-eeprom;
 };
 
@@ -256,32 +251,10 @@
        ath9k: wifi@0,0 {
                compatible = "pci168c,0033";
                reg = <0x0000 0 0 0 0>;
-               mtd-mac-address = <&art 0xc>;
+               mtd-mac-address = <&caldata 0xc>;
                qca,no-eeprom;
                #gpio-cells = <2>;
                gpio-controller;
-
-               usb_power {
-                       gpio-hog;
-                       line-name = "netgear:power:usb";
-                       gpios = <0 GPIO_ACTIVE_HIGH>;
-                       output-high;
-               };
-       };
-};
-
-&usb_phy {
-       status = "okay";
-};
-
-&usb {
-       status = "okay";
-       #address-cells = <1>;
-       #size-cells = <0>;
-
-       hub_port: port@1 {
-               reg = <1>;
-               #trigger-source-cells = <0>;
        };
 };