net/sfc/base: add Medford2 support to PHY module

Signed-off-by: Andy Moreton <amoreton@solarflare.com>
Signed-off-by: Andrew Rybchenko <arybchenko@solarflare.com>

diff --git a/drivers/net/sfc/base/ef10_phy.c b/drivers/net/sfc/base/ef10_phy.c
index aa8d6a2ba12e555dfdcbfc6a22f94c3385e13820..4b2aa760ccd2edb7049b6a159752f5a0c9832ab4 100644 (file)
--- a/drivers/net/sfc/base/ef10_phy.c
+++ b/drivers/net/sfc/base/ef10_phy.c
@@ -7,7 +7,7 @@
 #include "efx.h"
 #include "efx_impl.h"
 
-#if EFSYS_OPT_HUNTINGTON || EFSYS_OPT_MEDFORD
+#if EFSYS_OPT_HUNTINGTON || EFSYS_OPT_MEDFORD || EFSYS_OPT_MEDFORD2
 
 static                 void
 mcdi_phy_decode_cap(
@@ -606,4 +606,4 @@ ef10_bist_stop(
 
 #endif /* EFSYS_OPT_BIST */
 
-#endif /* EFSYS_OPT_HUNTINGTON || EFSYS_OPT_MEDFORD */
+#endif /* EFSYS_OPT_HUNTINGTON || EFSYS_OPT_MEDFORD || EFSYS_OPT_MEDFORD2 */

diff --git a/drivers/net/sfc/base/efx_phy.c b/drivers/net/sfc/base/efx_phy.c
index 069c2836afaa51fb446170eb309b36e29b42a139..2598928498e9ab3829090eb8340b19588b1c4935 100644 (file)
--- a/drivers/net/sfc/base/efx_phy.c
+++ b/drivers/net/sfc/base/efx_phy.c
@@ -27,7 +27,7 @@ static const efx_phy_ops_t    __efx_phy_siena_ops = {
 };
 #endif /* EFSYS_OPT_SIENA */
 
-#if EFSYS_OPT_HUNTINGTON || EFSYS_OPT_MEDFORD
+#if EFSYS_OPT_HUNTINGTON || EFSYS_OPT_MEDFORD || EFSYS_OPT_MEDFORD2
 static const efx_phy_ops_t     __efx_phy_ef10_ops = {
        ef10_phy_power,                 /* epo_power */
        NULL,                           /* epo_reset */
@@ -44,7 +44,7 @@ static const efx_phy_ops_t    __efx_phy_ef10_ops = {
        ef10_bist_stop,                 /* epo_bist_stop */
 #endif /* EFSYS_OPT_BIST */
 };
-#endif /* EFSYS_OPT_HUNTINGTON || EFSYS_OPT_MEDFORD */
+#endif /* EFSYS_OPT_HUNTINGTON || EFSYS_OPT_MEDFORD || EFSYS_OPT_MEDFORD2 */
 
        __checkReturn   efx_rc_t
 efx_phy_probe(
@@ -67,16 +67,25 @@ efx_phy_probe(
                epop = &__efx_phy_siena_ops;
                break;
 #endif /* EFSYS_OPT_SIENA */
+
 #if EFSYS_OPT_HUNTINGTON
        case EFX_FAMILY_HUNTINGTON:
                epop = &__efx_phy_ef10_ops;
                break;
 #endif /* EFSYS_OPT_HUNTINGTON */
+
 #if EFSYS_OPT_MEDFORD
        case EFX_FAMILY_MEDFORD:
                epop = &__efx_phy_ef10_ops;
                break;
 #endif /* EFSYS_OPT_MEDFORD */
+
+#if EFSYS_OPT_MEDFORD2
+       case EFX_FAMILY_MEDFORD2:
+               epop = &__efx_phy_ef10_ops;
+               break;
+#endif /* EFSYS_OPT_MEDFORD2 */
+
        default:
                rc = ENOTSUP;
                goto fail1;