This patch adds D-Link DIR-320/NRU (H/W rev B1) router support to
OpenWRT. This router is RT5350 SoC based. It has 8MB flash and 32MB ram.
I used this patch for wi-fi driver http://patchwork.openwrt.org/patch/3122/
Signal strength increased.
Signed-off-by: Vladimir Stolyarov <[email protected]>
Signed-off-by: Serge Vasilugin <[email protected]>
---
I forgot to include patch for wifi in previous patch
You can get working firmware images here
https://code.google.com/p/openwrt-on-dir-320-b1/downloads/list
Index: target/linux/ramips/files/arch/mips/ralink/rt305x/devices.c
===================================================================
--- target/linux/ramips/files/arch/mips/ralink/rt305x/devices.c
(revision 35708)
+++ target/linux/ramips/files/arch/mips/ralink/rt305x/devices.c (working
copy)
@@ -116,12 +116,23 @@
static void rt305x_fe_reset(void)
{
- u32 reset_bits = RT305X_RESET_FE;
+ u32 val;
- if (soc_is_rt5350())
- reset_bits |= RT305X_RESET_ESW;
- rt305x_sysc_wr(reset_bits, SYSC_REG_RESET_CTRL);
- rt305x_sysc_wr(0, SYSC_REG_RESET_CTRL);
+ val = rt305x_sysc_rr(SYSC_REG_RESET_CTRL);
+
+ if (soc_is_rt5350()) {
+ val = val | RT305X_RESET_FE | RT305X_RESET_ESW;
+ } else {
+ val = val | RT305X_RESET_FE;
+ }
+ rt305x_sysc_wr(SYSC_REG_RESET_CTRL, val);
+
+ if (soc_is_rt5350()) {
+ val = val & ~(RT305X_RESET_FE | RT305X_RESET_ESW);
+ } else {
+ val = val & ~(RT305X_RESET_FE);
+ }
+ rt305x_sysc_wr(SYSC_REG_RESET_CTRL, val);
}
static struct resource rt305x_eth_resources[] = {
Index: target/linux/ramips/files/arch/mips/ralink/rt305x/Makefile
===================================================================
--- target/linux/ramips/files/arch/mips/ralink/rt305x/Makefile (revision
35708)
+++ target/linux/ramips/files/arch/mips/ralink/rt305x/Makefile (working
copy)
@@ -22,6 +22,8 @@
obj-$(CONFIG_RT305X_MACH_BROADWAY) += mach-broadway.o
obj-$(CONFIG_RT305X_MACH_CARAMBOLA) += mach-carambola.o
obj-$(CONFIG_RT305X_MACH_DIR_300_REVB) += mach-dir-300-revb.o
+obj-$(CONFIG_RT305X_MACH_DIR_320_B1) += mach-dir-320-b1.o
+obj-$(CONFIG_RT305X_MACH_DIR_620_D1) += mach-dir-620-d1.o
obj-$(CONFIG_RT305X_MACH_DIR_615_H1) += mach-dir-615-h1.o
obj-$(CONFIG_RT305X_MACH_DAP_1350) += mach-dap-1350.o
obj-$(CONFIG_RT305X_MACH_ESR_9753) += mach-esr-9753.o
Index: target/linux/ramips/files/arch/mips/ralink/rt305x/Kconfig
===================================================================
--- target/linux/ramips/files/arch/mips/ralink/rt305x/Kconfig (revision
35708)
+++ target/linux/ramips/files/arch/mips/ralink/rt305x/Kconfig (working copy)
@@ -91,6 +91,16 @@
select RALINK_DEV_GPIO_BUTTONS
select RALINK_DEV_GPIO_LEDS
+config RT305X_MACH_DIR_320_B1
+ bool "D-Link DIR-320 revB1 board support"
+ select RALINK_DEV_GPIO_BUTTONS
+ select RALINK_DEV_GPIO_LEDS
+
+config RT305X_MACH_DIR_620_D1
+ bool "D-Link DIR-620 revD1 board support"
+ select RALINK_DEV_GPIO_BUTTONS
+ select RALINK_DEV_GPIO_LEDS
+
config RT305X_MACH_DIR_615_H1
bool "D-Link DIR-615 H1 board support"
select RALINK_DEV_GPIO_BUTTONS
Index: target/linux/ramips/files/arch/mips/include/asm/mach-ralink/machine.h
===================================================================
---
target/linux/ramips/files/arch/mips/include/asm/mach-ralink/machine.h
(revision 35708)
+++
target/linux/ramips/files/arch/mips/include/asm/mach-ralink/machine.h
(working copy)
@@ -72,6 +72,7 @@
/* RT3352 based machines */
RAMIPS_MACH_ALL5002, /* Allnet ALL5002 */
RAMIPS_MACH_DIR_615_H1,
+ RAMIPS_MACH_DIR_620_D1,
/* RT3662 based machines */
RAMIPS_MACH_DIR_645, /* D-Link DIR-645 */
@@ -84,4 +85,5 @@
/* RT5350 based machines */
RAMIPS_MACH_AIR3GII, /* AirLive Air3GII */
+ RAMIPS_MACH_DIR_320_B1 /* D-Link DIR-320/NRU */
};
Index: target/linux/ramips/image/Makefile
===================================================================
--- target/linux/ramips/image/Makefile (revision 35708)
+++ target/linux/ramips/image/Makefile (working copy)
@@ -249,6 +249,30 @@
$(call BuildFirmware/Generic/initramfs,$(1),$(2),$(call
mkcmdline,$(3),ttyS1,57600) $(call
mkmtd/phys,$(mtdlayout_dir620a1)),$(kernel_size_dir620a1),$(rootfs_size_dir620a1))
endef
+#########################################################################################
+mtdlayout_dir320b1=192k(u-boot)ro,64k(u-boot-env)ro,64k(factory)ro,896k(kernel),6976k(rootfs),7872k@0x50000(firmware)
+kernel_size_dir320b1=917504
+rootfs_size_dir320b1=7143424
+define BuildFirmware/DIR320B1
+ $(call BuildFirmware/Generic,$(1),$(2),$(call
mkcmdline,$(3),ttyS1,57600) $(call
mkmtd/spi,$(mtdlayout_dir320b1)),$(kernel_size_dir320b1),$(rootfs_size_dir320b1),DIR320B1)
+endef
+
+define BuildFirmware/DIR320B1/initramfs
+ $(call BuildFirmware/Generic/initramfs,$(1),$(2),$(call
mkcmdline,$(3),ttyS1,57600) $(call
mkmtd/spi,$(mtdlayout_dir320b1)),$(kernel_size_dir320b1),$(rootfs_size_dir320b1))
+endef
+
+mtdlayout_dir620d1=192k(u-boot)ro,64k(u-boot-env)ro,64k(factory)ro,896k(kernel),6976k(rootfs),7872k@0x50000(firmware)
+kernel_size_dir620d1=917504
+rootfs_size_dir620d1=7143424
+define BuildFirmware/DIR620D1
+ $(call BuildFirmware/Generic,$(1),$(2),$(call
mkcmdline,$(3),ttyS1,57600) $(call
mkmtd/spi,$(mtdlayout_dir620d1)),$(kernel_size_dir620d1),$(rootfs_size_dir620d1),DIR620D1)
+endef
+
+define BuildFirmware/DIR620D1/initramfs
+ $(call BuildFirmware/Generic/initramfs,$(1),$(2),$(call
mkcmdline,$(3),ttyS1,57600) $(call
mkmtd/spi,$(mtdlayout_dir620d1)),$(kernel_size_dir620d1),$(rootfs_size_dir620d1))
+endef
+#########################################################################################
+
define BuildFirmware/Edimax
if [ -e "$(call sysupname,$(1),$(2))" ]; then \
mkedimaximg -i $(call sysupname,$(1),$(2)) \
@@ -527,6 +551,16 @@
$(call
Image/Build/Template/$(fs_squash)/$(1),DAP1350,dap-1350,DAP-1350,RT3052-AP-DAP1350-3)
endef
+#########################################################################################
+define Image/Build/Profile/DIR320B1
+ $(call
Image/Build/Template/$(fs_squash)/$(1),DIR320B1,dir-320-b1,DIR-320-B1)
+endef
+
+define Image/Build/Profile/DIR620D1
+ $(call
Image/Build/Template/$(fs_squash)/$(1),DIR620D1,dir-620-d1,DIR-620-D1)
+endef
+#########################################################################################
+
define Image/Build/Profile/ESR9753
$(call
Image/Build/Template/$(fs_squash)/$(1),GENERIC_4M,esr-9753,ESR-9753,ttyS1,57600,phys)
endef
@@ -661,6 +695,10 @@
$(call Image/Build/Profile/DIR300B1,$(1))
$(call Image/Build/Profile/DIR615H1,$(1))
$(call Image/Build/Profile/DAP1350,$(1))
+###################################################
+ $(call Image/Build/Profile/DIR320B1,$(1))
+ $(call Image/Build/Profile/DIR620D1,$(1))
+###################################################
$(call Image/Build/Profile/ESR9753,$(1))
$(call Image/Build/Profile/F5D8235V2,$(1))
$(call Image/Build/Profile/RTN10PLUS,$(1))
Index: target/linux/ramips/rt305x/config-3.7
===================================================================
--- target/linux/ramips/rt305x/config-3.7 (revision 35708)
+++ target/linux/ramips/rt305x/config-3.7 (working copy)
@@ -114,7 +114,9 @@
CONFIG_RT305X_MACH_CARAMBOLA=y
CONFIG_RT305X_MACH_DAP_1350=y
CONFIG_RT305X_MACH_DIR_300_REVB=y
+CONFIG_RT305X_MACH_DIR_320_B1=y
CONFIG_RT305X_MACH_DIR_615_H1=y
+CONFIG_RT305X_MACH_DIR_620_D1=y
CONFIG_RT305X_MACH_ESR_9753=y
CONFIG_RT305X_MACH_F5D8235_V2=y
CONFIG_RT305X_MACH_FONERA20N=y
Index: target/linux/ramips/base-files/etc/uci-defaults/01_leds
===================================================================
--- target/linux/ramips/base-files/etc/uci-defaults/01_leds (revision 35708)
+++ target/linux/ramips/base-files/etc/uci-defaults/01_leds (working copy)
@@ -53,11 +53,18 @@
ucidef_set_led_default "wan" "WAN LED (amber)" "d-link:amber:wan"
"1"
set_wifi_led "rt2800pci-phy0::radio"
;;
+ dir-320-b1)
+ set_usb_led "d-link:green:usb"
+ set_wifi_led "rt2800pci-phy0::radio"
+ ;;
dir-615-d|\
dir-615-h1)
ucidef_set_led_default "status" "Status LED (amber)"
"d-link:amber:status" "0"
set_wifi_led "rt2800pci-phy0::radio"
;;
+ dir-620-d1)
+ set_wifi_led "d-link:amber:status"
+ ;;
esr-9753)
set_wifi_led "rt2800pci-phy0::radio"
;;
Index: target/linux/ramips/base-files/etc/uci-defaults/02_network
===================================================================
--- target/linux/ramips/base-files/etc/uci-defaults/02_network (revision
35708)
+++ target/linux/ramips/base-files/etc/uci-defaults/02_network (working
copy)
@@ -173,7 +173,13 @@
lan_mac=$(mtd_get_mac_binary factory 40)
wan_mac=$(macaddr_add "$lan_mac" 1)
;;
+
+ dir-320-b1)
+ lan_mac=$(ramips_get_mac_binary factory 1032)
+ wan_mac=$(/usr/sbin/maccalc add "$lan_mac" 1)
+ ;;
+
dir-300-b1 |\
dir-300-b2 |\
dir-600-b1)
@@ -181,6 +187,7 @@
wan_mac=$(macaddr_add "$lan_mac" 1)
;;
+ dir-620-d1 |\
dir-620-a1)
lan_mac=$(mtd_get_mac_binary factory 4)
lan_mac=$(macaddr_setbit_la "$lan_mac")
Index: target/linux/ramips/base-files/etc/diag.sh
===================================================================
--- target/linux/ramips/base-files/etc/diag.sh (revision 35708)
+++ target/linux/ramips/base-files/etc/diag.sh (working copy)
@@ -21,7 +21,7 @@
br6425)
status_led="edimax:green:power"
;;
- dir-300-b1 | dir-600-b1 | dir-600-b2 | dir-615-h1 | dir-615-d |
dir-620-a1)
+ dir-300-b1 | dir-600-b1 | dir-600-b2 | dir-615-h1 | dir-615-d |
dir-620-a1 | dir-320-b1 | dir-620-d1)
status_led="d-link:green:status"
;;
dir-645)
Index:
target/linux/ramips/base-files/etc/hotplug.d/firmware/10-rt2x00-eeprom
===================================================================
---
target/linux/ramips/base-files/etc/hotplug.d/firmware/10-rt2x00-eeprom
(revision 35708)
+++
target/linux/ramips/base-files/etc/hotplug.d/firmware/10-rt2x00-eeprom
(working copy)
@@ -65,6 +65,8 @@
carambola | \
dir-615-h1 | \
dir-620-a1 | \
+ dir-320-b1 | \
+ dir-620-d1 | \
esr-9753 | \
fonera20n | \
rt-n13u | \
Index: target/linux/ramips/base-files/lib/preinit/06_set_iface_mac
===================================================================
--- target/linux/ramips/base-files/lib/preinit/06_set_iface_mac
(revision 35708)
+++ target/linux/ramips/base-files/lib/preinit/06_set_iface_mac (working
copy)
@@ -20,6 +20,7 @@
bc2 |\
broadway |\
dir-620-a1 |\
+ dir-620-d1 |\
esr-9753 |\
freestation5 |\
nw718 |\
@@ -30,6 +31,10 @@
mac=$(macaddr_setbit_la "$mac")
ifconfig eth0 hw ether $mac 2>/dev/null
;;
+ dir-320-b1)
+ mac=$(ramips_get_mac_binary factory 1032)
+ ifconfig eth0 hw ether $mac 2>/dev/null
+ ;;
dir-300-b1 |\
dir-300-b2 |\
dir-600-b1)
Index: target/linux/ramips/base-files/lib/ramips.sh
===================================================================
--- target/linux/ramips/base-files/lib/ramips.sh (revision 35708)
+++ target/linux/ramips/base-files/lib/ramips.sh (working copy)
@@ -64,6 +64,12 @@
*"DIR-615 H1")
name="dir-615-h1"
;;
+ *"DIR-320 B1")
+ name="dir-320-b1"
+ ;;
+ *"DIR-620 D1")
+ name="dir-620-d1"
+ ;;
*"DIR-615 D")
name="dir-615-d"
;;
Index: target/linux/ramips/base-files/lib/upgrade/platform.sh
===================================================================
--- target/linux/ramips/base-files/lib/upgrade/platform.sh (revision 35708)
+++ target/linux/ramips/base-files/lib/upgrade/platform.sh (working copy)
@@ -29,6 +29,8 @@
dir-615-h1 | \
dir-615-d | \
dir-620-a1 | \
+ dir-620-d1 | \
+ dir-320-b1 | \
dap-1350 | \
esr-9753 | \
fonera20n | \
Index: package/mac80211/patches/630-rt2x00-support-rt5350.patch
===================================================================
--- package/mac80211/patches/630-rt2x00-support-rt5350.patch (revision 0)
+++ package/mac80211/patches/630-rt2x00-support-rt5350.patch (revision 0)
@@ -0,0 +1,438 @@
+--- a/drivers/net/wireless/rt2x00/rt2800.h
++++ b/drivers/net/wireless/rt2x00/rt2800.h
+@@ -69,6 +69,7 @@
+ #define RF3322 0x000c
+ #define RF3053 0x000d
+ #define RF3290 0x3290
++#define RF5350 0x5350
+ #define RF5360 0x5360
+ #define RF5370 0x5370
+ #define RF5372 0x5372
+--- a/drivers/net/wireless/rt2x00/rt2800lib.c
++++ b/drivers/net/wireless/rt2x00/rt2800lib.c
+@@ -2138,6 +2138,15 @@
+ if (rf->channel <= 14) {
+ int idx = rf->channel-1;
+
++ if (rt2x00_rt(rt2x00dev, RT5350)) {
++ static const char r59_non_bt[] = {0x0b, 0x0b,
++ 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0a,
++ 0x0a, 0x09, 0x08, 0x07, 0x07, 0x06};
++
++ rt2800_rfcsr_write(rt2x00dev, 59,
++ r59_non_bt[idx]);
++ }
++
+ if (test_bit(CAPABILITY_BT_COEXIST, &rt2x00dev->cap_flags)) {
+ if (rt2x00_rt_rev_gte(rt2x00dev, RT5390, REV_RT5390F)) {
+ /* r55/r59 value array of channel 1~14 */
+@@ -2219,6 +2228,7 @@
+ case RF3322:
+ rt2800_config_channel_rf3322(rt2x00dev, conf, rf, info);
+ break;
++ case RF5350:
+ case RF5360:
+ case RF5370:
+ case RF5372:
+@@ -2232,6 +2242,7 @@
+
+ if (rt2x00_rf(rt2x00dev, RF3290) ||
+ rt2x00_rf(rt2x00dev, RF3322) ||
++ rt2x00_rf(rt2x00dev, RF5350) ||
+ rt2x00_rf(rt2x00dev, RF5360) ||
+ rt2x00_rf(rt2x00dev, RF5370) ||
+ rt2x00_rf(rt2x00dev, RF5372) ||
+@@ -2362,7 +2373,8 @@
+ /*
+ * Clear update flag
+ */
+- if (rt2x00_rt(rt2x00dev, RT3352)) {
++ if (rt2x00_rt(rt2x00dev, RT3352) ||
++ rt2x00_rt(rt2x00dev, RT5350)) {
+ rt2800_bbp_read(rt2x00dev, 49, &bbp);
+ rt2x00_set_field8(&bbp, BBP49_UPDATE_FLAG, 0);
+ rt2800_bbp_write(rt2x00dev, 49, bbp);
+@@ -2801,6 +2813,7 @@
+ rt2800_rfcsr_write(rt2x00dev, 7, rfcsr);
+ break;
+ case RF3290:
++ case RF5350:
+ case RF5360:
+ case RF5370:
+ case RF5372:
+@@ -3125,7 +3138,8 @@
+ } else if (rt2x00_rt(rt2x00dev, RT3572)) {
+ rt2800_register_write(rt2x00dev, TX_SW_CFG0, 0x00000400);
+ rt2800_register_write(rt2x00dev, TX_SW_CFG1, 0x00080606);
+- } else if (rt2x00_rt(rt2x00dev, RT5390) ||
++ } else if (rt2x00_rt(rt2x00dev, RT5350) ||
++ rt2x00_rt(rt2x00dev, RT5390) ||
+ rt2x00_rt(rt2x00dev, RT5392)) {
+ rt2800_register_write(rt2x00dev, TX_SW_CFG0, 0x00000404);
+ rt2800_register_write(rt2x00dev, TX_SW_CFG1, 0x00080606);
+@@ -3507,6 +3521,10 @@
+ rt2800_bbp_write(rt2x00dev, 4, 0x50);
+ }
+
++ if (rt2x00_rt(rt2x00dev, RT5350)) {
++ rt2800_bbp_write(rt2x00dev, 4, 0x50);
++ }
++
+ if (rt2x00_rt(rt2x00dev, RT3290) ||
+ rt2x00_rt(rt2x00dev, RT5390) ||
+ rt2x00_rt(rt2x00dev, RT5392)) {
+@@ -3519,11 +3537,13 @@
+ rt2x00_rt(rt2x00dev, RT3290) ||
+ rt2x00_rt(rt2x00dev, RT3352) ||
+ rt2x00_rt(rt2x00dev, RT3572) ||
++ rt2x00_rt(rt2x00dev, RT5350) ||
+ rt2x00_rt(rt2x00dev, RT5390) ||
+ rt2x00_rt(rt2x00dev, RT5392))
+ rt2800_bbp_write(rt2x00dev, 31, 0x08);
+
+- if (rt2x00_rt(rt2x00dev, RT3352))
++ if (rt2x00_rt(rt2x00dev, RT3352) ||
++ rt2x00_rt(rt2x00dev, RT5350))
+ rt2800_bbp_write(rt2x00dev, 47, 0x48);
+
+ rt2800_bbp_write(rt2x00dev, 65, 0x2c);
+@@ -3531,6 +3551,7 @@
+
+ if (rt2x00_rt(rt2x00dev, RT3290) ||
+ rt2x00_rt(rt2x00dev, RT3352) ||
++ rt2x00_rt(rt2x00dev, RT5350) ||
+ rt2x00_rt(rt2x00dev, RT5390) ||
+ rt2x00_rt(rt2x00dev, RT5392))
+ rt2800_bbp_write(rt2x00dev, 68, 0x0b);
+@@ -3540,6 +3561,7 @@
+ rt2800_bbp_write(rt2x00dev, 73, 0x12);
+ } else if (rt2x00_rt(rt2x00dev, RT3290) ||
+ rt2x00_rt(rt2x00dev, RT3352) ||
++ rt2x00_rt(rt2x00dev, RT5350) ||
+ rt2x00_rt(rt2x00dev, RT5390) ||
+ rt2x00_rt(rt2x00dev, RT5392)) {
+ rt2800_bbp_write(rt2x00dev, 69, 0x12);
+@@ -3576,7 +3598,8 @@
+ rt2800_bbp_write(rt2x00dev, 79, 0x18);
+ rt2800_bbp_write(rt2x00dev, 80, 0x09);
+ rt2800_bbp_write(rt2x00dev, 81, 0x33);
+- } else if (rt2x00_rt(rt2x00dev, RT3352)) {
++ } else if (rt2x00_rt(rt2x00dev, RT3352) ||
++ rt2x00_rt(rt2x00dev, RT5350)) {
+ rt2800_bbp_write(rt2x00dev, 78, 0x0e);
+ rt2800_bbp_write(rt2x00dev, 80, 0x08);
+ rt2800_bbp_write(rt2x00dev, 81, 0x37);
+@@ -3586,6 +3609,7 @@
+
+ rt2800_bbp_write(rt2x00dev, 82, 0x62);
+ if (rt2x00_rt(rt2x00dev, RT3290) ||
++ rt2x00_rt(rt2x00dev, RT5350) ||
+ rt2x00_rt(rt2x00dev, RT5390) ||
+ rt2x00_rt(rt2x00dev, RT5392))
+ rt2800_bbp_write(rt2x00dev, 83, 0x7a);
+@@ -3595,6 +3619,7 @@
+ if (rt2x00_rt_rev(rt2x00dev, RT2860, REV_RT2860D))
+ rt2800_bbp_write(rt2x00dev, 84, 0x19);
+ else if (rt2x00_rt(rt2x00dev, RT3290) ||
++ rt2x00_rt(rt2x00dev, RT5350) ||
+ rt2x00_rt(rt2x00dev, RT5390) ||
+ rt2x00_rt(rt2x00dev, RT5392))
+ rt2800_bbp_write(rt2x00dev, 84, 0x9a);
+@@ -3603,6 +3628,7 @@
+
+ if (rt2x00_rt(rt2x00dev, RT3290) ||
+ rt2x00_rt(rt2x00dev, RT3352) ||
++ rt2x00_rt(rt2x00dev, RT5350) ||
+ rt2x00_rt(rt2x00dev, RT5390) ||
+ rt2x00_rt(rt2x00dev, RT5392))
+ rt2800_bbp_write(rt2x00dev, 86, 0x38);
+@@ -3617,6 +3643,7 @@
+
+ if (rt2x00_rt(rt2x00dev, RT3290) ||
+ rt2x00_rt(rt2x00dev, RT3352) ||
++ rt2x00_rt(rt2x00dev, RT5350) ||
+ rt2x00_rt(rt2x00dev, RT5390) ||
+ rt2x00_rt(rt2x00dev, RT5392))
+ rt2800_bbp_write(rt2x00dev, 92, 0x02);
+@@ -3635,6 +3662,7 @@
+ rt2x00_rt(rt2x00dev, RT3290) ||
+ rt2x00_rt(rt2x00dev, RT3352) ||
+ rt2x00_rt(rt2x00dev, RT3572) ||
++ rt2x00_rt(rt2x00dev, RT5350) ||
+ rt2x00_rt(rt2x00dev, RT5390) ||
+ rt2x00_rt(rt2x00dev, RT5392) ||
+ rt2800_is_305x_soc(rt2x00dev))
+@@ -3644,6 +3672,7 @@
+
+ if (rt2x00_rt(rt2x00dev, RT3290) ||
+ rt2x00_rt(rt2x00dev, RT3352) ||
++ rt2x00_rt(rt2x00dev, RT5350) ||
+ rt2x00_rt(rt2x00dev, RT5390) ||
+ rt2x00_rt(rt2x00dev, RT5392))
+ rt2800_bbp_write(rt2x00dev, 104, 0x92);
+@@ -3654,13 +3683,15 @@
+ rt2800_bbp_write(rt2x00dev, 105, 0x1c);
+ else if (rt2x00_rt(rt2x00dev, RT3352))
+ rt2800_bbp_write(rt2x00dev, 105, 0x34);
+- else if (rt2x00_rt(rt2x00dev, RT5390) ||
++ else if (rt2x00_rt(rt2x00dev, RT5350) ||
++ rt2x00_rt(rt2x00dev, RT5390) ||
+ rt2x00_rt(rt2x00dev, RT5392))
+ rt2800_bbp_write(rt2x00dev, 105, 0x3c);
+ else
+ rt2800_bbp_write(rt2x00dev, 105, 0x05);
+
+ if (rt2x00_rt(rt2x00dev, RT3290) ||
++ rt2x00_rt(rt2x00dev, RT5350) ||
+ rt2x00_rt(rt2x00dev, RT5390))
+ rt2800_bbp_write(rt2x00dev, 106, 0x03);
+ else if (rt2x00_rt(rt2x00dev, RT3352))
+@@ -3670,11 +3701,13 @@
+ else
+ rt2800_bbp_write(rt2x00dev, 106, 0x35);
+
+- if (rt2x00_rt(rt2x00dev, RT3352))
++ if (rt2x00_rt(rt2x00dev, RT3352) ||
++ rt2x00_rt(rt2x00dev, RT5350))
+ rt2800_bbp_write(rt2x00dev, 120, 0x50);
+
+ if (rt2x00_rt(rt2x00dev, RT3290) ||
+ rt2x00_rt(rt2x00dev, RT3352) ||
++ rt2x00_rt(rt2x00dev, RT5350) ||
+ rt2x00_rt(rt2x00dev, RT5390) ||
+ rt2x00_rt(rt2x00dev, RT5392))
+ rt2800_bbp_write(rt2x00dev, 128, 0x12);
+@@ -3684,13 +3717,15 @@
+ rt2800_bbp_write(rt2x00dev, 135, 0xf6);
+ }
+
+- if (rt2x00_rt(rt2x00dev, RT3352))
++ if (rt2x00_rt(rt2x00dev, RT3352) ||
++ rt2x00_rt(rt2x00dev, RT5350))
+ rt2800_bbp_write(rt2x00dev, 137, 0x0f);
+
+ if (rt2x00_rt(rt2x00dev, RT3071) ||
+ rt2x00_rt(rt2x00dev, RT3090) ||
+ rt2x00_rt(rt2x00dev, RT3390) ||
+ rt2x00_rt(rt2x00dev, RT3572) ||
++ rt2x00_rt(rt2x00dev, RT5350) ||
+ rt2x00_rt(rt2x00dev, RT5390) ||
+ rt2x00_rt(rt2x00dev, RT5392)) {
+ rt2800_bbp_read(rt2x00dev, 138, &value);
+@@ -3727,7 +3762,8 @@
+ rt2800_bbp_write(rt2x00dev, 3, value);
+ }
+
+- if (rt2x00_rt(rt2x00dev, RT3352)) {
++ if (rt2x00_rt(rt2x00dev, RT3352) ||
++ rt2x00_rt(rt2x00dev, RT5350)) {
+ rt2800_bbp_write(rt2x00dev, 163, 0xbd);
+ /* Set ITxBF timeout to 0x9c40=1000msec */
+ rt2800_bbp_write(rt2x00dev, 179, 0x02);
+@@ -3749,6 +3785,14 @@
+ rt2800_bbp_write(rt2x00dev, 148, 0xc8);
+ }
+
++ if (rt2x00_rt(rt2x00dev, RT5350)) {
++ rt2800_bbp_write(rt2x00dev, 150, 0x40); /* Antenna Software
OFDM */
++ rt2800_bbp_write(rt2x00dev, 151, 0x30); /* Antenna Software CCK
*/
++ rt2800_bbp_write(rt2x00dev, 152, 0xa3);
++ rt2800_bbp_write(rt2x00dev, 154, 0); /* Clear previously selected
antenna */
++ }
++
++
+ if (rt2x00_rt(rt2x00dev, RT5390) ||
+ rt2x00_rt(rt2x00dev, RT5392)) {
+ int ant, div_mode;
+@@ -4143,6 +4187,78 @@
+ rt2800_rfcsr_write(rt2x00dev, 31, 0x10);
+ }
+
++static void rt2800_init_rfcsr_5350(struct rt2x00_dev *rt2x00dev)
++{
++ struct rt2x00_platform_data *pdata = rt2x00dev->dev->platform_data;
++
++ rt2800_rfcsr_write(rt2x00dev, 0, 0xf0);
++ rt2800_rfcsr_write(rt2x00dev, 1, 0x23);
++ rt2800_rfcsr_write(rt2x00dev, 2, 0x50);
++ rt2800_rfcsr_write(rt2x00dev, 3, 0x08);
++ rt2800_rfcsr_write(rt2x00dev, 4, 0x49);
++ rt2800_rfcsr_write(rt2x00dev, 5, 0x10);
++ rt2800_rfcsr_write(rt2x00dev, 6, 0xe0);
++ rt2800_rfcsr_write(rt2x00dev, 7, 0x00);
++ rt2800_rfcsr_write(rt2x00dev, 8, 0xf1);
++ rt2800_rfcsr_write(rt2x00dev, 9, 0x02);
++ rt2800_rfcsr_write(rt2x00dev, 10, 0x53);
++ rt2800_rfcsr_write(rt2x00dev, 11, 0x4a);
++ rt2800_rfcsr_write(rt2x00dev, 12, 0x46);
++ if(pdata && pdata->clk_is_20mhz)
++ rt2800_rfcsr_write(rt2x00dev, 13, 0x1f);/*if clk_is_20mhz - 0x1f
else 0x9f*/
++ else
++ rt2800_rfcsr_write(rt2x00dev, 13, 0x9f);
++ rt2800_rfcsr_write(rt2x00dev, 14, 0x00);
++ rt2800_rfcsr_write(rt2x00dev, 15, 0x00);
++ rt2800_rfcsr_write(rt2x00dev, 16, 0xc0);
++ rt2800_rfcsr_write(rt2x00dev, 18, 0x03);
++ rt2800_rfcsr_write(rt2x00dev, 19, 0x00);
++ rt2800_rfcsr_write(rt2x00dev, 20, 0x00);
++ rt2800_rfcsr_write(rt2x00dev, 21, 0x00);
++ rt2800_rfcsr_write(rt2x00dev, 22, 0x20);
++ rt2800_rfcsr_write(rt2x00dev, 23, 0x00);
++ rt2800_rfcsr_write(rt2x00dev, 24, 0x00);
++ rt2800_rfcsr_write(rt2x00dev, 25, 0x80);
++ rt2800_rfcsr_write(rt2x00dev, 26, 0x00);
++ rt2800_rfcsr_write(rt2x00dev, 27, 0x03);
++ rt2800_rfcsr_write(rt2x00dev, 28, 0x00);
++ rt2800_rfcsr_write(rt2x00dev, 29, 0xd0);
++ rt2800_rfcsr_write(rt2x00dev, 30, 0x10);
++ rt2800_rfcsr_write(rt2x00dev, 31, 0x80);
++ rt2800_rfcsr_write(rt2x00dev, 32, 0x80);
++ rt2800_rfcsr_write(rt2x00dev, 33, 0x00);
++ rt2800_rfcsr_write(rt2x00dev, 34, 0x07);
++ rt2800_rfcsr_write(rt2x00dev, 35, 0x12);
++ rt2800_rfcsr_write(rt2x00dev, 36, 0x00);
++ rt2800_rfcsr_write(rt2x00dev, 37, 0x08);
++ rt2800_rfcsr_write(rt2x00dev, 38, 0x85);
++ rt2800_rfcsr_write(rt2x00dev, 39, 0x1b);
++ rt2800_rfcsr_write(rt2x00dev, 40, 0x0b);
++ rt2800_rfcsr_write(rt2x00dev, 41, 0xbb);
++ rt2800_rfcsr_write(rt2x00dev, 42, 0xd5);
++ rt2800_rfcsr_write(rt2x00dev, 43, 0x9b);
++ rt2800_rfcsr_write(rt2x00dev, 44, 0x0c);
++ rt2800_rfcsr_write(rt2x00dev, 45, 0xa6);
++ rt2800_rfcsr_write(rt2x00dev, 46, 0x73);
++ rt2800_rfcsr_write(rt2x00dev, 47, 0x00);
++ rt2800_rfcsr_write(rt2x00dev, 48, 0x10);
++ rt2800_rfcsr_write(rt2x00dev, 49, 0x80);
++ rt2800_rfcsr_write(rt2x00dev, 50, 0x00);
++ rt2800_rfcsr_write(rt2x00dev, 51, 0x00);
++ rt2800_rfcsr_write(rt2x00dev, 52, 0x38);
++ rt2800_rfcsr_write(rt2x00dev, 53, 0x00);
++ rt2800_rfcsr_write(rt2x00dev, 54, 0x38);
++ rt2800_rfcsr_write(rt2x00dev, 55, 0x43);
++ rt2800_rfcsr_write(rt2x00dev, 56, 0x82);
++ rt2800_rfcsr_write(rt2x00dev, 57, 0x00);
++ rt2800_rfcsr_write(rt2x00dev, 58, 0x39);
++ rt2800_rfcsr_write(rt2x00dev, 59, 0x0b);
++ rt2800_rfcsr_write(rt2x00dev, 60, 0x45);
++ rt2800_rfcsr_write(rt2x00dev, 61, 0xd1);
++ rt2800_rfcsr_write(rt2x00dev, 62, 0x00);
++ rt2800_rfcsr_write(rt2x00dev, 63, 0x00);
++}
++
+ static void rt2800_init_rfcsr_5390(struct rt2x00_dev *rt2x00dev)
+ {
+ rt2800_rfcsr_write(rt2x00dev, 1, 0x0f);
+@@ -4305,6 +4421,7 @@
+ !rt2x00_rt(rt2x00dev, RT3352) &&
+ !rt2x00_rt(rt2x00dev, RT3390) &&
+ !rt2x00_rt(rt2x00dev, RT3572) &&
++ !rt2x00_rt(rt2x00dev, RT5350) &&
+ !rt2x00_rt(rt2x00dev, RT5390) &&
+ !rt2x00_rt(rt2x00dev, RT5392) &&
+ !rt2800_is_305x_soc(rt2x00dev))
+@@ -4315,6 +4432,8 @@
+ */
+
+ if (rt2x00_rt(rt2x00dev, RT3290) ||
++ rt2x00_rt(rt2x00dev, RT3352) ||
++ rt2x00_rt(rt2x00dev, RT5350) ||
+ rt2x00_rt(rt2x00dev, RT5390) ||
+ rt2x00_rt(rt2x00dev, RT5392)) {
+ rt2800_rfcsr_read(rt2x00dev, 2, &rfcsr);
+@@ -4355,6 +4474,9 @@
+ case RT3572:
+ rt2800_init_rfcsr_3572(rt2x00dev);
+ break;
++ case RT5350:
++ rt2800_init_rfcsr_5350(rt2x00dev);
++ break;
+ case RT5390:
+ rt2800_init_rfcsr_5390(rt2x00dev);
+ break;
+@@ -4751,6 +4873,12 @@
+ if (rt2x00_get_field16(word, EEPROM_NIC_CONF0_RXPATH) > 2)
+ rt2x00_set_field16(&word, EEPROM_NIC_CONF0_RXPATH, 2);
+ rt2x00_eeprom_write(rt2x00dev, EEPROM_NIC_CONF0, word);
++ } else if(rt2x00_rt(rt2x00dev, RT5350)) {
++ rt2x00_set_field16(&word, EEPROM_NIC_CONF0_RXPATH, 1);
++ rt2x00_set_field16(&word, EEPROM_NIC_CONF0_TXPATH, 1);
++ rt2x00_set_field16(&word, EEPROM_NIC_CONF0_RF_TYPE, RF3320);
++ rt2x00_eeprom_write(rt2x00dev, EEPROM_NIC_CONF0, word);
++ EEPROM(rt2x00dev, "rt5350: Ant: 0x%04x\n", word);
+ }
+
+ rt2x00_eeprom_read(rt2x00dev, EEPROM_NIC_CONF1, &word);
+@@ -4875,6 +5003,8 @@
+ rt2x00_get_field32(reg, MAC_CSR0_CHIPSET) == RT5390 ||
+ rt2x00_get_field32(reg, MAC_CSR0_CHIPSET) == RT5392)
+ rt2x00_eeprom_read(rt2x00dev, EEPROM_CHIP_ID, &value);
++ else if(rt2x00_get_field32(reg, MAC_CSR0_CHIPSET) == RT5350)
++ value = RF5350;
+ else
+ value = rt2x00_get_field16(eeprom, EEPROM_NIC_CONF0_RF_TYPE);
+
+@@ -4892,6 +5022,7 @@
+ case RT3352:
+ case RT3390:
+ case RT3572:
++ case RT5350:
+ case RT5390:
+ case RT5392:
+ break;
+@@ -4913,6 +5044,7 @@
+ case RF3290:
+ case RF3320:
+ case RF3322:
++ case RF5350:
+ case RF5360:
+ case RF5370:
+ case RF5372:
+@@ -5276,7 +5408,8 @@
+ rt2x00_rf(rt2x00dev, RF5392)) {
+ spec->num_channels = 14;
+ spec->channels = rf_vals_3x;
+- } else if (rt2x00_rf(rt2x00dev, RF3322)) {
++ } else if (rt2x00_rf(rt2x00dev, RF3322) ||
++ rt2x00_rf(rt2x00dev, RF5350)) {
+ spec->num_channels = 14;
+ if (spec->clk_is_20mhz)
+ spec->channels = rf_vals_xtal20mhz_3x;
+@@ -5365,6 +5498,7 @@
+ case RF3290:
+ case RF5360:
+ case RF5370:
++ case RF5350:
+ case RF5372:
+ case RF5390:
+ case RF5392:
+--- a/drivers/net/wireless/rt2x00/rt2800pci.c
++++ b/drivers/net/wireless/rt2x00/rt2800pci.c
+@@ -171,7 +171,7 @@
+ #else
+ static inline int rt2800pci_read_eeprom_pci(struct rt2x00_dev *rt2x00dev)
+ {
+- return -EOPNOTSUPP;
++ return 0;
+ }
+
+ static inline int rt2800pci_efuse_detect(struct rt2x00_dev *rt2x00dev)
+@@ -181,7 +181,7 @@
+
+ static inline int rt2800pci_read_eeprom_efuse(struct rt2x00_dev
*rt2x00dev)
+ {
+- return -EOPNOTSUPP;
++ return 0;
+ }
+ #endif /* CONFIG_PCI */
+
+--- a/drivers/net/wireless/rt2x00/rt2x00.h
++++ b/drivers/net/wireless/rt2x00/rt2x00.h
+@@ -194,6 +194,7 @@
+ #define RT3572 0x3572
+ #define RT3593 0x3593
+ #define RT3883 0x3883 /* WSOC */
++#define RT5350 0x5350 /* WSOC 2.4GHz */
+ #define RT5390 0x5390 /* 2.4GHz */
+ #define RT5392 0x5392 /* 2.4GHz */
+
Index: package/mac80211/patches/631_rt2x00_rt5350_fix_signal.patch
===================================================================
--- package/mac80211/patches/631_rt2x00_rt5350_fix_signal.patch (revision 0)
+++ package/mac80211/patches/631_rt2x00_rt5350_fix_signal.patch (revision 0)
@@ -0,0 +1,48 @@
+Index: compat-wireless-2013-01-07/drivers/net/wireless/rt2x00/rt2800lib.c
+===================================================================
+---
compat-wireless-2013-01-07.orig/drivers/net/wireless/rt2x00/rt2800lib.c
2013-02-15 18:58:52.297563645 +0400
++++ compat-wireless-2013-01-07/drivers/net/wireless/rt2x00/rt2800lib.c
2013-02-15 19:34:49.136356059 +0400
+@@ -2661,6 +2661,11 @@
+ } else {
+ power_ctrl = 0;
+ }
++
++ if (rt2x00_rt(rt2x00dev, RT5350)) {
++ power_ctrl = 3;
++ }
++
+ rt2x00_set_field8(&r1, BBP1_TX_POWER_CTRL, power_ctrl);
+ rt2800_bbp_write(rt2x00dev, 1, r1);
+ offset = TX_PWR_CFG_0;
+@@ -3138,12 +3138,13 @@
+ } else if (rt2x00_rt(rt2x00dev, RT3572)) {
+ rt2800_register_write(rt2x00dev, TX_SW_CFG0, 0x00000400);
+ rt2800_register_write(rt2x00dev, TX_SW_CFG1, 0x00080606);
+- } else if (rt2x00_rt(rt2x00dev, RT5350) ||
+- rt2x00_rt(rt2x00dev, RT5390) ||
++ } else if (rt2x00_rt(rt2x00dev, RT5390) ||
+ rt2x00_rt(rt2x00dev, RT5392)) {
+ rt2800_register_write(rt2x00dev, TX_SW_CFG0, 0x00000404);
+ rt2800_register_write(rt2x00dev, TX_SW_CFG1, 0x00080606);
+ rt2800_register_write(rt2x00dev, TX_SW_CFG2, 0x00000000);
++ } else if (rt2x00_rt(rt2x00dev, RT5350)) {
++ rt2800_register_write(rt2x00dev, TX_SW_CFG0, 0x00000404);
+ } else {
+ rt2800_register_write(rt2x00dev, TX_SW_CFG0, 0x00000000);
+ rt2800_register_write(rt2x00dev, TX_SW_CFG1, 0x00080606);
+@@ -3725,7 +3726,6 @@
+ rt2x00_rt(rt2x00dev, RT3090) ||
+ rt2x00_rt(rt2x00dev, RT3390) ||
+ rt2x00_rt(rt2x00dev, RT3572) ||
+- rt2x00_rt(rt2x00dev, RT5350) ||
+ rt2x00_rt(rt2x00dev, RT5390) ||
+ rt2x00_rt(rt2x00dev, RT5392)) {
+ rt2800_bbp_read(rt2x00dev, 138, &value);
+@@ -3783,6 +3783,7 @@
+ rt2800_bbp_write(rt2x00dev, 143, 0xa2);
+
+ rt2800_bbp_write(rt2x00dev, 148, 0xc8);
++ rt2800_bbp_write(rt2x00dev, 70, 0xa);
+ }
+
+ if (rt2x00_rt(rt2x00dev, RT5350)) {
_______________________________________________
openwrt-devel mailing list
[email protected]
https://lists.openwrt.org/mailman/listinfo/openwrt-devel
