Minor ramips_esw.c cleanup
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.
Signed-off-by: Tobias Diedrich <ranma+open...@tdiedrich.de>
Index:
openwrt-ralink-swconfig/target/linux/ramips/files/arch/mips/ralink/rt305x/mach-wl351.c
===================================================================
---
openwrt-ralink-swconfig.orig/target/linux/ramips/files/arch/mips/ralink/rt305x/mach-wl351.c
2012-08-25 18:50:57.178325028 +0200
+++
openwrt-ralink-swconfig/target/linux/ramips/files/arch/mips/ralink/rt305x/mach-wl351.c
2012-08-25 18:52:07.318422989 +0200
@@ -97,9 +97,15 @@
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: eanbled, 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);
Index:
openwrt-ralink-swconfig/target/linux/ramips/files/arch/mips/include/asm/mach-ralink/rt305x_esw_platform.h
===================================================================
---
openwrt-ralink-swconfig.orig/target/linux/ramips/files/arch/mips/include/asm/mach-ralink/rt305x_esw_platform.h
2012-08-25 18:50:57.178325028 +0200
+++
openwrt-ralink-swconfig/target/linux/ramips/files/arch/mips/include/asm/mach-ralink/rt305x_esw_platform.h
2012-08-25 18:52:07.318422989 +0200
@@ -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,
};
Index:
openwrt-ralink-swconfig/target/linux/ramips/files/drivers/net/ethernet/ramips/ramips_esw.c
===================================================================
---
openwrt-ralink-swconfig.orig/target/linux/ramips/files/drivers/net/ethernet/ramips/ramips_esw.c
2012-08-25 18:52:07.248422894 +0200
+++
openwrt-ralink-swconfig/target/linux/ramips/files/drivers/net/ethernet/ramips/ramips_esw.c
2012-08-25 18:52:14.578433130 +0200
@@ -335,7 +335,7 @@
rt305x_esw_hw_init(struct rt305x_esw *esw)
{
int i;
- u8 port_map = 0;
+ u8 port_map = RT305X_ESW_PMAP_LLLLLL;
/* vodoo from original driver */
rt305x_esw_wr(esw, 0xC8A07850, RT305X_ESW_REG_FCT0);
@@ -412,55 +412,16 @@
/* select local register */
rt305x_mii_write(esw, 0, 31, 0x8000);
- /* Set up logical config and apply. */
- for (i = 0; i < RT305X_ESW_NUM_VLANS; i++) {
- esw->vlans[i].vid = RT305X_ESW_VLAN_NONE;
- esw->vlans[i].ports = RT305X_ESW_PORTS_NONE;
- }
-
- for (i = 0; i < RT305X_ESW_NUM_PORTS; i++) {
- esw->ports[i].pvid = 1;
- esw->ports[i].en_vlan = 1;
- esw->ports[i].untag = i != RT305X_ESW_PORT6;
- }
-
switch (esw->pdata->vlan_config) {
- case RT305X_ESW_VLAN_CONFIG_BYPASS:
case RT305X_ESW_VLAN_CONFIG_NONE:
port_map = RT305X_ESW_PMAP_LLLLLL;
- esw->global_vlan_enable = 0;
break;
-
case RT305X_ESW_VLAN_CONFIG_LLLLW:
port_map = RT305X_ESW_PMAP_LLLLWL;
- esw->global_vlan_enable = 1;
- esw->vlans[0].vid = 1;
- esw->vlans[1].vid = 2;
- esw->ports[4].pvid = 2;
- esw->ports[5].disable = 1;
- esw->vlans[0].ports =
- BIT(RT305X_ESW_PORT0) | BIT(RT305X_ESW_PORT1) |
- BIT(RT305X_ESW_PORT2) | BIT(RT305X_ESW_PORT3) |
- BIT(RT305X_ESW_PORT6);
- esw->vlans[1].ports =
- BIT(RT305X_ESW_PORT4) | BIT(RT305X_ESW_PORT6);
break;
-
case RT305X_ESW_VLAN_CONFIG_WLLLL:
port_map = RT305X_ESW_PMAP_WLLLLL;
- esw->global_vlan_enable = 1;
- esw->vlans[0].vid = 1;
- esw->vlans[1].vid = 2;
- esw->ports[0].pvid = 2;
- esw->ports[5].disable = 1;
- esw->vlans[0].ports =
- BIT(RT305X_ESW_PORT1) | BIT(RT305X_ESW_PORT2) |
- BIT(RT305X_ESW_PORT3) | BIT(RT305X_ESW_PORT4) |
- BIT(RT305X_ESW_PORT6);
- esw->vlans[1].ports =
- BIT(RT305X_ESW_PORT0) | BIT(RT305X_ESW_PORT6);
break;
-
default:
BUG();
}
@@ -475,6 +436,7 @@
RT305X_ESW_SGC2_LAN_PMAP_M << RT305X_ESW_SGC2_LAN_PMAP_S,
port_map << RT305X_ESW_SGC2_LAN_PMAP_S);
+ /* Apply the empty config. */
rt305x_esw_apply_config(&esw->swdev);
}
Index:
openwrt-ralink-swconfig/target/linux/ramips/files/arch/mips/ralink/rt305x/devices.c
===================================================================
---
openwrt-ralink-swconfig.orig/target/linux/ramips/files/arch/mips/ralink/rt305x/devices.c
2012-08-25 18:51:50.048398869 +0200
+++
openwrt-ralink-swconfig/target/linux/ramips/files/arch/mips/ralink/rt305x/devices.c
2012-08-25 18:52:07.318422989 +0200
@@ -156,8 +156,15 @@
};
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,
};
_______________________________________________
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel
