projects
/
openwrt
/
staging
/
jow.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ramips: clean up useless dts partition labels
[openwrt/staging/jow.git]
/
target
/
linux
/
ramips
/
dts
/
mt7620a_edimax_ew-747x.dtsi
diff --git
a/target/linux/ramips/dts/mt7620a_edimax_ew-747x.dtsi
b/target/linux/ramips/dts/mt7620a_edimax_ew-747x.dtsi
index d5db3958d80e9f37499bfbf6cbdaee625b2a2e5b..65b69a576aa96a0252914bf8c058cb5740868db4 100644
(file)
--- a/
target/linux/ramips/dts/mt7620a_edimax_ew-747x.dtsi
+++ b/
target/linux/ramips/dts/mt7620a_edimax_ew-747x.dtsi
@@
-4,6
+4,7
@@
#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 <dt-bindings/leds/common.h>
#include <dt-bindings/mtd/partitions/uimage.h>
/ {
#include <dt-bindings/mtd/partitions/uimage.h>
/ {
@@
-30,17
+31,20
@@
compatible = "gpio-leds";
led_power: power {
compatible = "gpio-leds";
led_power: power {
- label = "green:power";
+ function = LED_FUNCTION_POWER;
+ color = <LED_COLOR_ID_GREEN>;
gpios = <&gpio2 27 GPIO_ACTIVE_LOW>;
};
lan {
gpios = <&gpio2 27 GPIO_ACTIVE_LOW>;
};
lan {
- label = "green:lan";
+ function = LED_FUNCTION_LAN;
+ color = <LED_COLOR_ID_GREEN>;
gpios = <&gpio2 26 GPIO_ACTIVE_LOW>;
};
wps {
gpios = <&gpio2 26 GPIO_ACTIVE_LOW>;
};
wps {
- label = "green:wps";
+ function = LED_FUNCTION_WPS;
+ color = <LED_COLOR_ID_GREEN>;
gpios = <&gpio2 28 GPIO_ACTIVE_LOW>;
};
};
gpios = <&gpio2 28 GPIO_ACTIVE_LOW>;
};
};
@@
-79,20
+83,29
@@
read-only;
};
read-only;
};
- factory: partition@40000 {
- compatible = "nvmem-cells";
+ partition@40000 {
label = "factory";
reg = <0x40000 0x10000>;
label = "factory";
reg = <0x40000 0x10000>;
- #address-cells = <1>;
- #size-cells = <1>;
read-only;
read-only;
- eeprom_factory_0: eeprom@0 {
- reg = <0x0 0x200>;
- };
+ nvmem-layout {
+ compatible = "fixed-layout";
+ #address-cells = <1>;
+ #size-cells = <1>;
+
+ eeprom_factory_0: eeprom@0 {
+ reg = <0x0 0x200>;
+ };
+
+ eeprom_factory_8000: eeprom@8000 {
+ reg = <0x8000 0x200>;
+ };
- macaddr_factory_4: macaddr@4 {
- reg = <0x4 0x6>;
+ macaddr_factory_4: macaddr@4 {
+ compatible = "mac-base";
+ reg = <0x4 0x6>;
+ #nvmem-cell-cells = <1>;
+ };
};
};
};
};
@@
-133,7
+146,7
@@
pinctrl-names = "default";
pinctrl-0 = <&rgmii1_pins &mdio_pins &phy_reset_pins>;
pinctrl-names = "default";
pinctrl-0 = <&rgmii1_pins &mdio_pins &phy_reset_pins>;
- nvmem-cells = <&macaddr_factory_4>;
+ nvmem-cells = <&macaddr_factory_4
0
>;
nvmem-cell-names = "mac-address";
phy-reset-gpios = <&gpio1 15 GPIO_ACTIVE_LOW>;
nvmem-cell-names = "mac-address";
phy-reset-gpios = <&gpio1 15 GPIO_ACTIVE_LOW>;
@@
-185,7
+198,7
@@
};
&wmac {
};
&wmac {
- nvmem-cells = <&eeprom_factory_0>, <&macaddr_factory_4>;
+ nvmem-cells = <&eeprom_factory_0>, <&macaddr_factory_4
0
>;
nvmem-cell-names = "eeprom", "mac-address";
};
nvmem-cell-names = "eeprom", "mac-address";
};
@@
-196,10
+209,8
@@
&pcie0 {
wifi@0,0 {
reg = <0x0000 0 0 0 0>;
&pcie0 {
wifi@0,0 {
reg = <0x0000 0 0 0 0>;
- mediatek,mtd-eeprom = <&factory 0x8000>;
ieee80211-freq-limit = <5000000 6000000>;
ieee80211-freq-limit = <5000000 6000000>;
- nvmem-cells = <&macaddr_factory_4>;
- nvmem-cell-names = "mac-address";
- mac-address-increment = <2>;
+ nvmem-cells = <&eeprom_factory_8000>, <&macaddr_factory_4 2>;
+ nvmem-cell-names = "eeprom", "mac-address";
};
};
};
};