qi-hardware/openwrt-xburst
1
0
Fork 0
mirror of git://projects.qi-hardware.com/openwrt-xburst.git synced 2025-04-21 12:27:27 +03:00
Code Activity

ramips: Minor ramips_esw.c cleanup

Browse Source 
Stop handling VLAN setup in the kernel.
Removes the obsolete RT305X_ESW_VLAN_CONFIG_BYPASS option I added for
WL-351 and add some extra comments.
Also removes the en_vlan per-port flag that isn't very useful really, it now
is only controlled by the global enable_vlan flag.

Signed-off-by: Tobias Diedrich <ranma+openwrt@tdiedrich.de>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@33301 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
juhosg
2012-08-29 10:37:40 +00:00
parent 90dab951da
commit 1bac05a581
4 changed files with 18 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
target/linux/ramips/files/arch/mips/include/asm/mach-ralink/rt305x_esw_platform.h
View File

@@ -13,7 +13,6 @@
enum {
RT305X_ESW_VLAN_CONFIG_NONE = 0,
RT305X_ESW_VLAN_CONFIG_BYPASS,
RT305X_ESW_VLAN_CONFIG_LLLLW,
RT305X_ESW_VLAN_CONFIG_WLLLL,
};

7
target/linux/ramips/files/arch/mips/ralink/rt305x/devices.c
View File

@@ -156,8 +156,15 @@ static struct resource rt305x_esw_resources[] = {
};
struct rt305x_esw_platform_data rt305x_esw_data = {
/* All ports are LAN ports. */
.vlan_config = RT305X_ESW_VLAN_CONFIG_NONE,
.reg_initval_fct2 = 0x00d6500c,
/*
* ext phy base addr 31, enable port 5 polling, rx/tx clock skew 1,
* turbo mii off, rgmi 3.3v off
* port5: disabled
* port6: enabled, gige, full-duplex, rx/tx-flow-control
*/
.reg_initval_fpa2 = 0x3f502b28,
};

10
target/linux/ramips/files/arch/mips/ralink/rt305x/mach-wl351.c
View File

@@ -97,9 +97,15 @@ static void __init wl351_init(void)
ramips_register_gpio_buttons(-1, WL351_KEYS_POLL_INTERVAL,
ARRAY_SIZE(wl351_gpio_buttons),
wl351_gpio_buttons);
// external rtl8366rb
rt305x_esw_data.vlan_config = RT305X_ESW_VLAN_CONFIG_BYPASS;
/* External RTL8366RB. */
rt305x_esw_data.vlan_config = RT305X_ESW_VLAN_CONFIG_NONE;
rt305x_esw_data.reg_initval_fct2 = 0x0002500c;
/*
* ext phy base addr 31, rx/tx clock skew 0,
* turbo mii off, rgmi 3.3v off, port 5 polling off
* port5: enabled, gige, full-duplex, rx/tx-flow-control
* port6: enabled, gige, full-duplex, rx/tx-flow-control
*/
rt305x_esw_data.reg_initval_fpa2 = 0x1f003fff;
rt305x_register_ethernet();
platform_device_register(&wl351_switch);