net: phy: add BCM7425 and BCM7429 PHYs

Signed-off-by: Petri Gynther <pgynther@google.com>
Acked-by: Florian Fainelli <f.fainelli@gmai.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/phy/bcm7xxx.c b/drivers/net/phy/bcm7xxx.c
index daae69950925cb818edba49158c82de6c1c80deb..1d211d36903965a7f2fc461190763f2b2aadd705 100644 (file)
--- a/drivers/net/phy/bcm7xxx.c
+++ b/drivers/net/phy/bcm7xxx.c
@@ -350,6 +350,32 @@ static struct phy_driver bcm7xxx_driver[] = {
        BCM7XXX_28NM_GPHY(PHY_ID_BCM7439, "Broadcom BCM7439"),
        BCM7XXX_28NM_GPHY(PHY_ID_BCM7445, "Broadcom BCM7445"),
 {
+       .phy_id         = PHY_ID_BCM7425,
+       .phy_id_mask    = 0xfffffff0,
+       .name           = "Broadcom BCM7425",
+       .features       = PHY_GBIT_FEATURES |
+                         SUPPORTED_Pause | SUPPORTED_Asym_Pause,
+       .flags          = 0,
+       .config_init    = bcm7xxx_config_init,
+       .config_aneg    = genphy_config_aneg,
+       .read_status    = genphy_read_status,
+       .suspend        = bcm7xxx_suspend,
+       .resume         = bcm7xxx_config_init,
+       .driver         = { .owner = THIS_MODULE },
+}, {
+       .phy_id         = PHY_ID_BCM7429,
+       .phy_id_mask    = 0xfffffff0,
+       .name           = "Broadcom BCM7429",
+       .features       = PHY_GBIT_FEATURES |
+                         SUPPORTED_Pause | SUPPORTED_Asym_Pause,
+       .flags          = PHY_IS_INTERNAL,
+       .config_init    = bcm7xxx_config_init,
+       .config_aneg    = genphy_config_aneg,
+       .read_status    = genphy_read_status,
+       .suspend        = bcm7xxx_suspend,
+       .resume         = bcm7xxx_config_init,
+       .driver         = { .owner = THIS_MODULE },
+}, {
        .phy_id         = PHY_BCM_OUI_4,
        .phy_id_mask    = 0xffff0000,
        .name           = "Broadcom BCM7XXX 40nm",
@@ -381,6 +407,8 @@ static struct mdio_device_id __maybe_unused bcm7xxx_tbl[] = {
        { PHY_ID_BCM7250, 0xfffffff0, },
        { PHY_ID_BCM7364, 0xfffffff0, },
        { PHY_ID_BCM7366, 0xfffffff0, },
+       { PHY_ID_BCM7425, 0xfffffff0, },
+       { PHY_ID_BCM7429, 0xfffffff0, },
        { PHY_ID_BCM7439, 0xfffffff0, },
        { PHY_ID_BCM7445, 0xfffffff0, },
        { PHY_BCM_OUI_4, 0xffff0000 },

diff --git a/include/linux/brcmphy.h b/include/linux/brcmphy.h
index 3f626fe48c9a3eb2b7434f4da8a4086be86cad62..7ccd928cc1f29b71afc7b7cf5cf1ea6a855cd70f 100644 (file)
--- a/include/linux/brcmphy.h
+++ b/include/linux/brcmphy.h
@@ -16,6 +16,8 @@
 #define PHY_ID_BCM7250                 0xae025280
 #define PHY_ID_BCM7364                 0xae025260
 #define PHY_ID_BCM7366                 0x600d8490
+#define PHY_ID_BCM7425                 0x03625e60
+#define PHY_ID_BCM7429                 0x600d8730
 #define PHY_ID_BCM7439                 0x600d8480
 #define PHY_ID_BCM7445                 0x600d8510