Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ramips: mt7621: r6220: add support for additional flash layouts #1304

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 2 additions & 0 deletions target/linux/ramips/base-files/etc/board.d/01_leds
Expand Up @@ -337,6 +337,8 @@ px-4885-8M)
set_wifi_led "px-4885:orange:wifi"
set_usb_led "px-4885:blue:storage"
;;
r6220a|\
r6220b|\
r6220)
ucidef_set_led_netdev "wan" "wan" "$boardname:green:wan" eth0.2
set_wifi_led "$boardname:green:wifi"
Expand Down
4 changes: 4 additions & 0 deletions target/linux/ramips/base-files/etc/board.d/02_network
Expand Up @@ -106,6 +106,8 @@ ramips_setup_interfaces()
pbr-m1|\
psg1208|\
psg1218a|\
r6220b|\
r6220a|\
r6220|\
rt-n12p|\
sap-g3200u3|\
Expand Down Expand Up @@ -516,6 +518,8 @@ ramips_setup_macs()
lan_mac=$(mtd_get_mac_binary factory 40)
wan_mac=$(mtd_get_mac_binary factory 46)
;;
r6220b|\
r6220a|\
r6220)
wan_mac=$(mtd_get_mac_binary factory 4)
lan_mac=$(macaddr_add "$wan_mac" 1)
Expand Down
2 changes: 2 additions & 0 deletions target/linux/ramips/base-files/etc/diag.sh
Expand Up @@ -39,6 +39,8 @@ get_status_led() {
nbg-419n|\
nbg-419n2|\
pwh2004|\
r6220b|\
r6220a|\
r6220|\
tplink,c20-v4|\
tplink,c50-v3|\
Expand Down
6 changes: 6 additions & 0 deletions target/linux/ramips/base-files/lib/ramips.sh
Expand Up @@ -415,6 +415,12 @@ ramips_board_detect() {
*"Q7")
name="zte-q7"
;;
*"R6220B")
name="r6220b"
;;
*"R6220A")
name="r6220a"
;;
*"R6220")
name="r6220"
;;
Expand Down
4 changes: 4 additions & 0 deletions target/linux/ramips/base-files/lib/upgrade/platform.sh
Expand Up @@ -290,6 +290,8 @@ platform_check_image() {
;;
hc5962|\
mir3g|\
r6220b|\
r6220a|\
Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This line is incorrect - there is a character after the backslash which has to be removed. It results in a non-working sysupgrade script. As this commit is not accepted it is just a reminder for anyone who wants to compile it for him/herself.

r6220|\
ubnt-erx|\
ubnt-erx-sfp)
Expand Down Expand Up @@ -345,6 +347,8 @@ platform_do_upgrade() {
case "$board" in
hc5962|\
mir3g|\
r6220b|\
r6220a|\
r6220|\
ubnt-erx|\
ubnt-erx-sfp)
Expand Down
158 changes: 158 additions & 0 deletions target/linux/ramips/dts/R6220A.dts
@@ -0,0 +1,158 @@
/dts-v1/;

#include "mt7621.dtsi"

#include <dt-bindings/gpio/gpio.h>
#include <dt-bindings/input/input.h>

/ {
compatible = "netgear,r6220a", "mediatek,mt7621-soc";
model = "Netgear R6220A";

memory@0 {
device_type = "memory";
reg = <0x0 0x8000000>;
};

chosen {
bootargs = "console=ttyS0,57600";
};

gpio-leds {
compatible = "gpio-leds";

power {
label = "r6220a:green:power";
gpios = <&gpio0 18 GPIO_ACTIVE_LOW>;
};

usb {
label = "r6220a:green:usb";
gpios = <&gpio0 15 GPIO_ACTIVE_LOW>;
};

internet {
label = "r6220a:green:wan";
gpios = <&gpio0 13 GPIO_ACTIVE_LOW>;
};

wifi {
label = "r6220a:green:wifi";
gpios = <&gpio0 16 GPIO_ACTIVE_LOW>;
};

wps {
label = "r6220a:green:wps";
gpios = <&gpio0 12 GPIO_ACTIVE_LOW>;
};
};

gpio-keys-polled {
compatible = "gpio-keys-polled";
#address-cells = <1>;
#size-cells = <0>;
poll-interval = <20>;

wps {
label = "wps";
gpios = <&gpio0 7 GPIO_ACTIVE_HIGH>;
linux,code = <KEY_WPS_BUTTON>;
};

wifi {
label = "wifi";
gpios = <&gpio0 8 GPIO_ACTIVE_HIGH>;
linux,code = <KEY_RFKILL>;
};

reset {
label = "reset";
gpios = <&gpio0 14 GPIO_ACTIVE_HIGH>;
linux,code = <KEY_RESTART>;
};
};

gpio_export {
compatible = "gpio-export";
#size-cells = <0>;

usbpower {
gpio-export,name = "usbpower";
gpio-export,output = <1>;
gpios = <&gpio0 10 GPIO_ACTIVE_HIGH>;
};
};
};

&nand {
status = "okay";

partition@0 {
label = "u-boot";
reg = <0x0 0x100000>;
read-only;
};

partition@100000 {
label = "SC PID";
reg = <0x100000 0x100000>;
read-only;
};

partition@200000 {
label = "kernel";
reg = <0x200000 0x400000>;
};

partition@600000 {
label = "ubi";
reg = <0x600000 0x1c00000>;
};

factory: partition@2de0000 {
label = "factory";
reg = <0x2de0000 0x100000>;
read-only;
};

partition@4200000 {
label = "reserved";
reg = <0x4200000 0x3c00000>;
read-only;
};
};

&pcie {
status = "okay";

pcie0 {
mt76@0,0 {
reg = <0x0000 0 0 0 0>;
device_type = "pci";
mediatek,mtd-eeprom = <&factory 0x8000>;
ieee80211-freq-limit = <5000000 6000000>;
};
};

pcie1 {
mt76@1,0 {
reg = <0x0000 0 0 0 0>;
device_type = "pci";
mediatek,mtd-eeprom = <&factory 0x0000>;
ieee80211-freq-limit = <2400000 2500000>;
};
};
};

&ethernet {
mtd-mac-address = <&factory 0x00000004>;
};

&pinctrl {
state_default: pinctrl0 {
gpio {
ralink,group = "uart3", "jtag";
ralink,function = "gpio";
};
};
};
158 changes: 158 additions & 0 deletions target/linux/ramips/dts/R6220B.dts
@@ -0,0 +1,158 @@
/dts-v1/;

#include "mt7621.dtsi"

#include <dt-bindings/gpio/gpio.h>
#include <dt-bindings/input/input.h>

/ {
compatible = "netgear,r6220b", "mediatek,mt7621-soc";
model = "Netgear R6220B";

memory@0 {
device_type = "memory";
reg = <0x0 0x8000000>;
};

chosen {
bootargs = "console=ttyS0,57600";
};

gpio-leds {
compatible = "gpio-leds";

power {
label = "r6220b:green:power";
gpios = <&gpio0 18 GPIO_ACTIVE_LOW>;
};

usb {
label = "r6220b:green:usb";
gpios = <&gpio0 15 GPIO_ACTIVE_LOW>;
};

internet {
label = "r6220b:green:wan";
gpios = <&gpio0 13 GPIO_ACTIVE_LOW>;
};

wifi {
label = "r6220b:green:wifi";
gpios = <&gpio0 16 GPIO_ACTIVE_LOW>;
};

wps {
label = "r6220b:green:wps";
gpios = <&gpio0 12 GPIO_ACTIVE_LOW>;
};
};

gpio-keys-polled {
compatible = "gpio-keys-polled";
#address-cells = <1>;
#size-cells = <0>;
poll-interval = <20>;

wps {
label = "wps";
gpios = <&gpio0 7 GPIO_ACTIVE_HIGH>;
linux,code = <KEY_WPS_BUTTON>;
};

wifi {
label = "wifi";
gpios = <&gpio0 8 GPIO_ACTIVE_HIGH>;
linux,code = <KEY_RFKILL>;
};

reset {
label = "reset";
gpios = <&gpio0 14 GPIO_ACTIVE_HIGH>;
linux,code = <KEY_RESTART>;
};
};

gpio_export {
compatible = "gpio-export";
#size-cells = <0>;

usbpower {
gpio-export,name = "usbpower";
gpio-export,output = <1>;
gpios = <&gpio0 10 GPIO_ACTIVE_HIGH>;
};
};
};

&nand {
status = "okay";

partition@0 {
label = "u-boot";
reg = <0x0 0x100000>;
read-only;
};

partition@100000 {
label = "SC PID";
reg = <0x100000 0x100000>;
read-only;
};

partition@200000 {
label = "kernel";
reg = <0x200000 0x400000>;
};

partition@600000 {
label = "ubi";
reg = <0x600000 0x1c00000>;
};

factory: partition@2da0000 {
label = "factory";
reg = <0x2da0000 0x100000>;
read-only;
};

partition@4200000 {
label = "reserved";
reg = <0x4200000 0x3c00000>;
read-only;
};
};

&pcie {
status = "okay";

pcie0 {
mt76@0,0 {
reg = <0x0000 0 0 0 0>;
device_type = "pci";
mediatek,mtd-eeprom = <&factory 0x8000>;
ieee80211-freq-limit = <5000000 6000000>;
};
};

pcie1 {
mt76@1,0 {
reg = <0x0000 0 0 0 0>;
device_type = "pci";
mediatek,mtd-eeprom = <&factory 0x0000>;
ieee80211-freq-limit = <2400000 2500000>;
};
};
};

&ethernet {
mtd-mac-address = <&factory 0x00000004>;
};

&pinctrl {
state_default: pinctrl0 {
gpio {
ralink,group = "uart3", "jtag";
ralink,function = "gpio";
};
};
};