GitHub-Mirror/u-boot
2
0
Fork 0
mirror of https://github.com/Fishwaldo/u-boot.git synced 2025-03-24 16:11:33 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

tsec: General cleanup

Browse source 
- Cleanup formatting of phy_info structures

- Fix lines > 80 chars

- Fix some random indentation inconsistencies

Signed-off-by: Peter Tyser <ptyser@xes-inc.com>
Signed-off-by: Ben Warren <biggerbadderben@gmail.com>
This commit is contained in:
Peter Tyser 2009-11-09 13:09:46 -06:00 • committed by Ben Warren
parent e1957ef02c
commit c6dbdfda53
1 changed files with 324 additions and 343 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

667
drivers/net/tsec.c
View file

@ -236,7 +236,8 @@ static void tsec_local_mdio_write(volatile tsec_mdio_t *phyregs, uint addr,
/* Provide the default behavior of writing the PHY of this ethernet device */ /* Provide the default behavior of writing the PHY of this ethernet device */
#define write_phy_reg(priv, regnum, value) tsec_local_mdio_write(priv->phyregs,priv->phyaddr,regnum,value) #define write_phy_reg(priv, regnum, value) \
tsec_local_mdio_write(priv->phyregs,priv->phyaddr,regnum,value)
/* Reads register regnum on the device's PHY through the /* Reads register regnum on the device's PHY through the
* specified registers. It lowers and raises the read * specified registers. It lowers and raises the read
@ -271,7 +272,8 @@ static uint tsec_local_mdio_read(volatile tsec_mdio_t *phyregs,
} }
/* #define to provide old read_phy_reg functionality without duplicating code */ /* #define to provide old read_phy_reg functionality without duplicating code */
#define read_phy_reg(priv,regnum) tsec_local_mdio_read(priv->phyregs,priv->phyaddr,regnum) #define read_phy_reg(priv,regnum) \
tsec_local_mdio_read(priv->phyregs,priv->phyaddr,regnum)
#define TBIANA_SETTINGS ( \ #define TBIANA_SETTINGS ( \
TBIANA_ASYMMETRIC_PAUSE \ TBIANA_ASYMMETRIC_PAUSE \
@ -289,8 +291,8 @@ static uint tsec_local_mdio_read(volatile tsec_mdio_t *phyregs,
/* Configure the TBI for SGMII operation */ /* Configure the TBI for SGMII operation */
static void tsec_configure_serdes(struct tsec_private *priv) static void tsec_configure_serdes(struct tsec_private *priv)
{ {
/* Access TBI PHY registers at given TSEC register offset as opposed to the /* Access TBI PHY registers at given TSEC register offset as opposed
* register offset used for external PHY accesses */ * to the register offset used for external PHY accesses */
tsec_local_mdio_write(priv->phyregs_sgmii, priv->regs->tbipa, TBI_ANA, tsec_local_mdio_write(priv->phyregs_sgmii, priv->regs->tbipa, TBI_ANA,
TBIANA_SETTINGS); TBIANA_SETTINGS);
tsec_local_mdio_write(priv->phyregs_sgmii, priv->regs->tbipa, TBI_TBICON, tsec_local_mdio_write(priv->phyregs_sgmii, priv->regs->tbipa, TBI_TBICON,
@ -994,7 +996,7 @@ static struct phy_info phy_info_M88E1149S = {
0x1410ca, 0x1410ca,
"Marvell 88E1149S", "Marvell 88E1149S",
4, 4,
(struct phy_cmd[]){ /* config */ (struct phy_cmd[]) { /* config */
/* Reset and configure the PHY */ /* Reset and configure the PHY */
{MIIM_CONTROL, MIIM_CONTROL_RESET, NULL}, {MIIM_CONTROL, MIIM_CONTROL_RESET, NULL},
{0x1d, 0x1f, NULL}, {0x1d, 0x1f, NULL},
@ -1008,17 +1010,16 @@ static struct phy_info phy_info_M88E1149S = {
{MIIM_CONTROL, MIIM_CONTROL_INIT, &mii_cr_init}, {MIIM_CONTROL, MIIM_CONTROL_INIT, &mii_cr_init},
{miim_end,} {miim_end,}
}, },
(struct phy_cmd[]){ /* startup */ (struct phy_cmd[]) { /* startup */
/* Status is read once to clear old link state */ /* Status is read once to clear old link state */
{MIIM_STATUS, miim_read, NULL}, {MIIM_STATUS, miim_read, NULL},
/* Auto-negotiate */ /* Auto-negotiate */
{MIIM_STATUS, miim_read, &mii_parse_sr}, {MIIM_STATUS, miim_read, &mii_parse_sr},
/* Read the status */ /* Read the status */
{MIIM_88E1011_PHY_STATUS, miim_read, {MIIM_88E1011_PHY_STATUS, miim_read, &mii_parse_88E1011_psr},
&mii_parse_88E1011_psr},
{miim_end,} {miim_end,}
}, },
(struct phy_cmd[]){ /* shutdown */ (struct phy_cmd[]) { /* shutdown */
{miim_end,} {miim_end,}
}, },
}; };
@ -1110,70 +1111,68 @@ static struct phy_info phy_info_M88E1011S = {
0x01410c6, 0x01410c6,
"Marvell 88E1011S", "Marvell 88E1011S",
4, 4,
(struct phy_cmd[]){ /* config */ (struct phy_cmd[]) { /* config */
/* Reset and configure the PHY */ /* Reset and configure the PHY */
{MIIM_CONTROL, MIIM_CONTROL_RESET, NULL}, {MIIM_CONTROL, MIIM_CONTROL_RESET, NULL},
{0x1d, 0x1f, NULL}, {0x1d, 0x1f, NULL},
{0x1e, 0x200c, NULL}, {0x1e, 0x200c, NULL},
{0x1d, 0x5, NULL}, {0x1d, 0x5, NULL},
{0x1e, 0x0, NULL}, {0x1e, 0x0, NULL},
{0x1e, 0x100, NULL}, {0x1e, 0x100, NULL},
{MIIM_GBIT_CONTROL, MIIM_GBIT_CONTROL_INIT, NULL}, {MIIM_GBIT_CONTROL, MIIM_GBIT_CONTROL_INIT, NULL},
{MIIM_ANAR, MIIM_ANAR_INIT, NULL}, {MIIM_ANAR, MIIM_ANAR_INIT, NULL},
{MIIM_CONTROL, MIIM_CONTROL_RESET, NULL}, {MIIM_CONTROL, MIIM_CONTROL_RESET, NULL},
{MIIM_CONTROL, MIIM_CONTROL_INIT, &mii_cr_init}, {MIIM_CONTROL, MIIM_CONTROL_INIT, &mii_cr_init},
{miim_end,} {miim_end,}
}, },
(struct phy_cmd[]){ /* startup */ (struct phy_cmd[]) { /* startup */
/* Status is read once to clear old link state */ /* Status is read once to clear old link state */
{MIIM_STATUS, miim_read, NULL}, {MIIM_STATUS, miim_read, NULL},
/* Auto-negotiate */ /* Auto-negotiate */
{MIIM_STATUS, miim_read, &mii_parse_sr}, {MIIM_STATUS, miim_read, &mii_parse_sr},
/* Read the status */ /* Read the status */
{MIIM_88E1011_PHY_STATUS, miim_read, {MIIM_88E1011_PHY_STATUS, miim_read, &mii_parse_88E1011_psr},
&mii_parse_88E1011_psr}, {miim_end,}
{miim_end,} },
}, (struct phy_cmd[]) { /* shutdown */
(struct phy_cmd[]){ /* shutdown */ {miim_end,}
{miim_end,} },
},
}; };
static struct phy_info phy_info_M88E1111S = { static struct phy_info phy_info_M88E1111S = {
0x01410cc, 0x01410cc,
"Marvell 88E1111S", "Marvell 88E1111S",
4, 4,
(struct phy_cmd[]){ /* config */ (struct phy_cmd[]) { /* config */
/* Reset and configure the PHY */ /* Reset and configure the PHY */
{MIIM_CONTROL, MIIM_CONTROL_RESET, NULL}, {MIIM_CONTROL, MIIM_CONTROL_RESET, NULL},
{0x1b, 0x848f, &mii_m88e1111s_setmode}, {0x1b, 0x848f, &mii_m88e1111s_setmode},
{0x14, 0x0cd2, NULL}, /* Delay RGMII TX and RX */ {0x14, 0x0cd2, NULL}, /* Delay RGMII TX and RX */
{MIIM_GBIT_CONTROL, MIIM_GBIT_CONTROL_INIT, NULL}, {MIIM_GBIT_CONTROL, MIIM_GBIT_CONTROL_INIT, NULL},
{MIIM_ANAR, MIIM_ANAR_INIT, NULL}, {MIIM_ANAR, MIIM_ANAR_INIT, NULL},
{MIIM_CONTROL, MIIM_CONTROL_RESET, NULL}, {MIIM_CONTROL, MIIM_CONTROL_RESET, NULL},
{MIIM_CONTROL, MIIM_CONTROL_INIT, &mii_cr_init}, {MIIM_CONTROL, MIIM_CONTROL_INIT, &mii_cr_init},
{miim_end,} {miim_end,}
}, },
(struct phy_cmd[]){ /* startup */ (struct phy_cmd[]) { /* startup */
/* Status is read once to clear old link state */ /* Status is read once to clear old link state */
{MIIM_STATUS, miim_read, NULL}, {MIIM_STATUS, miim_read, NULL},
/* Auto-negotiate */ /* Auto-negotiate */
{MIIM_STATUS, miim_read, &mii_parse_sr}, {MIIM_STATUS, miim_read, &mii_parse_sr},
/* Read the status */ /* Read the status */
{MIIM_88E1011_PHY_STATUS, miim_read, {MIIM_88E1011_PHY_STATUS, miim_read, &mii_parse_88E1011_psr},
&mii_parse_88E1011_psr}, {miim_end,}
{miim_end,} },
}, (struct phy_cmd[]) { /* shutdown */
(struct phy_cmd[]){ /* shutdown */ {miim_end,}
{miim_end,} },
},
}; };
static struct phy_info phy_info_M88E1118 = { static struct phy_info phy_info_M88E1118 = {
0x01410e1, 0x01410e1,
"Marvell 88E1118", "Marvell 88E1118",
4, 4,
(struct phy_cmd[]){ /* config */ (struct phy_cmd[]) { /* config */
/* Reset and configure the PHY */ /* Reset and configure the PHY */
{MIIM_CONTROL, MIIM_CONTROL_RESET, NULL}, {MIIM_CONTROL, MIIM_CONTROL_RESET, NULL},
{0x16, 0x0002, NULL}, /* Change Page Number */ {0x16, 0x0002, NULL}, /* Change Page Number */
@ -1186,8 +1185,8 @@ static struct phy_info phy_info_M88E1118 = {
{MIIM_CONTROL, MIIM_CONTROL_RESET, NULL}, {MIIM_CONTROL, MIIM_CONTROL_RESET, NULL},
{MIIM_CONTROL, MIIM_CONTROL_INIT, &mii_cr_init}, {MIIM_CONTROL, MIIM_CONTROL_INIT, &mii_cr_init},
{miim_end,} {miim_end,}
}, },
(struct phy_cmd[]){ /* startup */ (struct phy_cmd[]) { /* startup */
{0x16, 0x0000, NULL}, /* Change Page Number */ {0x16, 0x0000, NULL}, /* Change Page Number */
/* Status is read once to clear old link state */ /* Status is read once to clear old link state */
{MIIM_STATUS, miim_read, NULL}, {MIIM_STATUS, miim_read, NULL},
@ -1197,10 +1196,10 @@ static struct phy_info phy_info_M88E1118 = {
{MIIM_88E1011_PHY_STATUS, miim_read, {MIIM_88E1011_PHY_STATUS, miim_read,
&mii_parse_88E1011_psr}, &mii_parse_88E1011_psr},
{miim_end,} {miim_end,}
}, },
(struct phy_cmd[]){ /* shutdown */ (struct phy_cmd[]) { /* shutdown */
{miim_end,} {miim_end,}
}, },
}; };
/* /*
@ -1228,30 +1227,29 @@ static struct phy_info phy_info_M88E1121R = {
0x01410cb, 0x01410cb,
"Marvell 88E1121R", "Marvell 88E1121R",
4, 4,
(struct phy_cmd[]){ /* config */ (struct phy_cmd[]) { /* config */
/* Reset and configure the PHY */ /* Reset and configure the PHY */
{MIIM_CONTROL, MIIM_CONTROL_RESET, NULL}, {MIIM_CONTROL, MIIM_CONTROL_RESET, NULL},
{MIIM_GBIT_CONTROL, MIIM_GBIT_CONTROL_INIT, NULL}, {MIIM_GBIT_CONTROL, MIIM_GBIT_CONTROL_INIT, NULL},
{MIIM_ANAR, MIIM_ANAR_INIT, NULL}, {MIIM_ANAR, MIIM_ANAR_INIT, NULL},
/* Configure leds */ /* Configure leds */
{MIIM_88E1121_PHY_LED_CTRL, miim_read, {MIIM_88E1121_PHY_LED_CTRL, miim_read, &mii_88E1121_set_led},
&mii_88E1121_set_led}, {MIIM_CONTROL, MIIM_CONTROL_INIT, &mii_cr_init},
{MIIM_CONTROL, MIIM_CONTROL_INIT, &mii_cr_init}, /* Disable IRQs and de-assert interrupt */
/* Disable IRQs and de-assert interrupt */ {MIIM_88E1121_PHY_IRQ_EN, 0, NULL},
{MIIM_88E1121_PHY_IRQ_EN, 0, NULL}, {MIIM_88E1121_PHY_IRQ_STATUS, miim_read, NULL},
{MIIM_88E1121_PHY_IRQ_STATUS, miim_read, NULL}, {miim_end,}
{miim_end,} },
}, (struct phy_cmd[]) { /* startup */
(struct phy_cmd[]){ /* startup */ /* Status is read once to clear old link state */
/* Status is read once to clear old link state */ {MIIM_STATUS, miim_read, NULL},
{MIIM_STATUS, miim_read, NULL}, {MIIM_STATUS, miim_read, &mii_parse_sr},
{MIIM_STATUS, miim_read, &mii_parse_sr}, {MIIM_STATUS, miim_read, &mii_parse_link},
{MIIM_STATUS, miim_read, &mii_parse_link}, {miim_end,}
{miim_end,} },
}, (struct phy_cmd[]) { /* shutdown */
(struct phy_cmd[]){ /* shutdown */ {miim_end,}
{miim_end,} },
},
}; };
static unsigned int m88e1145_setmode(uint mii_reg, struct tsec_private *priv) static unsigned int m88e1145_setmode(uint mii_reg, struct tsec_private *priv)
@ -1270,72 +1268,67 @@ static struct phy_info phy_info_M88E1145 = {
0x01410cd, 0x01410cd,
"Marvell 88E1145", "Marvell 88E1145",
4, 4,
(struct phy_cmd[]){ /* config */ (struct phy_cmd[]) { /* config */
/* Reset the PHY */ /* Reset the PHY */
{MIIM_CONTROL, MIIM_CONTROL_RESET, NULL}, {MIIM_CONTROL, MIIM_CONTROL_RESET, NULL},
/* Errata E0, E1 */ /* Errata E0, E1 */
{29, 0x001b, NULL}, {29, 0x001b, NULL},
{30, 0x418f, NULL}, {30, 0x418f, NULL},
{29, 0x0016, NULL}, {29, 0x0016, NULL},
{30, 0xa2da, NULL}, {30, 0xa2da, NULL},
/* Configure the PHY */ /* Configure the PHY */
{MIIM_GBIT_CONTROL, MIIM_GBIT_CONTROL_INIT, NULL}, {MIIM_GBIT_CONTROL, MIIM_GBIT_CONTROL_INIT, NULL},
{MIIM_ANAR, MIIM_ANAR_INIT, NULL}, {MIIM_ANAR, MIIM_ANAR_INIT, NULL},
{MIIM_88E1011_PHY_SCR, MIIM_88E1011_PHY_MDI_X_AUTO, {MIIM_88E1011_PHY_SCR, MIIM_88E1011_PHY_MDI_X_AUTO, NULL},
NULL}, {MIIM_88E1145_PHY_EXT_CR, 0, &m88e1145_setmode},
{MIIM_88E1145_PHY_EXT_CR, 0, &m88e1145_setmode}, {MIIM_CONTROL, MIIM_CONTROL_RESET, NULL},
{MIIM_CONTROL, MIIM_CONTROL_RESET, NULL}, {MIIM_CONTROL, MIIM_CONTROL_INIT, NULL},
{MIIM_CONTROL, MIIM_CONTROL_INIT, NULL}, {miim_end,}
{miim_end,} },
}, (struct phy_cmd[]) { /* startup */
(struct phy_cmd[]){ /* startup */ /* Status is read once to clear old link state */
/* Status is read once to clear old link state */ {MIIM_STATUS, miim_read, NULL},
{MIIM_STATUS, miim_read, NULL}, /* Auto-negotiate */
/* Auto-negotiate */ {MIIM_STATUS, miim_read, &mii_parse_sr},
{MIIM_STATUS, miim_read, &mii_parse_sr}, {MIIM_88E1111_PHY_LED_CONTROL, MIIM_88E1111_PHY_LED_DIRECT, NULL},
{MIIM_88E1111_PHY_LED_CONTROL, /* Read the Status */
MIIM_88E1111_PHY_LED_DIRECT, NULL}, {MIIM_88E1011_PHY_STATUS, miim_read, &mii_parse_88E1011_psr},
/* Read the Status */ {miim_end,}
{MIIM_88E1011_PHY_STATUS, miim_read, },
&mii_parse_88E1011_psr}, (struct phy_cmd[]) { /* shutdown */
{miim_end,} {miim_end,}
}, },
(struct phy_cmd[]){ /* shutdown */
{miim_end,}
},
}; };
static struct phy_info phy_info_cis8204 = { static struct phy_info phy_info_cis8204 = {
0x3f11, 0x3f11,
"Cicada Cis8204", "Cicada Cis8204",
6, 6,
(struct phy_cmd[]){ /* config */ (struct phy_cmd[]) { /* config */
/* Override PHY config settings */ /* Override PHY config settings */
{MIIM_CIS8201_AUX_CONSTAT, {MIIM_CIS8201_AUX_CONSTAT, MIIM_CIS8201_AUXCONSTAT_INIT, NULL},
MIIM_CIS8201_AUXCONSTAT_INIT, NULL}, /* Configure some basic stuff */
/* Configure some basic stuff */ {MIIM_CONTROL, MIIM_CONTROL_INIT, &mii_cr_init},
{MIIM_CONTROL, MIIM_CONTROL_INIT, &mii_cr_init}, {MIIM_CIS8204_SLED_CON, MIIM_CIS8204_SLEDCON_INIT,
{MIIM_CIS8204_SLED_CON, MIIM_CIS8204_SLEDCON_INIT, &mii_cis8204_fixled},
&mii_cis8204_fixled}, {MIIM_CIS8204_EPHY_CON, MIIM_CIS8204_EPHYCON_INIT,
{MIIM_CIS8204_EPHY_CON, MIIM_CIS8204_EPHYCON_INIT, &mii_cis8204_setmode},
&mii_cis8204_setmode}, {miim_end,}
{miim_end,} },
}, (struct phy_cmd[]) { /* startup */
(struct phy_cmd[]){ /* startup */ /* Read the Status (2x to make sure link is right) */
/* Read the Status (2x to make sure link is right) */ {MIIM_STATUS, miim_read, NULL},
{MIIM_STATUS, miim_read, NULL}, /* Auto-negotiate */
/* Auto-negotiate */ {MIIM_STATUS, miim_read, &mii_parse_sr},
{MIIM_STATUS, miim_read, &mii_parse_sr}, /* Read the status */
/* Read the status */ {MIIM_CIS8201_AUX_CONSTAT, miim_read, &mii_parse_cis8201},
{MIIM_CIS8201_AUX_CONSTAT, miim_read, {miim_end,}
&mii_parse_cis8201}, },
{miim_end,} (struct phy_cmd[]) { /* shutdown */
}, {miim_end,}
(struct phy_cmd[]){ /* shutdown */ },
{miim_end,}
},
}; };
/* Cicada 8201 */ /* Cicada 8201 */
@ -1343,30 +1336,27 @@ static struct phy_info phy_info_cis8201 = {
0xfc41, 0xfc41,
"CIS8201", "CIS8201",
4, 4,
(struct phy_cmd[]){ /* config */ (struct phy_cmd[]) { /* config */
/* Override PHY config settings */ /* Override PHY config settings */
{MIIM_CIS8201_AUX_CONSTAT, {MIIM_CIS8201_AUX_CONSTAT, MIIM_CIS8201_AUXCONSTAT_INIT, NULL},
MIIM_CIS8201_AUXCONSTAT_INIT, NULL}, /* Set up the interface mode */
/* Set up the interface mode */ {MIIM_CIS8201_EXT_CON1, MIIM_CIS8201_EXTCON1_INIT, NULL},
{MIIM_CIS8201_EXT_CON1, MIIM_CIS8201_EXTCON1_INIT, /* Configure some basic stuff */
NULL}, {MIIM_CONTROL, MIIM_CONTROL_INIT, &mii_cr_init},
/* Configure some basic stuff */ {miim_end,}
{MIIM_CONTROL, MIIM_CONTROL_INIT, &mii_cr_init}, },
{miim_end,} (struct phy_cmd[]) { /* startup */
}, /* Read the Status (2x to make sure link is right) */
(struct phy_cmd[]){ /* startup */ {MIIM_STATUS, miim_read, NULL},
/* Read the Status (2x to make sure link is right) */ /* Auto-negotiate */
{MIIM_STATUS, miim_read, NULL}, {MIIM_STATUS, miim_read, &mii_parse_sr},
/* Auto-negotiate */ /* Read the status */
{MIIM_STATUS, miim_read, &mii_parse_sr}, {MIIM_CIS8201_AUX_CONSTAT, miim_read, &mii_parse_cis8201},
/* Read the status */ {miim_end,}
{MIIM_CIS8201_AUX_CONSTAT, miim_read, },
&mii_parse_cis8201}, (struct phy_cmd[]) { /* shutdown */
{miim_end,} {miim_end,}
}, },
(struct phy_cmd[]){ /* shutdown */
{miim_end,}
},
}; };
static struct phy_info phy_info_VSC8211 = { static struct phy_info phy_info_VSC8211 = {
@ -1374,28 +1364,25 @@ static struct phy_info phy_info_VSC8211 = {
"Vitesse VSC8211", "Vitesse VSC8211",
4, 4,
(struct phy_cmd[]) { /* config */ (struct phy_cmd[]) { /* config */
/* Override PHY config settings */ /* Override PHY config settings */
{MIIM_CIS8201_AUX_CONSTAT, {MIIM_CIS8201_AUX_CONSTAT, MIIM_CIS8201_AUXCONSTAT_INIT, NULL},
MIIM_CIS8201_AUXCONSTAT_INIT, NULL}, /* Set up the interface mode */
/* Set up the interface mode */ {MIIM_CIS8201_EXT_CON1, MIIM_CIS8201_EXTCON1_INIT, NULL},
{MIIM_CIS8201_EXT_CON1, /* Configure some basic stuff */
MIIM_CIS8201_EXTCON1_INIT, NULL}, {MIIM_CONTROL, MIIM_CONTROL_INIT, &mii_cr_init},
/* Configure some basic stuff */ {miim_end,}
{MIIM_CONTROL, MIIM_CONTROL_INIT, &mii_cr_init}, },
{miim_end,}
},
(struct phy_cmd[]) { /* startup */ (struct phy_cmd[]) { /* startup */
/* Read the Status (2x to make sure link is right) */ /* Read the Status (2x to make sure link is right) */
{MIIM_STATUS, miim_read, NULL}, {MIIM_STATUS, miim_read, NULL},
/* Auto-negotiate */ /* Auto-negotiate */
{MIIM_STATUS, miim_read, &mii_parse_sr}, {MIIM_STATUS, miim_read, &mii_parse_sr},
/* Read the status */ /* Read the status */
{MIIM_CIS8201_AUX_CONSTAT, miim_read, {MIIM_CIS8201_AUX_CONSTAT, miim_read, &mii_parse_cis8201},
&mii_parse_cis8201}, {miim_end,}
{miim_end,} },
},
(struct phy_cmd[]) { /* shutdown */ (struct phy_cmd[]) { /* shutdown */
{miim_end,} {miim_end,}
}, },
}; };
@ -1403,143 +1390,138 @@ static struct phy_info phy_info_VSC8244 = {
0x3f1b, 0x3f1b,
"Vitesse VSC8244", "Vitesse VSC8244",
6, 6,
(struct phy_cmd[]){ /* config */ (struct phy_cmd[]) { /* config */
/* Override PHY config settings */ /* Override PHY config settings */
/* Configure some basic stuff */ /* Configure some basic stuff */
{MIIM_CONTROL, MIIM_CONTROL_INIT, &mii_cr_init}, {MIIM_CONTROL, MIIM_CONTROL_INIT, &mii_cr_init},
{miim_end,} {miim_end,}
}, },
(struct phy_cmd[]){ /* startup */ (struct phy_cmd[]) { /* startup */
/* Read the Status (2x to make sure link is right) */ /* Read the Status (2x to make sure link is right) */
{MIIM_STATUS, miim_read, NULL}, {MIIM_STATUS, miim_read, NULL},
/* Auto-negotiate */ /* Auto-negotiate */
{MIIM_STATUS, miim_read, &mii_parse_sr}, {MIIM_STATUS, miim_read, &mii_parse_sr},
/* Read the status */ /* Read the status */
{MIIM_VSC8244_AUX_CONSTAT, miim_read, {MIIM_VSC8244_AUX_CONSTAT, miim_read, &mii_parse_vsc8244},
&mii_parse_vsc8244}, {miim_end,}
{miim_end,} },
}, (struct phy_cmd[]) { /* shutdown */
(struct phy_cmd[]){ /* shutdown */ {miim_end,}
{miim_end,} },
},
}; };
static struct phy_info phy_info_VSC8641 = { static struct phy_info phy_info_VSC8641 = {
0x7043, 0x7043,
"Vitesse VSC8641", "Vitesse VSC8641",
4, 4,
(struct phy_cmd[]){ /* config */ (struct phy_cmd[]) { /* config */
/* Configure some basic stuff */ /* Configure some basic stuff */
{MIIM_CONTROL, MIIM_CONTROL_INIT, &mii_cr_init}, {MIIM_CONTROL, MIIM_CONTROL_INIT, &mii_cr_init},
{miim_end,} {miim_end,}
}, },
(struct phy_cmd[]){ /* startup */ (struct phy_cmd[]) { /* startup */
/* Read the Status (2x to make sure link is right) */ /* Read the Status (2x to make sure link is right) */
{MIIM_STATUS, miim_read, NULL}, {MIIM_STATUS, miim_read, NULL},
/* Auto-negotiate */ /* Auto-negotiate */
{MIIM_STATUS, miim_read, &mii_parse_sr}, {MIIM_STATUS, miim_read, &mii_parse_sr},
/* Read the status */ /* Read the status */
{MIIM_VSC8244_AUX_CONSTAT, miim_read, {MIIM_VSC8244_AUX_CONSTAT, miim_read, &mii_parse_vsc8244},
&mii_parse_vsc8244}, {miim_end,}
{miim_end,} },
}, (struct phy_cmd[]) { /* shutdown */
(struct phy_cmd[]){ /* shutdown */ {miim_end,}
{miim_end,} },
},
}; };
static struct phy_info phy_info_VSC8221 = { static struct phy_info phy_info_VSC8221 = {
0xfc55, 0xfc55,
"Vitesse VSC8221", "Vitesse VSC8221",
4, 4,
(struct phy_cmd[]){ /* config */ (struct phy_cmd[]) { /* config */
/* Configure some basic stuff */ /* Configure some basic stuff */
{MIIM_CONTROL, MIIM_CONTROL_INIT, &mii_cr_init}, {MIIM_CONTROL, MIIM_CONTROL_INIT, &mii_cr_init},
{miim_end,} {miim_end,}
}, },
(struct phy_cmd[]){ /* startup */ (struct phy_cmd[]) { /* startup */
/* Read the Status (2x to make sure link is right) */ /* Read the Status (2x to make sure link is right) */
{MIIM_STATUS, miim_read, NULL}, {MIIM_STATUS, miim_read, NULL},
/* Auto-negotiate */ /* Auto-negotiate */
{MIIM_STATUS, miim_read, &mii_parse_sr}, {MIIM_STATUS, miim_read, &mii_parse_sr},
/* Read the status */ /* Read the status */
{MIIM_VSC8244_AUX_CONSTAT, miim_read, {MIIM_VSC8244_AUX_CONSTAT, miim_read, &mii_parse_vsc8244},
&mii_parse_vsc8244}, {miim_end,}
{miim_end,} },
}, (struct phy_cmd[]) { /* shutdown */
(struct phy_cmd[]){ /* shutdown */ {miim_end,}
{miim_end,} },
},
}; };
static struct phy_info phy_info_VSC8601 = { static struct phy_info phy_info_VSC8601 = {
0x00007042, 0x00007042,
"Vitesse VSC8601", "Vitesse VSC8601",
4, 4,
(struct phy_cmd[]){ /* config */ (struct phy_cmd[]) { /* config */
/* Override PHY config settings */ /* Override PHY config settings */
/* Configure some basic stuff */ /* Configure some basic stuff */
{MIIM_CONTROL, MIIM_CONTROL_INIT, &mii_cr_init}, {MIIM_CONTROL, MIIM_CONTROL_INIT, &mii_cr_init},
#ifdef CONFIG_SYS_VSC8601_SKEWFIX #ifdef CONFIG_SYS_VSC8601_SKEWFIX
{MIIM_VSC8601_EPHY_CON,MIIM_VSC8601_EPHY_CON_INIT_SKEW,NULL}, {MIIM_VSC8601_EPHY_CON,MIIM_VSC8601_EPHY_CON_INIT_SKEW,NULL},
#if defined(CONFIG_SYS_VSC8601_SKEW_TX) && defined(CONFIG_SYS_VSC8601_SKEW_RX) #if defined(CONFIG_SYS_VSC8601_SKEW_TX) && defined(CONFIG_SYS_VSC8601_SKEW_RX)
{MIIM_EXT_PAGE_ACCESS,1,NULL}, {MIIM_EXT_PAGE_ACCESS,1,NULL},
#define VSC8101_SKEW (CONFIG_SYS_VSC8601_SKEW_TX<<14)|(CONFIG_SYS_VSC8601_SKEW_RX<<12) #define VSC8101_SKEW \
{MIIM_VSC8601_SKEW_CTRL,VSC8101_SKEW,NULL}, (CONFIG_SYS_VSC8601_SKEW_TX << 14) | (CONFIG_SYS_VSC8601_SKEW_RX << 12)
{MIIM_EXT_PAGE_ACCESS,0,NULL}, {MIIM_VSC8601_SKEW_CTRL,VSC8101_SKEW,NULL},
{MIIM_EXT_PAGE_ACCESS,0,NULL},
#endif #endif
#endif #endif
{MIIM_ANAR, MIIM_ANAR_INIT, NULL}, {MIIM_ANAR, MIIM_ANAR_INIT, NULL},
{MIIM_CONTROL, MIIM_CONTROL_RESTART, &mii_cr_init}, {MIIM_CONTROL, MIIM_CONTROL_RESTART, &mii_cr_init},
{miim_end,} {miim_end,}
}, },
(struct phy_cmd[]){ /* startup */ (struct phy_cmd[]) { /* startup */
/* Read the Status (2x to make sure link is right) */ /* Read the Status (2x to make sure link is right) */
{MIIM_STATUS, miim_read, NULL}, {MIIM_STATUS, miim_read, NULL},
/* Auto-negotiate */ /* Auto-negotiate */
{MIIM_STATUS, miim_read, &mii_parse_sr}, {MIIM_STATUS, miim_read, &mii_parse_sr},
/* Read the status */ /* Read the status */
{MIIM_VSC8244_AUX_CONSTAT, miim_read, {MIIM_VSC8244_AUX_CONSTAT, miim_read, &mii_parse_vsc8244},
&mii_parse_vsc8244}, {miim_end,}
{miim_end,} },
}, (struct phy_cmd[]) { /* shutdown */
(struct phy_cmd[]){ /* shutdown */ {miim_end,}
{miim_end,} },
},
}; };
static struct phy_info phy_info_dm9161 = { static struct phy_info phy_info_dm9161 = {
0x0181b88, 0x0181b88,
"Davicom DM9161E", "Davicom DM9161E",
4, 4,
(struct phy_cmd[]){ /* config */ (struct phy_cmd[]) { /* config */
{MIIM_CONTROL, MIIM_DM9161_CR_STOP, NULL}, {MIIM_CONTROL, MIIM_DM9161_CR_STOP, NULL},
/* Do not bypass the scrambler/descrambler */ /* Do not bypass the scrambler/descrambler */
{MIIM_DM9161_SCR, MIIM_DM9161_SCR_INIT, NULL}, {MIIM_DM9161_SCR, MIIM_DM9161_SCR_INIT, NULL},
/* Clear 10BTCSR to default */ /* Clear 10BTCSR to default */
{MIIM_DM9161_10BTCSR, MIIM_DM9161_10BTCSR_INIT, {MIIM_DM9161_10BTCSR, MIIM_DM9161_10BTCSR_INIT, NULL},
NULL}, /* Configure some basic stuff */
/* Configure some basic stuff */ {MIIM_CONTROL, MIIM_CR_INIT, NULL},
{MIIM_CONTROL, MIIM_CR_INIT, NULL}, /* Restart Auto Negotiation */
/* Restart Auto Negotiation */ {MIIM_CONTROL, MIIM_DM9161_CR_RSTAN, NULL},
{MIIM_CONTROL, MIIM_DM9161_CR_RSTAN, NULL}, {miim_end,}
{miim_end,} },
}, (struct phy_cmd[]) { /* startup */
(struct phy_cmd[]){ /* startup */ /* Status is read once to clear old link state */
/* Status is read once to clear old link state */ {MIIM_STATUS, miim_read, NULL},
{MIIM_STATUS, miim_read, NULL}, /* Auto-negotiate */
/* Auto-negotiate */ {MIIM_STATUS, miim_read, &mii_parse_sr},
{MIIM_STATUS, miim_read, &mii_parse_sr}, /* Read the status */
/* Read the status */ {MIIM_DM9161_SCSR, miim_read, &mii_parse_dm9161_scsr},
{MIIM_DM9161_SCSR, miim_read, {miim_end,}
&mii_parse_dm9161_scsr}, },
{miim_end,} (struct phy_cmd[]) { /* shutdown */
}, {miim_end,}
(struct phy_cmd[]){ /* shutdown */ },
{miim_end,}
},
}; };
/* a generic flavor. */ /* a generic flavor. */
static struct phy_info phy_info_generic = { static struct phy_info phy_info_generic = {
0, 0,
@ -1561,7 +1543,6 @@ static struct phy_info phy_info_generic = {
} }
}; };
static uint mii_parse_lxt971_sr2(uint mii_reg, struct tsec_private *priv) static uint mii_parse_lxt971_sr2(uint mii_reg, struct tsec_private *priv)
{ {
unsigned int speed; unsigned int speed;
@ -1597,20 +1578,20 @@ static struct phy_info phy_info_lxt971 = {
0x0001378e, 0x0001378e,
"LXT971", "LXT971",
4, 4,
(struct phy_cmd[]){ /* config */ (struct phy_cmd[]) { /* config */
{MIIM_CR, MIIM_CR_INIT, mii_cr_init}, /* autonegotiate */ {MIIM_CR, MIIM_CR_INIT, mii_cr_init}, /* autonegotiate */
{miim_end,} {miim_end,}
}, },
(struct phy_cmd[]){ /* startup - enable interrupts */ (struct phy_cmd[]) { /* startup - enable interrupts */
/* { 0x12, 0x00f2, NULL }, */ /* { 0x12, 0x00f2, NULL }, */
{MIIM_STATUS, miim_read, NULL}, {MIIM_STATUS, miim_read, NULL},
{MIIM_STATUS, miim_read, &mii_parse_sr}, {MIIM_STATUS, miim_read, &mii_parse_sr},
{MIIM_LXT971_SR2, miim_read, &mii_parse_lxt971_sr2}, {MIIM_LXT971_SR2, miim_read, &mii_parse_lxt971_sr2},
{miim_end,} {miim_end,}
}, },
(struct phy_cmd[]){ /* shutdown - disable interrupts */ (struct phy_cmd[]) { /* shutdown - disable interrupts */
{miim_end,} {miim_end,}
}, },
}; };
/* Parse the DP83865's link and auto-neg status register for speed and duplex /* Parse the DP83865's link and auto-neg status register for speed and duplex
@ -1646,30 +1627,29 @@ static struct phy_info phy_info_dp83865 = {
0x20005c7, 0x20005c7,
"NatSemi DP83865", "NatSemi DP83865",
4, 4,
(struct phy_cmd[]){ /* config */ (struct phy_cmd[]) { /* config */
{MIIM_CONTROL, MIIM_DP83865_CR_INIT, NULL}, {MIIM_CONTROL, MIIM_DP83865_CR_INIT, NULL},
{miim_end,} {miim_end,}
}, },
(struct phy_cmd[]){ /* startup */ (struct phy_cmd[]) { /* startup */
/* Status is read once to clear old link state */ /* Status is read once to clear old link state */
{MIIM_STATUS, miim_read, NULL}, {MIIM_STATUS, miim_read, NULL},
/* Auto-negotiate */ /* Auto-negotiate */
{MIIM_STATUS, miim_read, &mii_parse_sr}, {MIIM_STATUS, miim_read, &mii_parse_sr},
/* Read the link and auto-neg status */ /* Read the link and auto-neg status */
{MIIM_DP83865_LANR, miim_read, {MIIM_DP83865_LANR, miim_read, &mii_parse_dp83865_lanr},
&mii_parse_dp83865_lanr}, {miim_end,}
{miim_end,} },
}, (struct phy_cmd[]) { /* shutdown */
(struct phy_cmd[]){ /* shutdown */ {miim_end,}
{miim_end,} },
},
}; };
static struct phy_info phy_info_rtl8211b = { static struct phy_info phy_info_rtl8211b = {
0x001cc91, 0x001cc91,
"RealTek RTL8211B", "RealTek RTL8211B",
4, 4,
(struct phy_cmd[]){ /* config */ (struct phy_cmd[]) { /* config */
/* Reset and configure the PHY */ /* Reset and configure the PHY */
{MIIM_CONTROL, MIIM_CONTROL_RESET, NULL}, {MIIM_CONTROL, MIIM_CONTROL_RESET, NULL},
{MIIM_GBIT_CONTROL, MIIM_GBIT_CONTROL_INIT, NULL}, {MIIM_GBIT_CONTROL, MIIM_GBIT_CONTROL_INIT, NULL},
@ -1678,7 +1658,7 @@ static struct phy_info phy_info_rtl8211b = {
{MIIM_CONTROL, MIIM_CONTROL_INIT, &mii_cr_init}, {MIIM_CONTROL, MIIM_CONTROL_INIT, &mii_cr_init},
{miim_end,} {miim_end,}
}, },
(struct phy_cmd[]){ /* startup */ (struct phy_cmd[]) { /* startup */
/* Status is read once to clear old link state */ /* Status is read once to clear old link state */
{MIIM_STATUS, miim_read, NULL}, {MIIM_STATUS, miim_read, NULL},
/* Auto-negotiate */ /* Auto-negotiate */
@ -1687,7 +1667,7 @@ static struct phy_info phy_info_rtl8211b = {
{MIIM_RTL8211B_PHY_STATUS, miim_read, &mii_parse_RTL8211B_sr}, {MIIM_RTL8211B_PHY_STATUS, miim_read, &mii_parse_RTL8211B_sr},
{miim_end,} {miim_end,}
}, },
(struct phy_cmd[]){ /* shutdown */ (struct phy_cmd[]) { /* shutdown */
{miim_end,} {miim_end,}
}, },
}; };
@ -1746,7 +1726,8 @@ static struct phy_info *get_phy_info(struct eth_device *dev)
} }
if (theInfo == &phy_info_generic) { if (theInfo == &phy_info_generic) {
printf("%s: No support for PHY id %x; assuming generic\n", dev->name, phy_ID); printf("%s: No support for PHY id %x; assuming generic\n",
dev->name, phy_ID);
} else { } else {
debug("%s: PHY is %s (%x)\n", dev->name, theInfo->name, phy_ID); debug("%s: PHY is %s (%x)\n", dev->name, theInfo->name, phy_ID);
} }
@ -1859,10 +1840,10 @@ static int tsec_miiphy_write(char *devname, unsigned char addr,
static int static int
tsec_mcast_addr (struct eth_device *dev, u8 mcast_mac, u8 set) tsec_mcast_addr (struct eth_device *dev, u8 mcast_mac, u8 set)
{ {
struct tsec_private *priv = privlist[1]; struct tsec_private *priv = privlist[1];
volatile tsec_t *regs = priv->regs; volatile tsec_t *regs = priv->regs;
volatile u32 *reg_array, value; volatile u32 *reg_array, value;
u8 result, whichbit, whichreg; u8 result, whichbit, whichreg;
result = (u8)((ether_crc(MAC_ADDR_LEN,mcast_mac) >> 24) & 0xff); result = (u8)((ether_crc(MAC_ADDR_LEN,mcast_mac) >> 24) & 0xff);
whichbit = result & 0x1f; /* the 5 LSB = which bit to set */ whichbit = result & 0x1f; /* the 5 LSB = which bit to set */