Support for MR3420 v2 and small fixes in GPIO initialization

diff --git a/Makefile b/Makefile
index bdd42009cac7060473e15c8bd8a3dc703da1ff6c..de58fda4643ef6ac55d3132181f9132bbf7ac39f 100755 (executable)
--- a/Makefile
+++ b/Makefile
@@ -97,6 +97,16 @@ tplink_wdr3600_43x0:
        @cp $(BUILD_TOPDIR)/u-boot/tuboot.bin $(BUILD_TOPDIR)/bin/temp.bin
        @make show_size
 
+tplink_mr3420_v2:      export UBOOT_FILE_NAME=uboot_for_tp-link_tl-mr3420_v2
+tplink_mr3420_v2:      export MAX_UBOOT_SIZE=64
+tplink_mr3420_v2:      export COMPRESSED_UBOOT=1
+tplink_mr3420_v2:      export ETH_CONFIG=_s27
+tplink_mr3420_v2:
+       @cd $(BUILD_TOPDIR)/u-boot/ && $(MAKECMD) mr3420_v2_config
+       @cd $(BUILD_TOPDIR)/u-boot/ && $(MAKECMD) ENDIANNESS=-EB V=1 all
+       @cp $(BUILD_TOPDIR)/u-boot/tuboot.bin $(BUILD_TOPDIR)/bin/temp.bin
+       @make show_size
+
 tplink_wr841n_v8:      export UBOOT_FILE_NAME=uboot_for_tp-link_tl-wr841n_v8
 tplink_wr841n_v8:      export MAX_UBOOT_SIZE=64
 tplink_wr841n_v8:      export COMPRESSED_UBOOT=1

diff --git a/u-boot/Makefile b/u-boot/Makefile
index 37c5872e8fb2d21779fda76efd0126fc6d085bd1..b8db5721ec67c666afd3fdf778e40b41bbae3c3d 100755 (executable)
--- a/u-boot/Makefile
+++ b/u-boot/Makefile
@@ -499,6 +499,38 @@ wdr3600_43x0_config : unconfig wasp_common_config
 
        @./mkconfig -a db12x mips mips db12x ar7240 ar7240
 
+mr3420_v2_config : unconfig wasp_common_config
+       @echo '======= Configuring for TP-Link TL-MR3420 v2 at:' `date` '======='
+       @echo "#define CONFIG_FOR_TPLINK_MR3420_V2          1" >> include/config.h
+       @echo "#define CONFIG_AP123                         1" >> include/config.h
+       @echo "#define DDR2_32BIT_SUPPORT                   1" >> include/config.h
+       @echo "#define CFG_ATHRS27_PHY                      1" >> include/config.h
+       @echo "#define CFG_AG7240_NMACS                     2" >> include/config.h
+       @echo "#define GPIO_SYS_LED_BIT                    14" >> include/config.h
+       @echo "#define GPIO_SYS_LED_ON                      0" >> include/config.h
+       @echo "#define GPIO_WLAN_LED_BIT                   13" >> include/config.h
+       @echo "#define GPIO_WLAN_LED_ON                     0" >> include/config.h
+       @echo "#define GPIO_INTERNET_LED_BIT               18" >> include/config.h
+       @echo "#define GPIO_INTERNET_LED_ON                 0" >> include/config.h
+       @echo "#define GPIO_LAN1_LED_BIT                   19" >> include/config.h
+       @echo "#define GPIO_LAN1_LED_ON                     0" >> include/config.h
+       @echo "#define GPIO_LAN2_LED_BIT                   20" >> include/config.h
+       @echo "#define GPIO_LAN2_LED_ON                     0" >> include/config.h
+       @echo "#define GPIO_LAN3_LED_BIT                   21" >> include/config.h
+       @echo "#define GPIO_LAN3_LED_ON                     0" >> include/config.h
+       @echo "#define GPIO_LAN4_LED_BIT                   12" >> include/config.h
+       @echo "#define GPIO_LAN4_LED_ON                     0" >> include/config.h
+       @echo "#define GPIO_USB_LED_BIT                    11" >> include/config.h
+       @echo "#define GPIO_USB_LED_ON                      0" >> include/config.h
+       @echo "#define GPIO_QSS_LED_BIT                    15" >> include/config.h
+       @echo "#define GPIO_QSS_LED_ON                      0" >> include/config.h
+       @echo "#define GPIO_RST_BUTTON_BIT                 17" >> include/config.h
+       @echo "#define GPIO_RST_BUTTON_IS_ACTIVE_LOW        1" >> include/config.h
+       @echo "#define DEFAULT_FLASH_SIZE_IN_MB             4" >> include/config.h
+       @echo "#define BOARD_CUSTOM_STRING                  \"AP123 (AR9341) U-Boot for TL-MR3420 v2\"" >> include/config.h
+
+       @./mkconfig -a db12x mips mips db12x ar7240 ar7240
+
 wr841n_v8_config : unconfig wasp_common_config
        @echo '======= Configuring for TP-Link TL-WR841N/D v8 at:' `date` '======='
        @echo "#define CONFIG_FOR_TPLINK_WR841N_V8          1" >> include/config.h

diff --git a/u-boot/board/ar7240/db12x/db12x.c b/u-boot/board/ar7240/db12x/db12x.c
index 652f98a1063444491c40f531f2ad1a9634726340..d25175bd1f05ff0dce2174bf6bd80fc65ad74ee0 100755 (executable)
--- a/u-boot/board/ar7240/db12x/db12x.c
+++ b/u-boot/board/ar7240/db12x/db12x.c
@@ -18,7 +18,8 @@ void led_toggle(void){
 \r
 #if defined(CONFIG_FOR_TPLINK_WDR3600_WDR43X0_V1) || \\r
        defined(CONFIG_FOR_TPLINK_WR841N_V8) || \\r
-       defined(CONFIG_FOR_TPLINK_WA830RE_V2_WA801ND_V2)\r
+       defined(CONFIG_FOR_TPLINK_WA830RE_V2_WA801ND_V2) || \\r
+       defined(CONFIG_FOR_TPLINK_MR3420_V2)\r
        gpio ^= 1 << GPIO_SYS_LED_BIT;\r
 #else\r
        #error "Custom GPIO in leg_toggle() not defined!"\r
@@ -47,6 +48,16 @@ void all_led_on(void){
        SETBITVAL(gpio, GPIO_LAN3_LED_BIT,     GPIO_LAN3_LED_ON);\r
        SETBITVAL(gpio, GPIO_LAN4_LED_BIT,     GPIO_LAN4_LED_ON);\r
        SETBITVAL(gpio, GPIO_QSS_LED_BIT,      GPIO_QSS_LED_ON);\r
+#elif defined(CONFIG_FOR_TPLINK_MR3420_V2)\r
+       SETBITVAL(gpio, GPIO_SYS_LED_BIT,      GPIO_SYS_LED_ON);\r
+       SETBITVAL(gpio, GPIO_WLAN_LED_BIT,     GPIO_WLAN_LED_ON);\r
+       SETBITVAL(gpio, GPIO_INTERNET_LED_BIT, GPIO_INTERNET_LED_ON);\r
+       SETBITVAL(gpio, GPIO_LAN1_LED_BIT,     GPIO_LAN1_LED_ON);\r
+       SETBITVAL(gpio, GPIO_LAN2_LED_BIT,     GPIO_LAN2_LED_ON);\r
+       SETBITVAL(gpio, GPIO_LAN3_LED_BIT,     GPIO_LAN3_LED_ON);\r
+       SETBITVAL(gpio, GPIO_LAN4_LED_BIT,     GPIO_LAN4_LED_ON);\r
+       SETBITVAL(gpio, GPIO_USB_LED_BIT,      GPIO_USB_LED_ON);\r
+       SETBITVAL(gpio, GPIO_QSS_LED_BIT,      GPIO_QSS_LED_ON);\r
 #elif defined(CONFIG_FOR_TPLINK_WA830RE_V2_WA801ND_V2)\r
        SETBITVAL(gpio, GPIO_SYS_LED_BIT,      GPIO_SYS_LED_ON);\r
        SETBITVAL(gpio, GPIO_LAN_LED_BIT,      GPIO_LAN_LED_ON);\r
@@ -79,6 +90,16 @@ void all_led_off(void){
        SETBITVAL(gpio, GPIO_LAN3_LED_BIT,     !GPIO_LAN3_LED_ON);\r
        SETBITVAL(gpio, GPIO_LAN4_LED_BIT,     !GPIO_LAN4_LED_ON);\r
        SETBITVAL(gpio, GPIO_QSS_LED_BIT,      !GPIO_QSS_LED_ON);\r
+#elif defined(CONFIG_FOR_TPLINK_MR3420_V2)\r
+       SETBITVAL(gpio, GPIO_SYS_LED_BIT,      !GPIO_SYS_LED_ON);\r
+       SETBITVAL(gpio, GPIO_WLAN_LED_BIT,     !GPIO_WLAN_LED_ON);\r
+       SETBITVAL(gpio, GPIO_INTERNET_LED_BIT, !GPIO_INTERNET_LED_ON);\r
+       SETBITVAL(gpio, GPIO_LAN1_LED_BIT,     !GPIO_LAN1_LED_ON);\r
+       SETBITVAL(gpio, GPIO_LAN2_LED_BIT,     !GPIO_LAN2_LED_ON);\r
+       SETBITVAL(gpio, GPIO_LAN3_LED_BIT,     !GPIO_LAN3_LED_ON);\r
+       SETBITVAL(gpio, GPIO_LAN4_LED_BIT,     !GPIO_LAN4_LED_ON);\r
+       SETBITVAL(gpio, GPIO_USB_LED_BIT,      !GPIO_USB_LED_ON);\r
+       SETBITVAL(gpio, GPIO_QSS_LED_BIT,      !GPIO_QSS_LED_ON);\r
 #elif defined(CONFIG_FOR_TPLINK_WA830RE_V2_WA801ND_V2)\r
        SETBITVAL(gpio, GPIO_SYS_LED_BIT,      !GPIO_SYS_LED_ON);\r
        SETBITVAL(gpio, GPIO_LAN_LED_BIT,      !GPIO_LAN_LED_ON);\r

diff --git a/u-boot/cpu/mips/start_bootstrap.S b/u-boot/cpu/mips/start_bootstrap.S
index 4e6b2a5f1157da7f8b70c3ecf3e21fab8faf4d0c..7ab95cc32ed1478422eca461efd5130cd1ec43d5 100755 (executable)
--- a/u-boot/cpu/mips/start_bootstrap.S
+++ b/u-boot/cpu/mips/start_bootstrap.S
@@ -182,79 +182,76 @@ reset:
 
 #if defined(CONFIG_WASP_SUPPORT)
 
-       /*
-        * Disable JTAG
-        */
-
-       // Set  BIT 1 to 1 in AR934X_GPIO_FUNCTION
-       li a1, AR934X_GPIO_FUNCTION
-       lw v1, 0(a1)
-       li v0, 0x2
-       or v1, v1, v0
-       sw v1, 0(a1)
+       // Disable JTAG (bit 1 set) and ALL clock observation (bit 2~9 reset)
+       li  a1, AR934X_GPIO_FUNCTION
+       li  v1, 0x2
+       sw  v1, 0(a1)
 
 #if defined(CONFIG_FOR_TPLINK_WDR3600_WDR43X0_V1)
        /*
-        * LED's/Reset GPIOs on WDR3600/WDR43x0 v1:
+        * LEDs and buttons GPIOs on WDR3600/WDR43x0 v1:
         *
-        * 11 => USB1
-        * 12 => USB2
+        * 11 => USB1 LED
+        * 12 => USB2 LED
         * 13 => WLAN2G
         * 14 => SYS
         * 15 => QSS
+        * 21 => USB2 POWER (active high)
+        * 22 => USB1 POWER (active high)
         *
         * 16 => Reset button
+        * 17 => Wi-Fi ON/OFF switch
         *
-        * All used GPIOs are active LOW!
+        * All OUT GPIOs are active LOW if not stated otherwise
         */
 
        // GPIO Init
        li  a1, AR934X_GPIO_OE
        lw  v1, 0(a1)
-       li  v0, 0xFFFF07FF
-       and v1, v1, v0
+       // Set GPIOs 11~15 and 21~22 as outputs
+       and v1, v1, 0xFF9F07FF
+       // Set GPIOs 16~17 as inputs
+       or  v1, v1, 0x30000
        sw  v1, 0(a1)
 
-       // Set gpio function for GPIO 11
+       // Set GPIO function for GPIO 11
        li      a1, AR934X_GPIO_OUT_FUNCTION2
        lw      v1, 0(a1)
-       li      v0, 0x00FFFFFF
-       and v1, v1, v0
+       and v1, v1, 0x00FFFFFF
        sw      v1, 0(a1)
 
-       // Set gpio function for GPIOs 12~15
+       // Set GPIO function for GPIOs 12~15
        li      a1, AR934X_GPIO_OUT_FUNCTION3
-       lw      v1, 0(a1)
-       li      v0, 0x0
-       and v1, v1, v0
+       li      v1, 0x0
        sw      v1, 0(a1)
 
-       // Turn on GPIOs 11~15
-       li      a1, AR934X_GPIO_OUT
-       lw      v1, 0(a1)
-       li      v0, 0xFFFF07FF
-       and     v1, v1, v0
+       // Turn on power on both USB
+       li  a1, AR934X_GPIO_SET
+       li      v1, 0x600000
+       sw      v1, 0(a1)
+
+       // Turn on all LEDs
+       li  a1, AR934X_GPIO_CLEAR
+       li      v1, 0xF800
        sw      v1, 0(a1)
 
-       // wait for a while, for leds' bootup blink
-       li a1, 0
-       li v1, 0x70000
+       // Wait for a while, for leds bootup blink
+       li  a1, 0
+       li  v1, 0x70000
 
 1:
        addi a1, a1, 1
-       bne a1, v1, 1b
+       bne  a1, v1, 1b
        nop
 
-       // Turn off GPIOs 11~15
-       li      a1, AR934X_GPIO_OUT
-       lw      v1, 0(a1)
-       li      v0, ~(0xFFFF07FF)
-       or      v1, v1, v0
+       // Turn off all LEDs
+       li  a1, AR934X_GPIO_SET
+       li      v1, 0xF800
        sw      v1, 0(a1)
 
 #elif defined(CONFIG_FOR_TPLINK_WR841N_V8)
        /*
-        * LED's/Reset GPIOs on WR841N/D v8:
+        * LEDs and buttons GPIOs on WR841N/D v8:
         *
         * 12 => LAN4
         * 13 => WLAN
@@ -265,41 +262,103 @@ reset:
         * 20 => LAN2
         * 21 => LAN3
         *
-        * 16 => Wi-Fi switch
-        * 17 => Reset button (already set as input)
+        * 16 => Wi-Fi ON/OFF switch
+        * 17 => Reset button
         *
-        * All used GPIOs are active LOW!
+        * All OUT GPIOs are active LOW if not stated otherwise
         */
 
        // GPIOs init
        li  a1, AR934X_GPIO_OE
        lw  v1, 0(a1)
-       li  v0, 0xFFC30FFF
-       and v1, v1, v0
+       // Set GPIOs 12~15 and 18~21 as outputs
+       and v1, v1, 0xFFC30FFF
+       // Set GPIOs 16~17 as inputs
+       or  v1, v1, 0x30000
        sw  v1, 0(a1)
 
-       // Set gpio function for GPIO 11
+       // Set gpio function for GPIOs 12~15
+       li      a1, AR934X_GPIO_OUT_FUNCTION3
+       li      v1, 0x0
+       sw      v1, 0(a1)
+
+       // Set GPIO function for GPIOs 18~19
+       li      a1, AR934X_GPIO_OUT_FUNCTION4
+       lw      v1, 0(a1)
+       and v1, v1, 0xFFFF
+       sw      v1, 0(a1)
+
+       // Turn off all LEDs
+       li  a1, AR934X_GPIO_SET
+       li      v1, 0x3CF000
+       sw      v1, 0(a1)
+
+#elif defined(CONFIG_FOR_TPLINK_MR3420_V2)
+       /*
+        * LEDs and buttons GPIOs on MR3420 v2:
+        *
+        * 4  => USB Power (active high)
+        * 11 => USB/3G LED
+        * 12 => LAN4
+        * 13 => WLAN
+        * 14 => SYS
+        * 15 => QSS
+        * 18 => WAN
+        * 19 => LAN1
+        * 20 => LAN2
+        * 21 => LAN3
+        *
+        * 16 => WPS button
+        * 17 => Reset button
+        *
+        * All OUT GPIOs are active LOW if not stated otherwise
+        */
+
+       // GPIOs init
+       li  a1, AR934X_GPIO_OE
+       lw  v1, 0(a1)
+       // Set GPIOs 4, 11~15 and 18~21 as outputs
+       and v1, v1, 0xFFC307EF
+       // Set GPIOs 16~17 as inputs
+       or  v1, v1, 0x30000
+       sw  v1, 0(a1)
+
+       // Set GPIO function for GPIO 4
+       li      a1, AR934X_GPIO_OUT_FUNCTION1
+       lw      v1, 0(a1)
+       and v1, v1, 0xFFFFFF00
+       sw      v1, 0(a1)
+
+       // Set GPIO function for GPIO 11
        li      a1, AR934X_GPIO_OUT_FUNCTION2
        lw      v1, 0(a1)
-       li      v0, 0x00ffffff
-       and v1, v1, v0
+       and v1, v1, 0x00FFFFFF
        sw      v1, 0(a1)
 
-       // Set gpio function for GPIOs 12~15
+       // Set GPIO function for GPIOs 12~15
        li      a1, AR934X_GPIO_OUT_FUNCTION3
+       li      v1, 0x0
+       sw      v1, 0(a1)
+
+       // Set GPIO function for GPIOs 18~19
+       li      a1, AR934X_GPIO_OUT_FUNCTION4
        lw      v1, 0(a1)
-       li      v0, 0x0
-       and v1, v1, v0
+       and v1, v1, 0xFFFF
        sw      v1, 0(a1)
 
-       // Turn off GPIOs
+       // Turn on power on USB
        li  a1, AR934X_GPIO_SET
-       li      v1, 0x3CF000
+       li      v1, 0x10
+       sw      v1, 0(a1)
+
+       // Turn off all LEDs
+       li  a1, AR934X_GPIO_SET
+       li      v1, 0x3CF800
        sw      v1, 0(a1)
 
 #elif defined(CONFIG_FOR_TPLINK_WA830RE_V2_WA801ND_V2)
        /*
-        * LED's/Reset GPIOs on WR841N/D v8:
+        * LEDs and buttons GPIOs on WA830REv2 and WA801ND v2:
         *
         * 13 => WLAN
         * 14 => SYS
@@ -307,26 +366,33 @@ reset:
         * 18 => LAN
         *
         * 16 => Range Extender
-        * 17 => Reset button (already set as input)
+        * 17 => Reset button
         *
-        * All used GPIOs are active LOW!
+        * All OUT GPIOs are active LOW if not stated otherwise
         */
 
        // GPIOs init
        li  a1, AR934X_GPIO_OE
        lw  v1, 0(a1)
-       li  v0, 0xFFFB1FFF
-       and v1, v1, v0
+       // Set GPIOs 13~15 and 18 as outputs
+       and v1, v1, 0xFFFB1FFF
+       // Set GPIOs 16~17 as inputs
+       or  v1, v1, 0x30000
        sw  v1, 0(a1)
 
-       // Set gpio function for GPIOs 13~15
+       // Set GPIO function for GPIOs 13~15
        li      a1, AR934X_GPIO_OUT_FUNCTION3
        lw      v1, 0(a1)
-       li      v0, 0xFF
-       and v1, v1, v0
+       and v1, v1, 0xFF
+       sw      v1, 0(a1)
+
+       // Set GPIO function for GPIO 18
+       li      a1, AR934X_GPIO_OUT_FUNCTION4
+       lw      v1, 0(a1)
+       and v1, v1, 0xFF00FFFF
        sw      v1, 0(a1)
 
-       // Turn off GPIOs
+       // Turn off all LEDs
        li  a1, AR934X_GPIO_SET
        li      v1, 0x4E000
        sw      v1, 0(a1)