gengetopt: backport patch fixing support for c++17

[openwrt/openwrt.git] / target / linux / ath79 / dts / ar7161_dlink_dir-825-b1.dts

diff --git a/target/linux/ath79/dts/ar7161_dlink_dir-825-b1.dts b/target/linux/ath79/dts/ar7161_dlink_dir-825-b1.dts
index 5e35dddd4b53d417668d79071f2099a7117651d3..e6d2db57c080b5026880ede158f0d6bfdefc6867 100644 (file)
--- a/target/linux/ath79/dts/ar7161_dlink_dir-825-b1.dts
+++ b/target/linux/ath79/dts/ar7161_dlink_dir-825-b1.dts
@@ -1,10 +1,10 @@
 // SPDX-License-Identifier: GPL-2.0-or-later OR MIT
-/dts-v1/;
+
+#include "ar7100.dtsi"
 
 #include <dt-bindings/gpio/gpio.h>
 #include <dt-bindings/input/input.h>
-
-#include "ar7100.dtsi"
+#include <dt-bindings/leds/common.h>
 
 / {
        compatible = "dlink,dir-825-b1", "qca,ar7161";
@@ -17,50 +17,43 @@
                led-upgrade = &led_power_orange;
        };
 
-       chosen {
-               bootargs = "console=ttyS0,115200";
-       };
-
-       extosc: ref {
-               compatible = "fixed-clock";
-               #clock-cells = <0>;
-               clock-output-names = "ref";
-               clock-frequency = <40000000>;
-       };
-
        leds {
                compatible = "gpio-leds";
 
                usb {
-                       label = "d-link:blue:usb";
+                       function = LED_FUNCTION_USB;
+                       color = <LED_COLOR_ID_BLUE>;
                        gpios = <&gpio 0 GPIO_ACTIVE_LOW>;
                        trigger-sources = <&usb_ohci_port>, <&usb_ehci_port>;
                        linux,default-trigger = "usbport";
                };
 
                led_power_orange: power_orange {
-                       label = "d-link:orange:power";
+                       function = LED_FUNCTION_POWER;
+                       color = <LED_COLOR_ID_ORANGE>;
                        gpios = <&gpio 1 GPIO_ACTIVE_LOW>;
                        default-state = "on";
                };
 
                led_power_blue: power_blue {
-                       label = "d-link:blue:power";
+                       function = LED_FUNCTION_POWER;
+                       color = <LED_COLOR_ID_BLUE>;
                        gpios = <&gpio 2 GPIO_ACTIVE_LOW>;
                };
 
                wps {
-                       label = "d-link:blue:wps";
+                       function = LED_FUNCTION_WPS;
+                       color = <LED_COLOR_ID_BLUE>;
                        gpios = <&gpio 4 GPIO_ACTIVE_LOW>;
                };
 
                planet_orange {
-                       label = "d-link:orange:planet";
+                       label = "orange:planet";
                        gpios = <&gpio 6 GPIO_ACTIVE_LOW>;
                };
 
                planet_blue {
-                       label = "d-link:blue:planet";
+                       label = "blue:planet";
                        gpios = <&gpio 11 GPIO_ACTIVE_LOW>;
                };
        };
@@ -69,13 +62,13 @@
                compatible = "gpio-leds";
 
                wlan2g {
-                       label = "d-link:blue:wlan2g";
+                       label = "blue:wlan2g";
                        gpios = <&ath9k0 5 GPIO_ACTIVE_LOW>;
                        linux,default-trigger = "phy0tpt";
                };
 
                wlan5g {
-                       label = "d-link:blue:wlan5g";
+                       label = "blue:wlan5g";
                        gpios = <&ath9k1 5 GPIO_ACTIVE_LOW>;
                        linux,default-trigger = "phy1tpt";
                };
@@ -108,36 +101,37 @@
                        #size-cells = <0>;
                        status = "okay";
 
-                       phy-mask = <0x10>;
-
                        phy4: ethernet-phy@4 {
                                reg = <4>;
                                phy-mode = "rgmii";
                        };
                };
        };
+
+       virtual_flash {
+               compatible = "mtd-concat";
+               devices = <&fwconcat0 &fwconcat1>;
+
+               partitions {
+                       compatible = "fixed-partitions";
+                       #address-cells = <1>;
+                       #size-cells = <1>;
+
+                       partition@0 {
+                               compatible = "denx,uimage";
+                               label = "firmware";
+                               reg = <0x0 0x0>;
+                       };
+               };
+       };
 };
 
 &usb1 {
-       #address-cells = <1>;
-       #size-cells = <0>;
        status = "okay";
-
-       usb_ohci_port: port@1 {
-               reg = <1>;
-               #trigger-source-cells = <0>;
-       };
 };
 
 &usb2 {
-       #address-cells = <1>;
-       #size-cells = <0>;
        status = "okay";
-
-       usb_ehci_port: port@1 {
-               reg = <1>;
-               #trigger-source-cells = <0>;
-       };
 };
 
 &usb_phy {
@@ -147,36 +141,28 @@
 &pcie0 {
        status = "okay";
 
-       ath9k0: wifi@0,11 {
+       ath9k0: wifi@11,0 {
                compatible = "pci168c,0029";
                reg = <0x8800 0 0 0 0>;
-               qca,no-eeprom;
+               nvmem-cells = <&macaddr_lan 0>, <&cal_art_1000>;
+               nvmem-cell-names = "mac-address", "calibration";
                #gpio-cells = <2>;
                gpio-controller;
        };
 
-       ath9k1: wifi@0,12 {
+       ath9k1: wifi@12,0 {
                compatible = "pci168c,0029";
                reg = <0x9000 0 0 0 0>;
-               qca,no-eeprom;
+               nvmem-cells = <&macaddr_wan 1>, <&cal_art_5000>;
+               nvmem-cell-names = "mac-address", "calibration";
                #gpio-cells = <2>;
                gpio-controller;
        };
 };
 
-&uart {
-       status = "okay";
-};
-
-&pll {
-       clocks = <&extosc>;
-};
-
 &spi {
        status = "okay";
 
-       num-cs = <1>;
-
        flash@0 {
                compatible = "jedec,spi-nor";
                reg = <0>;
@@ -199,22 +185,46 @@
                                read-only;
                        };
 
-                       partition@50000 {
-                               compatible = "denx,uimage";
-                               label = "firmware";
+                       fwconcat0: partition@50000 {
+                               label = "fwconcat0";
                                reg = <0x050000 0x610000>;
                        };
 
-                       caldata: partition@60000 {
+                       partition@660000 {
                                label = "caldata";
                                reg = <0x660000 0x010000>;
                                read-only;
+
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       cal_art_1000: cal@1000 {
+                                               reg = <0x1000 0xeb8>;
+                                       };
+
+                                       cal_art_5000: cal@5000 {
+                                               reg = <0x5000 0xeb8>;
+                                       };
+
+                                       macaddr_lan: macaddr@ffa0 {
+                                               compatible = "mac-base";
+                                               reg = <0xffa0 0x11>;
+                                               #nvmem-cell-cells = <1>;
+                                       };
+
+                                       macaddr_wan: macaddr@ffb4 {
+                                               compatible = "mac-base";
+                                               reg = <0xffb4 0x11>;
+                                               #nvmem-cell-cells = <1>;
+                                       };
+                               };
                        };
 
-                       partition@670000 {
-                               label = "unknown";
+                       fwconcat1: partition@670000 {
+                               label = "fwconcat1";
                                reg = <0x670000 0x190000>;
-                               read-only;
                        };
                };
        };
@@ -225,6 +235,9 @@
 
        pll-data = <0x11110000 0x00001099 0x00991099>;
 
+       nvmem-cells = <&macaddr_lan 0>;
+       nvmem-cell-names = "mac-address";
+
        fixed-link {
                speed = <1000>;
                full-duplex;
@@ -236,5 +249,9 @@
 
        pll-data = <0x11110000 0x00001099 0x00991099>;
 
+       nvmem-cells = <&macaddr_wan 0>;
+       nvmem-cell-names = "mac-address";
+
        phy-handle = <&phy4>;
 };
+