aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGabor Juhos <juhosg@openwrt.org>2014-07-13 16:25:58 +0000
committerGabor Juhos <juhosg@openwrt.org>2014-07-13 16:25:58 +0000
commit0ffe21c792b9ef5c23aa8e7fca0d799474675e0b (patch)
treef623457f8f47cf1be5e6d9fd8dd58d2a2aa43c5e
parentf089f0db34f1a9a13595263cef58d8a4361a45bf (diff)
downloadupstream-0ffe21c792b9ef5c23aa8e7fca0d799474675e0b.tar.gz
upstream-0ffe21c792b9ef5c23aa8e7fca0d799474675e0b.tar.bz2
upstream-0ffe21c792b9ef5c23aa8e7fca0d799474675e0b.zip
ar71xx: Support for Mikrotik RB2011UiAS
The RB2011UiAS is almost exactly the same as the RB2011UAS, which is already supported. Hardware-wise, it adds a passive power injector on Eth10. Software-wise, Routerboot passes a different board name on the kernel command line. Hence the need for a patch. Not yet working: * touchscreen: doesn't work on RB2011UAS either. The touchscreen itself seems to be driven by an ADS7843-compatible IC, but figuring out which GPIO pins it's connected to is work for the future. * control of power injector: remains off. Probably also GPIO-controlled. Signed-off-by: Soren Harward <stharward@gmail.com> Patchwork: http://patchwork.openwrt.org/patch/5841/ [juhosg: rename and refresh the kernel patch] Signed-off-by: Gabor Juhos <juhosg@openwrt.org> SVN-Revision: 41617
-rwxr-xr-xtarget/linux/ar71xx/base-files/etc/uci-defaults/01_leds1
-rwxr-xr-xtarget/linux/ar71xx/base-files/etc/uci-defaults/02_network3
-rwxr-xr-xtarget/linux/ar71xx/base-files/lib/ar71xx.sh3
-rw-r--r--target/linux/ar71xx/patches-3.10/716-MIPS-ath79-add_mikrotik_rb2011uias.patch26
4 files changed, 32 insertions, 1 deletions
diff --git a/target/linux/ar71xx/base-files/etc/uci-defaults/01_leds b/target/linux/ar71xx/base-files/etc/uci-defaults/01_leds
index 21f049f6f5..2e68efa9dc 100755
--- a/target/linux/ar71xx/base-files/etc/uci-defaults/01_leds
+++ b/target/linux/ar71xx/base-files/etc/uci-defaults/01_leds
@@ -72,6 +72,7 @@ rb-750)
rb-2011l|\
rb-2011uas|\
+rb-2011uias|\
rb-2011uas-2hnd)
ucidef_set_led_switch "eth6" "ETH6" "rb:green:eth6" "switch1" "0x20"
ucidef_set_led_switch "eth7" "ETH7" "rb:green:eth7" "switch1" "0x10"
diff --git a/target/linux/ar71xx/base-files/etc/uci-defaults/02_network b/target/linux/ar71xx/base-files/etc/uci-defaults/02_network
index 6a43d03b74..cebc70ae8d 100755
--- a/target/linux/ar71xx/base-files/etc/uci-defaults/02_network
+++ b/target/linux/ar71xx/base-files/etc/uci-defaults/02_network
@@ -57,6 +57,7 @@ tl-wdr4900-v2)
db120 |\
rb-2011l | \
rb-2011uas |\
+rb-2011uias |\
rb-2011uas-2hnd)
ucidef_set_interfaces_lan_wan "eth0.1 eth1" "eth0.2"
ucidef_add_switch "switch0" "1" "1"
@@ -66,7 +67,7 @@ rb-2011uas-2hnd)
ucidef_add_switch_vlan "switch1" "1" "0 1 2 3 4 5"
case "$board" in
- rb-2011uas*)
+ rb-2011uas* | rb-2011uias)
ucidef_set_interface_raw "sfp" "eth0.3"
ucidef_add_switch_vlan "switch0" "3" "0t 6"
;;
diff --git a/target/linux/ar71xx/base-files/lib/ar71xx.sh b/target/linux/ar71xx/base-files/lib/ar71xx.sh
index dd369624e1..2d75954db5 100755
--- a/target/linux/ar71xx/base-files/lib/ar71xx.sh
+++ b/target/linux/ar71xx/base-files/lib/ar71xx.sh
@@ -466,6 +466,9 @@ ar71xx_board_detect() {
*"RouterBOARD 2011UAS")
name="rb-2011uas"
;;
+ *"RouterBOARD 2011UiAS")
+ name="rb-2011uias"
+ ;;
*"RouterBOARD 2011UAS-2HnD")
name="rb-2011uas-2hnd"
;;
diff --git a/target/linux/ar71xx/patches-3.10/716-MIPS-ath79-add_mikrotik_rb2011uias.patch b/target/linux/ar71xx/patches-3.10/716-MIPS-ath79-add_mikrotik_rb2011uias.patch
new file mode 100644
index 0000000000..b54eb2101d
--- /dev/null
+++ b/target/linux/ar71xx/patches-3.10/716-MIPS-ath79-add_mikrotik_rb2011uias.patch
@@ -0,0 +1,26 @@
+--- a/arch/mips/ath79/mach-rb2011.c
++++ b/arch/mips/ath79/mach-rb2011.c
+@@ -321,6 +321,13 @@ static void __init rb2011us_setup(void)
+
+ MIPS_MACHINE_NONAME(ATH79_MACH_RB_2011US, "2011US", rb2011us_setup);
+
++static void __init rb2011r5_setup(void)
++{
++ rb2011_setup(RB2011_FLAG_SFP | RB2011_FLAG_USB);
++}
++
++MIPS_MACHINE_NONAME(ATH79_MACH_RB_2011R5, "2011r5", rb2011r5_setup);
++
+ static void __init rb2011g_setup(void)
+ {
+ rb2011_setup(RB2011_FLAG_SFP |
+--- a/arch/mips/ath79/machtypes.h
++++ b/arch/mips/ath79/machtypes.h
+@@ -93,6 +93,7 @@ enum ath79_mach_type {
+ ATH79_MACH_RB_2011G, /* Mikrotik RouterBOARD 2011UAS-2HnD */
+ ATH79_MACH_RB_2011L, /* Mikrotik RouterBOARD 2011L */
+ ATH79_MACH_RB_2011US, /* Mikrotik RouterBOARD 2011UAS */
++ ATH79_MACH_RB_2011R5, /* Mikrotik RouterBOARD 2011UiAS */
+ ATH79_MACH_RB_SXTLITE2ND, /* Mikrotik RouterBOARD SXT Lite 2nD */
+ ATH79_MACH_RB_SXTLITE5ND, /* Mikrotik RouterBOARD SXT Lite 5nD */
+ ATH79_MACH_RW2458N, /* Redwave RW2458N */