net: phy: intel-xway: add VR9 v1.1 phy ids

The phys embedded into the v1.1 of the VR9 SoC are using different phy
ids. Add the phy ids to use the driver for this VR9 version as well.

Signed-off-by: Mathias Kresin <dev@kresin.me>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/phy/intel-xway.c b/drivers/net/phy/intel-xway.c
index c7eff6774bb13c4ca703cdc926f6ed6207615835..7d936fb61c22cb33f2330335ef01a2a3f4c67d42 100644 (file)
--- a/drivers/net/phy/intel-xway.c
+++ b/drivers/net/phy/intel-xway.c
@@ -149,6 +149,8 @@
 #define PHY_ID_PHY22F_1_4              0xD565A410
 #define PHY_ID_PHY11G_1_5              0xD565A401
 #define PHY_ID_PHY22F_1_5              0xD565A411
+#define PHY_ID_PHY11G_VR9_1_1          0xD565A408
+#define PHY_ID_PHY22F_VR9_1_1          0xD565A418
 #define PHY_ID_PHY11G_VR9_1_2          0xD565A409
 #define PHY_ID_PHY22F_VR9_1_2          0xD565A419
 
@@ -311,6 +313,30 @@ static struct phy_driver xway_gphy[] = {
                .config_intr    = xway_gphy_config_intr,
                .suspend        = genphy_suspend,
                .resume         = genphy_resume,
+       }, {
+               .phy_id         = PHY_ID_PHY11G_VR9_1_1,
+               .phy_id_mask    = 0xffffffff,
+               .name           = "Intel XWAY PHY11G (xRX v1.1 integrated)",
+               .features       = PHY_GBIT_FEATURES,
+               .flags          = PHY_HAS_INTERRUPT,
+               .config_init    = xway_gphy_config_init,
+               .ack_interrupt  = xway_gphy_ack_interrupt,
+               .did_interrupt  = xway_gphy_did_interrupt,
+               .config_intr    = xway_gphy_config_intr,
+               .suspend        = genphy_suspend,
+               .resume         = genphy_resume,
+       }, {
+               .phy_id         = PHY_ID_PHY22F_VR9_1_1,
+               .phy_id_mask    = 0xffffffff,
+               .name           = "Intel XWAY PHY22F (xRX v1.1 integrated)",
+               .features       = PHY_BASIC_FEATURES,
+               .flags          = PHY_HAS_INTERRUPT,
+               .config_init    = xway_gphy_config_init,
+               .ack_interrupt  = xway_gphy_ack_interrupt,
+               .did_interrupt  = xway_gphy_did_interrupt,
+               .config_intr    = xway_gphy_config_intr,
+               .suspend        = genphy_suspend,
+               .resume         = genphy_resume,
        }, {
                .phy_id         = PHY_ID_PHY11G_VR9_1_2,
                .phy_id_mask    = 0xffffffff,
@@ -346,6 +372,8 @@ static struct mdio_device_id __maybe_unused xway_gphy_tbl[] = {
        { PHY_ID_PHY22F_1_4, 0xffffffff },
        { PHY_ID_PHY11G_1_5, 0xffffffff },
        { PHY_ID_PHY22F_1_5, 0xffffffff },
+       { PHY_ID_PHY11G_VR9_1_1, 0xffffffff },
+       { PHY_ID_PHY22F_VR9_1_1, 0xffffffff },
        { PHY_ID_PHY11G_VR9_1_2, 0xffffffff },
        { PHY_ID_PHY22F_VR9_1_2, 0xffffffff },
        { }