git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
linux 2.6.16.38 w/ vs2.0.3-rc1
[linux-2.6.git]
/
drivers
/
net
/
ixp2000
/
pm3386.c
diff --git
a/drivers/net/ixp2000/pm3386.c
b/drivers/net/ixp2000/pm3386.c
index
5224651
..
5c7ab75
100644
(file)
--- a/
drivers/net/ixp2000/pm3386.c
+++ b/
drivers/net/ixp2000/pm3386.c
@@
-86,53
+86,40
@@
static void pm3386_port_reg_write(int port, int _reg, int spacing, u16 value)
pm3386_reg_write(port >> 1, reg, value);
}
pm3386_reg_write(port >> 1, reg, value);
}
-int pm3386_secondary_present(void)
-{
- return pm3386_reg_read(1, 0) == 0x3386;
-}
void pm3386_reset(void)
{
u8 mac[3][6];
void pm3386_reset(void)
{
u8 mac[3][6];
- int secondary;
-
- secondary = pm3386_secondary_present();
/* Save programmed MAC addresses. */
pm3386_get_mac(0, mac[0]);
pm3386_get_mac(1, mac[1]);
/* Save programmed MAC addresses. */
pm3386_get_mac(0, mac[0]);
pm3386_get_mac(1, mac[1]);
- if (secondary)
- pm3386_get_mac(2, mac[2]);
+ pm3386_get_mac(2, mac[2]);
/* Assert analog and digital reset. */
pm3386_reg_write(0, 0x002, 0x0060);
/* Assert analog and digital reset. */
pm3386_reg_write(0, 0x002, 0x0060);
- if (secondary)
- pm3386_reg_write(1, 0x002, 0x0060);
+ pm3386_reg_write(1, 0x002, 0x0060);
mdelay(1);
/* Deassert analog reset. */
pm3386_reg_write(0, 0x002, 0x0062);
mdelay(1);
/* Deassert analog reset. */
pm3386_reg_write(0, 0x002, 0x0062);
- if (secondary)
- pm3386_reg_write(1, 0x002, 0x0062);
+ pm3386_reg_write(1, 0x002, 0x0062);
mdelay(10);
/* Deassert digital reset. */
pm3386_reg_write(0, 0x002, 0x0063);
mdelay(10);
/* Deassert digital reset. */
pm3386_reg_write(0, 0x002, 0x0063);
- if (secondary)
- pm3386_reg_write(1, 0x002, 0x0063);
+ pm3386_reg_write(1, 0x002, 0x0063);
mdelay(10);
/* Restore programmed MAC addresses. */
pm3386_set_mac(0, mac[0]);
pm3386_set_mac(1, mac[1]);
mdelay(10);
/* Restore programmed MAC addresses. */
pm3386_set_mac(0, mac[0]);
pm3386_set_mac(1, mac[1]);
- if (secondary)
- pm3386_set_mac(2, mac[2]);
+ pm3386_set_mac(2, mac[2]);
/* Disable carrier on all ports. */
pm3386_set_carrier(0, 0);
pm3386_set_carrier(1, 0);
/* Disable carrier on all ports. */
pm3386_set_carrier(0, 0);
pm3386_set_carrier(1, 0);
- if (secondary)
- pm3386_set_carrier(2, 0);
+ pm3386_set_carrier(2, 0);
}
static u16 swaph(u16 x)
}
static u16 swaph(u16 x)
@@
-140,11
+127,6
@@
static u16 swaph(u16 x)
return ((x << 8) | (x >> 8)) & 0xffff;
}
return ((x << 8) | (x >> 8)) & 0xffff;
}
-int pm3386_port_count(void)
-{
- return 2 + pm3386_secondary_present();
-}
-
void pm3386_init_port(int port)
{
int pm = port >> 1;
void pm3386_init_port(int port)
{
int pm = port >> 1;