qi-hardware/openwrt-xburst
1
0
Fork 0
mirror of git://projects.qi-hardware.com/openwrt-xburst.git synced 2024-11-24 01:01:52 +02:00
Code

ar71xx: configure MII interface type from ar71xx_setup_phy_if_mode

Browse Source 
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@29010 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
juhosg 2011-11-13 11:26:54 +00:00
parent 4cc612872a
commit 13e0098939
2 changed files with 28 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
target/linux/ar71xx/files/arch/mips/ar71xx/devices.c
View File

@ -190,6 +190,22 @@ static void ar71xx_set_pll(u32 cfg_reg, u32 pll_reg, u32 pll_val, u32 shift)
iounmap(base); iounmap(base);
} }
static void __init ar71xx_mii_ctrl_set_if(unsigned int reg,
unsigned int mii_if)
{
void __iomem *base;
u32 t;
base = ioremap(AR71XX_MII_BASE, AR71XX_MII_SIZE);
t = __raw_readl(base + reg);
t &= ~(MII_CTRL_IF_MASK);
t |= (mii_if & MII_CTRL_IF_MASK);
__raw_writel(t, base + reg);
iounmap(base);
}
void __init ar71xx_add_device_mdio(unsigned int id, u32 phy_mask) void __init ar71xx_add_device_mdio(unsigned int id, u32 phy_mask)
{ {
struct platform_device *mdio_dev; struct platform_device *mdio_dev;
@ -588,6 +604,8 @@ static void __init ar71xx_init_eth_pll_data(unsigned int id)
static int __init ar71xx_setup_phy_if_mode(unsigned int id, static int __init ar71xx_setup_phy_if_mode(unsigned int id,
struct ag71xx_platform_data *pdata) struct ag71xx_platform_data *pdata)
{ {
unsigned int mii_if;
switch (id) { switch (id) {
case 0: case 0:
switch (ar71xx_soc) { switch (ar71xx_soc) {
@ -598,20 +616,21 @@ static int __init ar71xx_setup_phy_if_mode(unsigned int id,
case AR71XX_SOC_AR9132: case AR71XX_SOC_AR9132:
switch (pdata->phy_if_mode) { switch (pdata->phy_if_mode) {
case PHY_INTERFACE_MODE_MII: case PHY_INTERFACE_MODE_MII:
pdata->mii_if = MII0_CTRL_IF_MII; mii_if = MII0_CTRL_IF_MII;
break; break;
case PHY_INTERFACE_MODE_GMII: case PHY_INTERFACE_MODE_GMII:
pdata->mii_if = MII0_CTRL_IF_GMII; mii_if = MII0_CTRL_IF_GMII;
break; break;
case PHY_INTERFACE_MODE_RGMII: case PHY_INTERFACE_MODE_RGMII:
pdata->mii_if = MII0_CTRL_IF_RGMII; mii_if = MII0_CTRL_IF_RGMII;
break; break;
case PHY_INTERFACE_MODE_RMII: case PHY_INTERFACE_MODE_RMII:
pdata->mii_if = MII0_CTRL_IF_RMII; mii_if = MII0_CTRL_IF_RMII;
break; break;
default: default:
return -EINVAL; return -EINVAL;
} }
ar71xx_mii_ctrl_set_if(MII_REG_MII0_CTRL, mii_if);
break; break;
case AR71XX_SOC_AR7240: case AR71XX_SOC_AR7240:
@ -651,14 +670,15 @@ static int __init ar71xx_setup_phy_if_mode(unsigned int id,
case AR71XX_SOC_AR9132: case AR71XX_SOC_AR9132:
switch (pdata->phy_if_mode) { switch (pdata->phy_if_mode) {
case PHY_INTERFACE_MODE_RMII: case PHY_INTERFACE_MODE_RMII:
pdata->mii_if = MII1_CTRL_IF_RMII; mii_if = MII1_CTRL_IF_RMII;
break; break;
case PHY_INTERFACE_MODE_RGMII: case PHY_INTERFACE_MODE_RGMII:
pdata->mii_if = MII1_CTRL_IF_RGMII; mii_if = MII1_CTRL_IF_RGMII;
break; break;
default: default:
return -EINVAL; return -EINVAL;
} }
ar71xx_mii_ctrl_set_if(MII_REG_MII1_CTRL, mii_if);
break; break;
case AR71XX_SOC_AR7240: case AR71XX_SOC_AR7240:

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

@ -816,6 +816,8 @@ void ar71xx_flash_release(void);
#define MII_REG_MII0_CTRL 0x00 #define MII_REG_MII0_CTRL 0x00
#define MII_REG_MII1_CTRL 0x04 #define MII_REG_MII1_CTRL 0x04
#define MII_CTRL_IF_MASK 3
#define MII0_CTRL_IF_GMII 0 #define MII0_CTRL_IF_GMII 0
#define MII0_CTRL_IF_MII 1 #define MII0_CTRL_IF_MII 1
#define MII0_CTRL_IF_RGMII 2 #define MII0_CTRL_IF_RGMII 2