From nobody Mon Oct 6 06:47:31 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 DBBF224888C; Thu, 24 Jul 2025 20:12:41 +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=1753387963; cv=none; b=VQthbrs1gDfro9OApmuyXWdBS/n+LRpdHrgDE5qHodUnj25f12wu7l7sel5IOsrMuX+oNHgTeAZ0/DhYI2d6iE9HTvAYPV2Uy/XRT1YQvuVT64wTGKJhxqKZ1kn1O0PIpjE3zPlj0ljpxC6v4WYZjfnWFrvo7xPDEMUpIbp462I= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1753387963; c=relaxed/simple; bh=SVmFzM9HX1G4W1SR5ohas/J7SBbMjYe1/YYfaD8egpM=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=PVA7BljVSmIgHmlIvpqwUx7rXRGPMA/boy438xrkm8ncLlGtlFczAQXA9mieO2j3izTLsOsQdhnvBxO8kxz+ddcpi+zpeH1zXiTDgQ9yxUQ7M5nXrsXhMm9k43FlZcvOwkJRst3460t/Z6VNMtJnGkUZZ+vNsL7unVeTqmACzNY= 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=qKNyUqd8; 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="qKNyUqd8" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=microchip.com; i=@microchip.com; q=dns/txt; s=mchp; t=1753387961; x=1784923961; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=SVmFzM9HX1G4W1SR5ohas/J7SBbMjYe1/YYfaD8egpM=; b=qKNyUqd8UiVdzIUeMk9PPaTeAnDAzjEih6VqPhpaIdo6WR2iMPPzGgag 3NLBPEQt9pp/V/Vdw93ymBVvGQKQLc6DmwqTNG0BzCQZNkLggCrifKEnD 3GY/a0AV2epy2YA17n/a1bid/36nKU5r0Mf5wfy2W8lDohYQv+I7e9K3p VqXKK69SmfkEP5XeQSRiw0MF+VHJwdGGViVgPQ8GICYOq2OstEMDBtUYl 2Nvw4KETA3cmoev0AGswM89Enr6U9ctj4uHW6Q8KOX9tWVU5jpxSmJS8M HT9F+eaX2wr9teCcfcF5OtEhUc0YZiK4Xnbrq2/N2Ow+F2fBATBy4/qHO Q==; X-CSE-ConnectionGUID: Vloo96aWRWWEYpPX1eCS2Q== X-CSE-MsgGUID: dw1dE8HlQKK+Caexc1LEXQ== X-IronPort-AV: E=Sophos;i="6.16,337,1744095600"; d="scan'208";a="211826703" 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; 24 Jul 2025 13:12:34 -0700 Received: from chn-vm-ex01.mchp-main.com (10.10.85.143) by chn-vm-ex02.mchp-main.com (10.10.85.144) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.44; Thu, 24 Jul 2025 13:11:30 -0700 Received: from DEN-DL-M31836.microchip.com (10.10.85.11) by chn-vm-ex01.mchp-main.com (10.10.85.143) with Microsoft SMTP Server id 15.1.2507.44 via Frontend Transport; Thu, 24 Jul 2025 13:11:28 -0700 From: Horatiu Vultur To: , , , , , , , , CC: , , Horatiu Vultur Subject: [PATCH net-next v2 1/4] net: phy: micrel: Start using PHY_ID_MATCH_MODEL Date: Thu, 24 Jul 2025 22:08:23 +0200 Message-ID: <20250724200826.2662658-2-horatiu.vultur@microchip.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250724200826.2662658-1-horatiu.vultur@microchip.com> References: <20250724200826.2662658-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. Signed-off-by: Horatiu Vultur --- 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 f678c1bdacdf0..c6aacf7feb7b0 100644 --- a/drivers/net/phy/micrel.c +++ b/drivers/net/phy/micrel.c @@ -5643,8 +5643,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, @@ -5685,8 +5684,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, @@ -5701,8 +5699,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, @@ -5745,9 +5742,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, @@ -5766,9 +5762,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, @@ -5796,8 +5791,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, @@ -5817,8 +5811,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, @@ -5836,8 +5829,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, @@ -5852,8 +5844,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, @@ -5870,8 +5861,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, @@ -5892,8 +5882,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, @@ -5902,8 +5891,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 */ @@ -5923,8 +5911,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 */ @@ -5951,22 +5938,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