From 70342a708e3df9610ba7fb830d50514e05b4f978 Mon Sep 17 00:00:00 2001 From: juhosg Date: Mon, 24 Nov 2008 16:56:36 +0000 Subject: [ar71xx] ethernet driver preparation for gigabit support git-svn-id: svn://svn.openwrt.org/openwrt/trunk@13340 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx.h | 2 +- target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx_phy.c | 11 ++++------- .../ar71xx/files/include/asm-mips/mach-ar71xx/platform.h | 2 ++ 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx.h b/target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx.h index 3e15e33e0d..f7865523c3 100644 --- a/target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx.h +++ b/target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx.h @@ -37,7 +37,7 @@ #define ETH_FCS_LEN 4 #define AG71XX_DRV_NAME "ag71xx" -#define AG71XX_DRV_VERSION "0.4.3" +#define AG71XX_DRV_VERSION "0.4.4" #define AG71XX_NAPI_TX 1 diff --git a/target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx_phy.c b/target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx_phy.c index 7242868462..8728c7c7b9 100644 --- a/target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx_phy.c +++ b/target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx_phy.c @@ -255,13 +255,10 @@ int ag71xx_phy_connect(struct ag71xx *ag) } /* mask with MAC supported features */ - phydev->supported &= (SUPPORTED_10baseT_Half - | SUPPORTED_10baseT_Full - | SUPPORTED_100baseT_Half - | SUPPORTED_100baseT_Full - | SUPPORTED_Autoneg - | SUPPORTED_MII - | SUPPORTED_TP); + if (pdata->has_gbit) + phydev->supported &= PHY_GBIT_FEATURES; + else + phydev->supported &= PHY_BASIC_FEATURES; phydev->advertising = phydev->supported; diff --git a/target/linux/ar71xx/files/include/asm-mips/mach-ar71xx/platform.h b/target/linux/ar71xx/files/include/asm-mips/mach-ar71xx/platform.h index 53ac555c7b..f845c42f30 100644 --- a/target/linux/ar71xx/files/include/asm-mips/mach-ar71xx/platform.h +++ b/target/linux/ar71xx/files/include/asm-mips/mach-ar71xx/platform.h @@ -28,6 +28,8 @@ struct ag71xx_platform_data { u32 flush_reg; u32 mii_if; u8 mac_addr[ETH_ALEN]; + + u8 has_gbit:1; }; struct ag71xx_mdio_platform_data { -- cgit v1.2.3