From nobody Sat Oct 4 12:49:02 2025 Received: from esa.microchip.iphmx.com (esa.microchip.iphmx.com [68.232.154.123]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 04C0F271444; Mon, 18 Aug 2025 07:56:09 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=68.232.154.123 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1755503771; cv=none; b=nWaNrFvZ4qLPI5MEBsQzgU7KcMnM2oSFbo1ObfBi0Ymh/GhOiP2gq2eCBaRqFNG7sKQVV4dJ2nwx/Ok+nFs1Ik/LfYCEZuqhxyJBxL38NJt3+txmgl7GeBtM0019AHq1RQgviAn84B1BvzoTfHN77GSlO+J0LukJBKzkT/xE6bs= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1755503771; c=relaxed/simple; bh=Ux1Yv3h9m9q7wvKj7cgpI8/KlwaRrbLWESzal2PPOII=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=NfMgybMwE4NJfvkx0/r+cJHi3q/lYLGDjRaiPVEKg2w4sSYlqSUTlEOzeF3+xHTCbpvXOAVeaS1t/m4xHc2yG4JPD+oCmBwmKe7OmnyJ+/N2H+K1YJGgy64yvBIX8ir70nyhuw2Ezwn2FIdnuFof56sumzvC4DqYp2nM++gEd/o= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=microchip.com; spf=pass smtp.mailfrom=microchip.com; dkim=pass (2048-bit key) header.d=microchip.com header.i=@microchip.com header.b=0oM7dvVe; arc=none smtp.client-ip=68.232.154.123 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=microchip.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=microchip.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=microchip.com header.i=@microchip.com header.b="0oM7dvVe" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=microchip.com; i=@microchip.com; q=dns/txt; s=mchp; t=1755503770; x=1787039770; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=Ux1Yv3h9m9q7wvKj7cgpI8/KlwaRrbLWESzal2PPOII=; b=0oM7dvVeMAL9BrXpC3ETzSxzynIUFH4LNiY3YmkNvn8keVK6eg9nhGYO LuDT1aYMQ/U8DlqLJuE2uZJKUb4Obwfty8c9y/oDPGZ3WSwwjNuIo50KH J1sK4M+SEUJt0BiMuaa+o+x5Obu9BTXoBQuD1tE0nfYaFFb6t0jyACDJU JBXBC5+rklpnUSWIR2gkQrGs4aLP7f2U5mGC/iFVcFfxmMquzh3jkjvf+ xZpuTkGXveAr69WP2qjgrtFYEqoq+yQ6Aw/oTAlyw/7jfUoHBLlbuhEOg y3TfA/iQR6ESnkH01CaJ0l4D9FUuBjemexeL6bFpXGqY+SBD0pFUdW32z A==; X-CSE-ConnectionGUID: AVenGbd8Q7yFRh8PjwcTpw== X-CSE-MsgGUID: 5Es1nl5lTkaAK4eB4BStMg== X-IronPort-AV: E=Sophos;i="6.17,293,1747724400"; d="scan'208";a="212736494" X-Amp-Result: SKIPPED(no attachment in message) Received: from unknown (HELO email.microchip.com) ([170.129.1.10]) by esa6.microchip.iphmx.com with ESMTP/TLS/ECDHE-RSA-AES128-GCM-SHA256; 18 Aug 2025 00:56:08 -0700 Received: from chn-vm-ex04.mchp-main.com (10.10.85.152) by chn-vm-ex03.mchp-main.com (10.10.85.151) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.44; Mon, 18 Aug 2025 00:55:18 -0700 Received: from DEN-DL-M31836.microchip.com (10.10.85.11) by chn-vm-ex04.mchp-main.com (10.10.85.152) with Microsoft SMTP Server id 15.1.2507.44 via Frontend Transport; Mon, 18 Aug 2025 00:55:16 -0700 From: Horatiu Vultur To: , , , , , , , , , CC: , , Horatiu Vultur Subject: [PATCH net-next v5 1/4] net: phy: micrel: Start using PHY_ID_MATCH_MODEL Date: Mon, 18 Aug 2025 09:51:18 +0200 Message-ID: <20250818075121.1298170-2-horatiu.vultur@microchip.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250818075121.1298170-1-horatiu.vultur@microchip.com> References: <20250818075121.1298170-1-horatiu.vultur@microchip.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" 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 Reviewed-by: Andrew Lunn --- drivers/net/phy/micrel.c | 66 ++++++++++++++++------------------------ 1 file changed, 27 insertions(+), 39 deletions(-) diff --git a/drivers/net/phy/micrel.c b/drivers/net/phy/micrel.c index 605b0315b4cb0..e138f208c0e49 100644 --- a/drivers/net/phy/micrel.c +++ b/drivers/net/phy/micrel.c @@ -5645,8 +5645,7 @@ static int ksz9131_resume(struct phy_device *phydev) =20 static struct phy_driver ksphy_driver[] =3D { { - .phy_id =3D PHY_ID_KS8737, - .phy_id_mask =3D MICREL_PHY_ID_MASK, + PHY_ID_MATCH_MODEL(PHY_ID_KS8737), .name =3D "Micrel KS8737", /* PHY_BASIC_FEATURES */ .driver_data =3D &ks8737_type, @@ -5687,8 +5686,7 @@ static struct phy_driver ksphy_driver[] =3D { .suspend =3D kszphy_suspend, .resume =3D kszphy_resume, }, { - .phy_id =3D PHY_ID_KSZ8041, - .phy_id_mask =3D MICREL_PHY_ID_MASK, + PHY_ID_MATCH_MODEL(PHY_ID_KSZ8041), .name =3D "Micrel KSZ8041", /* PHY_BASIC_FEATURES */ .driver_data =3D &ksz8041_type, @@ -5703,8 +5701,7 @@ static struct phy_driver ksphy_driver[] =3D { .suspend =3D ksz8041_suspend, .resume =3D ksz8041_resume, }, { - .phy_id =3D PHY_ID_KSZ8041RNLI, - .phy_id_mask =3D MICREL_PHY_ID_MASK, + PHY_ID_MATCH_MODEL(PHY_ID_KSZ8041RNLI), .name =3D "Micrel KSZ8041RNLI", /* PHY_BASIC_FEATURES */ .driver_data =3D &ksz8041_type, @@ -5747,9 +5744,8 @@ static struct phy_driver ksphy_driver[] =3D { .suspend =3D kszphy_suspend, .resume =3D kszphy_resume, }, { - .phy_id =3D PHY_ID_KSZ8081, + PHY_ID_MATCH_MODEL(PHY_ID_KSZ8081), .name =3D "Micrel KSZ8081 or KSZ8091", - .phy_id_mask =3D MICREL_PHY_ID_MASK, .flags =3D PHY_POLL_CABLE_TEST, /* PHY_BASIC_FEATURES */ .driver_data =3D &ksz8081_type, @@ -5768,9 +5764,8 @@ static struct phy_driver ksphy_driver[] =3D { .cable_test_start =3D ksz886x_cable_test_start, .cable_test_get_status =3D ksz886x_cable_test_get_status, }, { - .phy_id =3D PHY_ID_KSZ8061, + PHY_ID_MATCH_MODEL(PHY_ID_KSZ8061), .name =3D "Micrel KSZ8061", - .phy_id_mask =3D MICREL_PHY_ID_MASK, /* PHY_BASIC_FEATURES */ .probe =3D kszphy_probe, .config_init =3D ksz8061_config_init, @@ -5798,8 +5793,7 @@ static struct phy_driver ksphy_driver[] =3D { .read_mmd =3D genphy_read_mmd_unsupported, .write_mmd =3D genphy_write_mmd_unsupported, }, { - .phy_id =3D PHY_ID_KSZ9031, - .phy_id_mask =3D MICREL_PHY_ID_MASK, + PHY_ID_MATCH_MODEL(PHY_ID_KSZ9031), .name =3D "Micrel KSZ9031 Gigabit PHY", .flags =3D PHY_POLL_CABLE_TEST, .driver_data =3D &ksz9021_type, @@ -5819,8 +5813,7 @@ static struct phy_driver ksphy_driver[] =3D { .cable_test_get_status =3D ksz9x31_cable_test_get_status, .set_loopback =3D ksz9031_set_loopback, }, { - .phy_id =3D PHY_ID_LAN8814, - .phy_id_mask =3D MICREL_PHY_ID_MASK, + PHY_ID_MATCH_MODEL(PHY_ID_LAN8814), .name =3D "Microchip INDY Gigabit Quad PHY", .flags =3D PHY_POLL_CABLE_TEST, .config_init =3D lan8814_config_init, @@ -5838,8 +5831,7 @@ static struct phy_driver ksphy_driver[] =3D { .cable_test_start =3D lan8814_cable_test_start, .cable_test_get_status =3D ksz886x_cable_test_get_status, }, { - .phy_id =3D PHY_ID_LAN8804, - .phy_id_mask =3D MICREL_PHY_ID_MASK, + PHY_ID_MATCH_MODEL(PHY_ID_LAN8804), .name =3D "Microchip LAN966X Gigabit PHY", .config_init =3D lan8804_config_init, .driver_data =3D &ksz9021_type, @@ -5854,8 +5846,7 @@ static struct phy_driver ksphy_driver[] =3D { .config_intr =3D lan8804_config_intr, .handle_interrupt =3D lan8804_handle_interrupt, }, { - .phy_id =3D PHY_ID_LAN8841, - .phy_id_mask =3D MICREL_PHY_ID_MASK, + PHY_ID_MATCH_MODEL(PHY_ID_LAN8841), .name =3D "Microchip LAN8841 Gigabit PHY", .flags =3D PHY_POLL_CABLE_TEST, .driver_data =3D &lan8841_type, @@ -5872,8 +5863,7 @@ static struct phy_driver ksphy_driver[] =3D { .cable_test_start =3D lan8814_cable_test_start, .cable_test_get_status =3D ksz886x_cable_test_get_status, }, { - .phy_id =3D PHY_ID_KSZ9131, - .phy_id_mask =3D MICREL_PHY_ID_MASK, + PHY_ID_MATCH_MODEL(PHY_ID_KSZ9131), .name =3D "Microchip KSZ9131 Gigabit PHY", /* PHY_GBIT_FEATURES */ .flags =3D PHY_POLL_CABLE_TEST, @@ -5894,8 +5884,7 @@ static struct phy_driver ksphy_driver[] =3D { .cable_test_get_status =3D ksz9x31_cable_test_get_status, .get_features =3D ksz9477_get_features, }, { - .phy_id =3D PHY_ID_KSZ8873MLL, - .phy_id_mask =3D MICREL_PHY_ID_MASK, + PHY_ID_MATCH_MODEL(PHY_ID_KSZ8873MLL), .name =3D "Micrel KSZ8873MLL Switch", /* PHY_BASIC_FEATURES */ .config_init =3D kszphy_config_init, @@ -5904,8 +5893,7 @@ static struct phy_driver ksphy_driver[] =3D { .suspend =3D genphy_suspend, .resume =3D genphy_resume, }, { - .phy_id =3D PHY_ID_KSZ886X, - .phy_id_mask =3D MICREL_PHY_ID_MASK, + PHY_ID_MATCH_MODEL(PHY_ID_KSZ886X), .name =3D "Micrel KSZ8851 Ethernet MAC or KSZ886X Switch", .driver_data =3D &ksz886x_type, /* PHY_BASIC_FEATURES */ @@ -5925,8 +5913,7 @@ static struct phy_driver ksphy_driver[] =3D { .suspend =3D genphy_suspend, .resume =3D genphy_resume, }, { - .phy_id =3D PHY_ID_KSZ9477, - .phy_id_mask =3D MICREL_PHY_ID_MASK, + PHY_ID_MATCH_MODEL(PHY_ID_KSZ9477), .name =3D "Microchip KSZ9477", .probe =3D kszphy_probe, /* PHY_GBIT_FEATURES */ @@ -5953,22 +5940,23 @@ MODULE_LICENSE("GPL"); =20 static const struct mdio_device_id __maybe_unused micrel_tbl[] =3D { { PHY_ID_KSZ9021, 0x000ffffe }, - { PHY_ID_KSZ9031, MICREL_PHY_ID_MASK }, - { PHY_ID_KSZ9131, MICREL_PHY_ID_MASK }, + { PHY_ID_MATCH_MODEL(PHY_ID_KSZ9031) }, + { PHY_ID_MATCH_MODEL(PHY_ID_KSZ9131) }, { PHY_ID_KSZ8001, 0x00fffffc }, - { PHY_ID_KS8737, MICREL_PHY_ID_MASK }, + { PHY_ID_MATCH_MODEL(PHY_ID_KS8737) }, { PHY_ID_KSZ8021, 0x00ffffff }, { PHY_ID_KSZ8031, 0x00ffffff }, - { PHY_ID_KSZ8041, MICREL_PHY_ID_MASK }, - { PHY_ID_KSZ8051, MICREL_PHY_ID_MASK }, - { PHY_ID_KSZ8061, MICREL_PHY_ID_MASK }, - { PHY_ID_KSZ8081, MICREL_PHY_ID_MASK }, - { PHY_ID_KSZ8873MLL, MICREL_PHY_ID_MASK }, - { PHY_ID_KSZ886X, MICREL_PHY_ID_MASK }, - { PHY_ID_KSZ9477, MICREL_PHY_ID_MASK }, - { PHY_ID_LAN8814, MICREL_PHY_ID_MASK }, - { PHY_ID_LAN8804, MICREL_PHY_ID_MASK }, - { PHY_ID_LAN8841, MICREL_PHY_ID_MASK }, + { PHY_ID_MATCH_MODEL(PHY_ID_KSZ8041) }, + { PHY_ID_MATCH_MODEL(PHY_ID_KSZ8041RNLI) }, + { PHY_ID_MATCH_MODEL(PHY_ID_KSZ8051) }, + { PHY_ID_MATCH_MODEL(PHY_ID_KSZ8061) }, + { PHY_ID_MATCH_MODEL(PHY_ID_KSZ8081) }, + { PHY_ID_MATCH_MODEL(PHY_ID_KSZ8873MLL) }, + { PHY_ID_MATCH_MODEL(PHY_ID_KSZ886X) }, + { PHY_ID_MATCH_MODEL(PHY_ID_KSZ9477) }, + { PHY_ID_MATCH_MODEL(PHY_ID_LAN8814) }, + { PHY_ID_MATCH_MODEL(PHY_ID_LAN8804) }, + { PHY_ID_MATCH_MODEL(PHY_ID_LAN8841) }, { } }; =20 --=20 2.34.1