projects
/
openwrt
/
staging
/
hauke.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ath79: ar: convert to mac-base
[openwrt/staging/hauke.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 a7e6b49c1f65a13f9e32a4d81d370b46f401ff4d..ac27874c68ab7be6d8472870b63f57f898c9fb14 100644
(file)
--- a/
target/linux/ath79/dts/ar7240_netgear_wnr612-v2.dtsi
+++ b/
target/linux/ath79/dts/ar7240_netgear_wnr612-v2.dtsi
@@
-1,9
+1,10
@@
// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
+#include "ar7240.dtsi"
+
#include <dt-bindings/gpio/gpio.h>
#include <dt-bindings/input/input.h>
#include <dt-bindings/gpio/gpio.h>
#include <dt-bindings/input/input.h>
-
-#include "ar7240.dtsi"
+#include <dt-bindings/mtd/partitions/uimage.h>
/ {
aliases {
/ {
aliases {
@@
-33,22
+34,22
@@
pinctrl-0 = <&jtag_disable_pins &switch_led_disable_pins &clks_disable_pins>;
led_power: power {
pinctrl-0 = <&jtag_disable_pins &switch_led_disable_pins &clks_disable_pins>;
led_power: power {
- label = "
netgear:
green:power";
+ label = "green:power";
gpios = <&gpio 11 GPIO_ACTIVE_LOW>;
};
lan1 {
gpios = <&gpio 11 GPIO_ACTIVE_LOW>;
};
lan1 {
- label = "
netgear:
green:lan1";
+ label = "green:lan1";
gpios = <&gpio 13 GPIO_ACTIVE_LOW>;
};
lan2 {
gpios = <&gpio 13 GPIO_ACTIVE_LOW>;
};
lan2 {
- label = "
netgear:
green:lan2";
+ label = "green:lan2";
gpios = <&gpio 14 GPIO_ACTIVE_LOW>;
};
wan {
gpios = <&gpio 14 GPIO_ACTIVE_LOW>;
};
wan {
- label = "
netgear:
green:wan";
+ label = "green:wan";
gpios = <&gpio 17 GPIO_ACTIVE_LOW>;
};
};
gpios = <&gpio 17 GPIO_ACTIVE_LOW>;
};
};
@@
-57,7
+58,7
@@
compatible = "gpio-leds";
wlan {
compatible = "gpio-leds";
wlan {
- label = "
netgear:
green:wlan";
+ label = "green:wlan";
gpios = <&ath9k 1 GPIO_ACTIVE_LOW>;
linux,default-trigger = "phy0tpt";
};
gpios = <&ath9k 1 GPIO_ACTIVE_LOW>;
linux,default-trigger = "phy0tpt";
};
@@
-67,8
+68,6
@@
&spi {
status = "okay";
&spi {
status = "okay";
- num-cs = <1>;
-
flash@0 {
compatible = "jedec,spi-nor";
reg = <0>;
flash@0 {
compatible = "jedec,spi-nor";
reg = <0>;
@@
-91,7
+90,9
@@
};
partition@50000 {
};
partition@50000 {
- compatible = "netgear,uimage";
+ compatible = "openwrt,uimage", "denx,uimage";
+ openwrt,ih-magic = <0x32303631>;
+ openwrt,ih-type = <IH_TYPE_FILESYSTEM>;
reg = <0x50000 0x3a0000>;
label = "firmware";
};
reg = <0x50000 0x3a0000>;
label = "firmware";
};
@@
-100,21
+101,37
@@
reg = <0x3f0000 0x10000>;
label = "art";
read-only;
reg = <0x3f0000 0x10000>;
label = "art";
read-only;
+
+ nvmem-layout {
+ compatible = "fixed-layout";
+ #address-cells = <1>;
+ #size-cells = <1>;
+
+ macaddr_art_0: macaddr@0 {
+ compatible = "mac-base";
+ reg = <0x0 0x6>;
+ #nvmem-cell-cells = <1>;
+ };
+
+ macaddr_art_6: macaddr@6 {
+ reg = <0x6 0x6>;
+ };
+ };
};
};
};
};
ð0 {
};
};
};
};
ð0 {
- status = "okay";
-
- mtd-mac-address = <&art 0x0>;
+ nvmem-cells = <&macaddr_art_0 0>;
+ nvmem-cell-names = "mac-address";
};
ð1 {
status = "okay";
};
ð1 {
status = "okay";
- mtd-mac-address = <&art 0x6>;
+ nvmem-cells = <&macaddr_art_6>;
+ nvmem-cell-names = "mac-address";
};
&pcie {
};
&pcie {
@@
-123,14
+140,10
@@
ath9k: wifi@0,0 {
compatible = "pci168c,002b";
reg = <0x0000 0 0 0 0>;
ath9k: wifi@0,0 {
compatible = "pci168c,002b";
reg = <0x0000 0 0 0 0>;
-
mtd-mac-address = <&art 0x0
>;
-
mtd-mac-address-increment = <1>
;
+
nvmem-cells = <&macaddr_art_0 1
>;
+
nvmem-cell-names = "mac-address"
;
qca,no-eeprom;
#gpio-cells = <2>;
gpio-controller;
};
};
qca,no-eeprom;
#gpio-cells = <2>;
gpio-controller;
};
};
-
-&uart {
- status = "okay";
-};