Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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 <dbaryshkov@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

authored by

Dmitry Baryshkov and committed by
David S. Miller
fcb26ec5 deb0d7c7

+18 -12
+12 -12
drivers/net/phy/broadcom.c
··· 685 685 } 686 686 687 687 static struct phy_driver bcm5411_driver = { 688 - .phy_id = 0x00206070, 688 + .phy_id = PHY_ID_BCM5411, 689 689 .phy_id_mask = 0xfffffff0, 690 690 .name = "Broadcom BCM5411", 691 691 .features = PHY_GBIT_FEATURES | ··· 700 700 }; 701 701 702 702 static struct phy_driver bcm5421_driver = { 703 - .phy_id = 0x002060e0, 703 + .phy_id = PHY_ID_BCM5421, 704 704 .phy_id_mask = 0xfffffff0, 705 705 .name = "Broadcom BCM5421", 706 706 .features = PHY_GBIT_FEATURES | ··· 715 715 }; 716 716 717 717 static struct phy_driver bcm5461_driver = { 718 - .phy_id = 0x002060c0, 718 + .phy_id = PHY_ID_BCM5461, 719 719 .phy_id_mask = 0xfffffff0, 720 720 .name = "Broadcom BCM5461", 721 721 .features = PHY_GBIT_FEATURES | ··· 730 730 }; 731 731 732 732 static struct phy_driver bcm5464_driver = { 733 - .phy_id = 0x002060b0, 733 + .phy_id = PHY_ID_BCM5464, 734 734 .phy_id_mask = 0xfffffff0, 735 735 .name = "Broadcom BCM5464", 736 736 .features = PHY_GBIT_FEATURES | ··· 745 745 }; 746 746 747 747 static struct phy_driver bcm5481_driver = { 748 - .phy_id = 0x0143bca0, 748 + .phy_id = PHY_ID_BCM5481, 749 749 .phy_id_mask = 0xfffffff0, 750 750 .name = "Broadcom BCM5481", 751 751 .features = PHY_GBIT_FEATURES | ··· 760 760 }; 761 761 762 762 static struct phy_driver bcm5482_driver = { 763 - .phy_id = 0x0143bcb0, 763 + .phy_id = PHY_ID_BCM5482, 764 764 .phy_id_mask = 0xfffffff0, 765 765 .name = "Broadcom BCM5482", 766 766 .features = PHY_GBIT_FEATURES | ··· 910 910 module_exit(broadcom_exit); 911 911 912 912 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 }, 919 919 { PHY_ID_BCM50610, 0xfffffff0 }, 920 920 { PHY_ID_BCM50610M, 0xfffffff0 }, 921 921 { PHY_ID_BCM57780, 0xfffffff0 },
+6
include/linux/brcmphy.h
··· 1 1 #define PHY_ID_BCM50610 0x0143bd60 2 2 #define PHY_ID_BCM50610M 0x0143bd70 3 3 #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 4 10 #define PHY_ID_BCM57780 0x03625d90 5 11 6 12 #define PHY_BCM_OUI_MASK 0xfffffc00