Mirrors/u-boot
2
0
Fork 0
mirror of https://github.com/AsahiLinux/u-boot synced 2024-11-25 06:00:43 +00:00
Code Issues Projects Releases Packages Wiki Activity

net: phy: micrel: make ksz9021 phy accessible

Browse source 
Micrel accidentally used the same part number
for the KS8721 and KSZ9021. So, both cannot be
in the same build of u-boot. Add a config option
to handle this.

Signed-off-by: Troy Kisky <troy.kisky@boundarydevices.com>
Acked-by: Vladimir Zapolskiy <vz@mleia.com>
This commit is contained in:
Troy Kisky 2012-06-28 08:00:28 +00:00 committed by Joe Hershberger
parent 11af8d6527
commit cc5f552283
2 changed files with 14 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
drivers/net/phy/micrel.c
View file

@ -35,6 +35,12 @@ static struct phy_driver KSZ804_driver = {
.shutdown = &genphy_shutdown, .shutdown = &genphy_shutdown,
}; };
#ifndef CONFIG_PHY_MICREL_KSZ9021
/*
* I can't believe Micrel used the exact same part number
* for the KSZ9021
* Shame Micrel, Shame!!!!!
*/
static struct phy_driver KS8721_driver = { static struct phy_driver KS8721_driver = {
.name = "Micrel KS8721BL", .name = "Micrel KS8721BL",
.uid = 0x221610, .uid = 0x221610,
@ -44,7 +50,9 @@ static struct phy_driver KS8721_driver = {
.startup = &genphy_startup, .startup = &genphy_startup,
.shutdown = &genphy_shutdown, .shutdown = &genphy_shutdown,
}; };
#endif
#ifdef CONFIG_PHY_MICREL_KSZ9021
/* ksz9021 PHY Registers */ /* ksz9021 PHY Registers */
#define MII_KSZ9021_EXTENDED_CTRL 0x0b #define MII_KSZ9021_EXTENDED_CTRL 0x0b
#define MII_KSZ9021_EXTENDED_DATAW 0x0c #define MII_KSZ9021_EXTENDED_DATAW 0x0c
@ -127,12 +135,15 @@ static struct phy_driver ksz9021_driver = {
.startup = &ksz9021_startup, .startup = &ksz9021_startup,
.shutdown = &genphy_shutdown, .shutdown = &genphy_shutdown,
}; };
#endif
int phy_micrel_init(void) int phy_micrel_init(void)
{ {
phy_register(&KSZ804_driver); phy_register(&KSZ804_driver);
phy_register(&KS8721_driver); #ifdef CONFIG_PHY_MICREL_KSZ9021
phy_register(&ksz9021_driver); phy_register(&ksz9021_driver);
#else
phy_register(&KS8721_driver);
#endif
return 0; return 0;
} }

1
include/configs/mx6qsabrelite.h
View file

@ -96,6 +96,7 @@
#define CONFIG_FEC_MXC_PHYADDR 6 #define CONFIG_FEC_MXC_PHYADDR 6
#define CONFIG_PHYLIB #define CONFIG_PHYLIB
#define CONFIG_PHY_MICREL #define CONFIG_PHY_MICREL
#define CONFIG_PHY_MICREL_KSZ9021
/* USB Configs */ /* USB Configs */
#define CONFIG_CMD_USB #define CONFIG_CMD_USB