projects
/
openwrt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ar71xx: add kmod-ledtrig-usbdev for the MZK-W04NU profile as well
[openwrt.git]
/
target
/
linux
/
generic
/
files
/
drivers
/
net
/
phy
/
rtl8366s.c
diff --git
a/target/linux/generic/files/drivers/net/phy/rtl8366s.c
b/target/linux/generic/files/drivers/net/phy/rtl8366s.c
index
66dc2db
..
3b7fcce
100644
(file)
--- a/
target/linux/generic/files/drivers/net/phy/rtl8366s.c
+++ b/
target/linux/generic/files/drivers/net/phy/rtl8366s.c
@@
-25,6
+25,7
@@
#define RTL8366S_PHY_NO_MAX 4
#define RTL8366S_PHY_PAGE_MAX 7
#define RTL8366S_PHY_ADDR_MAX 31
#define RTL8366S_PHY_NO_MAX 4
#define RTL8366S_PHY_PAGE_MAX 7
#define RTL8366S_PHY_ADDR_MAX 31
+#define RTL8366S_PHY_WAN 4
/* Switch Global Configuration register */
#define RTL8366S_SGCR 0x0000
/* Switch Global Configuration register */
#define RTL8366S_SGCR 0x0000
@@
-256,9
+257,6
@@
static int rtl8366s_hw_init(struct rtl8366_smi *smi)
REG_RMW(smi, RTL8366S_SGCR, RTL8366S_SGCR_MAX_LENGTH_MASK,
RTL8366S_SGCR_MAX_LENGTH_1536);
REG_RMW(smi, RTL8366S_SGCR, RTL8366S_SGCR_MAX_LENGTH_MASK,
RTL8366S_SGCR_MAX_LENGTH_1536);
- /* enable all ports */
- REG_WR(smi, RTL8366S_PECR, 0);
-
/* enable learning for all ports */
REG_WR(smi, RTL8366S_SSCR0, 0);
/* enable learning for all ports */
REG_WR(smi, RTL8366S_SSCR0, 0);
@@
-454,8
+452,8
@@
static int rtl8366s_set_vlan_4k(struct rtl8366_smi *smi,
int i;
if (vlan4k->vid >= RTL8366S_NUM_VIDS ||
int i;
if (vlan4k->vid >= RTL8366S_NUM_VIDS ||
- vlan4k->member > RTL8366S_
PORT_ALL
||
- vlan4k->untag > RTL8366S_
PORT_ALL
||
+ vlan4k->member > RTL8366S_
VLAN_MEMBER_MASK
||
+ vlan4k->untag > RTL8366S_
VLAN_UNTAG_MASK
||
vlan4k->fid > RTL8366S_FIDMAX)
return -EINVAL;
vlan4k->fid > RTL8366S_FIDMAX)
return -EINVAL;
@@
-523,8
+521,8
@@
static int rtl8366s_set_vlan_mc(struct rtl8366_smi *smi, u32 index,
if (index >= RTL8366S_NUM_VLANS ||
vlanmc->vid >= RTL8366S_NUM_VIDS ||
vlanmc->priority > RTL8366S_PRIORITYMAX ||
if (index >= RTL8366S_NUM_VLANS ||
vlanmc->vid >= RTL8366S_NUM_VIDS ||
vlanmc->priority > RTL8366S_PRIORITYMAX ||
- vlanmc->member > RTL8366S_
PORT_ALL
||
- vlanmc->untag > RTL8366S_
PORT_ALL
||
+ vlanmc->member > RTL8366S_
VLAN_MEMBER_MASK
||
+ vlanmc->untag > RTL8366S_
VLAN_UNTAG_MASK
||
vlanmc->fid > RTL8366S_FIDMAX)
return -EINVAL;
vlanmc->fid > RTL8366S_FIDMAX)
return -EINVAL;
@@
-604,6
+602,12
@@
static int rtl8366s_is_vlan_valid(struct rtl8366_smi *smi, unsigned vlan)
return 1;
}
return 1;
}
+static int rtl8366s_enable_port(struct rtl8366_smi *smi, int port, int enable)
+{
+ return rtl8366_smi_rmwr(smi, RTL8366S_PECR, (1 << port),
+ (enable) ? 0 : (1 << port));
+}
+
static int rtl8366s_sw_reset_mibs(struct switch_dev *dev,
const struct switch_attr *attr,
struct switch_val *val)
static int rtl8366s_sw_reset_mibs(struct switch_dev *dev,
const struct switch_attr *attr,
struct switch_val *val)
@@
-801,7
+805,15
@@
static int rtl8366s_sw_reset_switch(struct switch_dev *dev)
if (err)
return err;
if (err)
return err;
- return rtl8366_reset_vlan(smi);
+ err = rtl8366_reset_vlan(smi);
+ if (err)
+ return err;
+
+ err = rtl8366_enable_vlan(smi, 1);
+ if (err)
+ return err;
+
+ return rtl8366_enable_all_ports(smi, 1);
}
static struct switch_attr rtl8366s_globals[] = {
}
static struct switch_attr rtl8366s_globals[] = {
@@
-882,6
+894,13
@@
static struct switch_attr rtl8366s_vlan[] = {
.max = 1,
.set = NULL,
.get = rtl8366_sw_get_vlan_info,
.max = 1,
.set = NULL,
.get = rtl8366_sw_get_vlan_info,
+ }, {
+ .type = SWITCH_TYPE_INT,
+ .name = "fid",
+ .description = "Get/Set vlan FID",
+ .max = RTL8366S_FIDMAX,
+ .set = rtl8366_sw_set_vlan_fid,
+ .get = rtl8366_sw_get_vlan_fid,
},
};
},
};
@@
-1024,9
+1043,10
@@
static struct rtl8366_smi_ops rtl8366s_smi_ops = {
.is_vlan_valid = rtl8366s_is_vlan_valid,
.enable_vlan = rtl8366s_enable_vlan,
.enable_vlan4k = rtl8366s_enable_vlan4k,
.is_vlan_valid = rtl8366s_is_vlan_valid,
.enable_vlan = rtl8366s_enable_vlan,
.enable_vlan4k = rtl8366s_enable_vlan4k,
+ .enable_port = rtl8366s_enable_port,
};
};
-static int __init rtl8366s_probe(struct platform_device *pdev)
+static int __
dev
init rtl8366s_probe(struct platform_device *pdev)
{
static int rtl8366_smi_version_printed;
struct rtl8366s_platform_data *pdata;
{
static int rtl8366_smi_version_printed;
struct rtl8366s_platform_data *pdata;
@@
-1090,6
+1110,10
@@
static int rtl8366s_phy_config_init(struct phy_device *phydev)
static int rtl8366s_phy_config_aneg(struct phy_device *phydev)
{
static int rtl8366s_phy_config_aneg(struct phy_device *phydev)
{
+ /* phy 4 might be connected to a second mac, allow aneg config */
+ if (phydev->addr == RTL8366S_PHY_WAN)
+ return genphy_config_aneg(phydev);
+
return 0;
}
return 0;
}
This page took
0.030808 seconds
and
4
git commands to generate.