From patchwork Wed Nov 22 08:59:55 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nikita Shubin via B4 Relay X-Patchwork-Id: 168188 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:2b07:b0:403:3b70:6f57 with SMTP id io7csp1190285vqb; Wed, 22 Nov 2023 01:06:44 -0800 (PST) X-Google-Smtp-Source: AGHT+IHHpWmCXvKf039XQbPyUPRDqPGxOPic/z+PzBikHE4kh2xX1NCWaSRmOb74ReY2dEE0P6F0 X-Received: by 2002:a05:6808:10c6:b0:3a9:bb4f:9efd with SMTP id s6-20020a05680810c600b003a9bb4f9efdmr2366817ois.29.1700644003825; Wed, 22 Nov 2023 01:06:43 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1700644003; cv=none; d=google.com; s=arc-20160816; b=VKqhD3jzxyJxXDrjv71BkG3YXDrsAoJdKxLsKg2KVmWHam5PbT9D4wohZ7ApcZNrB3 2Ru/81CDAAh+d3yKqHF8J7VPkt/TQlRyNzebE/3rG6cMJr2nlCH+Fy05MzBdhBHvRQOM WikJUbrpapILNmL1eaSvRuy1YEn/cD7yKJukL82Yb06dmnPq73Lq+cPJXmDMRIBjFT+Q s++Q9lt2PCRBFgBzWZx+I4anqAddSwTf4QmfAYdqnuUU7iUeNgquHzCJcdvwftYIL6g6 KzPbVaoNdombuQ+fGu5I/sEc3NfcDZ22Y1JR0shibLm+JN7DyxGPBQ0+hfjet7SeLc9d kx2Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:reply-to:cc:to:in-reply-to:references:message-id :content-transfer-encoding:mime-version:subject:date:from :dkim-signature; bh=PYhhHJ8Blonmly2FgwlT7Sdlo1OTPtYjhTdsasA0Yis=; fh=HMWTsfpf36WzZgw+91a6hu5ZvQSH1PY4GkMQ9bfAhLs=; b=CnUF2f7C+7iqtU6BpWFrxtdjr0lb7fVe02NT+j10TDYfpkY6AGjWjX/0KAI60ncZZe Y2CzIkRiZ+7Wiyf9Hj+oTP8ukQA+FrAAtS4Us6b14FzXbN/dmTSai9QZH/vKuL8RKuzv JBScfYxpnEruP8x7OQlyLTKgqcpwLeTXh+zl2BWVn2wiRWo5XeElHQbNcTcwSAN47YTt VcKh0J/MQXA+qASo+4htQ2Rnf3GcSmeoi5s0T/1jW6DmhSwOxx5bjklt5MefjoQUfF4u R6/74cJ2MDJ5uyfjyoByp1xI/glC2/Ich7CLqJcLGkYoUon9/5y+fS6bYDEZJbe4MaML uu9Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=fATj2p9q; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from snail.vger.email (snail.vger.email. [23.128.96.37]) by mx.google.com with ESMTPS id h125-20020a636c83000000b00578b4082453si12015322pgc.712.2023.11.22.01.06.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 22 Nov 2023 01:06:43 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) client-ip=23.128.96.37; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=fATj2p9q; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by snail.vger.email (Postfix) with ESMTP id 1F24B8032028; Wed, 22 Nov 2023 01:02:35 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at snail.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1343694AbjKVJCP (ORCPT + 99 others); Wed, 22 Nov 2023 04:02:15 -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 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: X-Spam-Status: No, score=-4.5 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (snail.vger.email [0.0.0.0]); Wed, 22 Nov 2023 01:02:35 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1783254486769927798 X-GMAIL-MSGID: 1783254486769927798 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/ethernet/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 -#include - #define DRV_MODULE_NAME "ep93xx-eth" #define RX_QUEUE_ENTRIES 64 @@ -738,25 +737,6 @@ static const struct net_device_ops ep93xx_netdev_ops = { .ndo_set_mac_address = eth_mac_addr, }; -static struct net_device *ep93xx_dev_alloc(struct ep93xx_eth_data *data) -{ - struct net_device *dev; - - dev = alloc_etherdev(sizeof(struct ep93xx_priv)); - if (dev == NULL) - return NULL; - - eth_hw_addr_set(dev, data->dev_addr); - - dev->ethtool_ops = &ep93xx_ethtool_ops; - dev->netdev_ops = &ep93xx_netdev_ops; - - dev->features |= 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) 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; if (pdev == NULL) return -ENODEV; - data = dev_get_platdata(&pdev->dev); mem = platform_get_resource(pdev, IORESOURCE_MEM, 0); irq = platform_get_irq(pdev, 0); if (!mem || irq < 0) return -ENXIO; - dev = ep93xx_dev_alloc(data); + base_addr = ioremap(mem->start, resource_size(mem)); + if (!base_addr) + return dev_err_probe(&pdev->dev, -EIO, "Failed to ioremap ethernet registers\n"); + + np = 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 = 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 = alloc_etherdev(sizeof(struct ep93xx_priv)); if (dev == NULL) { err = -ENOMEM; goto err_out; } + + eth_hw_addr_set(dev, base_addr + 0x50); + dev->ethtool_ops = &ep93xx_ethtool_ops; + dev->netdev_ops = &ep93xx_netdev_ops; + dev->features |= NETIF_F_SG | NETIF_F_HW_CSUM; + ep = netdev_priv(dev); ep->dev = dev; SET_NETDEV_DEV(dev, &pdev->dev); @@ -822,15 +822,10 @@ static int ep93xx_eth_probe(struct platform_device *pdev) goto err_out; } - ep->base_addr = ioremap(mem->start, resource_size(mem)); - if (ep->base_addr == NULL) { - dev_err(&pdev->dev, "Failed to ioremap ethernet registers\n"); - err = -EIO; - goto err_out; - } + ep->base_addr = base_addr; ep->irq = irq; - ep->mii.phy_id = data->phy_id; + ep->mii.phy_id = phy_id; ep->mii.phy_id_mask = 0x1f; ep->mii.reg_num_mask = 0x1f; ep->mii.dev = dev; @@ -857,12 +852,18 @@ static int ep93xx_eth_probe(struct platform_device *pdev) return err; } +static const struct of_device_id ep93xx_eth_of_ids[] = { + { .compatible = "cirrus,ep9301-eth" }, + { /* sentinel */ } +}; +MODULE_DEVICE_TABLE(of, ep93xx_eth_of_ids); static struct platform_driver ep93xx_eth_driver = { .probe = ep93xx_eth_probe, .remove_new = ep93xx_eth_remove, .driver = { .name = "ep93xx-eth", + .of_match_table = ep93xx_eth_of_ids, }, };