projects
/
openwrt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[brcm63xx] fix SPI driver, move register out of driver code
[openwrt.git]
/
target
/
linux
/
ixp4xx
/
patches-2.6.34
/
205-npe_driver_separate_phy_functions.patch
diff --git
a/target/linux/ixp4xx/patches-2.6.34/205-npe_driver_separate_phy_functions.patch
b/target/linux/ixp4xx/patches-2.6.34/205-npe_driver_separate_phy_functions.patch
index
b9835a0
..
9aeee2d
100644
(file)
--- a/
target/linux/ixp4xx/patches-2.6.34/205-npe_driver_separate_phy_functions.patch
+++ b/
target/linux/ixp4xx/patches-2.6.34/205-npe_driver_separate_phy_functions.patch
@@
-1,6
+1,6
@@
--- a/drivers/net/arm/ixp4xx_eth.c
+++ b/drivers/net/arm/ixp4xx_eth.c
--- a/drivers/net/arm/ixp4xx_eth.c
+++ b/drivers/net/arm/ixp4xx_eth.c
-@@ -39
6,6 +396
,50 @@ static void ixp4xx_adjust_link(struct ne
+@@ -39
7,6 +397
,50 @@ static void ixp4xx_adjust_link(struct ne
dev->name, port->speed, port->duplex ? "full" : "half");
}
dev->name, port->speed, port->duplex ? "full" : "half");
}
@@
-51,7
+51,7
@@
static inline void debug_pkt(struct net_device *dev, const char *func,
u8 *data, int len)
static inline void debug_pkt(struct net_device *dev, const char *func,
u8 *data, int len)
-@@ -100
5,8 +1049
,7 @@ static int eth_open(struct net_device *d
+@@ -100
9,8 +1053
,7 @@ static int eth_open(struct net_device *d
return err;
}
return err;
}
@@
-61,7
+61,7
@@
for (i = 0; i < ETH_ALEN; i++)
__raw_writel(dev->dev_addr[i], &port->regs->hw_addr[i]);
for (i = 0; i < ETH_ALEN; i++)
__raw_writel(dev->dev_addr[i], &port->regs->hw_addr[i]);
-@@ -11
27,7 +1170
,7 @@ static int eth_close(struct net_device *
+@@ -11
31,7 +1174
,7 @@ static int eth_close(struct net_device *
printk(KERN_CRIT "%s: unable to disable loopback\n",
dev->name);
printk(KERN_CRIT "%s: unable to disable loopback\n",
dev->name);
@@
-70,7
+70,7
@@
if (!ports_open)
qmgr_disable_irq(TXDONE_QUEUE);
if (!ports_open)
qmgr_disable_irq(TXDONE_QUEUE);
-@@ -115
3,7 +1196
,6 @@ static int __devinit eth_init_one(struct
+@@ -115
7,7 +1200
,6 @@ static int __devinit eth_init_one(struct
struct net_device *dev;
struct eth_plat_info *plat = pdev->dev.platform_data;
u32 regs_phys;
struct net_device *dev;
struct eth_plat_info *plat = pdev->dev.platform_data;
u32 regs_phys;
@@
-78,7
+78,7
@@
int err;
if (!(dev = alloc_etherdev(sizeof(struct port))))
int err;
if (!(dev = alloc_etherdev(sizeof(struct port))))
-@@ -121
1,18 +1253
,10 @@ static int __devinit eth_init_one(struct
+@@ -121
5,18 +1257
,10 @@ static int __devinit eth_init_one(struct
__raw_writel(DEFAULT_CORE_CNTRL, &port->regs->core_control);
udelay(50);
__raw_writel(DEFAULT_CORE_CNTRL, &port->regs->core_control);
udelay(50);
@@
-99,16
+99,16
@@
if ((err = register_netdev(dev)))
goto err_phy_dis;
if ((err = register_netdev(dev)))
goto err_phy_dis;
-@@ -123
2,7 +1266
,7 @@ static int __devinit eth_init_one(struct
+@@ -123
6,7 +1270
,7 @@ static int __devinit eth_init_one(struct
return 0;
err_phy_dis:
- phy_disconnect(port->phydev);
return 0;
err_phy_dis:
- phy_disconnect(port->phydev);
-+ ixp4xx_phy_disconnect(
port->phy
dev);
++ ixp4xx_phy_disconnect(dev);
err_free_mem:
npe_port_tab[NPE_ID(port->id)] = NULL;
platform_set_drvdata(pdev, NULL);
err_free_mem:
npe_port_tab[NPE_ID(port->id)] = NULL;
platform_set_drvdata(pdev, NULL);
-@@ -125
0,7 +1284
,7 @@ static int __devexit eth_remove_one(stru
+@@ -125
4,7 +1288
,7 @@ static int __devexit eth_remove_one(stru
struct port *port = netdev_priv(dev);
unregister_netdev(dev);
struct port *port = netdev_priv(dev);
unregister_netdev(dev);
This page took
0.022839 seconds
and
4
git commands to generate.