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 nvmem-layout
[openwrt/staging/hauke.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 90978fb99f27b15bf1f1b9c2bbafaaf175020272..d2a30000044e63d0af0b2213672ab4c74107ad3a 100644
(file)
--- a/
target/linux/ath79/dts/ar9344_netgear_wndr.dtsi
+++ b/
target/linux/ath79/dts/ar9344_netgear_wndr.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 "ar9344.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 "ar9344.dtsi"
+#include <dt-bindings/mtd/partitions/uimage.h>
/ {
chosen {
/ {
chosen {
@@
-40,66
+41,49
@@
};
};
};
};
- leds {
+ leds
: leds
{
compatible = "gpio-leds";
pinctrl-names = "default";
pinctrl-0 = <&enable_gpio_11>;
led_power_green: power_green {
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 {
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";
};
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 {
wlan2g_green {
- label = "
netgear:
green:wlan2g";
+ label = "green:wlan2g";
gpios = <&gpio 11 GPIO_ACTIVE_LOW>;
linux,default-trigger = "phy0tpt";
};
wlan5g_blue {
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 {
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 {
gpios = <&gpio 16 GPIO_ACTIVE_LOW>;
};
wps_amber {
- label = "
netgear:
amber:wps";
+ label = "amber:wps";
gpios = <&gpio 17 GPIO_ACTIVE_LOW>;
};
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";
};
ubi-concat {
compatible = "mtd-concat";
- devices = <&ubi
part0 &ubipar
t1>;
+ devices = <&ubi
concat0 &ubiconca
t1>;
partitions {
compatible = "fixed-partitions";
partitions {
compatible = "fixed-partitions";
@@
-143,6
+127,28
@@
label = "caldata";
reg = <0x80000 0x40000>;
read-only;
label = "caldata";
reg = <0x80000 0x40000>;
read-only;
+
+ nvmem-layout {
+ compatible = "fixed-layout";
+ #address-cells = <1>;
+ #size-cells = <1>;
+
+ macaddr_caldata_0: macaddr@0 {
+ reg = <0x0 0x6>;
+ };
+
+ macaddr_caldata_c: macaddr@c {
+ reg = <0xc 0x6>;
+ };
+
+ cal_art_1000: cal@1000 {
+ reg = <0x1000 0x440>;
+ };
+
+ cal_art_5000: cal@5000 {
+ reg = <0x5000 0x440>;
+ };
+ };
};
partition@c0000 {
};
partition@c0000 {
@@
-170,15
+176,17
@@
reg = <0x6c0000 0x400000>;
};
reg = <0x6c0000 0x400000>;
};
- ubi
par
t0: partition@ac0000 {
- label = "ubi
par
t0";
+ ubi
conca
t0: partition@ac0000 {
+ label = "ubi
conca
t0";
reg = <0xac0000 0x1500000>;
};
partition@6c0000 {
label = "firmware";
reg = <0x6c0000 0x1900000>;
reg = <0xac0000 0x1500000>;
};
partition@6c0000 {
label = "firmware";
reg = <0x6c0000 0x1900000>;
- compatible = "netgear,uimage";
+ compatible = "openwrt,uimage", "denx,uimage";
+ openwrt,ih-magic = <0x33373033>;
+ openwrt,ih-type = <IH_TYPE_FILESYSTEM>;
};
partition@1fc0000 {
};
partition@1fc0000 {
@@
-187,8
+195,8
@@
read-only;
};
read-only;
};
- ubi
par
t1: partition@2000000 {
- label = "ubi
par
t1";
+ ubi
conca
t1: partition@2000000 {
+ label = "ubi
conca
t1";
reg = <0x2000000 0x6000000>;
};
};
reg = <0x2000000 0x6000000>;
};
};
@@
-206,8
+214,6
@@
&mdio0 {
status = "okay";
&mdio0 {
status = "okay";
- phy-mask = <0>;
-
phy0: ethernet-phy@0 {
reg = <0>;
phy-mode = "rgmii";
phy0: ethernet-phy@0 {
reg = <0>;
phy-mode = "rgmii";
@@
-233,7
+239,8
@@
/* default for ar934x, except for 1000M */
pll-data = <0x06000000 0x00000101 0x00001616>;
/* default for ar934x, except for 1000M */
pll-data = <0x06000000 0x00000101 0x00001616>;
- mtd-mac-address = <&caldata 0x0>;
+ nvmem-cells = <&macaddr_caldata_0>;
+ nvmem-cell-names = "mac-address";
phy-mode = "rgmii";
phy-handle = <&phy0>;
phy-mode = "rgmii";
phy-handle = <&phy0>;
@@
-258,8
+265,8
@@
&wmac {
status = "okay";
&wmac {
status = "okay";
-
mtd-mac-address = <&caldata 0x
0>;
-
qca,no-eeprom
;
+
nvmem-cells = <&macaddr_caldata_0>, <&cal_art_100
0>;
+
nvmem-cell-names = "mac-address", "calibration"
;
};
&pcie {
};
&pcie {
@@
-268,35
+275,9
@@
ath9k: wifi@0,0 {
compatible = "pci168c,0033";
reg = <0x0000 0 0 0 0>;
ath9k: wifi@0,0 {
compatible = "pci168c,0033";
reg = <0x0000 0 0 0 0>;
-
mtd-mac-address = <&caldata 0xc
>;
-
qca,no-eeprom
;
+
nvmem-cells = <&macaddr_caldata_c>, <&cal_art_5000
>;
+
nvmem-cell-names = "mac-address", "calibration"
;
#gpio-cells = <2>;
gpio-controller;
#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>;
- };
-};
-
-&uart {
- status = "okay";
-};