projects
/
openwrt
/
openwrt.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/openwrt.git]
/
target
/
linux
/
ramips
/
dts
/
mt7621_beeline_smartbox-giga.dts
diff --git
a/target/linux/ramips/dts/mt7621_beeline_smartbox-giga.dts
b/target/linux/ramips/dts/mt7621_beeline_smartbox-giga.dts
index 22fc065eb299076e86533f371faf1a8c9f98fc22..12ff04ed28d299b7e0f88db51b2f37095e3166d5 100644
(file)
--- a/
target/linux/ramips/dts/mt7621_beeline_smartbox-giga.dts
+++ b/
target/linux/ramips/dts/mt7621_beeline_smartbox-giga.dts
@@
-23,21
+23,18
@@
compatible = "gpio-leds";
led_status_green: led-0 {
compatible = "gpio-leds";
led_status_green: led-0 {
- label = "green:status";
color = <LED_COLOR_ID_GREEN>;
function = LED_FUNCTION_STATUS;
gpios = <&gpio 13 GPIO_ACTIVE_HIGH>;
};
led-1 {
color = <LED_COLOR_ID_GREEN>;
function = LED_FUNCTION_STATUS;
gpios = <&gpio 13 GPIO_ACTIVE_HIGH>;
};
led-1 {
- label = "blue:wan";
color = <LED_COLOR_ID_BLUE>;
function = LED_FUNCTION_WAN;
gpios = <&gpio 14 GPIO_ACTIVE_HIGH>;
};
led_status_red: led-2 {
color = <LED_COLOR_ID_BLUE>;
function = LED_FUNCTION_WAN;
gpios = <&gpio 14 GPIO_ACTIVE_HIGH>;
};
led_status_red: led-2 {
- label = "red:status";
color = <LED_COLOR_ID_RED>;
function = LED_FUNCTION_STATUS;
gpios = <&gpio 15 GPIO_ACTIVE_HIGH>;
color = <LED_COLOR_ID_RED>;
function = LED_FUNCTION_STATUS;
gpios = <&gpio 15 GPIO_ACTIVE_HIGH>;
@@
-47,7
+44,7
@@
keys {
compatible = "gpio-keys";
keys {
compatible = "gpio-keys";
-
reset
{
+
button-0
{
label = "reset";
gpios = <&gpio 4 GPIO_ACTIVE_LOW>;
linux,code = <KEY_RESTART>;
label = "reset";
gpios = <&gpio 4 GPIO_ACTIVE_LOW>;
linux,code = <KEY_RESTART>;
@@
-93,18
+90,30
@@
sercomm,scpart-id = <1>;
};
sercomm,scpart-id = <1>;
};
-
factory:
partition@200000 {
+ partition@200000 {
label = "Factory";
reg = <0x200000 0x100000>;
sercomm,scpart-id = <2>;
read-only;
label = "Factory";
reg = <0x200000 0x100000>;
sercomm,scpart-id = <2>;
read-only;
- compatible = "nvmem-cells";
- #address-cells = <1>;
- #size-cells = <1>;
+ nvmem-layout {
+ compatible = "fixed-layout";
+ #address-cells = <1>;
+ #size-cells = <1>;
+
+ eeprom_factory_0: eeprom@0 {
+ reg = <0x0 0x400>;
+ };
+
+ eeprom_factory_8000: eeprom@8000 {
+ reg = <0x8000 0x4da8>;
+ };
- macaddr_factory_21000: macaddr@21000 {
- reg = <0x21000 0x6>;
+ macaddr_factory_21000: macaddr@21000 {
+ compatible = "mac-base";
+ reg = <0x21000 0x6>;
+ #nvmem-cell-cells = <1>;
+ };
};
};
};
};
@@
-175,12
+184,10
@@
wifi@0,0 {
compatible = "mediatek,mt76";
reg = <0x0000 0 0 0 0>;
wifi@0,0 {
compatible = "mediatek,mt76";
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_21000>;
- nvmem-cell-names = "mac-address";
- mac-address-increment = <(5)>;
+ nvmem-cells = <&eeprom_factory_8000>, <&macaddr_factory_21000 5>;
+ nvmem-cell-names = "eeprom", "mac-address";
};
};
};
};
@@
-188,17
+195,15
@@
wifi@0,0 {
compatible = "mediatek,mt76";
reg = <0x0000 0 0 0 0>;
wifi@0,0 {
compatible = "mediatek,mt76";
reg = <0x0000 0 0 0 0>;
- mediatek,mtd-eeprom = <&factory 0x0>;
ieee80211-freq-limit = <2400000 2500000>;
ieee80211-freq-limit = <2400000 2500000>;
- nvmem-cells = <&macaddr_factory_21000>;
- nvmem-cell-names = "mac-address";
- mac-address-increment = <(4)>;
+ nvmem-cells = <&eeprom_factory_0>, <&macaddr_factory_21000 4>;
+ nvmem-cell-names = "eeprom", "mac-address";
};
};
&gmac0 {
};
};
&gmac0 {
- nvmem-cells = <&macaddr_factory_21000>;
+ nvmem-cells = <&macaddr_factory_21000
0
>;
nvmem-cell-names = "mac-address";
};
nvmem-cell-names = "mac-address";
};
@@
-207,9
+212,8
@@
label = "wan";
phy-handle = <ðphy0>;
label = "wan";
phy-handle = <ðphy0>;
- nvmem-cells = <&macaddr_factory_21000>;
+ nvmem-cells = <&macaddr_factory_21000
1
>;
nvmem-cell-names = "mac-address";
nvmem-cell-names = "mac-address";
- mac-address-increment = <(1)>;
};
&mdio {
};
&mdio {