ath79: WNR612v2: improve device support

[openwrt/staging/chunkeey.git] / target / linux / ath79 / dts / ar7240_netgear_wnr612-v2.dtsi

diff --git a/target/linux/ath79/dts/ar7240_netgear_wnr612-v2.dtsi b/target/linux/ath79/dts/ar7240_netgear_wnr612-v2.dtsi
index 8e934429a3afc35fd22d41a5f172905c2204b492..07a2217a7730a0cfddc0ad169191a8442b8769af 100644 (file)
--- a/target/linux/ath79/dts/ar7240_netgear_wnr612-v2.dtsi
+++ b/target/linux/ath79/dts/ar7240_netgear_wnr612-v2.dtsi
@@ -14,7 +14,7 @@
                led-upgrade = &power;
        };
 
-       keys {
+       ath9k-keys {
                compatible = "gpio-keys-polled";
                poll-interval = <20>;
 
@@ -28,6 +28,10 @@
 
        leds {
                compatible = "gpio-leds";
+
+               pinctrl-names = "default";
+               pinctrl-0 = <&jtag_disable_pins &switch_led_disable_pins &clks_disable_pins>;
+
                power: power {
                        label = "netgear:green:power";
                        gpios = <&gpio 11 GPIO_ACTIVE_LOW>;
@@ -47,6 +51,10 @@
                        label = "netgear:green:wan";
                        gpios = <&gpio 17 GPIO_ACTIVE_LOW>;
                };
+       };
+
+       ath9k-leds {
+               compatible = "gpio-leds";
 
                wlan: wlan {
                        label = "netgear:green:wlan";
@@ -70,7 +78,7 @@
                        #address-cells = <1>;
                        #size-cells = <1>;
 
-                       uboot: partition@0 {
+                       partition@0 {
                                reg = <0x0 0x40000>;
                                label = "u-boot";
                                read-only;
@@ -87,7 +95,7 @@
                                label = "firmware";
                        };
 
-                       partition@3f0000 {
+                       art: partition@3f0000 {
                                reg = <0x3f0000 0x10000>;
                                label = "art";
                                read-only;
@@ -99,15 +107,13 @@
 &eth0 {
        status = "okay";
 
-       mtd-mac-address = <&uboot 0x1fc00>;
-       mtd-mac-address-increment = <(-1)>;
+       mtd-mac-address = <&art 0x0>;
 };
 
 &eth1 {
        status = "okay";
 
-       mtd-mac-address = <&uboot 0x1fc00>;
-       mtd-mac-address-increment = <1>;
+       mtd-mac-address = <&art 0x6>;
 };
 
 &pcie {
@@ -116,6 +122,8 @@
        ath9k: wifi@0,0 {
                compatible = "pci168c,002b";
                reg = <0x0000 0 0 0 0>;
+               mtd-mac-address = <&art 0x0>;
+               mtd-mac-address-increment = <1>;
                qca,no-eeprom;
                #gpio-cells = <2>;
                gpio-controller;