Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
net: phy: micrel: Start using PHY_ID_MATCH_MODEL
Start using PHY_ID_MATCH_MODEL for all the drivers.
While at this add also PHY_ID_KSZ8041RNLI to micrel_tbl.
It is safe to change the current of 0x00fffff0 to PHY_ID_MATCH_MODEL
because all the micrel PHYs have in MSB a value of 0.
Signed-off-by: Horatiu Vultur <horatiu.vultur@microchip.com>
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Link: https://patch.msgid.link/20250818075121.1298170-2-horatiu.vultur@microchip.com
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
authored by
Horatiu Vultur
and committed by
Paolo Abeni
54e974c7
38dad812
+27
-39
+27
-39
drivers/net/phy/micrel.c
+27
-39
drivers/net/phy/micrel.c
···
5645
5645
5646
5646
static struct phy_driver ksphy_driver[] = {
5647
5647
{
5648
-
.phy_id = PHY_ID_KS8737,
5649
-
.phy_id_mask = MICREL_PHY_ID_MASK,
5648
+
PHY_ID_MATCH_MODEL(PHY_ID_KS8737),
5650
5649
.name = "Micrel KS8737",
5651
5650
/* PHY_BASIC_FEATURES */
5652
5651
.driver_data = &ks8737_type,
···
5686
5687
.suspend = kszphy_suspend,
5687
5688
.resume = kszphy_resume,
5688
5689
}, {
5689
-
.phy_id = PHY_ID_KSZ8041,
5690
-
.phy_id_mask = MICREL_PHY_ID_MASK,
5690
+
PHY_ID_MATCH_MODEL(PHY_ID_KSZ8041),
5691
5691
.name = "Micrel KSZ8041",
5692
5692
/* PHY_BASIC_FEATURES */
5693
5693
.driver_data = &ksz8041_type,
···
5701
5703
.suspend = ksz8041_suspend,
5702
5704
.resume = ksz8041_resume,
5703
5705
}, {
5704
-
.phy_id = PHY_ID_KSZ8041RNLI,
5705
-
.phy_id_mask = MICREL_PHY_ID_MASK,
5706
+
PHY_ID_MATCH_MODEL(PHY_ID_KSZ8041RNLI),
5706
5707
.name = "Micrel KSZ8041RNLI",
5707
5708
/* PHY_BASIC_FEATURES */
5708
5709
.driver_data = &ksz8041_type,
···
5744
5747
.suspend = kszphy_suspend,
5745
5748
.resume = kszphy_resume,
5746
5749
}, {
5747
-
.phy_id = PHY_ID_KSZ8081,
5750
+
PHY_ID_MATCH_MODEL(PHY_ID_KSZ8081),
5748
5751
.name = "Micrel KSZ8081 or KSZ8091",
5749
-
.phy_id_mask = MICREL_PHY_ID_MASK,
5750
5752
.flags = PHY_POLL_CABLE_TEST,
5751
5753
/* PHY_BASIC_FEATURES */
5752
5754
.driver_data = &ksz8081_type,
···
5764
5768
.cable_test_start = ksz886x_cable_test_start,
5765
5769
.cable_test_get_status = ksz886x_cable_test_get_status,
5766
5770
}, {
5767
-
.phy_id = PHY_ID_KSZ8061,
5771
+
PHY_ID_MATCH_MODEL(PHY_ID_KSZ8061),
5768
5772
.name = "Micrel KSZ8061",
5769
-
.phy_id_mask = MICREL_PHY_ID_MASK,
5770
5773
/* PHY_BASIC_FEATURES */
5771
5774
.probe = kszphy_probe,
5772
5775
.config_init = ksz8061_config_init,
···
5793
5798
.read_mmd = genphy_read_mmd_unsupported,
5794
5799
.write_mmd = genphy_write_mmd_unsupported,
5795
5800
}, {
5796
-
.phy_id = PHY_ID_KSZ9031,
5797
-
.phy_id_mask = MICREL_PHY_ID_MASK,
5801
+
PHY_ID_MATCH_MODEL(PHY_ID_KSZ9031),
5798
5802
.name = "Micrel KSZ9031 Gigabit PHY",
5799
5803
.flags = PHY_POLL_CABLE_TEST,
5800
5804
.driver_data = &ksz9021_type,
···
5813
5819
.cable_test_get_status = ksz9x31_cable_test_get_status,
5814
5820
.set_loopback = ksz9031_set_loopback,
5815
5821
}, {
5816
-
.phy_id = PHY_ID_LAN8814,
5817
-
.phy_id_mask = MICREL_PHY_ID_MASK,
5822
+
PHY_ID_MATCH_MODEL(PHY_ID_LAN8814),
5818
5823
.name = "Microchip INDY Gigabit Quad PHY",
5819
5824
.flags = PHY_POLL_CABLE_TEST,
5820
5825
.config_init = lan8814_config_init,
···
5831
5838
.cable_test_start = lan8814_cable_test_start,
5832
5839
.cable_test_get_status = ksz886x_cable_test_get_status,
5833
5840
}, {
5834
-
.phy_id = PHY_ID_LAN8804,
5835
-
.phy_id_mask = MICREL_PHY_ID_MASK,
5841
+
PHY_ID_MATCH_MODEL(PHY_ID_LAN8804),
5836
5842
.name = "Microchip LAN966X Gigabit PHY",
5837
5843
.config_init = lan8804_config_init,
5838
5844
.driver_data = &ksz9021_type,
···
5846
5854
.config_intr = lan8804_config_intr,
5847
5855
.handle_interrupt = lan8804_handle_interrupt,
5848
5856
}, {
5849
-
.phy_id = PHY_ID_LAN8841,
5850
-
.phy_id_mask = MICREL_PHY_ID_MASK,
5857
+
PHY_ID_MATCH_MODEL(PHY_ID_LAN8841),
5851
5858
.name = "Microchip LAN8841 Gigabit PHY",
5852
5859
.flags = PHY_POLL_CABLE_TEST,
5853
5860
.driver_data = &lan8841_type,
···
5863
5872
.cable_test_start = lan8814_cable_test_start,
5864
5873
.cable_test_get_status = ksz886x_cable_test_get_status,
5865
5874
}, {
5866
-
.phy_id = PHY_ID_KSZ9131,
5867
-
.phy_id_mask = MICREL_PHY_ID_MASK,
5875
+
PHY_ID_MATCH_MODEL(PHY_ID_KSZ9131),
5868
5876
.name = "Microchip KSZ9131 Gigabit PHY",
5869
5877
/* PHY_GBIT_FEATURES */
5870
5878
.flags = PHY_POLL_CABLE_TEST,
···
5884
5894
.cable_test_get_status = ksz9x31_cable_test_get_status,
5885
5895
.get_features = ksz9477_get_features,
5886
5896
}, {
5887
-
.phy_id = PHY_ID_KSZ8873MLL,
5888
-
.phy_id_mask = MICREL_PHY_ID_MASK,
5897
+
PHY_ID_MATCH_MODEL(PHY_ID_KSZ8873MLL),
5889
5898
.name = "Micrel KSZ8873MLL Switch",
5890
5899
/* PHY_BASIC_FEATURES */
5891
5900
.config_init = kszphy_config_init,
···
5893
5904
.suspend = genphy_suspend,
5894
5905
.resume = genphy_resume,
5895
5906
}, {
5896
-
.phy_id = PHY_ID_KSZ886X,
5897
-
.phy_id_mask = MICREL_PHY_ID_MASK,
5907
+
PHY_ID_MATCH_MODEL(PHY_ID_KSZ886X),
5898
5908
.name = "Micrel KSZ8851 Ethernet MAC or KSZ886X Switch",
5899
5909
.driver_data = &ksz886x_type,
5900
5910
/* PHY_BASIC_FEATURES */
···
5913
5925
.suspend = genphy_suspend,
5914
5926
.resume = genphy_resume,
5915
5927
}, {
5916
-
.phy_id = PHY_ID_KSZ9477,
5917
-
.phy_id_mask = MICREL_PHY_ID_MASK,
5928
+
PHY_ID_MATCH_MODEL(PHY_ID_KSZ9477),
5918
5929
.name = "Microchip KSZ9477",
5919
5930
.probe = kszphy_probe,
5920
5931
/* PHY_GBIT_FEATURES */
···
5940
5953
5941
5954
static const struct mdio_device_id __maybe_unused micrel_tbl[] = {
5942
5955
{ PHY_ID_KSZ9021, 0x000ffffe },
5943
-
{ PHY_ID_KSZ9031, MICREL_PHY_ID_MASK },
5944
-
{ PHY_ID_KSZ9131, MICREL_PHY_ID_MASK },
5956
+
{ PHY_ID_MATCH_MODEL(PHY_ID_KSZ9031) },
5957
+
{ PHY_ID_MATCH_MODEL(PHY_ID_KSZ9131) },
5945
5958
{ PHY_ID_KSZ8001, 0x00fffffc },
5946
-
{ PHY_ID_KS8737, MICREL_PHY_ID_MASK },
5959
+
{ PHY_ID_MATCH_MODEL(PHY_ID_KS8737) },
5947
5960
{ PHY_ID_KSZ8021, 0x00ffffff },
5948
5961
{ PHY_ID_KSZ8031, 0x00ffffff },
5949
-
{ PHY_ID_KSZ8041, MICREL_PHY_ID_MASK },
5950
-
{ PHY_ID_KSZ8051, MICREL_PHY_ID_MASK },
5951
-
{ PHY_ID_KSZ8061, MICREL_PHY_ID_MASK },
5952
-
{ PHY_ID_KSZ8081, MICREL_PHY_ID_MASK },
5953
-
{ PHY_ID_KSZ8873MLL, MICREL_PHY_ID_MASK },
5954
-
{ PHY_ID_KSZ886X, MICREL_PHY_ID_MASK },
5955
-
{ PHY_ID_KSZ9477, MICREL_PHY_ID_MASK },
5956
-
{ PHY_ID_LAN8814, MICREL_PHY_ID_MASK },
5957
-
{ PHY_ID_LAN8804, MICREL_PHY_ID_MASK },
5958
-
{ PHY_ID_LAN8841, MICREL_PHY_ID_MASK },
5962
+
{ PHY_ID_MATCH_MODEL(PHY_ID_KSZ8041) },
5963
+
{ PHY_ID_MATCH_MODEL(PHY_ID_KSZ8041RNLI) },
5964
+
{ PHY_ID_MATCH_MODEL(PHY_ID_KSZ8051) },
5965
+
{ PHY_ID_MATCH_MODEL(PHY_ID_KSZ8061) },
5966
+
{ PHY_ID_MATCH_MODEL(PHY_ID_KSZ8081) },
5967
+
{ PHY_ID_MATCH_MODEL(PHY_ID_KSZ8873MLL) },
5968
+
{ PHY_ID_MATCH_MODEL(PHY_ID_KSZ886X) },
5969
+
{ PHY_ID_MATCH_MODEL(PHY_ID_KSZ9477) },
5970
+
{ PHY_ID_MATCH_MODEL(PHY_ID_LAN8814) },
5971
+
{ PHY_ID_MATCH_MODEL(PHY_ID_LAN8804) },
5972
+
{ PHY_ID_MATCH_MODEL(PHY_ID_LAN8841) },
5959
5973
{ }
5960
5974
};
5961
5975