[U-Boot-Users] Adds Marvel 8 phy part M88E1149S to drivers/tsec.c
Signed-off-by: Eran Liberty eran.liberty@gmail.com
Index: drivers/tsec.c =================================================================== --- drivers/tsec.c (.../tags/trunk/20070620_2_merge_to_exsw6000) (revision 69) +++ drivers/tsec.c (.../branches/exsw6000) (revision 69) @@ -900,6 +900,39 @@ phy_run_commands(priv, priv->phyinfo->shutdown); }
+struct phy_info phy_info_M88E1149S = { + 0x1410ca, + "Marvell 88E1149S", + 4, + (struct phy_cmd[]){ /* config */ + /* Reset and configure the PHY */ + {MIIM_CONTROL, MIIM_CONTROL_RESET, NULL}, + {0x1d, 0x1f, NULL}, + {0x1e, 0x200c, NULL}, + {0x1d, 0x5, NULL}, + {0x1e, 0x0, NULL}, + {0x1e, 0x100, NULL}, + {MIIM_GBIT_CONTROL, MIIM_GBIT_CONTROL_INIT, NULL}, + {MIIM_ANAR, MIIM_ANAR_INIT, NULL}, + {MIIM_CONTROL, MIIM_CONTROL_RESET, NULL}, + {MIIM_CONTROL, MIIM_CONTROL_INIT, &mii_cr_init}, + {miim_end,} + }, + (struct phy_cmd[]){ /* startup */ + /* Status is read once to clear old link state */ + {MIIM_STATUS, miim_read, NULL}, + /* Auto-negotiate */ + {MIIM_STATUS, miim_read, &mii_parse_sr}, + /* Read the status */ + {MIIM_88E1011_PHY_STATUS, miim_read, + &mii_parse_88E1011_psr}, + {miim_end,} + }, + (struct phy_cmd[]){ /* shutdown */ + {miim_end,} + }, +}; + /* The 5411 id is 0x206070, the 5421 is 0x2060e0 */ struct phy_info phy_info_BCM5461S = { 0x02060c1, /* 5461 ID */ @@ -1293,6 +1326,7 @@ &phy_info_cis8201, &phy_info_BCM5461S, &phy_info_M88E1011S, + &phy_info_M88E1149S, &phy_info_M88E1111S, &phy_info_M88E1145, &phy_info_dm9161,
On 7/3/07, eran.liberty@gmail.com eran.liberty@gmail.com wrote:
Signed-off-by: Eran Liberty eran.liberty@gmail.com
Hmmm; this PHY stuff should really common between all drivers... but that's not a comment on your patch.
Acked-by: Grant Likely grant.likely@secretlab.ca
Index: drivers/tsec.c
--- drivers/tsec.c (.../tags/trunk/20070620_2_merge_to_exsw6000) (revision 69) +++ drivers/tsec.c (.../branches/exsw6000) (revision 69) @@ -900,6 +900,39 @@ phy_run_commands(priv, priv->phyinfo->shutdown); }
+struct phy_info phy_info_M88E1149S = {
0x1410ca,"Marvell 88E1149S",4,(struct phy_cmd[]){ /* config *//* Reset and configure the PHY */{MIIM_CONTROL, MIIM_CONTROL_RESET, NULL},{0x1d, 0x1f, NULL},{0x1e, 0x200c, NULL},{0x1d, 0x5, NULL},{0x1e, 0x0, NULL},{0x1e, 0x100, NULL},{MIIM_GBIT_CONTROL, MIIM_GBIT_CONTROL_INIT, NULL},{MIIM_ANAR, MIIM_ANAR_INIT, NULL},{MIIM_CONTROL, MIIM_CONTROL_RESET, NULL},{MIIM_CONTROL, MIIM_CONTROL_INIT, &mii_cr_init},{miim_end,}},(struct phy_cmd[]){ /* startup *//* Status is read once to clear old link state */{MIIM_STATUS, miim_read, NULL},/* Auto-negotiate */{MIIM_STATUS, miim_read, &mii_parse_sr},/* Read the status */{MIIM_88E1011_PHY_STATUS, miim_read,&mii_parse_88E1011_psr},{miim_end,}},(struct phy_cmd[]){ /* shutdown */{miim_end,}},+};
/* The 5411 id is 0x206070, the 5421 is 0x2060e0 */ struct phy_info phy_info_BCM5461S = { 0x02060c1, /* 5461 ID */ @@ -1293,6 +1326,7 @@ &phy_info_cis8201, &phy_info_BCM5461S, &phy_info_M88E1011S,
&phy_info_M88E1149S, &phy_info_M88E1111S, &phy_info_M88E1145, &phy_info_dm9161,
This SF.net email is sponsored by DB2 Express Download DB2 Express C - the FREE version of DB2 express and take control of your XML. No limits. Just data. Click to get it now. http://sourceforge.net/powerbar/db2/ _______________________________________________ U-Boot-Users mailing list U-Boot-Users@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/u-boot-users
eran.liberty@gmail.com wrote:
Signed-off-by: Eran Liberty eran.liberty@gmail.com
Index: drivers/tsec.c
--- drivers/tsec.c (.../tags/trunk/20070620_2_merge_to_exsw6000) (revision 69) +++ drivers/tsec.c (.../branches/exsw6000) (revision 69) @@ -900,6 +900,39 @@ phy_run_commands(priv, priv->phyinfo->shutdown); }
+struct phy_info phy_info_M88E1149S = {
- 0x1410ca,
- "Marvell 88E1149S",
- 4,
- (struct phy_cmd[]){ /* config */
/* Reset and configure the PHY */{MIIM_CONTROL, MIIM_CONTROL_RESET, NULL},{0x1d, 0x1f, NULL},{0x1e, 0x200c, NULL},{0x1d, 0x5, NULL},{0x1e, 0x0, NULL},{0x1e, 0x100, NULL},
I believe the above five writes were only required for an Errata on an 88E1011 device and are not applicable to new devices.
{MIIM_GBIT_CONTROL, MIIM_GBIT_CONTROL_INIT, NULL},{MIIM_ANAR, MIIM_ANAR_INIT, NULL},{MIIM_CONTROL, MIIM_CONTROL_RESET, NULL},{MIIM_CONTROL, MIIM_CONTROL_INIT, &mii_cr_init},{miim_end,}},- (struct phy_cmd[]){ /* startup */
/* Status is read once to clear old link state */{MIIM_STATUS, miim_read, NULL},/* Auto-negotiate */{MIIM_STATUS, miim_read, &mii_parse_sr},/* Read the status */{MIIM_88E1011_PHY_STATUS, miim_read,&mii_parse_88E1011_psr},{miim_end,}},- (struct phy_cmd[]){ /* shutdown */
{miim_end,}},+};
/* The 5411 id is 0x206070, the 5421 is 0x2060e0 */ struct phy_info phy_info_BCM5461S = { 0x02060c1, /* 5461 ID */ @@ -1293,6 +1326,7 @@ &phy_info_cis8201, &phy_info_BCM5461S, &phy_info_M88E1011S,
- &phy_info_M88E1149S, &phy_info_M88E1111S, &phy_info_M88E1145, &phy_info_dm9161,
This SF.net email is sponsored by DB2 Express Download DB2 Express C - the FREE version of DB2 express and take control of your XML. No limits. Just data. Click to get it now. http://sourceforge.net/powerbar/db2/ _______________________________________________ U-Boot-Users mailing list U-Boot-Users@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/u-boot-users
On 7/4/07, John Traill john.traill@freescale.com wrote:
eran.liberty@gmail.com wrote:
Signed-off-by: Eran Liberty eran.liberty@gmail.com
Index: drivers/tsec.c
--- drivers/tsec.c (.../tags/trunk/20070620_2_merge_to_exsw6000) (revision 69) +++ drivers/tsec.c (.../branches/exsw6000) (revision 69) @@ -900,6 +900,39 @@ phy_run_commands(priv, priv->phyinfo->shutdown); }
+struct phy_info phy_info_M88E1149S = {
0x1410ca,"Marvell 88E1149S",4,(struct phy_cmd[]){ /* config *//* Reset and configure the PHY */{MIIM_CONTROL, MIIM_CONTROL_RESET, NULL},{0x1d, 0x1f, NULL},{0x1e, 0x200c, NULL},{0x1d, 0x5, NULL},{0x1e, 0x0, NULL},{0x1e, 0x100, NULL},I believe the above five writes were only required for an Errata on an 88E1011 device and are not applicable to new devices.
I do not really understand the values I added. (not a phy expert) I needed a entry that identify itself as Marvell 88E1149S. so i copy-paste from the 88E1011 entry. It works as is! Tell me what needs to be cut out and I will try it.
{MIIM_GBIT_CONTROL, MIIM_GBIT_CONTROL_INIT, NULL},{MIIM_ANAR, MIIM_ANAR_INIT, NULL},{MIIM_CONTROL, MIIM_CONTROL_RESET, NULL},{MIIM_CONTROL, MIIM_CONTROL_INIT, &mii_cr_init},{miim_end,}},(struct phy_cmd[]){ /* startup *//* Status is read once to clear old link state */{MIIM_STATUS, miim_read, NULL},/* Auto-negotiate */{MIIM_STATUS, miim_read, &mii_parse_sr},/* Read the status */{MIIM_88E1011_PHY_STATUS, miim_read,&mii_parse_88E1011_psr},{miim_end,}},(struct phy_cmd[]){ /* shutdown */{miim_end,}},+};
/* The 5411 id is 0x206070, the 5421 is 0x2060e0 */ struct phy_info phy_info_BCM5461S = { 0x02060c1, /* 5461 ID */ @@ -1293,6 +1326,7 @@ &phy_info_cis8201, &phy_info_BCM5461S, &phy_info_M88E1011S,
&phy_info_M88E1149S, &phy_info_M88E1111S, &phy_info_M88E1145, &phy_info_dm9161,
This SF.net email is sponsored by DB2 Express Download DB2 Express C - the FREE version of DB2 express and take control of your XML. No limits. Just data. Click to get it now. http://sourceforge.net/powerbar/db2/ _______________________________________________ U-Boot-Users mailing list U-Boot-Users@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/u-boot-users
-- John Traill Systems Engineer Network and Computing Systems Group
Freescale Semiconductor UK LTD Colvilles Road East Kilbride Glasgow G75 0TG, Scotland
Tel: +44 (0) 1355 355494 Fax: +44 (0) 1355 261790
E-mail: john.traill@freescale.com
Registration Number: SC262720 VAT Number: GB831329053
[ ] General Business Use [ ] Freescale Internal Use Only [ ] Freescale Confidential Proprietary
Eran,
eran liberty wrote:
On 7/4/07, John Traill john.traill@freescale.com wrote:
eran.liberty@gmail.com wrote:
Signed-off-by: Eran Liberty eran.liberty@gmail.com
Index: drivers/tsec.c
--- drivers/tsec.c
(.../tags/trunk/20070620_2_merge_to_exsw6000) (revision 69)
+++ drivers/tsec.c (.../branches/exsw6000) (revision 69) @@ -900,6 +900,39 @@ phy_run_commands(priv, priv->phyinfo->shutdown); }
+struct phy_info phy_info_M88E1149S = {
0x1410ca,"Marvell 88E1149S",4,(struct phy_cmd[]){ /* config *//* Reset and configure the PHY */{MIIM_CONTROL, MIIM_CONTROL_RESET, NULL},{0x1d, 0x1f, NULL},{0x1e, 0x200c, NULL},{0x1d, 0x5, NULL},{0x1e, 0x0, NULL},{0x1e, 0x100, NULL},I believe the above five writes were only required for an Errata on an 88E1011 device and are not applicable to new devices.
I do not really understand the values I added. (not a phy expert) I needed a entry that identify itself as Marvell 88E1149S. so i copy-paste from the 88E1011 entry. It works as is! Tell me what needs to be cut out and I will try it.
I'm not an expert on phys but I believe the following :-
{0x1d, 0x1f, NULL},{0x1e, 0x200c, NULL},{0x1d, 0x5, NULL},{0x1e, 0x0, NULL},{0x1e, 0x100, NULL},
Has been cut'n'pasted from the 88E1011 entry but does not apply to other Marvell phys. Try removing the above lines and see if it still works.
{MIIM_GBIT_CONTROL, MIIM_GBIT_CONTROL_INIT,NULL},
{MIIM_ANAR, MIIM_ANAR_INIT, NULL},{MIIM_CONTROL, MIIM_CONTROL_RESET, NULL},{MIIM_CONTROL, MIIM_CONTROL_INIT,&mii_cr_init},
{miim_end,}},(struct phy_cmd[]){ /* startup *//* Status is read once to clear old linkstate */
{MIIM_STATUS, miim_read, NULL},/* Auto-negotiate */{MIIM_STATUS, miim_read, &mii_parse_sr},/* Read the status */{MIIM_88E1011_PHY_STATUS, miim_read,&mii_parse_88E1011_psr},{miim_end,}},(struct phy_cmd[]){ /* shutdown */{miim_end,}},+};
/* The 5411 id is 0x206070, the 5421 is 0x2060e0 */ struct phy_info phy_info_BCM5461S = { 0x02060c1, /* 5461 ID */ @@ -1293,6 +1326,7 @@ &phy_info_cis8201, &phy_info_BCM5461S, &phy_info_M88E1011S,
&phy_info_M88E1149S, &phy_info_M88E1111S, &phy_info_M88E1145, &phy_info_dm9161,
This SF.net email is sponsored by DB2 Express Download DB2 Express C - the FREE version of DB2 express and take control of your XML. No limits. Just data. Click to get it now. http://sourceforge.net/powerbar/db2/ _______________________________________________ U-Boot-Users mailing list U-Boot-Users@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/u-boot-users
-- John Traill Systems Engineer Network and Computing Systems Group
Freescale Semiconductor UK LTD Colvilles Road East Kilbride Glasgow G75 0TG, Scotland
Tel: +44 (0) 1355 355494 Fax: +44 (0) 1355 261790
E-mail: john.traill@freescale.com
Registration Number: SC262720 VAT Number: GB831329053
[ ] General Business Use [ ] Freescale Internal Use Only [ ] Freescale Confidential Proprietary
On 7/4/07, John Traill john.traill@freescale.com wrote:
Eran,
eran liberty wrote:
On 7/4/07, John Traill john.traill@freescale.com wrote:
eran.liberty@gmail.com wrote:
Signed-off-by: Eran Liberty eran.liberty@gmail.com
Index: drivers/tsec.c
--- drivers/tsec.c
(.../tags/trunk/20070620_2_merge_to_exsw6000) (revision 69)
+++ drivers/tsec.c (.../branches/exsw6000) (revision 69) @@ -900,6 +900,39 @@ phy_run_commands(priv, priv->phyinfo->shutdown); }
+struct phy_info phy_info_M88E1149S = {
0x1410ca,"Marvell 88E1149S",4,(struct phy_cmd[]){ /* config *//* Reset and configure the PHY */{MIIM_CONTROL, MIIM_CONTROL_RESET, NULL},{0x1d, 0x1f, NULL},{0x1e, 0x200c, NULL},{0x1d, 0x5, NULL},{0x1e, 0x0, NULL},{0x1e, 0x100, NULL},I believe the above five writes were only required for an Errata on an 88E1011 device and are not applicable to new devices.
I do not really understand the values I added. (not a phy expert) I needed a entry that identify itself as Marvell 88E1149S. so i copy-paste from the 88E1011 entry. It works as is! Tell me what needs to be cut out and I will try it.
I'm not an expert on phys but I believe the following :-
{0x1d, 0x1f, NULL},{0x1e, 0x200c, NULL},{0x1d, 0x5, NULL},{0x1e, 0x0, NULL},{0x1e, 0x100, NULL},Has been cut'n'pasted from the 88E1011 entry but does not apply to other Marvell phys. Try removing the above lines and see if it still works.
It works :)
Thanks.
Patch follows
Liberty
{MIIM_GBIT_CONTROL, MIIM_GBIT_CONTROL_INIT,NULL},
{MIIM_ANAR, MIIM_ANAR_INIT, NULL},{MIIM_CONTROL, MIIM_CONTROL_RESET, NULL},{MIIM_CONTROL, MIIM_CONTROL_INIT,&mii_cr_init},
{miim_end,}},(struct phy_cmd[]){ /* startup *//* Status is read once to clear old linkstate */
{MIIM_STATUS, miim_read, NULL},/* Auto-negotiate */{MIIM_STATUS, miim_read, &mii_parse_sr},/* Read the status */{MIIM_88E1011_PHY_STATUS, miim_read,&mii_parse_88E1011_psr},{miim_end,}},(struct phy_cmd[]){ /* shutdown */{miim_end,}},+};
/* The 5411 id is 0x206070, the 5421 is 0x2060e0 */ struct phy_info phy_info_BCM5461S = { 0x02060c1, /* 5461 ID */ @@ -1293,6 +1326,7 @@ &phy_info_cis8201, &phy_info_BCM5461S, &phy_info_M88E1011S,
&phy_info_M88E1149S, &phy_info_M88E1111S, &phy_info_M88E1145, &phy_info_dm9161,
This SF.net email is sponsored by DB2 Express Download DB2 Express C - the FREE version of DB2 express and take control of your XML. No limits. Just data. Click to get it now. http://sourceforge.net/powerbar/db2/ _______________________________________________ U-Boot-Users mailing list U-Boot-Users@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/u-boot-users
-- John Traill Systems Engineer Network and Computing Systems Group
Freescale Semiconductor UK LTD Colvilles Road East Kilbride Glasgow G75 0TG, Scotland
Tel: +44 (0) 1355 355494 Fax: +44 (0) 1355 261790
E-mail: john.traill@freescale.com
Registration Number: SC262720 VAT Number: GB831329053
[ ] General Business Use [ ] Freescale Internal Use Only [ ] Freescale Confidential Proprietary
-- John Traill Systems Engineer Network and Computing Systems Group
Freescale Semiconductor UK LTD Colvilles Road East Kilbride Glasgow G75 0TG, Scotland
Tel: +44 (0) 1355 355494 Fax: +44 (0) 1355 261790
E-mail: john.traill@freescale.com
Registration Number: SC262720 VAT Number: GB831329053
[ ] General Business Use [ ] Freescale Internal Use Only [ ] Freescale Confidential Proprietary
participants (4)
-
eran liberty -
eran.liberty＠gmail.com
-
Grant Likely -
John Traill