RepoMirrors/openwrt
1
0
Fork 0
mirror of git://git.openwrt.org/openwrt/openwrt.git synced 2024-12-30 10:42:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

ar71xx: ag71xx: allow to connect PHY4 to the CPU on AR934X

Browse Source 
SVN-Revision: 29553
This commit is contained in:
Gabor Juhos 2011-12-15 22:25:30 +00:00
parent 0540970345
commit 00667c3846
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
target/linux/ar71xx/files/arch/mips/include/asm/mach-ar71xx/platform.h
View File

@ -18,7 +18,7 @@
#include <linux/spi/spi.h> #include <linux/spi/spi.h>
struct ag71xx_switch_platform_data { struct ag71xx_switch_platform_data {
int dummy; u8 phy4_mii_en:1;
}; };
struct ag71xx_platform_data { struct ag71xx_platform_data {

10
target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx_ar7240.c
View File

@ -203,6 +203,9 @@
#define AR934X_OPER_MODE0_MAC_GMII_EN BIT(6) #define AR934X_OPER_MODE0_MAC_GMII_EN BIT(6)
#define AR934X_OPER_MODE0_PHY_MII_EN BIT(10) #define AR934X_OPER_MODE0_PHY_MII_EN BIT(10)
#define AR934X_REG_OPER_MODE1 0x08
#define AR934X_REG_OPER_MODE1_PHY4_MII_EN BIT(28)
#define sw_to_ar7240(_dev) container_of(_dev, struct ar7240sw, swdev) #define sw_to_ar7240(_dev) container_of(_dev, struct ar7240sw, swdev)
struct ar7240sw { struct ar7240sw {
@ -898,11 +901,8 @@ static struct ar7240sw *ar7240_probe(struct ag71xx *ag)
if (sw_is_ar7240(as)) { if (sw_is_ar7240(as)) {
swdev->name = "AR7240/AR9330 built-in switch"; swdev->name = "AR7240/AR9330 built-in switch";
} else if (sw_is_ar934x(as)) { } else if (sw_is_ar934x(as)) {
struct ag71xx_platform_data *pdata;
swdev->name = "AR934X built-in switch"; swdev->name = "AR934X built-in switch";
pdata = ag71xx_get_pdata(ag);
if (pdata->phy_if_mode == PHY_INTERFACE_MODE_GMII) { if (pdata->phy_if_mode == PHY_INTERFACE_MODE_GMII) {
ar7240sw_reg_set(mii, AR934X_REG_OPER_MODE0, ar7240sw_reg_set(mii, AR934X_REG_OPER_MODE0,
AR934X_OPER_MODE0_MAC_GMII_EN); AR934X_OPER_MODE0_MAC_GMII_EN);
@ -914,6 +914,10 @@ static struct ar7240sw *ar7240_probe(struct ag71xx *ag)
ag->dev->name); ag->dev->name);
goto err_free; goto err_free;
} }
if (as->swdata->phy4_mii_en)
ar7240sw_reg_set(mii, AR934X_REG_OPER_MODE1,
AR934X_REG_OPER_MODE1_PHY4_MII_EN);
} else { } else {
pr_err("%s: unsupported chip, ctrl=%08x\n", pr_err("%s: unsupported chip, ctrl=%08x\n",
ag->dev->name, ctrl); ag->dev->name, ctrl);