From nobody Wed Dec 17 22:46:44 2025 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id CC91CC61D9B for ; Wed, 22 Nov 2023 09:02:17 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1343699AbjKVJCT (ORCPT ); Wed, 22 Nov 2023 04:02:19 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51004 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235092AbjKVJBW (ORCPT ); Wed, 22 Nov 2023 04:01:22 -0500 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7ADF5F4 for ; Wed, 22 Nov 2023 01:01:18 -0800 (PST) Received: by smtp.kernel.org (Postfix) with ESMTPS id 46A8DC4AF5E; Wed, 22 Nov 2023 09:01:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1700643675; bh=jUp23sLyZF2ZiQtXRJ5Qs3WUcDXhAHo6TBkYOOsV0MI=; h=From:Date:Subject:References:In-Reply-To:To:Cc:Reply-To:From; b=fATj2p9qoGNfI/s6bODUrFypUVSFlQt5EHL84BhKVjrPXNoB39oL0sef6JG2k7fL1 RCfy/Gp6UL7xKfWryp4wY6cKihoF/JGVpHwdPRwZR1Er1vER7z0zo0V9Y9TwOhTQvs PUuoJ1wfm+qSLLOYXOGwZenwOZzpKk4WSXnARLcfBVQQPVzXAGUX8oeBxccIR23rV+ O+B24eT5+ag5prUUOdYy+0NK+/fNIXeiZodCOdpD9hLhneMzCD7bJJ+5WdIrCw6b9R GRzCyQjHpCTTzO5zwd/DCjeBb0NaKQhcfzx8F8ARVMMQT99BcnqUAIRD5mWFho7m+X zZjlJnyMaJCCg== Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 34720C61D9D; Wed, 22 Nov 2023 09:01:15 +0000 (UTC) From: Nikita Shubin via B4 Relay Date: Wed, 22 Nov 2023 11:59:55 +0300 Subject: [PATCH v5 17/39] net: cirrus: add DT support for Cirrus EP93xx MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20231122-ep93xx-v5-17-d59a76d5df29@maquefel.me> References: <20231122-ep93xx-v5-0-d59a76d5df29@maquefel.me> In-Reply-To: <20231122-ep93xx-v5-0-d59a76d5df29@maquefel.me> To: Hartley Sweeten , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Alexander Sverdlin , Andrew Lunn X-Mailer: b4 0.13-dev-e3e53 X-Developer-Signature: v=1; a=ed25519-sha256; t=1700643671; l=4248; i=nikita.shubin@maquefel.me; s=20230718; h=from:subject:message-id; bh=Jsr2Z57/1zzjxnodjeFhBhk8dpD7lZ/Sm2ymHhuQVGM=; =?utf-8?q?b=3D9pjWKpAD7FKZ?= =?utf-8?q?sto7rhb4p4w2coguelUdAbhvpt2T2Yq7FGIGYi8g6RkJyz68L7uOa8aOefJAloel?= 02SmdDgWBz1YHde96fTJBs8pHYG3y87Y5DbV/x7CbysNGqriDtV8 X-Developer-Key: i=nikita.shubin@maquefel.me; a=ed25519; pk=vqf5YIUJ7BJv3EJFaNNxWZgGuMgDH6rwufTLflwU9ac= X-Endpoint-Received: by B4 Relay for nikita.shubin@maquefel.me/20230718 with auth_id=65 X-Original-From: Nikita Shubin Reply-To: Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Nikita Shubin - add OF ID match table - get phy_id from the device tree, as part of mdio - copy_addr is now always used, as there is no SoC/board that aren't - dropped platform header Reviewed-by: Andrew Lunn Tested-by: Alexander Sverdlin Reviewed-by: Linus Walleij Signed-off-by: Nikita Shubin --- drivers/net/ethernet/cirrus/ep93xx_eth.c | 63 ++++++++++++++++------------= ---- 1 file changed, 32 insertions(+), 31 deletions(-) diff --git a/drivers/net/ethernet/cirrus/ep93xx_eth.c b/drivers/net/etherne= t/cirrus/ep93xx_eth.c index 1c2a540db13d..2a58af5fc288 100644 --- a/drivers/net/ethernet/cirrus/ep93xx_eth.c +++ b/drivers/net/ethernet/cirrus/ep93xx_eth.c @@ -17,12 +17,11 @@ #include #include #include +#include #include #include #include =20 -#include - #define DRV_MODULE_NAME "ep93xx-eth" =20 #define RX_QUEUE_ENTRIES 64 @@ -738,25 +737,6 @@ static const struct net_device_ops ep93xx_netdev_ops = =3D { .ndo_set_mac_address =3D eth_mac_addr, }; =20 -static struct net_device *ep93xx_dev_alloc(struct ep93xx_eth_data *data) -{ - struct net_device *dev; - - dev =3D alloc_etherdev(sizeof(struct ep93xx_priv)); - if (dev =3D=3D NULL) - return NULL; - - eth_hw_addr_set(dev, data->dev_addr); - - dev->ethtool_ops =3D &ep93xx_ethtool_ops; - dev->netdev_ops =3D &ep93xx_netdev_ops; - - dev->features |=3D NETIF_F_SG | NETIF_F_HW_CSUM; - - return dev; -} - - static void ep93xx_eth_remove(struct platform_device *pdev) { struct net_device *dev; @@ -786,27 +766,47 @@ static void ep93xx_eth_remove(struct platform_device = *pdev) =20 static int ep93xx_eth_probe(struct platform_device *pdev) { - struct ep93xx_eth_data *data; struct net_device *dev; struct ep93xx_priv *ep; struct resource *mem; + void __iomem *base_addr; + struct device_node *np; + u32 phy_id; int irq; int err; =20 if (pdev =3D=3D NULL) return -ENODEV; - data =3D dev_get_platdata(&pdev->dev); =20 mem =3D platform_get_resource(pdev, IORESOURCE_MEM, 0); irq =3D platform_get_irq(pdev, 0); if (!mem || irq < 0) return -ENXIO; =20 - dev =3D ep93xx_dev_alloc(data); + base_addr =3D ioremap(mem->start, resource_size(mem)); + if (!base_addr) + return dev_err_probe(&pdev->dev, -EIO, "Failed to ioremap ethernet regis= ters\n"); + + np =3D of_parse_phandle(pdev->dev.of_node, "phy-handle", 0); + if (!np) + return dev_err_probe(&pdev->dev, -ENODEV, "Please provide \"phy-handle\"= \n"); + + err =3D of_property_read_u32(np, "reg", &phy_id); + of_node_put(np); + if (err) + return dev_err_probe(&pdev->dev, -ENOENT, "Failed to locate \"phy_id\"\n= "); + + dev =3D alloc_etherdev(sizeof(struct ep93xx_priv)); if (dev =3D=3D NULL) { err =3D -ENOMEM; goto err_out; } + + eth_hw_addr_set(dev, base_addr + 0x50); + dev->ethtool_ops =3D &ep93xx_ethtool_ops; + dev->netdev_ops =3D &ep93xx_netdev_ops; + dev->features |=3D NETIF_F_SG | NETIF_F_HW_CSUM; + ep =3D netdev_priv(dev); ep->dev =3D dev; SET_NETDEV_DEV(dev, &pdev->dev); @@ -822,15 +822,10 @@ static int ep93xx_eth_probe(struct platform_device *p= dev) goto err_out; } =20 - ep->base_addr =3D ioremap(mem->start, resource_size(mem)); - if (ep->base_addr =3D=3D NULL) { - dev_err(&pdev->dev, "Failed to ioremap ethernet registers\n"); - err =3D -EIO; - goto err_out; - } + ep->base_addr =3D base_addr; ep->irq =3D irq; =20 - ep->mii.phy_id =3D data->phy_id; + ep->mii.phy_id =3D phy_id; ep->mii.phy_id_mask =3D 0x1f; ep->mii.reg_num_mask =3D 0x1f; ep->mii.dev =3D dev; @@ -857,12 +852,18 @@ static int ep93xx_eth_probe(struct platform_device *p= dev) return err; } =20 +static const struct of_device_id ep93xx_eth_of_ids[] =3D { + { .compatible =3D "cirrus,ep9301-eth" }, + { /* sentinel */ } +}; +MODULE_DEVICE_TABLE(of, ep93xx_eth_of_ids); =20 static struct platform_driver ep93xx_eth_driver =3D { .probe =3D ep93xx_eth_probe, .remove_new =3D ep93xx_eth_remove, .driver =3D { .name =3D "ep93xx-eth", + .of_match_table =3D ep93xx_eth_of_ids, }, }; =20 --=20 2.41.0