Skip to content

Commit fcb26ec

Browse files
lumagdavem330
authored andcommitted
broadcom: move all PHY_ID's to header
Move all PHY IDs to brcmphy.h header for completeness and unification of code. Signed-off-by: Dmitry Eremin-Solenikov <[email protected]> Signed-off-by: David S. Miller <[email protected]>
1 parent deb0d7c commit fcb26ec

File tree

2 files changed

+18
-12
lines changed

2 files changed

+18
-12
lines changed

drivers/net/phy/broadcom.c

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -685,7 +685,7 @@ static int brcm_fet_config_intr(struct phy_device *phydev)
685685
}
686686

687687
static struct phy_driver bcm5411_driver = {
688-
.phy_id = 0x00206070,
688+
.phy_id = PHY_ID_BCM5411,
689689
.phy_id_mask = 0xfffffff0,
690690
.name = "Broadcom BCM5411",
691691
.features = PHY_GBIT_FEATURES |
@@ -700,7 +700,7 @@ static struct phy_driver bcm5411_driver = {
700700
};
701701

702702
static struct phy_driver bcm5421_driver = {
703-
.phy_id = 0x002060e0,
703+
.phy_id = PHY_ID_BCM5421,
704704
.phy_id_mask = 0xfffffff0,
705705
.name = "Broadcom BCM5421",
706706
.features = PHY_GBIT_FEATURES |
@@ -715,7 +715,7 @@ static struct phy_driver bcm5421_driver = {
715715
};
716716

717717
static struct phy_driver bcm5461_driver = {
718-
.phy_id = 0x002060c0,
718+
.phy_id = PHY_ID_BCM5461,
719719
.phy_id_mask = 0xfffffff0,
720720
.name = "Broadcom BCM5461",
721721
.features = PHY_GBIT_FEATURES |
@@ -730,7 +730,7 @@ static struct phy_driver bcm5461_driver = {
730730
};
731731

732732
static struct phy_driver bcm5464_driver = {
733-
.phy_id = 0x002060b0,
733+
.phy_id = PHY_ID_BCM5464,
734734
.phy_id_mask = 0xfffffff0,
735735
.name = "Broadcom BCM5464",
736736
.features = PHY_GBIT_FEATURES |
@@ -745,7 +745,7 @@ static struct phy_driver bcm5464_driver = {
745745
};
746746

747747
static struct phy_driver bcm5481_driver = {
748-
.phy_id = 0x0143bca0,
748+
.phy_id = PHY_ID_BCM5481,
749749
.phy_id_mask = 0xfffffff0,
750750
.name = "Broadcom BCM5481",
751751
.features = PHY_GBIT_FEATURES |
@@ -760,7 +760,7 @@ static struct phy_driver bcm5481_driver = {
760760
};
761761

762762
static struct phy_driver bcm5482_driver = {
763-
.phy_id = 0x0143bcb0,
763+
.phy_id = PHY_ID_BCM5482,
764764
.phy_id_mask = 0xfffffff0,
765765
.name = "Broadcom BCM5482",
766766
.features = PHY_GBIT_FEATURES |
@@ -910,12 +910,12 @@ module_init(broadcom_init);
910910
module_exit(broadcom_exit);
911911

912912
static struct mdio_device_id broadcom_tbl[] = {
913-
{ 0x00206070, 0xfffffff0 },
914-
{ 0x002060e0, 0xfffffff0 },
915-
{ 0x002060c0, 0xfffffff0 },
916-
{ 0x002060b0, 0xfffffff0 },
917-
{ 0x0143bca0, 0xfffffff0 },
918-
{ 0x0143bcb0, 0xfffffff0 },
913+
{ PHY_ID_BCM5411, 0xfffffff0 },
914+
{ PHY_ID_BCM5421, 0xfffffff0 },
915+
{ PHY_ID_BCM5461, 0xfffffff0 },
916+
{ PHY_ID_BCM5464, 0xfffffff0 },
917+
{ PHY_ID_BCM5482, 0xfffffff0 },
918+
{ PHY_ID_BCM5482, 0xfffffff0 },
919919
{ PHY_ID_BCM50610, 0xfffffff0 },
920920
{ PHY_ID_BCM50610M, 0xfffffff0 },
921921
{ PHY_ID_BCM57780, 0xfffffff0 },

include/linux/brcmphy.h

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,12 @@
11
#define PHY_ID_BCM50610 0x0143bd60
22
#define PHY_ID_BCM50610M 0x0143bd70
33
#define PHY_ID_BCMAC131 0x0143bc70
4+
#define PHY_ID_BCM5481 0x0143bca0
5+
#define PHY_ID_BCM5482 0x0143bcb0
6+
#define PHY_ID_BCM5411 0x00206070
7+
#define PHY_ID_BCM5421 0x002060e0
8+
#define PHY_ID_BCM5464 0x002060b0
9+
#define PHY_ID_BCM5461 0x002060c0
410
#define PHY_ID_BCM57780 0x03625d90
511

612
#define PHY_BCM_OUI_MASK 0xfffffc00

0 commit comments

Comments
 (0)