You cannot select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
47 lines
1.4 KiB
Diff
47 lines
1.4 KiB
Diff
--- a/arch/arm/mach-ixp4xx/avila-setup.c
|
|
+++ b/arch/arm/mach-ixp4xx/avila-setup.c
|
|
@@ -291,6 +291,7 @@ static void __init avila_gw2345_setup(vo
|
|
|
|
static void __init avila_gw2347_setup(void)
|
|
{
|
|
+ avila_npeb_data.quirks |= IXP4XX_ETH_QUIRK_GW23X7;
|
|
platform_device_register(&avila_npeb_device);
|
|
|
|
avila_gpio_leds[0].gpio = AVILA_GW23X7_LED_USER_GPIO;
|
|
@@ -335,6 +336,7 @@ static void __init avila_gw2355_setup(vo
|
|
|
|
static void __init avila_gw2357_setup(void)
|
|
{
|
|
+ avila_npeb_data.quirks |= IXP4XX_ETH_QUIRK_GW23X7;
|
|
platform_device_register(&avila_npeb_device);
|
|
|
|
avila_gpio_leds[0].gpio = AVILA_GW23X7_LED_USER_GPIO;
|
|
--- a/drivers/net/arm/ixp4xx_eth.c
|
|
+++ b/drivers/net/arm/ixp4xx_eth.c
|
|
@@ -348,6 +348,14 @@ static void phy_reset(struct net_device
|
|
return;
|
|
}
|
|
|
|
+ if (port->plat->quirks & IXP4XX_ETH_QUIRK_GW23X7) {
|
|
+ mdio_write(dev, 1, 0x19,
|
|
+ (mdio_read(dev, 1, 0x19) & 0xfffe) | 0x8000);
|
|
+
|
|
+ printk(KERN_DEBUG "%s: phy_id of the DP83848 changed to 0\n",
|
|
+ dev->name);
|
|
+ }
|
|
+
|
|
/* restart auto negotiation */
|
|
bmcr = mdio_read(dev, phy_id, MII_BMCR);
|
|
bmcr |= (BMCR_ANENABLE | BMCR_ANRESTART);
|
|
--- a/arch/arm/mach-ixp4xx/include/mach/platform.h
|
|
+++ b/arch/arm/mach-ixp4xx/include/mach/platform.h
|
|
@@ -104,6 +104,8 @@ struct eth_plat_info {
|
|
u8 txreadyq;
|
|
u8 hwaddr[6];
|
|
u32 phy_mask;
|
|
+ u32 quirks;
|
|
+#define IXP4XX_ETH_QUIRK_GW23X7 0x00000001
|
|
};
|
|
|
|
/* Information about built-in HSS (synchronous serial) interfaces */
|