qi-hardware/openwrt-xburst
1
0
Fork 0
mirror of git://projects.qi-hardware.com/openwrt-xburst.git synced 2024-11-27 17:55:55 +02:00
Code

[backfire] merge r23127

Browse Source 
git-svn-id: svn://svn.openwrt.org/openwrt/branches/backfire@23659 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
jow 2010-10-27 11:34:36 +00:00
parent d6278941db
commit a412649794
2 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
target/linux/generic-2.6/files/drivers/net/phy/rtl8366rb.c
View File

@ -25,6 +25,7 @@
#define RTL8366RB_PHY_NO_MAX 4 #define RTL8366RB_PHY_NO_MAX 4
#define RTL8366RB_PHY_PAGE_MAX 7 #define RTL8366RB_PHY_PAGE_MAX 7
#define RTL8366RB_PHY_ADDR_MAX 31 #define RTL8366RB_PHY_ADDR_MAX 31
#define RTL8366RB_PHY_WAN 4
/* Switch Global Configuration register */ /* Switch Global Configuration register */
#define RTL8366RB_SGCR 0x0000 #define RTL8366RB_SGCR 0x0000
@ -1063,6 +1064,10 @@ static int rtl8366rb_phy_config_init(struct phy_device *phydev)
static int rtl8366rb_phy_config_aneg(struct phy_device *phydev) static int rtl8366rb_phy_config_aneg(struct phy_device *phydev)
{ {
/* phy 4 might be connected to a second mac, allow aneg config */
if (phydev->addr == RTL8366RB_PHY_WAN)
return genphy_config_aneg(phydev);
return 0; return 0;
} }

5
target/linux/generic-2.6/files/drivers/net/phy/rtl8366s.c
View File

@ -25,6 +25,7 @@
#define RTL8366S_PHY_NO_MAX 4 #define RTL8366S_PHY_NO_MAX 4
#define RTL8366S_PHY_PAGE_MAX 7 #define RTL8366S_PHY_PAGE_MAX 7
#define RTL8366S_PHY_ADDR_MAX 31 #define RTL8366S_PHY_ADDR_MAX 31
#define RTL8366S_PHY_WAN 4
/* Switch Global Configuration register */ /* Switch Global Configuration register */
#define RTL8366S_SGCR 0x0000 #define RTL8366S_SGCR 0x0000
@ -1090,6 +1091,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;
} }