mvebu: migrate mamba support to the upstreamed code
authorImre Kaloz <kaloz@openwrt.org>
Sun, 12 Apr 2015 17:29:50 +0000 (17:29 +0000)
committerImre Kaloz <kaloz@openwrt.org>
Sun, 12 Apr 2015 17:29:50 +0000 (17:29 +0000)
Signed-off-by: Imre Kaloz <kaloz@openwrt.org>
SVN-Revision: 45400

19 files changed:
package/boot/uboot-envtools/files/mvebu
target/linux/mvebu/base-files/etc/diag.sh
target/linux/mvebu/base-files/etc/uci-defaults/01_leds
target/linux/mvebu/base-files/etc/uci-defaults/02_network
target/linux/mvebu/base-files/etc/uci-defaults/03_wireless
target/linux/mvebu/base-files/lib/mvebu.sh
target/linux/mvebu/base-files/lib/preinit/06_set_iface_mac
target/linux/mvebu/base-files/lib/preinit/81_linksys_syscfg
target/linux/mvebu/base-files/lib/upgrade/platform.sh
target/linux/mvebu/files/arch/arm/boot/dts/armada-xp-mamba.dts [deleted file]
target/linux/mvebu/image/Makefile
target/linux/mvebu/patches-3.18/001-add_mamba_support.patch [new file with mode: 0644]
target/linux/mvebu/patches-3.18/001-build_mamba_dts.patch [deleted file]
target/linux/mvebu/patches-3.18/002-add_mamba_powertables.patch [new file with mode: 0644]
target/linux/mvebu/patches-3.18/003-add_mamba_switch.patch [new file with mode: 0644]
target/linux/mvebu/patches-4.0/001-add_mamba_support.patch [new file with mode: 0644]
target/linux/mvebu/patches-4.0/001-build_mamba_dts.patch [deleted file]
target/linux/mvebu/patches-4.0/002-add_mamba_powertables.patch [new file with mode: 0644]
target/linux/mvebu/patches-4.0/003-add_mamba_switch.patch [new file with mode: 0644]

index 1b1f5ff..04dfa20 100644 (file)
@@ -14,7 +14,7 @@ touch /etc/config/ubootenv
 board=$(mvebu_board_name)
 
 case "$board" in
-"armada-xp-mamba")
+"armada-xp-linksys-mamba")
        ubootenv_add_uci_config "/dev/mtd1" "0x0" "0x40000" "0x20000"
        ;;
 esac
index adba975..6534ac3 100644 (file)
@@ -6,7 +6,7 @@
 
 get_status_led() {
        case $(mvebu_board_name) in
-       armada-xp-mamba)
+       armada-xp-linksys-mamba)
                status_led="mamba:white:power"
                ;;
        esac
index 611ee2a..8907a4b 100644 (file)
@@ -9,7 +9,7 @@
 board=$(mvebu_board_name)
 
 case "$board" in
-armada-xp-mamba)
+armada-xp-linksys-mamba)
        ucidef_set_led_netdev "wan" "WAN" "mamba:white:wan" "eth1"
        ucidef_set_led_usbdev "usb2" "USB2" "mamba:white:usb2" "1-1"
        ucidef_set_led_usbdev "usb3" "USB3" "mamba:white:usb3_1" "2-2"
index 6485e35..93dc515 100644 (file)
@@ -15,7 +15,7 @@ ucidef_set_interface_loopback
 board=$(mvebu_board_name)
 
 case "$board" in
-armada-xp-mamba)
+armada-xp-linksys-mamba)
        ucidef_set_interfaces_lan_wan "eth0" "eth1"
        ucidef_add_switch "switch0" "1" "1"
        ucidef_add_switch_vlan "switch0" "1" "0 1 2 3 5"
index ec188fb..5eb3c90 100644 (file)
@@ -10,7 +10,7 @@
 board=$(mvebu_board_name)
 
 case "$board" in
-armada-xp-mamba)
+armada-xp-linksys-mamba)
        SKU=$(strings /dev/mtd3|sed -ne 's/^cert_region=//p')
        case "$SKU" in
                AP)
index e8985b4..3d50196 100755 (executable)
@@ -31,8 +31,8 @@ mvebu_board_detect() {
        *"Marvell Armada XP GP Board")
                name="armada-xp-gp"
                ;;
-       *"Linksys WRT1900AC (Mamba)")
-               name="armada-xp-mamba"
+       *"Linksys WRT1900AC")
+               name="armada-xp-linksys-mamba"
                ;;
        esac
 
index 2b64eda..7b77bea 100644 (file)
@@ -9,7 +9,7 @@ preinit_set_mac_address() {
        . /lib/mvebu.sh
 
        case $(mvebu_board_name) in
-       armada-xp-mamba)
+       armada-xp-linksys-mamba)
                mac=$(mtd_get_mac_ascii devinfo hw_mac_addr)
                mac_wan=$(macaddr_setbit_la "$mac")
                ifconfig eth0 hw ether $mac 2>/dev/null
index fdd0d1e..d59cec3 100644 (file)
@@ -8,7 +8,7 @@ preinit_mount_syscfg() {
        . /lib/mvebu.sh
 
        case $(mvebu_board_name) in
-       armada-xp-mamba)
+       armada-xp-linksys-mamba)
                needs_recovery=0
                ubiattach -m 8 || needs_recovery=1
                if [ $needs_recovery -eq 1 ]
index f5e44c3..55807f5 100755 (executable)
@@ -13,7 +13,7 @@ platform_check_image() {
        [ "$#" -gt 1 ] && return 1
 
        case "$board" in
-       armada-xp-mamba )
+       armada-xp-linksys-mamba )
                [ "$magic_long" != "27051956" -a "$magic_long" != "73797375" ] && {
                        echo "Invalid image type."
                        return 1
@@ -30,7 +30,7 @@ platform_do_upgrade() {
        local board=$(mvebu_board_name)
 
        case "$board" in
-       armada-xp-mamba)
+       armada-xp-linksys-mamba)
                platform_do_upgrade_linksys "$ARGV"
                ;;
        *)
diff --git a/target/linux/mvebu/files/arch/arm/boot/dts/armada-xp-mamba.dts b/target/linux/mvebu/files/arch/arm/boot/dts/armada-xp-mamba.dts
deleted file mode 100644 (file)
index b6499d4..0000000
+++ /dev/null
@@ -1,429 +0,0 @@
-/*
- * Device Tree file for the Linksys WRT1900AC (Mamba).
- *
- * Note: this board is shipped with a new generation boot loader that
- * remaps internal registers at 0xf1000000. Therefore, if earlyprintk
- * is used, the CONFIG_DEBUG_MVEBU_UART_ALTERNATE option should be
- * used.
- *
- * Copyright (C) 2014 Imre Kaloz <kaloz@openwrt.org>
- *
- * Based on armada-xp-axpwifiap.dts:
- *
- *     Copyright (C) 2013 Marvell
- *
- *     Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
- *
- * This file is dual-licensed: you can use it either under the terms
- * of the GPL or the X11 license, at your option. Note that this dual
- * licensing only applies to this file, and not this project as a
- * whole.
- *
- *  a) This file is licensed under the terms of the GNU General Public
- *     License version 2.  This program is licensed "as is" without
- *     any warranty of any kind, whether express or implied.
- *
- * Or, alternatively,
- *
- *  b) Permission is hereby granted, free of charge, to any person
- *     obtaining a copy of this software and associated documentation
- *     files (the "Software"), to deal in the Software without
- *     restriction, including without limitation the rights to use,
- *     copy, modify, merge, publish, distribute, sublicense, and/or
- *     sell copies of the Software, and to permit persons to whom the
- *     Software is furnished to do so, subject to the following
- *     conditions:
- *
- *     The above copyright notice and this permission notice shall be
- *     included in all copies or substantial portions of the Software.
- *
- *     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- *     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
- *     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- *     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
- *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- *     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- *     OTHER DEALINGS IN THE SOFTWARE.
- */
-
-/dts-v1/;
-#include <dt-bindings/gpio/gpio.h>
-#include <dt-bindings/input/input.h>
-#include "armada-xp-mv78230.dtsi"
-
-/ {
-       model = "Linksys WRT1900AC (Mamba)";
-       compatible = "linksys,mamba", "marvell,armadaxp-mv78230",
-                    "marvell,armadaxp", "marvell,armada-370-xp";
-
-       chosen {
-               bootargs = "console=ttyS0,115200";
-               stdout-path = &uart0;
-       };
-
-       memory {
-               device_type = "memory";
-               reg = <0x00000000 0x00000000 0x00000000 0x10000000>; /* 256MB */
-       };
-
-       soc {
-               ranges = <MBUS_ID(0xf0, 0x01) 0 0 0xf1000000 0x100000
-                         MBUS_ID(0x01, 0x1d) 0 0 0xfff00000 0x100000>;
-
-               pcie-controller {
-                       status = "okay";
-
-                       /* Etron EJ168 USB 3.0 controller */
-                       pcie@1,0 {
-                               /* Port 0, Lane 0 */
-                               status = "okay";
-                       };
-
-                       /* First mini-PCIe port */
-                       pcie@2,0 {
-                               /* Port 0, Lane 1 */
-                               status = "okay";
-
-                               mwlwifi {
-                                       marvell,5ghz = <0>;
-                                       marvell,chainmask = <4 4>;
-                                       marvell,powertable {
-                                               FCC =
-                                                       <1 0 0x17 0x11 0x11 0x11 0x10 0x10 0x10 0x10 0xf 0xf 0xf 0xf 0x0 0x0 0x0 0x0 0 0xf>,
-                                                       <2 0 0x17 0x16 0x16 0x16 0x16 0x16 0x16 0x14 0x10 0x10 0x10 0x10 0x0 0x0 0x0 0x0 0 0xf>,
-                                                       <3 0 0x17 0x16 0x16 0x16 0x16 0x16 0x16 0x14 0x10 0x10 0x10 0x10 0x0 0x0 0x0 0x0 0 0xf>,
-                                                       <4 0 0x17 0x16 0x16 0x16 0x16 0x16 0x16 0x14 0x10 0x10 0x10 0x10 0x0 0x0 0x0 0x0 0 0xf>,
-                                                       <5 0 0x17 0x16 0x16 0x16 0x16 0x16 0x16 0x14 0x10 0x10 0x10 0x10 0x0 0x0 0x0 0x0 0 0xf>,
-                                                       <6 0 0x17 0x16 0x16 0x16 0x16 0x16 0x16 0x14 0x10 0x10 0x10 0x10 0x0 0x0 0x0 0x0 0 0xf>,
-                                                       <7 0 0x17 0x16 0x16 0x16 0x16 0x16 0x16 0x14 0x10 0x10 0x10 0x10 0x0 0x0 0x0 0x0 0 0xf>,
-                                                       <8 0 0x17 0x16 0x16 0x16 0x16 0x16 0x16 0x14 0x10 0x10 0x10 0x10 0x0 0x0 0x0 0x0 0 0xf>,
-                                                       <9 0 0x17 0x16 0x16 0x16 0x16 0x16 0x16 0x14 0x10 0x10 0x10 0x10 0x0 0x0 0x0 0x0 0 0xf>,
-                                                       <10 0 0x17 0x16 0x16 0x16 0x16 0x16 0x16 0x14 0x10 0x10 0x10 0x10 0x0 0x0 0x0 0x0 0 0xf>,
-                                                       <11 0 0x17 0x11 0x11 0x11 0x11 0x11 0x11 0x11 0x10 0x10 0x10 0x10 0x0 0x0 0x0 0x0 0 0xf>;
-
-                                               ETSI =
-                                                       <1 0 0xb 0xb 0xb 0xb 0xb 0xb 0xb 0xb 0xb 0xb 0xb 0xb 0x0 0x0 0x0 0x0 0 0xf>,
-                                                       <2 0 0xb 0xb 0xb 0xb 0xb 0xb 0xb 0xb 0xb 0xb 0xb 0xb 0x0 0x0 0x0 0x0 0 0xf>,
-                                                       <3 0 0xb 0xb 0xb 0xb 0xb 0xb 0xb 0xb 0xb 0xb 0xb 0xb 0x0 0x0 0x0 0x0 0 0xf>,
-                                                       <4 0 0xb 0xb 0xb 0xb 0xb 0xb 0xb 0xb 0xb 0xb 0xb 0xb 0x0 0x0 0x0 0x0 0 0xf>,
-                                                       <5 0 0xb 0xb 0xb 0xb 0xb 0xb 0xb 0xb 0xb 0xb 0xb 0xb 0x0 0x0 0x0 0x0 0 0xf>,
-                                                       <6 0 0xb 0xb 0xb 0xb 0xb 0xb 0xb 0xb 0xb 0xb 0xb 0xb 0x0 0x0 0x0 0x0 0 0xf>,
-                                                       <7 0 0xb 0xb 0xb 0xb 0xb 0xb 0xb 0xb 0xb 0xb 0xb 0xb 0x0 0x0 0x0 0x0 0 0xf>,
-                                                       <8 0 0xb 0xb 0xb 0xb 0xb 0xb 0xb 0xb 0xb 0xb 0xb 0xb 0x0 0x0 0x0 0x0 0 0xf>,
-                                                       <9 0 0xb 0xb 0xb 0xb 0xb 0xb 0xb 0xb 0xb 0xb 0xb 0xb 0x0 0x0 0x0 0x0 0 0xf>,
-                                                       <10 0 0xb 0xb 0xb 0xb 0xb 0xb 0xb 0xb 0xb 0xb 0xb 0xb 0x0 0x0 0x0 0x0 0 0xf>,
-                                                       <11 0 0xb 0xb 0xb 0xb 0xb 0xb 0xb 0xb 0xb 0xb 0xb 0xb 0x0 0x0 0x0 0x0 0 0xf>,
-                                                       <12 0 0xb 0xb 0xb 0xb 0xb 0xb 0xb 0xb 0xb 0xb 0xb 0xb 0x0 0x0 0x0 0x0 0 0xf>,
-                                                       <13 0 0xb 0xb 0xb 0xb 0xb 0xb 0xb 0xb 0xb 0xb 0xb 0xb 0x0 0x0 0x0 0x0 0 0xf>;
-                                       };
-                               };
-                       };
-
-                       /* Second mini-PCIe port */
-                       pcie@3,0 {
-                               /* Port 0, Lane 3 */
-                               status = "okay";
-
-                               mwlwifi {
-                                       marvell,2ghz = <0>;
-                                       marvell,chainmask = <4 4>;
-                                       marvell,powertable {
-                                               FCC =
-                                                       <36 0 0x8 0x8 0x8 0x8 0x8 0x8 0x8 0x8 0x9 0x9 0x9 0x9 0x9 0x9 0x9 0x9 0 0xf>,
-                                                       <40 0 0x8 0x8 0x8 0x8 0x9 0x9 0x9 0x9 0x9 0x9 0x9 0x9 0x9 0x9 0x9 0x9 0 0xf>,
-                                                       <44 0 0x8 0x8 0x8 0x8 0x9 0x9 0x9 0x9 0x9 0x9 0x9 0x9 0x9 0x9 0x9 0x9 0 0xf>,
-                                                       <48 0 0x8 0x8 0x8 0x8 0x9 0x9 0x9 0x9 0x9 0x9 0x9 0x9 0x9 0x9 0x9 0x9 0 0xf>,
-                                                       <52 0 0xf 0xf 0xf 0xf 0xf 0xf 0xf 0xf 0x12 0x12 0x12 0x12 0x12 0x12 0x12 0x12 0 0xf>,
-                                                       <56 0 0xf 0xf 0xf 0xf 0xf 0xf 0xf 0xf 0x12 0x12 0x12 0x12 0x12 0x12 0x12 0x12 0 0xf>,
-                                                       <60 0 0xf 0xf 0xf 0xf 0xf 0xf 0xf 0xf 0x12 0x12 0x12 0x12 0x12 0x12 0x12 0x12 0 0xf>,
-                                                       <64 0 0xf 0xf 0xf 0xf 0xf 0xf 0xf 0xf 0x12 0x12 0x12 0x12 0x12 0x12 0x12 0x12 0 0xf>,
-                                                       <100 0 0x14 0x14 0x14 0x14 0x14 0x14 0x14 0x14 0x14 0x14 0x14 0x14 0x14 0x14 0x14 0x14 0 0xf>,
-                                                       <104 0 0x14 0x14 0x14 0x14 0x14 0x14 0x14 0x14 0x14 0x14 0x14 0x14 0x14 0x14 0x14 0x14 0 0xf>,
-                                                       <108 0 0x14 0x14 0x14 0x14 0x14 0x14 0x14 0x14 0x14 0x14 0x14 0x14 0x14 0x14 0x14 0x14 0 0xf>,
-                                                       <112 0 0x14 0x14 0x14 0x14 0x14 0x14 0x14 0x14 0x14 0x14 0x14 0x14 0x14 0x14 0x14 0x14 0 0xf>,
-                                                       <116 0 0x14 0x14 0x14 0x14 0x14 0x14 0x14 0x14 0x14 0x14 0x14 0x14 0x14 0x14 0x14 0x14 0 0xf>,
-                                                       <120 0 0x14 0x14 0x14 0x14 0x14 0x14 0x14 0x14 0x14 0x14 0x14 0x14 0x14 0x14 0x14 0x14 0 0xf>,
-                                                       <124 0 0x14 0x14 0x14 0x14 0x14 0x14 0x14 0x14 0x14 0x14 0x14 0x14 0x14 0x14 0x14 0x14 0 0xf>,
-                                                       <128 0 0x14 0x14 0x14 0x14 0x14 0x14 0x14 0x14 0x14 0x14 0x14 0x14 0x14 0x14 0x14 0x14 0 0xf>,
-                                                       <132 0 0x14 0x14 0x14 0x14 0x14 0x14 0x14 0x14 0x14 0x14 0x14 0x14 0x14 0x14 0x14 0x14 0 0xf>,
-                                                       <136 0 0x14 0x14 0x14 0x14 0x14 0x14 0x14 0x14 0x14 0x14 0x14 0x14 0x14 0x14 0x14 0x14 0 0xf>,
-                                                       <140 0 0x14 0x14 0x14 0x14 0x14 0x14 0x14 0x14 0x14 0x14 0x14 0x14 0x14 0x14 0x14 0x14 0 0xf>,
-                                                       <149 0 0x16 0x16 0x16 0x16 0x14 0x14 0x14 0x14 0x15 0x15 0x15 0x15 0x14 0x14 0x14 0x14 0 0xf>,
-                                                       <153 0 0x15 0x15 0x15 0x15 0x15 0x15 0x15 0x15 0x15 0x15 0x15 0x15 0x14 0x14 0x14 0x14 0 0xf>,
-                                                       <157 0 0x15 0x15 0x15 0x15 0x15 0x15 0x15 0x15 0x15 0x15 0x15 0x15 0x14 0x14 0x14 0x14 0 0xf>,
-                                                       <161 0 0x15 0x15 0x15 0x15 0x15 0x15 0x15 0x15 0x15 0x15 0x15 0x15 0x14 0x14 0x14 0x14 0 0xf>,
-                                                       <165 0 0x16 0x16 0x16 0x16 0x16 0x16 0x16 0x16 0x15 0x15 0x15 0x15 0x14 0x14 0x14 0x14 0 0xf>;
-
-                                               ETSI =
-                                                       <36 0 0xc 0xc 0xc 0xc 0xc 0xc 0xc 0xc 0xd 0xd 0xd 0xd 0xc 0xc 0xc 0xc 0 0xf>,
-                                                       <40 0 0xc 0xc 0xc 0xc 0xc 0xc 0xc 0xc 0xd 0xd 0xd 0xd 0xc 0xc 0xc 0xc 0 0xf>,
-                                                       <44 0 0xc 0xc 0xc 0xc 0xc 0xc 0xc 0xc 0xd 0xd 0xd 0xd 0xc 0xc 0xc 0xc 0 0xf>,
-                                                       <48 0 0xc 0xc 0xc 0xc 0xc 0xc 0xc 0xc 0xd 0xd 0xd 0xd 0xc 0xc 0xc 0xc 0 0xf>,
-                                                       <52 0 0xc 0xc 0xc 0xc 0xc 0xc 0xc 0xc 0xd 0xd 0xd 0xd 0xc 0xc 0xc 0xc 0 0xf>,
-                                                       <56 0 0xc 0xc 0xc 0xc 0xc 0xc 0xc 0xc 0xd 0xd 0xd 0xd 0xc 0xc 0xc 0xc 0 0xf>,
-                                                       <60 0 0xc 0xc 0xc 0xc 0xc 0xc 0xc 0xc 0xd 0xd 0xd 0xd 0xc 0xc 0xc 0xc 0 0xf>,
-                                                       <64 0 0xc 0xc 0xc 0xc 0xc 0xc 0xc 0xc 0xd 0xd 0xd 0xd 0xc 0xc 0xc 0xc 0 0xf>,
-                                                       <100 0 0xc 0xc 0xc 0xc 0xc 0xc 0xc 0xc 0xd 0xd 0xd 0xd 0xc 0xc 0xc 0xc 0 0xf>,
-                                                       <104 0 0xc 0xc 0xc 0xc 0xc 0xc 0xc 0xc 0xd 0xd 0xd 0xd 0xc 0xc 0xc 0xc 0 0xf>,
-                                                       <108 0 0xc 0xc 0xc 0xc 0xc 0xc 0xc 0xc 0xd 0xd 0xd 0xd 0xc 0xc 0xc 0xc 0 0xf>,
-                                                       <112 0 0xc 0xc 0xc 0xc 0xc 0xc 0xc 0xc 0xd 0xd 0xd 0xd 0xc 0xc 0xc 0xc 0 0xf>,
-                                                       <116 0 0xc 0xc 0xc 0xc 0xc 0xc 0xc 0xc 0xd 0xd 0xd 0xd 0xc 0xc 0xc 0xc 0 0xf>,
-                                                       <120 0 0xc 0xc 0xc 0xc 0xc 0xc 0xc 0xc 0xd 0xd 0xd 0xd 0xc 0xc 0xc 0xc 0 0xf>,
-                                                       <124 0 0xc 0xc 0xc 0xc 0xc 0xc 0xc 0xc 0xd 0xd 0xd 0xd 0xc 0xc 0xc 0xc 0 0xf>,
-                                                       <128 0 0xc 0xc 0xc 0xc 0xc 0xc 0xc 0xc 0xd 0xd 0xd 0xd 0xc 0xc 0xc 0xc 0 0xf>,
-                                                       <132 0 0xc 0xc 0xc 0xc 0xc 0xc 0xc 0xc 0xd 0xd 0xd 0xd 0xc 0xc 0xc 0xc 0 0xf>,
-                                                       <136 0 0xc 0xc 0xc 0xc 0xc 0xc 0xc 0xc 0xd 0xd 0xd 0xd 0xc 0xc 0xc 0xc 0 0xf>,
-                                                       <140 0 0xc 0xc 0xc 0xc 0xc 0xc 0xc 0xc 0xd 0xd 0xd 0xd 0xc 0xc 0xc 0xc 0 0xf>,
-                                                       <149 0 0xc 0xc 0xc 0xc 0xc 0xc 0xc 0xc 0xd 0xd 0xd 0xd 0xc 0xc 0xc 0xc 0 0xf>;
-                                       };
-                               };
-                       };
-               };
-
-               internal-regs {
-                       serial@12000 {
-                               status = "okay";
-                       };
-
-                       sata@a0000 {
-                               nr-ports = <1>;
-                               status = "okay";
-                       };
-
-                       ethernet@70000 {
-                               pinctrl-0 = <&ge0_rgmii_pins>;
-                               pinctrl-names = "default";
-                               status = "okay";
-                               phy-mode = "rgmii-id";
-                               fixed-link {
-                                       speed = <1000>;
-                                       full-duplex;
-                               };
-                       };
-
-                       ethernet@74000 {
-                               pinctrl-0 = <&ge1_rgmii_pins>;
-                               pinctrl-names = "default";
-                               status = "okay";
-                               phy-mode = "rgmii-id";
-                               fixed-link {
-                                       speed = <1000>;
-                                       full-duplex;
-                               };
-                       };
-
-                       /* USB part of the eSATA/USB 2.0 port */
-                       usb@50000 {
-                               status = "okay";
-                       };
-
-                       i2c@11000 {
-                               status = "okay";
-                               clock-frequency = <100000>;
-
-                               tmp421@4c {
-                                       compatible = "ti,tmp421";
-                                       reg = <0x4c>;
-                               };
-
-                               tlc59116@68 {
-                                       #address-cells = <1>;
-                                       #size-cells = <0>;
-                                       #gpio-cells = <2>;
-                                       compatible = "ti,tlc59116";
-                                       reg = <0x68>;
-
-                                       wan_amber@0 {
-                                               label = "mamba:amber:wan";
-                                               reg = <0x0>;
-                                       };
-
-                                       wan_white@1 {
-                                               label = "mamba:white:wan";
-                                               reg = <0x1>;
-                                       };
-
-                                       wlan_2g@2 {
-                                               label = "mamba:white:wlan_2g";
-                                               reg = <0x2>;
-                                       };
-
-                                       wlan_5g@3 {
-                                               label = "mamba:white:wlan_5g";
-                                               reg = <0x3>;
-                                       };
-
-                                       esata@4 {
-                                               label = "mamba:white:esata";
-                                               reg = <0x4>;
-                                       };
-
-                                       usb2@5 {
-                                               label = "mamba:white:usb2";
-                                               reg = <0x5>;
-                                       };
-
-                                       usb3_1@6 {
-                                               label = "mamba:white:usb3_1";
-                                               reg = <0x6>;
-                                       };
-
-                                       usb3_2@7 {
-                                               label = "mamba:white:usb3_2";
-                                               reg = <0x7>;
-                                       };
-
-                                       wps_white@8 {
-                                               label = "mamba:white:wps";
-                                               reg = <0x8>;
-                                       };
-
-                                       wps_amber@9 {
-                                               label = "mamba:amber:wps";
-                                               reg = <0x9>;
-                                       };
-                               };
-                       };
-
-                       nand@d0000 {
-                               status = "okay";
-                               num-cs = <1>;
-                               marvell,nand-keep-config;
-                               marvell,nand-enable-arbiter;
-                               nand-on-flash-bbt;
-                               nand-ecc-strength = <4>;
-                               nand-ecc-step-size = <512>;
-
-                               partition@0 {
-                                       label = "u-boot";
-                                       reg = <0x0000000 0x100000>;  /* 1MB */
-                                       read-only;
-                               };
-
-                               partition@100000 {
-                                       label = "u_env";
-                                       reg = <0x100000 0x40000>;    /* 256KB */
-                               };
-
-                               partition@140000 {
-                                       label = "s_env";
-                                       reg = <0x140000 0x40000>;    /* 256KB */
-                               };
-
-                               partition@900000 {
-                                       label = "devinfo";
-                                       reg = <0x900000 0x100000>;    /* 1MB */
-                                       read-only;
-                               };
-
-                               partition@a00000 {
-                                       label = "kernel1";
-                                       reg = <0xa00000 0x2800000>;    /* 3MB + rootfs1 */
-                               };
-
-                               partition@d00000 {
-                                       label = "rootfs1";
-                                       reg = <0xd00000 0x2500000>;    /* 37MB */
-                               };
-
-                               partition@3200000 {
-                                       label = "kernel2";
-                                       reg = <0x3200000 0x2800000>;    /* 3MB + rootfs2 */
-                               };
-
-                               partition@3500000 {
-                                       label = "rootfs2";
-                                       reg = <0x3500000 0x2500000>;    /* 37MB */
-                               };
-
-                               /* Last MB is for the BBT, i.e. not writable */
-                               partition@5a00000 {
-                                       label = "syscfg";
-                                       reg = <0x5a00000 0x2600000>;    /* 38MB */
-                               };
-                       };
-
-                       spi0: spi@10600 {
-                               status = "okay";
-
-                               spi-flash@0 {
-                                       #address-cells = <1>;
-                                       #size-cells = <1>;
-                                       compatible = "everspin,mr25h256";
-                                       reg = <0>; /* Chip select 0 */
-                                       spi-max-frequency = <40000000>;
-                               };
-                       };
-               };
-       };
-
-       gpio_keys {
-               compatible = "gpio-keys";
-               #address-cells = <1>;
-               #size-cells = <0>;
-               pinctrl-0 = <&keys_pin>;
-               pinctrl-names = "default";
-
-               button@1 {
-                       label = "WPS";
-                       linux,code = <KEY_WPS_BUTTON>;
-                       gpios = <&gpio1 0 GPIO_ACTIVE_HIGH>;
-               };
-
-               button@2 {
-                       label = "Factory Reset Button";
-                       linux,code = <KEY_RESTART>;
-                       gpios = <&gpio1 1 GPIO_ACTIVE_HIGH>;
-               };
-       };
-
-       gpio-leds {
-               compatible = "gpio-leds";
-               pinctrl-0 = <&power_led_pin>;
-               pinctrl-names = "default";
-
-               power {
-                       label = "mamba:white:power";
-                       gpios = <&gpio1 8 GPIO_ACTIVE_HIGH>;
-                       default-state = "on";
-               };
-       };
-
-       gpio_fan {
-               /* SUNON HA4010V4-0000-C99 */
-               compatible = "gpio-fan";
-               gpios = <&gpio0 24 0>;
-
-               gpio-fan,speed-map = <0    0
-                                     4500 1>;
-       };
-
-       mvsw61xx {
-               compatible = "marvell,88e6172";
-               status = "okay";
-               reg = <0x10>;
-
-               mii-bus = <&mdio>;
-               cpu-port-0 = <5>;
-               cpu-port-1 = <6>;
-       };
-};
-
-&pinctrl {
-
-       keys_pin: keys-pin {
-               marvell,pins = "mpp32", "mpp33";
-               marvell,function = "gpio";
-       };
-
-       power_led_pin: power-led-pin {
-               marvell,pins = "mpp40";
-               marvell,function = "gpio";
-       };
-
-       gpio_fan_pin: gpio-fan-pin {
-               marvell,pins = "mpp24";
-               marvell,function = "gpio";
-       };
-};
index da7d217..4431101 100644 (file)
@@ -137,7 +137,7 @@ $(eval $(call NANDProfile,XP-DB,armada-xp-db,512KiB,4096))
 $(eval $(call NANDProfile,XP-GP,armada-xp-gp,512KiB,4096))
 
 # Boards with NAND, with subpages
-$(eval $(call NANDProfile,Mamba,armada-xp-mamba,128KiB,2048,512,2048))
+$(eval $(call NANDProfile,Mamba,armada-xp-linksys-mamba,128KiB,2048,512,2048))
 
 # Boards with large NOR, where we want to use UBI
 $(eval $(call UBINORProfile,OpenBlocks-AX-3-4,armada-xp-openblocks-ax3-4,128KiB))
@@ -146,12 +146,12 @@ $(eval $(call UBINORProfile,OpenBlocks-AX-3-4,armada-xp-openblocks-ax3-4,128KiB)
 $(eval $(call NORProfile,385-RD,armada-385-rd,256KiB))
 
 define Image/Build/Profile/Mamba/squashfs
-       $(call Image/Build/UbinizeImage,armada-xp-mamba,,squashfs, -p 128KiB -m 2048 -s 512 -O 2048)
+       $(call Image/Build/UbinizeImage,armada-xp-linksys-mamba,,squashfs, -p 128KiB -m 2048 -s 512 -O 2048)
        ( \
-               dd if=$(KDIR)/uImage-armada-xp-mamba bs=3072k conv=sync; \
-               dd if=$(KDIR)/$(IMG_PREFIX)-armada-xp-mamba-squashfs-ubinized.bin \
+               dd if=$(KDIR)/uImage-armada-xp-linksys-mamba bs=3072k conv=sync; \
+               dd if=$(KDIR)/$(IMG_PREFIX)-armada-xp-linksys-mamba-squashfs-ubinized.bin \
                bs=2048 conv=sync; \
-       ) > $(BIN_DIR)/$(IMG_PREFIX)-armada-xp-mamba-squashfs-factory.img
+       ) > $(BIN_DIR)/$(IMG_PREFIX)-armada-xp-linksys-mamba-squashfs-factory.img
 endef
 
 # The Default profile should build everything
diff --git a/target/linux/mvebu/patches-3.18/001-add_mamba_support.patch b/target/linux/mvebu/patches-3.18/001-add_mamba_support.patch
new file mode 100644 (file)
index 0000000..437cc3a
--- /dev/null
@@ -0,0 +1,388 @@
+From 4824140f4bd1caaf900215aabe27e4bdd1677704 Mon Sep 17 00:00:00 2001
+From: Imre Kaloz <kaloz@openwrt.org>
+Date: Mon, 16 Feb 2015 13:31:04 +0100
+Subject: [PATCH] ARM: mvebu: add Linksys WRT1900AC (Mamba) support
+
+The Linksys WRT1900AC (Mamba) is a router that has
+
+- 2 mini-PCIe slots with Marvell 88W8864 radios
+- 1 USB 3.0 port
+- 1 USB 2.0/eSATAp port
+- 2 Ethernet interfaces connected to a 88E6172 switch (1x WAN + 4x LAN)
+- 128MB NAND flash
+- 256MB RAM
+
+gregory.clement@free-electrons.com: - add ARM to the title
+       - fix the reference to CONFIG_DEBUG_MVEBU_UART0_ALTERNATE
+       - fix the unbalanced comment for the syscfg partition
+
+Signed-off-by: Imre Kaloz <kaloz@openwrt.org>
+Acked-by: Gregory CLEMENT <gregory.clement@free-electrons.com>
+Signed-off-by: Gregory CLEMENT <gregory.clement@free-electrons.com>
+---
+ arch/arm/boot/dts/Makefile                    |   1 +
+ arch/arm/boot/dts/armada-xp-linksys-mamba.dts | 348 ++++++++++++++++++++++++++
+ 2 files changed, 349 insertions(+)
+ create mode 100644 arch/arm/boot/dts/armada-xp-linksys-mamba.dts
+
+--- a/arch/arm/boot/dts/Makefile
++++ b/arch/arm/boot/dts/Makefile
+@@ -506,6 +506,7 @@ dtb-$(CONFIG_MACH_ARMADA_XP) += \
+       armada-xp-db.dtb \
+       armada-xp-gp.dtb \
+       armada-xp-lenovo-ix4-300d.dtb \
++      armada-xp-linksys-mamba.dtb \
+       armada-xp-matrix.dtb \
+       armada-xp-netgear-rn2120.dtb \
+       armada-xp-openblocks-ax3-4.dtb
+--- /dev/null
++++ b/arch/arm/boot/dts/armada-xp-linksys-mamba.dts
+@@ -0,0 +1,348 @@
++/*
++ * Device Tree file for the Linksys WRT1900AC (Mamba).
++ *
++ * Note: this board is shipped with a new generation boot loader that
++ * remaps internal registers at 0xf1000000. Therefore, if earlyprintk
++ * is used, the CONFIG_DEBUG_MVEBU_UART0_ALTERNATE option should be
++ * used.
++ *
++ * Copyright (C) 2014 Imre Kaloz <kaloz@openwrt.org>
++ *
++ * Based on armada-xp-axpwifiap.dts:
++ *
++ *     Copyright (C) 2013 Marvell
++ *
++ *     Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
++ *
++ * This file is dual-licensed: you can use it either under the terms
++ * of the GPL or the X11 license, at your option. Note that this dual
++ * licensing only applies to this file, and not this project as a
++ * whole.
++ *
++ *  a) This file is licensed under the terms of the GNU General Public
++ *     License version 2.  This program is licensed "as is" without
++ *     any warranty of any kind, whether express or implied.
++ *
++ * Or, alternatively,
++ *
++ *  b) Permission is hereby granted, free of charge, to any person
++ *     obtaining a copy of this software and associated documentation
++ *     files (the "Software"), to deal in the Software without
++ *     restriction, including without limitation the rights to use,
++ *     copy, modify, merge, publish, distribute, sublicense, and/or
++ *     sell copies of the Software, and to permit persons to whom the
++ *     Software is furnished to do so, subject to the following
++ *     conditions:
++ *
++ *     The above copyright notice and this permission notice shall be
++ *     included in all copies or substantial portions of the Software.
++ *
++ *     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
++ *     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
++ *     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
++ *     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
++ *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
++ *     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
++ *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
++ *     OTHER DEALINGS IN THE SOFTWARE.
++ */
++
++/dts-v1/;
++#include <dt-bindings/gpio/gpio.h>
++#include <dt-bindings/input/input.h>
++#include "armada-xp-mv78230.dtsi"
++
++/ {
++      model = "Linksys WRT1900AC";
++      compatible = "linksys,mamba", "marvell,armadaxp-mv78230",
++                   "marvell,armadaxp", "marvell,armada-370-xp";
++
++      chosen {
++              bootargs = "console=ttyS0,115200";
++              stdout-path = &uart0;
++      };
++
++      memory {
++              device_type = "memory";
++              reg = <0x00000000 0x00000000 0x00000000 0x10000000>; /* 256MB */
++      };
++
++      soc {
++              ranges = <MBUS_ID(0xf0, 0x01) 0 0 0xf1000000 0x100000
++                        MBUS_ID(0x01, 0x1d) 0 0 0xfff00000 0x100000>;
++
++              pcie-controller {
++                      status = "okay";
++
++                      /* Etron EJ168 USB 3.0 controller */
++                      pcie@1,0 {
++                              /* Port 0, Lane 0 */
++                              status = "okay";
++                      };
++
++                      /* First mini-PCIe port */
++                      pcie@2,0 {
++                              /* Port 0, Lane 1 */
++                              status = "okay";
++                      };
++
++                      /* Second mini-PCIe port */
++                      pcie@3,0 {
++                              /* Port 0, Lane 3 */
++                              status = "okay";
++                      };
++              };
++
++              internal-regs {
++
++                      /* J10: VCC, NC, RX, NC, TX, GND  */
++                      serial@12000 {
++                              status = "okay";
++                      };
++
++                      sata@a0000 {
++                              nr-ports = <1>;
++                              status = "okay";
++                      };
++
++                      ethernet@70000 {
++                              pinctrl-0 = <&ge0_rgmii_pins>;
++                              pinctrl-names = "default";
++                              status = "okay";
++                              phy-mode = "rgmii-id";
++                              fixed-link {
++                                      speed = <1000>;
++                                      full-duplex;
++                              };
++                      };
++
++                      ethernet@74000 {
++                              pinctrl-0 = <&ge1_rgmii_pins>;
++                              pinctrl-names = "default";
++                              status = "okay";
++                              phy-mode = "rgmii-id";
++                              fixed-link {
++                                      speed = <1000>;
++                                      full-duplex;
++                              };
++                      };
++
++                      /* USB part of the eSATA/USB 2.0 port */
++                      usb@50000 {
++                              status = "okay";
++                      };
++
++                      i2c@11000 {
++                              status = "okay";
++                              clock-frequency = <100000>;
++
++                              tmp421@4c {
++                                      compatible = "ti,tmp421";
++                                      reg = <0x4c>;
++                              };
++
++                              tlc59116@68 {
++                                      #address-cells = <1>;
++                                      #size-cells = <0>;
++                                      #gpio-cells = <2>;
++                                      compatible = "ti,tlc59116";
++                                      reg = <0x68>;
++
++                                      wan_amber@0 {
++                                              label = "mamba:amber:wan";
++                                              reg = <0x0>;
++                                      };
++
++                                      wan_white@1 {
++                                              label = "mamba:white:wan";
++                                              reg = <0x1>;
++                                      };
++
++                                      wlan_2g@2 {
++                                              label = "mamba:white:wlan_2g";
++                                              reg = <0x2>;
++                                      };
++
++                                      wlan_5g@3 {
++                                              label = "mamba:white:wlan_5g";
++                                              reg = <0x3>;
++                                      };
++
++                                      esata@4 {
++                                              label = "mamba:white:esata";
++                                              reg = <0x4>;
++                                      };
++
++                                      usb2@5 {
++                                              label = "mamba:white:usb2";
++                                              reg = <0x5>;
++                                      };
++
++                                      usb3_1@6 {
++                                              label = "mamba:white:usb3_1";
++                                              reg = <0x6>;
++                                      };
++
++                                      usb3_2@7 {
++                                              label = "mamba:white:usb3_2";
++                                              reg = <0x7>;
++                                      };
++
++                                      wps_white@8 {
++                                              label = "mamba:white:wps";
++                                              reg = <0x8>;
++                                      };
++
++                                      wps_amber@9 {
++                                              label = "mamba:amber:wps";
++                                              reg = <0x9>;
++                                      };
++                              };
++                      };
++
++                      nand@d0000 {
++                              status = "okay";
++                              num-cs = <1>;
++                              marvell,nand-keep-config;
++                              marvell,nand-enable-arbiter;
++                              nand-on-flash-bbt;
++                              nand-ecc-strength = <4>;
++                              nand-ecc-step-size = <512>;
++
++                              partition@0 {
++                                      label = "u-boot";
++                                      reg = <0x0000000 0x100000>;  /* 1MB */
++                                      read-only;
++                              };
++
++                              partition@100000 {
++                                      label = "u_env";
++                                      reg = <0x100000 0x40000>;    /* 256KB */
++                              };
++
++                              partition@140000 {
++                                      label = "s_env";
++                                      reg = <0x140000 0x40000>;    /* 256KB */
++                              };
++
++                              partition@900000 {
++                                      label = "devinfo";
++                                      reg = <0x900000 0x100000>;   /* 1MB */
++                                      read-only;
++                              };
++
++                              /* kernel1 overlaps with rootfs1 by design */
++                              partition@a00000 {
++                                      label = "kernel1";
++                                      reg = <0xa00000 0x2800000>;  /* 40MB */
++                              };
++
++                              partition@d00000 {
++                                      label = "rootfs1";
++                                      reg = <0xd00000 0x2500000>;  /* 37MB */
++                              };
++
++                              /* kernel2 overlaps with rootfs2 by design */
++                              partition@3200000 {
++                                      label = "kernel2";
++                                      reg = <0x3200000 0x2800000>; /* 40MB */
++                              };
++
++                              partition@3500000 {
++                                      label = "rootfs2";
++                                      reg = <0x3500000 0x2500000>; /* 37MB */
++                              };
++
++                              /*
++                               * 38MB, last MB is for the BBT, not writable
++                               */
++                              partition@5a00000 {
++                                      label = "syscfg";
++                                      reg = <0x5a00000 0x2600000>;
++                              };
++
++                              /*
++                               * Unused area between "s_env" and "devinfo".
++                               * Moved here because otherwise the renumbered
++                               * partitions would break the bootloader
++                               * supplied bootargs
++                               */
++                              partition@180000 {
++                                      label = "unused_area";
++                                      reg = <0x180000 0x780000>;   /* 7.5MB */
++                              };
++                      };
++
++                      spi0: spi@10600 {
++                              status = "okay";
++
++                              spi-flash@0 {
++                                      #address-cells = <1>;
++                                      #size-cells = <1>;
++                                      compatible = "everspin,mr25h256";
++                                      reg = <0>; /* Chip select 0 */
++                                      spi-max-frequency = <40000000>;
++                              };
++                      };
++              };
++      };
++
++      gpio_keys {
++              compatible = "gpio-keys";
++              #address-cells = <1>;
++              #size-cells = <0>;
++              pinctrl-0 = <&keys_pin>;
++              pinctrl-names = "default";
++
++              button@1 {
++                      label = "WPS";
++                      linux,code = <KEY_WPS_BUTTON>;
++                      gpios = <&gpio1 0 GPIO_ACTIVE_HIGH>;
++              };
++
++              button@2 {
++                      label = "Factory Reset Button";
++                      linux,code = <KEY_RESTART>;
++                      gpios = <&gpio1 1 GPIO_ACTIVE_HIGH>;
++              };
++      };
++
++      gpio-leds {
++              compatible = "gpio-leds";
++              pinctrl-0 = <&power_led_pin>;
++              pinctrl-names = "default";
++
++              power {
++                      label = "mamba:white:power";
++                      gpios = <&gpio1 8 GPIO_ACTIVE_HIGH>;
++                      default-state = "on";
++              };
++      };
++
++      gpio_fan {
++              /* SUNON HA4010V4-0000-C99 */
++              compatible = "gpio-fan";
++              gpios = <&gpio0 24 0>;
++
++              gpio-fan,speed-map = <0    0
++                                    4500 1>;
++      };
++};
++
++&pinctrl {
++
++      keys_pin: keys-pin {
++              marvell,pins = "mpp32", "mpp33";
++              marvell,function = "gpio";
++      };
++
++      power_led_pin: power-led-pin {
++              marvell,pins = "mpp40";
++              marvell,function = "gpio";
++      };
++
++      gpio_fan_pin: gpio-fan-pin {
++              marvell,pins = "mpp24";
++              marvell,function = "gpio";
++      };
++};
diff --git a/target/linux/mvebu/patches-3.18/001-build_mamba_dts.patch b/target/linux/mvebu/patches-3.18/001-build_mamba_dts.patch
deleted file mode 100644 (file)
index cb27ccd..0000000
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/arch/arm/boot/dts/Makefile
-+++ b/arch/arm/boot/dts/Makefile
-@@ -506,6 +506,7 @@ dtb-$(CONFIG_MACH_ARMADA_XP) += \
-       armada-xp-db.dtb \
-       armada-xp-gp.dtb \
-       armada-xp-lenovo-ix4-300d.dtb \
-+      armada-xp-mamba.dtb \
-       armada-xp-matrix.dtb \
-       armada-xp-netgear-rn2120.dtb \
-       armada-xp-openblocks-ax3-4.dtb
diff --git a/target/linux/mvebu/patches-3.18/002-add_mamba_powertables.patch b/target/linux/mvebu/patches-3.18/002-add_mamba_powertables.patch
new file mode 100644 (file)
index 0000000..6b51e48
--- /dev/null
@@ -0,0 +1,103 @@
+--- a/arch/arm/boot/dts/armada-xp-linksys-mamba.dts
++++ b/arch/arm/boot/dts/armada-xp-linksys-mamba.dts
+@@ -84,12 +84,100 @@
+                       pcie@2,0 {
+                               /* Port 0, Lane 1 */
+                               status = "okay";
++
++                              mwlwifi {
++                                      marvell,5ghz = <0>;
++                                      marvell,chainmask = <4 4>;
++                                      marvell,powertable {
++                                              FCC =
++                                                      <1 0 0x17 0x11 0x11 0x11 0x10 0x10 0x10 0x10 0xf 0xf 0xf 0xf 0x0 0x0 0x0 0x0 0 0xf>,
++                                                      <2 0 0x17 0x16 0x16 0x16 0x16 0x16 0x16 0x14 0x10 0x10 0x10 0x10 0x0 0x0 0x0 0x0 0 0xf>,
++                                                      <3 0 0x17 0x16 0x16 0x16 0x16 0x16 0x16 0x14 0x10 0x10 0x10 0x10 0x0 0x0 0x0 0x0 0 0xf>,
++                                                      <4 0 0x17 0x16 0x16 0x16 0x16 0x16 0x16 0x14 0x10 0x10 0x10 0x10 0x0 0x0 0x0 0x0 0 0xf>,
++                                                      <5 0 0x17 0x16 0x16 0x16 0x16 0x16 0x16 0x14 0x10 0x10 0x10 0x10 0x0 0x0 0x0 0x0 0 0xf>,
++                                                      <6 0 0x17 0x16 0x16 0x16 0x16 0x16 0x16 0x14 0x10 0x10 0x10 0x10 0x0 0x0 0x0 0x0 0 0xf>,
++                                                      <7 0 0x17 0x16 0x16 0x16 0x16 0x16 0x16 0x14 0x10 0x10 0x10 0x10 0x0 0x0 0x0 0x0 0 0xf>,
++                                                      <8 0 0x17 0x16 0x16 0x16 0x16 0x16 0x16 0x14 0x10 0x10 0x10 0x10 0x0 0x0 0x0 0x0 0 0xf>,
++                                                      <9 0 0x17 0x16 0x16 0x16 0x16 0x16 0x16 0x14 0x10 0x10 0x10 0x10 0x0 0x0 0x0 0x0 0 0xf>,
++                                                      <10 0 0x17 0x16 0x16 0x16 0x16 0x16 0x16 0x14 0x10 0x10 0x10 0x10 0x0 0x0 0x0 0x0 0 0xf>,
++                                                      <11 0 0x17 0x11 0x11 0x11 0x11 0x11 0x11 0x11 0x10 0x10 0x10 0x10 0x0 0x0 0x0 0x0 0 0xf>;
++
++                                              ETSI =
++                                                      <1 0 0xb 0xb 0xb 0xb 0xb 0xb 0xb 0xb 0xb 0xb 0xb 0xb 0x0 0x0 0x0 0x0 0 0xf>,
++                                                      <2 0 0xb 0xb 0xb 0xb 0xb 0xb 0xb 0xb 0xb 0xb 0xb 0xb 0x0 0x0 0x0 0x0 0 0xf>,
++                                                      <3 0 0xb 0xb 0xb 0xb 0xb 0xb 0xb 0xb 0xb 0xb 0xb 0xb 0x0 0x0 0x0 0x0 0 0xf>,
++                                                      <4 0 0xb 0xb 0xb 0xb 0xb 0xb 0xb 0xb 0xb 0xb 0xb 0xb 0x0 0x0 0x0 0x0 0 0xf>,
++                                                      <5 0 0xb 0xb 0xb 0xb 0xb 0xb 0xb 0xb 0xb 0xb 0xb 0xb 0x0 0x0 0x0 0x0 0 0xf>,
++                                                      <6 0 0xb 0xb 0xb 0xb 0xb 0xb 0xb 0xb 0xb 0xb 0xb 0xb 0x0 0x0 0x0 0x0 0 0xf>,
++                                                      <7 0 0xb 0xb 0xb 0xb 0xb 0xb 0xb 0xb 0xb 0xb 0xb 0xb 0x0 0x0 0x0 0x0 0 0xf>,
++                                                      <8 0 0xb 0xb 0xb 0xb 0xb 0xb 0xb 0xb 0xb 0xb 0xb 0xb 0x0 0x0 0x0 0x0 0 0xf>,
++                                                      <9 0 0xb 0xb 0xb 0xb 0xb 0xb 0xb 0xb 0xb 0xb 0xb 0xb 0x0 0x0 0x0 0x0 0 0xf>,
++                                                      <10 0 0xb 0xb 0xb 0xb 0xb 0xb 0xb 0xb 0xb 0xb 0xb 0xb 0x0 0x0 0x0 0x0 0 0xf>,
++                                                      <11 0 0xb 0xb 0xb 0xb 0xb 0xb 0xb 0xb 0xb 0xb 0xb 0xb 0x0 0x0 0x0 0x0 0 0xf>,
++                                                      <12 0 0xb 0xb 0xb 0xb 0xb 0xb 0xb 0xb 0xb 0xb 0xb 0xb 0x0 0x0 0x0 0x0 0 0xf>,
++                                                      <13 0 0xb 0xb 0xb 0xb 0xb 0xb 0xb 0xb 0xb 0xb 0xb 0xb 0x0 0x0 0x0 0x0 0 0xf>;
++                                      };
++                              };
+                       };
+                       /* Second mini-PCIe port */
+                       pcie@3,0 {
+                               /* Port 0, Lane 3 */
+                               status = "okay";
++
++                              mwlwifi {
++                                      marvell,2ghz = <0>;
++                                      marvell,chainmask = <4 4>;
++                                      marvell,powertable {
++                                              FCC =
++                                                      <36 0 0x8 0x8 0x8 0x8 0x8 0x8 0x8 0x8 0x9 0x9 0x9 0x9 0x9 0x9 0x9 0x9 0 0xf>,
++                                                      <40 0 0x8 0x8 0x8 0x8 0x9 0x9 0x9 0x9 0x9 0x9 0x9 0x9 0x9 0x9 0x9 0x9 0 0xf>,
++                                                      <44 0 0x8 0x8 0x8 0x8 0x9 0x9 0x9 0x9 0x9 0x9 0x9 0x9 0x9 0x9 0x9 0x9 0 0xf>,
++                                                      <48 0 0x8 0x8 0x8 0x8 0x9 0x9 0x9 0x9 0x9 0x9 0x9 0x9 0x9 0x9 0x9 0x9 0 0xf>,
++                                                      <52 0 0xf 0xf 0xf 0xf 0xf 0xf 0xf 0xf 0x12 0x12 0x12 0x12 0x12 0x12 0x12 0x12 0 0xf>,
++                                                      <56 0 0xf 0xf 0xf 0xf 0xf 0xf 0xf 0xf 0x12 0x12 0x12 0x12 0x12 0x12 0x12 0x12 0 0xf>,
++                                                      <60 0 0xf 0xf 0xf 0xf 0xf 0xf 0xf 0xf 0x12 0x12 0x12 0x12 0x12 0x12 0x12 0x12 0 0xf>,
++                                                      <64 0 0xf 0xf 0xf 0xf 0xf 0xf 0xf 0xf 0x12 0x12 0x12 0x12 0x12 0x12 0x12 0x12 0 0xf>,
++                                                      <100 0 0x14 0x14 0x14 0x14 0x14 0x14 0x14 0x14 0x14 0x14 0x14 0x14 0x14 0x14 0x14 0x14 0 0xf>,
++                                                      <104 0 0x14 0x14 0x14 0x14 0x14 0x14 0x14 0x14 0x14 0x14 0x14 0x14 0x14 0x14 0x14 0x14 0 0xf>,
++                                                      <108 0 0x14 0x14 0x14 0x14 0x14 0x14 0x14 0x14 0x14 0x14 0x14 0x14 0x14 0x14 0x14 0x14 0 0xf>,
++                                                      <112 0 0x14 0x14 0x14 0x14 0x14 0x14 0x14 0x14 0x14 0x14 0x14 0x14 0x14 0x14 0x14 0x14 0 0xf>,
++                                                      <116 0 0x14 0x14 0x14 0x14 0x14 0x14 0x14 0x14 0x14 0x14 0x14 0x14 0x14 0x14 0x14 0x14 0 0xf>,
++                                                      <120 0 0x14 0x14 0x14 0x14 0x14 0x14 0x14 0x14 0x14 0x14 0x14 0x14 0x14 0x14 0x14 0x14 0 0xf>,
++                                                      <124 0 0x14 0x14 0x14 0x14 0x14 0x14 0x14 0x14 0x14 0x14 0x14 0x14 0x14 0x14 0x14 0x14 0 0xf>,
++                                                      <128 0 0x14 0x14 0x14 0x14 0x14 0x14 0x14 0x14 0x14 0x14 0x14 0x14 0x14 0x14 0x14 0x14 0 0xf>,
++                                                      <132 0 0x14 0x14 0x14 0x14 0x14 0x14 0x14 0x14 0x14 0x14 0x14 0x14 0x14 0x14 0x14 0x14 0 0xf>,
++                                                      <136 0 0x14 0x14 0x14 0x14 0x14 0x14 0x14 0x14 0x14 0x14 0x14 0x14 0x14 0x14 0x14 0x14 0 0xf>,
++                                                      <140 0 0x14 0x14 0x14 0x14 0x14 0x14 0x14 0x14 0x14 0x14 0x14 0x14 0x14 0x14 0x14 0x14 0 0xf>,
++                                                      <149 0 0x16 0x16 0x16 0x16 0x14 0x14 0x14 0x14 0x15 0x15 0x15 0x15 0x14 0x14 0x14 0x14 0 0xf>,
++                                                      <153 0 0x15 0x15 0x15 0x15 0x15 0x15 0x15 0x15 0x15 0x15 0x15 0x15 0x14 0x14 0x14 0x14 0 0xf>,
++                                                      <157 0 0x15 0x15 0x15 0x15 0x15 0x15 0x15 0x15 0x15 0x15 0x15 0x15 0x14 0x14 0x14 0x14 0 0xf>,
++                                                      <161 0 0x15 0x15 0x15 0x15 0x15 0x15 0x15 0x15 0x15 0x15 0x15 0x15 0x14 0x14 0x14 0x14 0 0xf>,
++                                                      <165 0 0x16 0x16 0x16 0x16 0x16 0x16 0x16 0x16 0x15 0x15 0x15 0x15 0x14 0x14 0x14 0x14 0 0xf>;
++
++                                              ETSI =
++                                                      <36 0 0xc 0xc 0xc 0xc 0xc 0xc 0xc 0xc 0xd 0xd 0xd 0xd 0xc 0xc 0xc 0xc 0 0xf>,
++                                                      <40 0 0xc 0xc 0xc 0xc 0xc 0xc 0xc 0xc 0xd 0xd 0xd 0xd 0xc 0xc 0xc 0xc 0 0xf>,
++                                                      <44 0 0xc 0xc 0xc 0xc 0xc 0xc 0xc 0xc 0xd 0xd 0xd 0xd 0xc 0xc 0xc 0xc 0 0xf>,
++                                                      <48 0 0xc 0xc 0xc 0xc 0xc 0xc 0xc 0xc 0xd 0xd 0xd 0xd 0xc 0xc 0xc 0xc 0 0xf>,
++                                                      <52 0 0xc 0xc 0xc 0xc 0xc 0xc 0xc 0xc 0xd 0xd 0xd 0xd 0xc 0xc 0xc 0xc 0 0xf>,
++                                                      <56 0 0xc 0xc 0xc 0xc 0xc 0xc 0xc 0xc 0xd 0xd 0xd 0xd 0xc 0xc 0xc 0xc 0 0xf>,
++                                                      <60 0 0xc 0xc 0xc 0xc 0xc 0xc 0xc 0xc 0xd 0xd 0xd 0xd 0xc 0xc 0xc 0xc 0 0xf>,
++                                                      <64 0 0xc 0xc 0xc 0xc 0xc 0xc 0xc 0xc 0xd 0xd 0xd 0xd 0xc 0xc 0xc 0xc 0 0xf>,
++                                                      <100 0 0xc 0xc 0xc 0xc 0xc 0xc 0xc 0xc 0xd 0xd 0xd 0xd 0xc 0xc 0xc 0xc 0 0xf>,
++                                                      <104 0 0xc 0xc 0xc 0xc 0xc 0xc 0xc 0xc 0xd 0xd 0xd 0xd 0xc 0xc 0xc 0xc 0 0xf>,
++                                                      <108 0 0xc 0xc 0xc 0xc 0xc 0xc 0xc 0xc 0xd 0xd 0xd 0xd 0xc 0xc 0xc 0xc 0 0xf>,
++                                                      <112 0 0xc 0xc 0xc 0xc 0xc 0xc 0xc 0xc 0xd 0xd 0xd 0xd 0xc 0xc 0xc 0xc 0 0xf>,
++                                                      <116 0 0xc 0xc 0xc 0xc 0xc 0xc 0xc 0xc 0xd 0xd 0xd 0xd 0xc 0xc 0xc 0xc 0 0xf>,
++                                                      <120 0 0xc 0xc 0xc 0xc 0xc 0xc 0xc 0xc 0xd 0xd 0xd 0xd 0xc 0xc 0xc 0xc 0 0xf>,
++                                                      <124 0 0xc 0xc 0xc 0xc 0xc 0xc 0xc 0xc 0xd 0xd 0xd 0xd 0xc 0xc 0xc 0xc 0 0xf>,
++                                                      <128 0 0xc 0xc 0xc 0xc 0xc 0xc 0xc 0xc 0xd 0xd 0xd 0xd 0xc 0xc 0xc 0xc 0 0xf>,
++                                                      <132 0 0xc 0xc 0xc 0xc 0xc 0xc 0xc 0xc 0xd 0xd 0xd 0xd 0xc 0xc 0xc 0xc 0 0xf>,
++                                                      <136 0 0xc 0xc 0xc 0xc 0xc 0xc 0xc 0xc 0xd 0xd 0xd 0xd 0xc 0xc 0xc 0xc 0 0xf>,
++                                                      <140 0 0xc 0xc 0xc 0xc 0xc 0xc 0xc 0xc 0xd 0xd 0xd 0xd 0xc 0xc 0xc 0xc 0 0xf>,
++                                                      <149 0 0xc 0xc 0xc 0xc 0xc 0xc 0xc 0xc 0xd 0xd 0xd 0xd 0xc 0xc 0xc 0xc 0 0xf>;
++                                      };
++                              };
+                       };
+               };
diff --git a/target/linux/mvebu/patches-3.18/003-add_mamba_switch.patch b/target/linux/mvebu/patches-3.18/003-add_mamba_switch.patch
new file mode 100644 (file)
index 0000000..e43d164
--- /dev/null
@@ -0,0 +1,19 @@
+--- a/arch/arm/boot/dts/armada-xp-linksys-mamba.dts
++++ b/arch/arm/boot/dts/armada-xp-linksys-mamba.dts
+@@ -415,6 +415,16 @@
+               gpio-fan,speed-map = <0    0
+                                     4500 1>;
+       };
++
++      mvsw61xx {
++              compatible = "marvell,88e6172";
++              status = "okay";
++              reg = <0x10>;
++
++              mii-bus = <&mdio>;
++              cpu-port-0 = <5>;
++              cpu-port-1 = <6>;
++      };
+ };
+ &pinctrl {
diff --git a/target/linux/mvebu/patches-4.0/001-add_mamba_support.patch b/target/linux/mvebu/patches-4.0/001-add_mamba_support.patch
new file mode 100644 (file)
index 0000000..305479a
--- /dev/null
@@ -0,0 +1,388 @@
+From 4824140f4bd1caaf900215aabe27e4bdd1677704 Mon Sep 17 00:00:00 2001
+From: Imre Kaloz <kaloz@openwrt.org>
+Date: Mon, 16 Feb 2015 13:31:04 +0100
+Subject: [PATCH] ARM: mvebu: add Linksys WRT1900AC (Mamba) support
+
+The Linksys WRT1900AC (Mamba) is a router that has
+
+- 2 mini-PCIe slots with Marvell 88W8864 radios
+- 1 USB 3.0 port
+- 1 USB 2.0/eSATAp port
+- 2 Ethernet interfaces connected to a 88E6172 switch (1x WAN + 4x LAN)
+- 128MB NAND flash
+- 256MB RAM
+
+gregory.clement@free-electrons.com: - add ARM to the title
+       - fix the reference to CONFIG_DEBUG_MVEBU_UART0_ALTERNATE
+       - fix the unbalanced comment for the syscfg partition
+
+Signed-off-by: Imre Kaloz <kaloz@openwrt.org>
+Acked-by: Gregory CLEMENT <gregory.clement@free-electrons.com>
+Signed-off-by: Gregory CLEMENT <gregory.clement@free-electrons.com>
+---
+ arch/arm/boot/dts/Makefile                    |   1 +
+ arch/arm/boot/dts/armada-xp-linksys-mamba.dts | 348 ++++++++++++++++++++++++++
+ 2 files changed, 349 insertions(+)
+ create mode 100644 arch/arm/boot/dts/armada-xp-linksys-mamba.dts
+
+--- a/arch/arm/boot/dts/Makefile
++++ b/arch/arm/boot/dts/Makefile
+@@ -629,6 +629,7 @@ dtb-$(CONFIG_MACH_ARMADA_XP) += \
+       armada-xp-db.dtb \
+       armada-xp-gp.dtb \
+       armada-xp-lenovo-ix4-300d.dtb \
++      armada-xp-linksys-mamba.dtb \
+       armada-xp-matrix.dtb \
+       armada-xp-netgear-rn2120.dtb \
+       armada-xp-openblocks-ax3-4.dtb \
+--- /dev/null
++++ b/arch/arm/boot/dts/armada-xp-linksys-mamba.dts
+@@ -0,0 +1,348 @@
++/*
++ * Device Tree file for the Linksys WRT1900AC (Mamba).
++ *
++ * Note: this board is shipped with a new generation boot loader that
++ * remaps internal registers at 0xf1000000. Therefore, if earlyprintk
++ * is used, the CONFIG_DEBUG_MVEBU_UART0_ALTERNATE option should be
++ * used.
++ *
++ * Copyright (C) 2014 Imre Kaloz <kaloz@openwrt.org>
++ *
++ * Based on armada-xp-axpwifiap.dts:
++ *
++ *     Copyright (C) 2013 Marvell
++ *
++ *     Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
++ *
++ * This file is dual-licensed: you can use it either under the terms
++ * of the GPL or the X11 license, at your option. Note that this dual
++ * licensing only applies to this file, and not this project as a
++ * whole.
++ *
++ *  a) This file is licensed under the terms of the GNU General Public
++ *     License version 2.  This program is licensed "as is" without
++ *     any warranty of any kind, whether express or implied.
++ *
++ * Or, alternatively,
++ *
++ *  b) Permission is hereby granted, free of charge, to any person
++ *     obtaining a copy of this software and associated documentation
++ *     files (the "Software"), to deal in the Software without
++ *     restriction, including without limitation the rights to use,
++ *     copy, modify, merge, publish, distribute, sublicense, and/or
++ *     sell copies of the Software, and to permit persons to whom the
++ *     Software is furnished to do so, subject to the following
++ *     conditions:
++ *
++ *     The above copyright notice and this permission notice shall be
++ *     included in all copies or substantial portions of the Software.
++ *
++ *     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
++ *     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
++ *     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
++ *     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
++ *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
++ *     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
++ *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
++ *     OTHER DEALINGS IN THE SOFTWARE.
++ */
++
++/dts-v1/;
++#include <dt-bindings/gpio/gpio.h>
++#include <dt-bindings/input/input.h>
++#include "armada-xp-mv78230.dtsi"
++
++/ {
++      model = "Linksys WRT1900AC";
++      compatible = "linksys,mamba", "marvell,armadaxp-mv78230",
++                   "marvell,armadaxp", "marvell,armada-370-xp";
++
++      chosen {
++              bootargs = "console=ttyS0,115200";
++              stdout-path = &uart0;
++      };
++
++      memory {
++              device_type = "memory";
++              reg = <0x00000000 0x00000000 0x00000000 0x10000000>; /* 256MB */
++      };
++
++      soc {
++              ranges = <MBUS_ID(0xf0, 0x01) 0 0 0xf1000000 0x100000
++                        MBUS_ID(0x01, 0x1d) 0 0 0xfff00000 0x100000>;
++
++              pcie-controller {
++                      status = "okay";
++
++                      /* Etron EJ168 USB 3.0 controller */
++                      pcie@1,0 {
++                              /* Port 0, Lane 0 */
++                              status = "okay";
++                      };
++
++                      /* First mini-PCIe port */
++                      pcie@2,0 {
++                              /* Port 0, Lane 1 */
++                              status = "okay";
++                      };
++
++                      /* Second mini-PCIe port */
++                      pcie@3,0 {
++                              /* Port 0, Lane 3 */
++                              status = "okay";
++                      };
++              };
++
++              internal-regs {
++
++                      /* J10: VCC, NC, RX, NC, TX, GND  */
++                      serial@12000 {
++                              status = "okay";
++                      };
++
++                      sata@a0000 {
++                              nr-ports = <1>;
++                              status = "okay";
++                      };
++
++                      ethernet@70000 {
++                              pinctrl-0 = <&ge0_rgmii_pins>;
++                              pinctrl-names = "default";
++                              status = "okay";
++                              phy-mode = "rgmii-id";
++                              fixed-link {
++                                      speed = <1000>;
++                                      full-duplex;
++                              };
++                      };
++
++                      ethernet@74000 {
++                              pinctrl-0 = <&ge1_rgmii_pins>;
++                              pinctrl-names = "default";
++                              status = "okay";
++                              phy-mode = "rgmii-id";
++                              fixed-link {
++                                      speed = <1000>;
++                                      full-duplex;
++                              };
++                      };
++
++                      /* USB part of the eSATA/USB 2.0 port */
++                      usb@50000 {
++                              status = "okay";
++                      };
++
++                      i2c@11000 {
++                              status = "okay";
++                              clock-frequency = <100000>;
++
++                              tmp421@4c {
++                                      compatible = "ti,tmp421";
++                                      reg = <0x4c>;
++                              };
++
++                              tlc59116@68 {
++                                      #address-cells = <1>;
++                                      #size-cells = <0>;
++                                      #gpio-cells = <2>;
++                                      compatible = "ti,tlc59116";
++                                      reg = <0x68>;
++
++                                      wan_amber@0 {
++                                              label = "mamba:amber:wan";
++                                              reg = <0x0>;
++                                      };
++
++                                      wan_white@1 {
++                                              label = "mamba:white:wan";
++                                              reg = <0x1>;
++                                      };
++
++                                      wlan_2g@2 {
++                                              label = "mamba:white:wlan_2g";
++                                              reg = <0x2>;
++                                      };
++
++                                      wlan_5g@3 {
++                                              label = "mamba:white:wlan_5g";
++                                              reg = <0x3>;
++                                      };
++
++                                      esata@4 {
++                                              label = "mamba:white:esata";
++                                              reg = <0x4>;
++                                      };
++
++                                      usb2@5 {
++                                              label = "mamba:white:usb2";
++                                              reg = <0x5>;
++                                      };
++
++                                      usb3_1@6 {
++                                              label = "mamba:white:usb3_1";
++                                              reg = <0x6>;
++                                      };
++
++                                      usb3_2@7 {
++                                              label = "mamba:white:usb3_2";
++                                              reg = <0x7>;
++                                      };
++
++                                      wps_white@8 {
++                                              label = "mamba:white:wps";
++                                              reg = <0x8>;
++                                      };
++
++                                      wps_amber@9 {
++                                              label = "mamba:amber:wps";
++                                              reg = <0x9>;
++                                      };
++                              };
++                      };
++
++                      nand@d0000 {
++                              status = "okay";
++                              num-cs = <1>;
++                              marvell,nand-keep-config;
++                              marvell,nand-enable-arbiter;
++                              nand-on-flash-bbt;
++                              nand-ecc-strength = <4>;
++                              nand-ecc-step-size = <512>;
++
++                              partition@0 {
++                                      label = "u-boot";
++                                      reg = <0x0000000 0x100000>;  /* 1MB */
++                                      read-only;
++                              };
++
++                              partition@100000 {
++                                      label = "u_env";
++                                      reg = <0x100000 0x40000>;    /* 256KB */
++                              };
++
++                              partition@140000 {
++                                      label = "s_env";
++                                      reg = <0x140000 0x40000>;    /* 256KB */
++                              };
++
++                              partition@900000 {
++                                      label = "devinfo";
++                                      reg = <0x900000 0x100000>;   /* 1MB */
++                                      read-only;
++                              };
++
++                              /* kernel1 overlaps with rootfs1 by design */
++                              partition@a00000 {
++                                      label = "kernel1";
++                                      reg = <0xa00000 0x2800000>;  /* 40MB */
++                              };
++
++                              partition@d00000 {
++                                      label = "rootfs1";
++                                      reg = <0xd00000 0x2500000>;  /* 37MB */
++                              };
++
++                              /* kernel2 overlaps with rootfs2 by design */
++                              partition@3200000 {
++                                      label = "kernel2";
++                                      reg = <0x3200000 0x2800000>; /* 40MB */
++                              };
++
++                              partition@3500000 {
++                                      label = "rootfs2";
++                                      reg = <0x3500000 0x2500000>; /* 37MB */
++                              };
++
++                              /*
++                               * 38MB, last MB is for the BBT, not writable
++                               */
++                              partition@5a00000 {
++                                      label = "syscfg";
++                                      reg = <0x5a00000 0x2600000>;
++                              };
++
++                              /*
++                               * Unused area between "s_env" and "devinfo".
++                               * Moved here because otherwise the renumbered
++                               * partitions would break the bootloader
++                               * supplied bootargs
++                               */
++                              partition@180000 {
++                                      label = "unused_area";
++                                      reg = <0x180000 0x780000>;   /* 7.5MB */
++                              };
++                      };
++
++                      spi0: spi@10600 {
++                              status = "okay";
++
++                              spi-flash@0 {
++                                      #address-cells = <1>;
++                                      #size-cells = <1>;
++                                      compatible = "everspin,mr25h256";
++                                      reg = <0>; /* Chip select 0 */
++                                      spi-max-frequency = <40000000>;
++                              };
++                      };
++              };
++      };
++
++      gpio_keys {
++              compatible = "gpio-keys";
++              #address-cells = <1>;
++              #size-cells = <0>;
++              pinctrl-0 = <&keys_pin>;
++              pinctrl-names = "default";
++
++              button@1 {
++                      label = "WPS";
++                      linux,code = <KEY_WPS_BUTTON>;
++                      gpios = <&gpio1 0 GPIO_ACTIVE_HIGH>;
++              };
++
++              button@2 {
++                      label = "Factory Reset Button";
++                      linux,code = <KEY_RESTART>;
++                      gpios = <&gpio1 1 GPIO_ACTIVE_HIGH>;
++              };
++      };
++
++      gpio-leds {
++              compatible = "gpio-leds";
++              pinctrl-0 = <&power_led_pin>;
++              pinctrl-names = "default";
++
++              power {
++                      label = "mamba:white:power";
++                      gpios = <&gpio1 8 GPIO_ACTIVE_HIGH>;
++                      default-state = "on";
++              };
++      };
++
++      gpio_fan {
++              /* SUNON HA4010V4-0000-C99 */
++              compatible = "gpio-fan";
++              gpios = <&gpio0 24 0>;
++
++              gpio-fan,speed-map = <0    0
++                                    4500 1>;
++      };
++};
++
++&pinctrl {
++
++      keys_pin: keys-pin {
++              marvell,pins = "mpp32", "mpp33";
++              marvell,function = "gpio";
++      };
++
++      power_led_pin: power-led-pin {
++              marvell,pins = "mpp40";
++              marvell,function = "gpio";
++      };
++
++      gpio_fan_pin: gpio-fan-pin {
++              marvell,pins = "mpp24";
++              marvell,function = "gpio";
++      };
++};
diff --git a/target/linux/mvebu/patches-4.0/001-build_mamba_dts.patch b/target/linux/mvebu/patches-4.0/001-build_mamba_dts.patch
deleted file mode 100644 (file)
index 5993d3c..0000000
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/arch/arm/boot/dts/Makefile
-+++ b/arch/arm/boot/dts/Makefile
-@@ -629,6 +629,7 @@ dtb-$(CONFIG_MACH_ARMADA_XP) += \
-       armada-xp-db.dtb \
-       armada-xp-gp.dtb \
-       armada-xp-lenovo-ix4-300d.dtb \
-+      armada-xp-mamba.dtb \
-       armada-xp-matrix.dtb \
-       armada-xp-netgear-rn2120.dtb \
-       armada-xp-openblocks-ax3-4.dtb \
diff --git a/target/linux/mvebu/patches-4.0/002-add_mamba_powertables.patch b/target/linux/mvebu/patches-4.0/002-add_mamba_powertables.patch
new file mode 100644 (file)
index 0000000..6b51e48
--- /dev/null
@@ -0,0 +1,103 @@
+--- a/arch/arm/boot/dts/armada-xp-linksys-mamba.dts
++++ b/arch/arm/boot/dts/armada-xp-linksys-mamba.dts
+@@ -84,12 +84,100 @@
+                       pcie@2,0 {
+                               /* Port 0, Lane 1 */
+                               status = "okay";
++
++                              mwlwifi {
++                                      marvell,5ghz = <0>;
++                                      marvell,chainmask = <4 4>;
++                                      marvell,powertable {
++                                              FCC =
++                                                      <1 0 0x17 0x11 0x11 0x11 0x10 0x10 0x10 0x10 0xf 0xf 0xf 0xf 0x0 0x0 0x0 0x0 0 0xf>,
++                                                      <2 0 0x17 0x16 0x16 0x16 0x16 0x16 0x16 0x14 0x10 0x10 0x10 0x10 0x0 0x0 0x0 0x0 0 0xf>,
++                                                      <3 0 0x17 0x16 0x16 0x16 0x16 0x16 0x16 0x14 0x10 0x10 0x10 0x10 0x0 0x0 0x0 0x0 0 0xf>,
++                                                      <4 0 0x17 0x16 0x16 0x16 0x16 0x16 0x16 0x14 0x10 0x10 0x10 0x10 0x0 0x0 0x0 0x0 0 0xf>,
++                                                      <5 0 0x17 0x16 0x16 0x16 0x16 0x16 0x16 0x14 0x10 0x10 0x10 0x10 0x0 0x0 0x0 0x0 0 0xf>,
++                                                      <6 0 0x17 0x16 0x16 0x16 0x16 0x16 0x16 0x14 0x10 0x10 0x10 0x10 0x0 0x0 0x0 0x0 0 0xf>,
++                                                      <7 0 0x17 0x16 0x16 0x16 0x16 0x16 0x16 0x14 0x10 0x10 0x10 0x10 0x0 0x0 0x0 0x0 0 0xf>,
++                                                      <8 0 0x17 0x16 0x16 0x16 0x16 0x16 0x16 0x14 0x10 0x10 0x10 0x10 0x0 0x0 0x0 0x0 0 0xf>,
++                                                      <9 0 0x17 0x16 0x16 0x16 0x16 0x16 0x16 0x14 0x10 0x10 0x10 0x10 0x0 0x0 0x0 0x0 0 0xf>,
++                                                      <10 0 0x17 0x16 0x16 0x16 0x16 0x16 0x16 0x14 0x10 0x10 0x10 0x10 0x0 0x0 0x0 0x0 0 0xf>,
++                                                      <11 0 0x17 0x11 0x11 0x11 0x11 0x11 0x11 0x11 0x10 0x10 0x10 0x10 0x0 0x0 0x0 0x0 0 0xf>;
++
++                                              ETSI =
++                                                      <1 0 0xb 0xb 0xb 0xb 0xb 0xb 0xb 0xb 0xb 0xb 0xb 0xb 0x0 0x0 0x0 0x0 0 0xf>,
++                                                      <2 0 0xb 0xb 0xb 0xb 0xb 0xb 0xb 0xb 0xb 0xb 0xb 0xb 0x0 0x0 0x0 0x0 0 0xf>,
++                                                      <3 0 0xb 0xb 0xb 0xb 0xb 0xb 0xb 0xb 0xb 0xb 0xb 0xb 0x0 0x0 0x0 0x0 0 0xf>,
++                                                      <4 0 0xb 0xb 0xb 0xb 0xb 0xb 0xb 0xb 0xb 0xb 0xb 0xb 0x0 0x0 0x0 0x0 0 0xf>,
++                                                      <5 0 0xb 0xb 0xb 0xb 0xb 0xb 0xb 0xb 0xb 0xb 0xb 0xb 0x0 0x0 0x0 0x0 0 0xf>,
++                                                      <6 0 0xb 0xb 0xb 0xb 0xb 0xb 0xb 0xb 0xb 0xb 0xb 0xb 0x0 0x0 0x0 0x0 0 0xf>,
++                                                      <7 0 0xb 0xb 0xb 0xb 0xb 0xb 0xb 0xb 0xb 0xb 0xb 0xb 0x0 0x0 0x0 0x0 0 0xf>,
++                                                      <8 0 0xb 0xb 0xb 0xb 0xb 0xb 0xb 0xb 0xb 0xb 0xb 0xb 0x0 0x0 0x0 0x0 0 0xf>,
++                                                      <9 0 0xb 0xb 0xb 0xb 0xb 0xb 0xb 0xb 0xb 0xb 0xb 0xb 0x0 0x0 0x0 0x0 0 0xf>,
++                                                      <10 0 0xb 0xb 0xb 0xb 0xb 0xb 0xb 0xb 0xb 0xb 0xb 0xb 0x0 0x0 0x0 0x0 0 0xf>,
++                                                      <11 0 0xb 0xb 0xb 0xb 0xb 0xb 0xb 0xb 0xb 0xb 0xb 0xb 0x0 0x0 0x0 0x0 0 0xf>,
++                                                      <12 0 0xb 0xb 0xb 0xb 0xb 0xb 0xb 0xb 0xb 0xb 0xb 0xb 0x0 0x0 0x0 0x0 0 0xf>,
++                                                      <13 0 0xb 0xb 0xb 0xb 0xb 0xb 0xb 0xb 0xb 0xb 0xb 0xb 0x0 0x0 0x0 0x0 0 0xf>;
++                                      };
++                              };
+                       };
+                       /* Second mini-PCIe port */
+                       pcie@3,0 {
+                               /* Port 0, Lane 3 */
+                               status = "okay";
++
++                              mwlwifi {
++                                      marvell,2ghz = <0>;
++                                      marvell,chainmask = <4 4>;
++                                      marvell,powertable {
++                                              FCC =
++                                                      <36 0 0x8 0x8 0x8 0x8 0x8 0x8 0x8 0x8 0x9 0x9 0x9 0x9 0x9 0x9 0x9 0x9 0 0xf>,
++                                                      <40 0 0x8 0x8 0x8 0x8 0x9 0x9 0x9 0x9 0x9 0x9 0x9 0x9 0x9 0x9 0x9 0x9 0 0xf>,
++                                                      <44 0 0x8 0x8 0x8 0x8 0x9 0x9 0x9 0x9 0x9 0x9 0x9 0x9 0x9 0x9 0x9 0x9 0 0xf>,
++                                                      <48 0 0x8 0x8 0x8 0x8 0x9 0x9 0x9 0x9 0x9 0x9 0x9 0x9 0x9 0x9 0x9 0x9 0 0xf>,
++                                                      <52 0 0xf 0xf 0xf 0xf 0xf 0xf 0xf 0xf 0x12 0x12 0x12 0x12 0x12 0x12 0x12 0x12 0 0xf>,
++                                                      <56 0 0xf 0xf 0xf 0xf 0xf 0xf 0xf 0xf 0x12 0x12 0x12 0x12 0x12 0x12 0x12 0x12 0 0xf>,
++                                                      <60 0 0xf 0xf 0xf 0xf 0xf 0xf 0xf 0xf 0x12 0x12 0x12 0x12 0x12 0x12 0x12 0x12 0 0xf>,
++                                                      <64 0 0xf 0xf 0xf 0xf 0xf 0xf 0xf 0xf 0x12 0x12 0x12 0x12 0x12 0x12 0x12 0x12 0 0xf>,
++                                                      <100 0 0x14 0x14 0x14 0x14 0x14 0x14 0x14 0x14 0x14 0x14 0x14 0x14 0x14 0x14 0x14 0x14 0 0xf>,
++                                                      <104 0 0x14 0x14 0x14 0x14 0x14 0x14 0x14 0x14 0x14 0x14 0x14 0x14 0x14 0x14 0x14 0x14 0 0xf>,
++                                                      <108 0 0x14 0x14 0x14 0x14 0x14 0x14 0x14 0x14 0x14 0x14 0x14 0x14 0x14 0x14 0x14 0x14 0 0xf>,
++                                                      <112 0 0x14 0x14 0x14 0x14 0x14 0x14 0x14 0x14 0x14 0x14 0x14 0x14 0x14 0x14 0x14 0x14 0 0xf>,
++                                                      <116 0 0x14 0x14 0x14 0x14 0x14 0x14 0x14 0x14 0x14 0x14 0x14 0x14 0x14 0x14 0x14 0x14 0 0xf>,
++                                                      <120 0 0x14 0x14 0x14 0x14 0x14 0x14 0x14 0x14 0x14 0x14 0x14 0x14 0x14 0x14 0x14 0x14 0 0xf>,
++                                                      <124 0 0x14 0x14 0x14 0x14 0x14 0x14 0x14 0x14 0x14 0x14 0x14 0x14 0x14 0x14 0x14 0x14 0 0xf>,
++                                                      <128 0 0x14 0x14 0x14 0x14 0x14 0x14 0x14 0x14 0x14 0x14 0x14 0x14 0x14 0x14 0x14 0x14 0 0xf>,
++                                                      <132 0 0x14 0x14 0x14 0x14 0x14 0x14 0x14 0x14 0x14 0x14 0x14 0x14 0x14 0x14 0x14 0x14 0 0xf>,
++                                                      <136 0 0x14 0x14 0x14 0x14 0x14 0x14 0x14 0x14 0x14 0x14 0x14 0x14 0x14 0x14 0x14 0x14 0 0xf>,
++                                                      <140 0 0x14 0x14 0x14 0x14 0x14 0x14 0x14 0x14 0x14 0x14 0x14 0x14 0x14 0x14 0x14 0x14 0 0xf>,
++                                                      <149 0 0x16 0x16 0x16 0x16 0x14 0x14 0x14 0x14 0x15 0x15 0x15 0x15 0x14 0x14 0x14 0x14 0 0xf>,
++                                                      <153 0 0x15 0x15 0x15 0x15 0x15 0x15 0x15 0x15 0x15 0x15 0x15 0x15 0x14 0x14 0x14 0x14 0 0xf>,
++                                                      <157 0 0x15 0x15 0x15 0x15 0x15 0x15 0x15 0x15 0x15 0x15 0x15 0x15 0x14 0x14 0x14 0x14 0 0xf>,
++                                                      <161 0 0x15 0x15 0x15 0x15 0x15 0x15 0x15 0x15 0x15 0x15 0x15 0x15 0x14 0x14 0x14 0x14 0 0xf>,
++                                                      <165 0 0x16 0x16 0x16 0x16 0x16 0x16 0x16 0x16 0x15 0x15 0x15 0x15 0x14 0x14 0x14 0x14 0 0xf>;
++
++                                              ETSI =
++                                                      <36 0 0xc 0xc 0xc 0xc 0xc 0xc 0xc 0xc 0xd 0xd 0xd 0xd 0xc 0xc 0xc 0xc 0 0xf>,
++                                                      <40 0 0xc 0xc 0xc 0xc 0xc 0xc 0xc 0xc 0xd 0xd 0xd 0xd 0xc 0xc 0xc 0xc 0 0xf>,
++                                                      <44 0 0xc 0xc 0xc 0xc 0xc 0xc 0xc 0xc 0xd 0xd 0xd 0xd 0xc 0xc 0xc 0xc 0 0xf>,
++                                                      <48 0 0xc 0xc 0xc 0xc 0xc 0xc 0xc 0xc 0xd 0xd 0xd 0xd 0xc 0xc 0xc 0xc 0 0xf>,
++                                                      <52 0 0xc 0xc 0xc 0xc 0xc 0xc 0xc 0xc 0xd 0xd 0xd 0xd 0xc 0xc 0xc 0xc 0 0xf>,
++                                                      <56 0 0xc 0xc 0xc 0xc 0xc 0xc 0xc 0xc 0xd 0xd 0xd 0xd 0xc 0xc 0xc 0xc 0 0xf>,
++                                                      <60 0 0xc 0xc 0xc 0xc 0xc 0xc 0xc 0xc 0xd 0xd 0xd 0xd 0xc 0xc 0xc 0xc 0 0xf>,
++                                                      <64 0 0xc 0xc 0xc 0xc 0xc 0xc 0xc 0xc 0xd 0xd 0xd 0xd 0xc 0xc 0xc 0xc 0 0xf>,
++                                                      <100 0 0xc 0xc 0xc 0xc 0xc 0xc 0xc 0xc 0xd 0xd 0xd 0xd 0xc 0xc 0xc 0xc 0 0xf>,
++                                                      <104 0 0xc 0xc 0xc 0xc 0xc 0xc 0xc 0xc 0xd 0xd 0xd 0xd 0xc 0xc 0xc 0xc 0 0xf>,
++                                                      <108 0 0xc 0xc 0xc 0xc 0xc 0xc 0xc 0xc 0xd 0xd 0xd 0xd 0xc 0xc 0xc 0xc 0 0xf>,
++                                                      <112 0 0xc 0xc 0xc 0xc 0xc 0xc 0xc 0xc 0xd 0xd 0xd 0xd 0xc 0xc 0xc 0xc 0 0xf>,
++                                                      <116 0 0xc 0xc 0xc 0xc 0xc 0xc 0xc 0xc 0xd 0xd 0xd 0xd 0xc 0xc 0xc 0xc 0 0xf>,
++                                                      <120 0 0xc 0xc 0xc 0xc 0xc 0xc 0xc 0xc 0xd 0xd 0xd 0xd 0xc 0xc 0xc 0xc 0 0xf>,
++                                                      <124 0 0xc 0xc 0xc 0xc 0xc 0xc 0xc 0xc 0xd 0xd 0xd 0xd 0xc 0xc 0xc 0xc 0 0xf>,
++                                                      <128 0 0xc 0xc 0xc 0xc 0xc 0xc 0xc 0xc 0xd 0xd 0xd 0xd 0xc 0xc 0xc 0xc 0 0xf>,
++                                                      <132 0 0xc 0xc 0xc 0xc 0xc 0xc 0xc 0xc 0xd 0xd 0xd 0xd 0xc 0xc 0xc 0xc 0 0xf>,
++                                                      <136 0 0xc 0xc 0xc 0xc 0xc 0xc 0xc 0xc 0xd 0xd 0xd 0xd 0xc 0xc 0xc 0xc 0 0xf>,
++                                                      <140 0 0xc 0xc 0xc 0xc 0xc 0xc 0xc 0xc 0xd 0xd 0xd 0xd 0xc 0xc 0xc 0xc 0 0xf>,
++                                                      <149 0 0xc 0xc 0xc 0xc 0xc 0xc 0xc 0xc 0xd 0xd 0xd 0xd 0xc 0xc 0xc 0xc 0 0xf>;
++                                      };
++                              };
+                       };
+               };
diff --git a/target/linux/mvebu/patches-4.0/003-add_mamba_switch.patch b/target/linux/mvebu/patches-4.0/003-add_mamba_switch.patch
new file mode 100644 (file)
index 0000000..e43d164
--- /dev/null
@@ -0,0 +1,19 @@
+--- a/arch/arm/boot/dts/armada-xp-linksys-mamba.dts
++++ b/arch/arm/boot/dts/armada-xp-linksys-mamba.dts
+@@ -415,6 +415,16 @@
+               gpio-fan,speed-map = <0    0
+                                     4500 1>;
+       };
++
++      mvsw61xx {
++              compatible = "marvell,88e6172";
++              status = "okay";
++              reg = <0x10>;
++
++              mii-bus = <&mdio>;
++              cpu-port-0 = <5>;
++              cpu-port-1 = <6>;
++      };
+ };
+ &pinctrl {