diff options
author | Dmitry Baryshkov <dbaryshkov@gmail.com> | 2010-06-16 19:02:24 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2010-06-25 00:30:09 -0400 |
commit | 7a938f80264f2cbfb0c0841b450eab42a8093281 (patch) | |
tree | ae883f1c9a1170efc64b7f33db96f7989ad422a3 | |
parent | fcb26ec5b18d88bb22366799d056dc3630d0e895 (diff) |
broadcom: Add 5241 support
This patch adds the 5241 PHY ID to the broadcom module.
Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r-- | drivers/net/phy/broadcom.c | 22 | ||||
-rw-r--r-- | include/linux/brcmphy.h | 1 |
2 files changed, 23 insertions, 0 deletions
diff --git a/drivers/net/phy/broadcom.c b/drivers/net/phy/broadcom.c index b743d37532ff..4accd83d3dfe 100644 --- a/drivers/net/phy/broadcom.c +++ b/drivers/net/phy/broadcom.c | |||
@@ -834,6 +834,21 @@ static struct phy_driver bcmac131_driver = { | |||
834 | .driver = { .owner = THIS_MODULE }, | 834 | .driver = { .owner = THIS_MODULE }, |
835 | }; | 835 | }; |
836 | 836 | ||
837 | static struct phy_driver bcm5241_driver = { | ||
838 | .phy_id = PHY_ID_BCM5241, | ||
839 | .phy_id_mask = 0xfffffff0, | ||
840 | .name = "Broadcom BCM5241", | ||
841 | .features = PHY_BASIC_FEATURES | | ||
842 | SUPPORTED_Pause | SUPPORTED_Asym_Pause, | ||
843 | .flags = PHY_HAS_MAGICANEG | PHY_HAS_INTERRUPT, | ||
844 | .config_init = brcm_fet_config_init, | ||
845 | .config_aneg = genphy_config_aneg, | ||
846 | .read_status = genphy_read_status, | ||
847 | .ack_interrupt = brcm_fet_ack_interrupt, | ||
848 | .config_intr = brcm_fet_config_intr, | ||
849 | .driver = { .owner = THIS_MODULE }, | ||
850 | }; | ||
851 | |||
837 | static int __init broadcom_init(void) | 852 | static int __init broadcom_init(void) |
838 | { | 853 | { |
839 | int ret; | 854 | int ret; |
@@ -868,8 +883,13 @@ static int __init broadcom_init(void) | |||
868 | ret = phy_driver_register(&bcmac131_driver); | 883 | ret = phy_driver_register(&bcmac131_driver); |
869 | if (ret) | 884 | if (ret) |
870 | goto out_ac131; | 885 | goto out_ac131; |
886 | ret = phy_driver_register(&bcm5241_driver); | ||
887 | if (ret) | ||
888 | goto out_5241; | ||
871 | return ret; | 889 | return ret; |
872 | 890 | ||
891 | out_5241: | ||
892 | phy_driver_unregister(&bcmac131_driver); | ||
873 | out_ac131: | 893 | out_ac131: |
874 | phy_driver_unregister(&bcm57780_driver); | 894 | phy_driver_unregister(&bcm57780_driver); |
875 | out_57780: | 895 | out_57780: |
@@ -894,6 +914,7 @@ out_5411: | |||
894 | 914 | ||
895 | static void __exit broadcom_exit(void) | 915 | static void __exit broadcom_exit(void) |
896 | { | 916 | { |
917 | phy_driver_unregister(&bcm5241_driver); | ||
897 | phy_driver_unregister(&bcmac131_driver); | 918 | phy_driver_unregister(&bcmac131_driver); |
898 | phy_driver_unregister(&bcm57780_driver); | 919 | phy_driver_unregister(&bcm57780_driver); |
899 | phy_driver_unregister(&bcm50610m_driver); | 920 | phy_driver_unregister(&bcm50610m_driver); |
@@ -920,6 +941,7 @@ static struct mdio_device_id broadcom_tbl[] = { | |||
920 | { PHY_ID_BCM50610M, 0xfffffff0 }, | 941 | { PHY_ID_BCM50610M, 0xfffffff0 }, |
921 | { PHY_ID_BCM57780, 0xfffffff0 }, | 942 | { PHY_ID_BCM57780, 0xfffffff0 }, |
922 | { PHY_ID_BCMAC131, 0xfffffff0 }, | 943 | { PHY_ID_BCMAC131, 0xfffffff0 }, |
944 | { PHY_ID_BCM5241, 0xfffffff0 }, | ||
923 | { } | 945 | { } |
924 | }; | 946 | }; |
925 | 947 | ||
diff --git a/include/linux/brcmphy.h b/include/linux/brcmphy.h index c14c3a1b64d2..b840a4960282 100644 --- a/include/linux/brcmphy.h +++ b/include/linux/brcmphy.h | |||
@@ -1,5 +1,6 @@ | |||
1 | #define PHY_ID_BCM50610 0x0143bd60 | 1 | #define PHY_ID_BCM50610 0x0143bd60 |
2 | #define PHY_ID_BCM50610M 0x0143bd70 | 2 | #define PHY_ID_BCM50610M 0x0143bd70 |
3 | #define PHY_ID_BCM5241 0x0143bc30 | ||
3 | #define PHY_ID_BCMAC131 0x0143bc70 | 4 | #define PHY_ID_BCMAC131 0x0143bc70 |
4 | #define PHY_ID_BCM5481 0x0143bca0 | 5 | #define PHY_ID_BCM5481 0x0143bca0 |
5 | #define PHY_ID_BCM5482 0x0143bcb0 | 6 | #define PHY_ID_BCM5482 0x0143bcb0 |