resubmission: all in one patch with all fixes and cleanups.
Signed-off-by: Andrew Andrianov <[email protected]>
Regards,
Andrew
From 9512bb8629db1a42b349c51456524b1881999acd Mon Sep 17 00:00:00 2001
From: Andrew <[email protected]>
Date: Wed, 17 Aug 2011 20:51:07 +0400
Subject: ramips: applied wr512-3gn patches
Signed-off-by: Andrew Andrianov <[email protected]>
---
.../etc/hotplug.d/firmware/10-rt2x00-eeprom | 3 +-
target/linux/ramips/base-files/lib/ramips.sh | 3 +
.../arch/mips/include/asm/mach-ralink/machine.h | 1 +
.../ramips/files/arch/mips/ralink/rt305x/Kconfig | 5 +
.../ramips/files/arch/mips/ralink/rt305x/Makefile | 2 +
.../files/arch/mips/ralink/rt305x/mach-wr512-3gn.c | 149 ++++++++++++++++++++
target/linux/ramips/image/Makefile | 13 ++-
target/linux/ramips/rt305x/config-2.6.39 | 1 +
8 files changed, 175 insertions(+), 2 deletions(-)
create mode 100644 target/linux/ramips/files/arch/mips/ralink/rt305x/mach-wr512-3gn.c
diff --git a/target/linux/ramips/base-files/etc/hotplug.d/firmware/10-rt2x00-eeprom b/target/linux/ramips/base-files/etc/hotplug.d/firmware/10-rt2x00-eeprom
index 1ffa790..c9ddbb0 100644
--- a/target/linux/ramips/base-files/etc/hotplug.d/firmware/10-rt2x00-eeprom
+++ b/target/linux/ramips/base-files/etc/hotplug.d/firmware/10-rt2x00-eeprom
@@ -51,7 +51,8 @@ case "$FIRMWARE" in
rt-n15 | \
v22rw-2x2 | \
wcr150gn | \
- whr-g300n)
+ whr-g300n | \
+ wr512-3gn)
rt2x00_eeprom_extract "factory" 0 272
;;
diff --git a/target/linux/ramips/base-files/lib/ramips.sh b/target/linux/ramips/base-files/lib/ramips.sh
index 616e966..1ab8f79 100755
--- a/target/linux/ramips/base-files/lib/ramips.sh
+++ b/target/linux/ramips/base-files/lib/ramips.sh
@@ -58,6 +58,9 @@ ramips_board_name() {
*"WZR-AGL300NH")
name="wzr-agl300nh"
;;
+ *"SH-WR512NU/WS-WR512N1-like 3GN router")
+ name="wr512-3gn"
+ ;;
*)
name="generic"
;;
diff --git a/target/linux/ramips/files/arch/mips/include/asm/mach-ralink/machine.h b/target/linux/ramips/files/arch/mips/include/asm/mach-ralink/machine.h
index baaff71..10706b7 100644
--- a/target/linux/ramips/files/arch/mips/include/asm/mach-ralink/machine.h
+++ b/target/linux/ramips/files/arch/mips/include/asm/mach-ralink/machine.h
@@ -34,4 +34,5 @@ enum ramips_mach_type {
RAMIPS_MACH_FONERA20N, /* La Fonera 2.0N */
RAMIPS_MACH_HW550_3G, /* Aztech HW550-3G */
RAMIPS_MACH_MOFI3500_3GN, /* MoFi Network MOFI3500-3GN */
+ RAMIPS_MACH_WR512_3GN, /* SH-WR512NU/WS-WR512N1-like 3GN router from DX */
};
diff --git a/target/linux/ramips/files/arch/mips/ralink/rt305x/Kconfig b/target/linux/ramips/files/arch/mips/ralink/rt305x/Kconfig
index 36b1515..929706e 100644
--- a/target/linux/ramips/files/arch/mips/ralink/rt305x/Kconfig
+++ b/target/linux/ramips/files/arch/mips/ralink/rt305x/Kconfig
@@ -49,6 +49,11 @@ config RT305X_MACH_MOFI3500_3GN
select RALINK_DEV_GPIO_BUTTONS
select RALINK_DEV_GPIO_LEDS
+config RT305X_MACH_WR512_3GN
+ bool "SH-WR512NU/WS-WR512N1-like 3GN router"
+ default n
+
+
config RT305X_MACH_NW718
bool "Netcore NW718"
default y
diff --git a/target/linux/ramips/files/arch/mips/ralink/rt305x/Makefile b/target/linux/ramips/files/arch/mips/ralink/rt305x/Makefile
index 75f4782..0d2e8b2 100644
--- a/target/linux/ramips/files/arch/mips/ralink/rt305x/Makefile
+++ b/target/linux/ramips/files/arch/mips/ralink/rt305x/Makefile
@@ -17,9 +17,11 @@ obj-$(CONFIG_RT305X_MACH_F5D8235_V2) += mach-f5d8235-v2.o
obj-$(CONFIG_RT305X_MACH_FONERA20N) += mach-fonera20n.o
obj-$(CONFIG_RT305X_MACH_HW550_3G) += mach-hw550-3g.o
obj-$(CONFIG_RT305X_MACH_MOFI3500_3GN) += mach-mofi3500-3gn.o
+obj-$(CONFIG_RT305X_MACH_WR512_3GN) += mach-wr512-3gn.o
obj-$(CONFIG_RT305X_MACH_NW718) += mach-nw718.o
obj-$(CONFIG_RT305X_MACH_PWH2004) += mach-pwh2004.o
obj-$(CONFIG_RT305X_MACH_RT_G32_REVB) += mach-rt-g32-revb.o
obj-$(CONFIG_RT305X_MACH_V22RW_2X2) += mach-v22rw-2x2.o
obj-$(CONFIG_RT305X_MACH_WCR150GN) += mach-wcr150gn.o
obj-$(CONFIG_RT305X_MACH_WHR_G300N) += mach-whr-g300n.o
+
diff --git a/target/linux/ramips/files/arch/mips/ralink/rt305x/mach-wr512-3gn.c b/target/linux/ramips/files/arch/mips/ralink/rt305x/mach-wr512-3gn.c
new file mode 100644
index 0000000..7aaa940
--- /dev/null
+++ b/target/linux/ramips/files/arch/mips/ralink/rt305x/mach-wr512-3gn.c
@@ -0,0 +1,149 @@
+/*
+ * Unbranded router from DX board support
+ * Also known as *WR512*-3GN by local vendors
+ * e.g. WS-WR512N1, Sin Hon SH-WR512NU, and etc
+ * (http://www.dealextreme.com/p/portable-wireless-n-3g-router-cdma2000-evdo-td-scdma-hspa-wcdma-45639)
+ * This router is also known to be rebranded and sold by a number of local vendors
+ * in several countries.
+ *
+ * Copyright (C) 2011 Andrew Andrianov <[email protected]>
+ * Based on MOFI3500-3N code by
+ * Copyright (C) 2011 Layne Edwards <[email protected]>
+ *
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 as published
+ * by the Free Software Foundation.
+ */
+
+#include <linux/init.h>
+#include <linux/platform_device.h>
+#include <linux/mtd/mtd.h>
+#include <linux/mtd/partitions.h>
+#include <linux/mtd/physmap.h>
+
+#include <asm/mach-ralink/machine.h>
+#include <asm/mach-ralink/dev-gpio-buttons.h>
+#include <asm/mach-ralink/dev-gpio-leds.h>
+#include <asm/mach-ralink/rt305x.h>
+#include <asm/mach-ralink/rt305x_regs.h>
+
+#include "devices.h"
+
+
+#define WR512_3GN_GPIO_LED_3G 9
+#define WR512_3GN_GPIO_LED_GATEWAY 11
+#define WR512_3GN_GPIO_LED_AP 12
+#define WR512_3GN_GPIO_LED_STATION 13
+#define WR512_3GN_GPIO_LED_WPS 14
+
+#define WR512_3GN_GPIO_BUTTON_RESET 10
+#define WR512_3GN_GPIO_BUTTON_CONNECT 7
+#define WR512_3GN_GPIO_BUTTON_WPS 0
+#define WR512_3GN_GPIO_BUTTON_WPS2 8
+
+#define WR512_3GN_BUTTONS_POLL_INTERVAL 20
+
+#ifdef CONFIG_MTD_PARTITIONS
+
+static struct mtd_partition wr512_3gn_partitions[] = {
+ {
+ .name = "u-boot",
+ .offset = 0,
+ .size = 0x030000,
+ .mask_flags = MTD_WRITEABLE,
+ }, {
+ .name = "devdata",
+ .offset = 0x030000,
+ .size = 0x010000,
+ .mask_flags = MTD_WRITEABLE,
+ }, {
+ .name = "devconf",
+ .offset = 0x040000,
+ .size = 0x010000,
+ .mask_flags = MTD_WRITEABLE,
+ }, {
+ .name = "kernel",
+ .offset = 0x050000,
+ .size = 0x0d0000,
+ }, {
+ .name = "rootfs",
+ .offset = 0x120000,
+ .size = 0x2e0000,
+ }, {
+ .name = "firmware",
+ .offset = 0x050000,
+ .size = 0x3b0000,
+ }
+};
+
+#endif /* CONFIG_MTD_PARTITIONS */
+
+static struct physmap_flash_data wr512_3gn_flash_data = {
+#ifdef CONFIG_MTD_PARTITIONS
+ .nr_parts = ARRAY_SIZE(wr512_3gn_partitions),
+ .parts = wr512_3gn_partitions,
+#endif
+};
+
+static struct gpio_led wr512_3gn_leds_gpio[] __initdata = {
+ {
+ .name = "wr512:green:3g",
+ .gpio = WR512_3GN_GPIO_LED_3G,
+ .active_low = 1,
+ }, {
+ .name = "wr512:green:gateway",
+ .gpio = WR512_3GN_GPIO_LED_GATEWAY,
+ .active_low = 1,
+ }, {
+ .name = "wr512:green:ap",
+ .gpio = WR512_3GN_GPIO_LED_AP,
+ .active_low = 1,
+ }, {
+ .name = "wr512:green:wps",
+ .gpio = WR512_3GN_GPIO_LED_WPS,
+ .active_low = 1,
+ },{
+ .name = "wr512:green:station",
+ .gpio = WR512_3GN_GPIO_LED_STATION,
+ .active_low = 1,
+ }
+};
+
+static struct gpio_button wr512_3gn_gpio_buttons[] __initdata = {
+ {
+ .desc = "reset_wps",
+ .type = EV_KEY,
+ .code = KEY_RESTART,
+ .threshold = 3,
+ .gpio = WR512_3GN_GPIO_BUTTON_RESET,
+ .active_low = 1,
+ }, {
+ .desc = "mode",
+ .type = EV_KEY,
+ .code = KEY_M,
+ .threshold = 3,
+ .gpio = WR512_3GN_GPIO_BUTTON_CONNECT,
+ .active_low = 1,
+ }
+};
+
+#define WR512_3GN_GPIO_MODE \
+ ((RT305X_GPIO_MODE_GPIO << RT305X_GPIO_MODE_UART0_SHIFT) | \
+ RT305X_GPIO_MODE_MDIO)
+
+static void __init wr512_3gn_init(void)
+{
+ rt305x_gpio_init(WR512_3GN_GPIO_MODE);
+
+ rt305x_register_flash(0, &wr512_3gn_flash_data);
+ rt305x_register_ethernet();
+ ramips_register_gpio_leds(-1, ARRAY_SIZE(wr512_3gn_leds_gpio),
+ wr512_3gn_leds_gpio);
+ ramips_register_gpio_buttons(-1, WR512_3GN_BUTTONS_POLL_INTERVAL,
+ ARRAY_SIZE(wr512_3gn_gpio_buttons),
+ wr512_3gn_gpio_buttons);
+ rt305x_register_wifi();
+ rt305x_register_wdt();
+}
+
diff --git a/target/linux/ramips/image/Makefile b/target/linux/ramips/image/Makefile
index bbbf0e6..3aaeba5 100644
--- a/target/linux/ramips/image/Makefile
+++ b/target/linux/ramips/image/Makefile
@@ -146,6 +146,13 @@ define Image/Build/Template/RTG32B1
$(call BuildFirmware/Generic,$(1),$(2),board=$(3),mtdlayout_rtg32b1,$(mtd_rtg32b1_kernel_part_size),$(mtd_rtg32b1_rootfs_part_size))
endef
+#mtdlayout_unbranded3gn=mtdparts=physmap-flash.0:192k(u-boot)ro,64k(u-boot-env)ro,64k(factory)ro,832k(kernel),2944k(rootfs),3776k@0x50000(firmware)
+#$(call BuildFirmware/Generic,$(1),$(2),board=$(3),mtdlayout_unbranded3gn,851968,3014656)
+mtdlayout_unbranded3gn=mtdparts=physmap-flash.0:192k(u-boot)ro,64k(u-boot-env)ro,64k(factory)ro,960k(kernel),2816k(rootfs),3776k@0x50000(firmware)
+define Image/Build/Template/WR5123GN
+ $(call BuildFirmware/Generic,$(1),$(2),board=$(3),mtdlayout_unbranded3gn,983040,2883584)
+endef
+
define Image/Build/Profile/RTG32B1
$(call Image/Build/Template/RTG32B1,$(1),rt-g32-b1,RT-G32-B1)
endef
@@ -210,7 +217,6 @@ define Image/Build/Profile/ARGUS_ATP52B
$(call Image/Build/Template/ARGUS_ATP52B,$(1),argus_atp52b,ARGUS_ATP52B)
endef
-
mtdlayout_f5d8235=mtdparts=physmap-flash.0:320k(u-boot)ro,1536k(kernel),6208k(rootfs),64k(nvram),64k(factory),7744k@0x50000(firmware)
mtd_f5d8235_kernel_part_size=1572864
mtd_f5d8235_rootfs_part_size=6356992
@@ -222,6 +228,10 @@ define Image/Build/Profile/F5D8235V2
$(call Image/Build/Template/F5D8235V2,$(1),f5d8235v2,F5D8235_V2)
endef
+define Image/Build/Profile/WR5123GN
+$(call Image/Build/Template/WR5123GN,$(1),wr512-3gn,WR512-3GN)
+endef
+
ifeq ($(CONFIG_RALINK_RT305X),y)
define Image/Build/Profile/Default
@@ -237,6 +247,7 @@ define Image/Build/Profile/Default
$(call Image/Build/Profile/F5D8235V2,$(1))
$(call Image/Build/Profile/HW5503G,$(1))
$(call Image/Build/Profile/MOFI35003GN,$(1))
+ $(call Image/Build/Profile/WR5123GN,$(1))
endef
endif
diff --git a/target/linux/ramips/rt305x/config-2.6.39 b/target/linux/ramips/rt305x/config-2.6.39
index e15fa07..82ff3ce 100644
--- a/target/linux/ramips/rt305x/config-2.6.39
+++ b/target/linux/ramips/rt305x/config-2.6.39
@@ -97,6 +97,7 @@ CONFIG_RT305X_MACH_F5D8235_V2=y
CONFIG_RT305X_MACH_FONERA20N=y
CONFIG_RT305X_MACH_HW550_3G=y
CONFIG_RT305X_MACH_MOFI3500_3GN=y
+CONFIG_RT305X_MACH_WR512_3GN=y
CONFIG_RT305X_MACH_NW718=y
CONFIG_RT305X_MACH_PWH2004=y
CONFIG_RT305X_MACH_RT_G32_REVB=y
--
1.7.4.1
From 29f7e2b471a11e7e73e32000a6bb5588b0c8a06e Mon Sep 17 00:00:00 2001
From: Andrew <[email protected]>
Date: Wed, 17 Aug 2011 22:44:09 +0400
Subject: ramips: last fixes
Signed-off-by: Necromant <[email protected]>
---
.../files/arch/mips/ralink/rt305x/mach-wr512-3gn.c | 2 ++
target/linux/ramips/rt305x/config-2.6.39 | 2 +-
2 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/target/linux/ramips/files/arch/mips/ralink/rt305x/mach-wr512-3gn.c b/target/linux/ramips/files/arch/mips/ralink/rt305x/mach-wr512-3gn.c
index 7aaa940..1b7ddaf 100644
--- a/target/linux/ramips/files/arch/mips/ralink/rt305x/mach-wr512-3gn.c
+++ b/target/linux/ramips/files/arch/mips/ralink/rt305x/mach-wr512-3gn.c
@@ -147,3 +147,5 @@ static void __init wr512_3gn_init(void)
rt305x_register_wdt();
}
+MIPS_MACHINE(RAMIPS_MACH_WR512_3GN, "WR512-3GN", "SH-WR512NU/WS-WR512N1-like 3GN router",
+ wr512_3gn_init);
\ No newline at end of file
diff --git a/target/linux/ramips/rt305x/config-2.6.39 b/target/linux/ramips/rt305x/config-2.6.39
index 82ff3ce..3276d14 100644
--- a/target/linux/ramips/rt305x/config-2.6.39
+++ b/target/linux/ramips/rt305x/config-2.6.39
@@ -97,13 +97,13 @@ CONFIG_RT305X_MACH_F5D8235_V2=y
CONFIG_RT305X_MACH_FONERA20N=y
CONFIG_RT305X_MACH_HW550_3G=y
CONFIG_RT305X_MACH_MOFI3500_3GN=y
-CONFIG_RT305X_MACH_WR512_3GN=y
CONFIG_RT305X_MACH_NW718=y
CONFIG_RT305X_MACH_PWH2004=y
CONFIG_RT305X_MACH_RT_G32_REVB=y
CONFIG_RT305X_MACH_V22RW_2X2=y
CONFIG_RT305X_MACH_WCR150GN=y
CONFIG_RT305X_MACH_WHR_G300N=y
+CONFIG_RT305X_MACH_WR512_3GN=y
# CONFIG_SCSI_DMA is not set
CONFIG_SERIAL_8250_NR_UARTS=4
CONFIG_SERIAL_8250_RT288X=y
--
1.7.4.1
From 3bd7c1618ac9f58b84c69b8245b001ef2b9ad365 Mon Sep 17 00:00:00 2001
From: Andrew <[email protected]>
Date: Wed, 17 Aug 2011 23:10:22 +0400
Subject: ramips: fix vlan layout in mach-wr512-3gn
Signed-off-by: Necromant <[email protected]>
---
.../files/arch/mips/ralink/rt305x/mach-wr512-3gn.c | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/target/linux/ramips/files/arch/mips/ralink/rt305x/mach-wr512-3gn.c b/target/linux/ramips/files/arch/mips/ralink/rt305x/mach-wr512-3gn.c
index 1b7ddaf..378cf94 100644
--- a/target/linux/ramips/files/arch/mips/ralink/rt305x/mach-wr512-3gn.c
+++ b/target/linux/ramips/files/arch/mips/ralink/rt305x/mach-wr512-3gn.c
@@ -137,6 +137,7 @@ static void __init wr512_3gn_init(void)
rt305x_gpio_init(WR512_3GN_GPIO_MODE);
rt305x_register_flash(0, &wr512_3gn_flash_data);
+ rt305x_esw_data.vlan_config = RT305X_ESW_VLAN_CONFIG_LLLLW;
rt305x_register_ethernet();
ramips_register_gpio_leds(-1, ARRAY_SIZE(wr512_3gn_leds_gpio),
wr512_3gn_leds_gpio);
--
1.7.4.1
From d0bba71e4f59d18b74ec3af0e6a6340881bd2a98 Mon Sep 17 00:00:00 2001
From: Andrew <[email protected]>
Date: Thu, 18 Aug 2011 00:04:55 +0400
Subject: ramips: usb fix
Signed-off-by: Necromant <[email protected]>
---
.../files/arch/mips/ralink/rt305x/mach-wr512-3gn.c | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/target/linux/ramips/files/arch/mips/ralink/rt305x/mach-wr512-3gn.c b/target/linux/ramips/files/arch/mips/ralink/rt305x/mach-wr512-3gn.c
index 378cf94..e52be07 100644
--- a/target/linux/ramips/files/arch/mips/ralink/rt305x/mach-wr512-3gn.c
+++ b/target/linux/ramips/files/arch/mips/ralink/rt305x/mach-wr512-3gn.c
@@ -146,7 +146,8 @@ static void __init wr512_3gn_init(void)
wr512_3gn_gpio_buttons);
rt305x_register_wifi();
rt305x_register_wdt();
+ rt305x_register_usb();
}
MIPS_MACHINE(RAMIPS_MACH_WR512_3GN, "WR512-3GN", "SH-WR512NU/WS-WR512N1-like 3GN router",
- wr512_3gn_init);
\ No newline at end of file
+ wr512_3gn_init);
--
1.7.4.1
From 88848aaeeb3fa212047f6cbdd5022704a5defaa3 Mon Sep 17 00:00:00 2001
From: Andrew <[email protected]>
Date: Thu, 18 Aug 2011 09:28:06 +0400
Subject: ramips: added 8mb wr512-3gn version
Signed-off-by: Necromant <[email protected]>
---
target/linux/ramips/image/Makefile | 12 ++++++++----
1 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/target/linux/ramips/image/Makefile b/target/linux/ramips/image/Makefile
index 3aaeba5..46108a8 100644
--- a/target/linux/ramips/image/Makefile
+++ b/target/linux/ramips/image/Makefile
@@ -146,11 +146,14 @@ define Image/Build/Template/RTG32B1
$(call BuildFirmware/Generic,$(1),$(2),board=$(3),mtdlayout_rtg32b1,$(mtd_rtg32b1_kernel_part_size),$(mtd_rtg32b1_rootfs_part_size))
endef
-#mtdlayout_unbranded3gn=mtdparts=physmap-flash.0:192k(u-boot)ro,64k(u-boot-env)ro,64k(factory)ro,832k(kernel),2944k(rootfs),3776k@0x50000(firmware)
-#$(call BuildFirmware/Generic,$(1),$(2),board=$(3),mtdlayout_unbranded3gn,851968,3014656)
-mtdlayout_unbranded3gn=mtdparts=physmap-flash.0:192k(u-boot)ro,64k(u-boot-env)ro,64k(factory)ro,960k(kernel),2816k(rootfs),3776k@0x50000(firmware)
+mtdlayout_wr5123gn=mtdparts=physmap-flash.0:192k(u-boot)ro,64k(u-boot-env)ro,64k(factory)ro,832k(kernel),2944k(rootfs),3776k@0x50000(firmware)
+mtdlayout_wr5123gn8m=mtdparts=physmap-flash.0:192k(u-boot)ro,64k(u-boot-env)ro,64k(factory)ro,832k(kernel),7040k(rootfs),7872k@0x50000(firmware)
define Image/Build/Template/WR5123GN
- $(call BuildFirmware/Generic,$(1),$(2),board=$(3),mtdlayout_unbranded3gn,983040,2883584)
+ $(call BuildFirmware/Generic,$(1),$(2),board=$(3),mtdlayout_wr5123gn,851968,3014656)
+endef
+
+define Image/Build/Template/WR5123GN8M
+ $(call BuildFirmware/Generic,$(1),$(2),board=$(3),mtdlayout_wr5123gn8m,851968,3014656)
endef
define Image/Build/Profile/RTG32B1
@@ -248,6 +251,7 @@ define Image/Build/Profile/Default
$(call Image/Build/Profile/HW5503G,$(1))
$(call Image/Build/Profile/MOFI35003GN,$(1))
$(call Image/Build/Profile/WR5123GN,$(1))
+ $(call Image/Build/Profile/WR5123GN8M,$(1))
endef
endif
--
1.7.4.1
_______________________________________________
openwrt-devel mailing list
[email protected]
https://lists.openwrt.org/mailman/listinfo/openwrt-devel
