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 6934a8f952bec892801ce7c0ee6f58a7d9f478ce..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
@@ -4,6 +4,7 @@
 
 #include <dt-bindings/gpio/gpio.h>
 #include <dt-bindings/input/input.h>
+#include <dt-bindings/leds/common.h>
 
 / {
        compatible = "dlink,dir-825-b1", "qca,ar7161";
@@ -20,25 +21,29 @@
                compatible = "gpio-leds";
 
                usb {
-                       label = "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 = "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 = "blue:power";
+                       function = LED_FUNCTION_POWER;
+                       color = <LED_COLOR_ID_BLUE>;
                        gpios = <&gpio 2 GPIO_ACTIVE_LOW>;
                };
 
                wps {
-                       label = "blue:wps";
+                       function = LED_FUNCTION_WPS;
+                       color = <LED_COLOR_ID_BLUE>;
                        gpios = <&gpio 4 GPIO_ACTIVE_LOW>;
                };
 
@@ -136,18 +141,20 @@
 &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;
        };
@@ -187,6 +194,32 @@
                                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>;
+                                       };
+                               };
                        };
 
                        fwconcat1: partition@670000 {
@@ -202,6 +235,9 @@
 
        pll-data = <0x11110000 0x00001099 0x00991099>;
 
+       nvmem-cells = <&macaddr_lan 0>;
+       nvmem-cell-names = "mac-address";
+
        fixed-link {
                speed = <1000>;
                full-duplex;
@@ -213,5 +249,9 @@
 
        pll-data = <0x11110000 0x00001099 0x00991099>;
 
+       nvmem-cells = <&macaddr_wan 0>;
+       nvmem-cell-names = "mac-address";
+
        phy-handle = <&phy4>;
 };
+