diff options
| -rwxr-xr-x | target/linux/ramips/base-files/etc/board.d/01_leds | 2 | ||||
| -rwxr-xr-x | target/linux/ramips/base-files/etc/board.d/02_network | 5 | ||||
| -rw-r--r-- | target/linux/ramips/dts/R6120.dts | 20 |
3 files changed, 15 insertions, 12 deletions
diff --git a/target/linux/ramips/base-files/etc/board.d/01_leds b/target/linux/ramips/base-files/etc/board.d/01_leds index 4e2d534c99..f19d6be6e8 100755 --- a/target/linux/ramips/base-files/etc/board.d/01_leds +++ b/target/linux/ramips/base-files/etc/board.d/01_leds @@ -252,8 +252,8 @@ mzk-ex750np) ;; netgear,r6120) ucidef_set_led_switch "lan" "lan" "$boardname:green:lan" "switch0" "0x0f" + ucidef_set_led_switch "wan" "wan" "$boardname:green:wan" "switch0" "0x10" ucidef_set_led_wlan "wlan2g" "WiFi 2.4GHz" "$boardname:green:wlan2g" "phy0tpt" - ucidef_set_led_wlan "wlan5g" "WiFi 5GHz" "$boardname:green:wlan5g" "phy1tpt" ;; oy-0001) set_wifi_led "$boardname:green:wifi" diff --git a/target/linux/ramips/base-files/etc/board.d/02_network b/target/linux/ramips/base-files/etc/board.d/02_network index d84e738e89..fca3398f2d 100755 --- a/target/linux/ramips/base-files/etc/board.d/02_network +++ b/target/linux/ramips/base-files/etc/board.d/02_network @@ -108,7 +108,6 @@ ramips_setup_interfaces() mtc,wr1201|\ mzk-750dhp|\ mzk-w300nh2|\ - netgear,r6120|\ nixcore-x1-8M|\ nixcore-x1-16M|\ oy-0001|\ @@ -341,6 +340,10 @@ ramips_setup_interfaces() "0:lan" "1:lan" "2:lan" "3:lan" "6t@eth0" ucidef_set_interface_wan "usb0" ;; + netgear,r6120) + ucidef_add_switch "switch0" \ + "0:lan:4" "1:lan:3" "2:lan:2" "3:lan:1" "4:wan" "6@eth0" + ;; hc5761) ucidef_add_switch "switch0" \ "1:lan" "4:lan" "0:wan" "6@eth0" diff --git a/target/linux/ramips/dts/R6120.dts b/target/linux/ramips/dts/R6120.dts index e7eb3f9aaa..07b1a165d3 100644 --- a/target/linux/ramips/dts/R6120.dts +++ b/target/linux/ramips/dts/R6120.dts @@ -55,13 +55,13 @@ gpios = <&gpio1 9 GPIO_ACTIVE_LOW>; }; - wlan5 { - label = "r6120:green:wlan5g"; + wan { + label = "r6120:green:wan"; gpios = <&gpio1 8 GPIO_ACTIVE_LOW>; }; - wlan5_orange { - label = "r6120:orange:wlan5g"; + wan_orange { + label = "r6120:orange:wan"; gpios = <&gpio1 7 GPIO_ACTIVE_LOW>; }; }; @@ -102,7 +102,7 @@ read-only; }; - nvram: partition@60000 { + partition@60000 { label = "nvram"; reg = <0x60000 0x30000>; read-only; @@ -125,12 +125,12 @@ &wmac { status = "okay"; - mtd-mac-address = <&nvram 0x100b0>; - mediatek,mtd-eeprom = <&factory 0x20000>; + mtd-mac-address = <&factory 0x4>; + mediatek,mtd-eeprom = <&factory 0x0>; }; ðernet { - mtd-mac-address = <&nvram 0x100b0>; + mtd-mac-address = <&factory 0x4>; }; &pcie { @@ -140,9 +140,9 @@ &pcie0 { wifi@0,0 { reg = <0x0000 0 0 0 0>; - mediatek,mtd-eeprom = <&factory 0x28000>; + mediatek,mtd-eeprom = <&factory 0x8000>; ieee80211-freq-limit = <5000000 6000000>; - mtd-mac-address = <&nvram 0x100b0>; + mtd-mac-address = <&factory 0x4>; mtd-mac-address-increment = <(2)>; }; }; |