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

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 21f049f6f5ad8a6887d0d770df754f22cf2e4762..2e68efa9dc79d077e8dcf4106399cb545e686327 100755 (executable)
--- 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 6a43d03b7438b13580f703cf6de6e304018bcd64..cebc70ae8d483450b32309ee78a29f05d1e677e7 100755 (executable)
--- 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 dd369624e17864ab0f83561e28546731b3391e69..2d75954db59a92c84348bb6f72e79f26d50013b1 100755 (executable)
--- 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 (file)
index 0000000..b54eb21
--- /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 */