From patchwork Tue Jan 11 16:05:58 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Evgeny Boger X-Patchwork-Id: 12709993 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 4BEA8C433EF for ; Tue, 11 Jan 2022 16:07:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=AmgVvtoO5eWJAarr84EEBhCz+JqtyII+vNY7BNXiSk4=; b=IrWrbjyPQ8YImY EABuHdpOILsjQpOay8LhuAT0QvT08Bibnx99C7qBPoJBD0Rpy9QMbG1b7w2+8FVpyDLftwz254b9Q dlDKEinLPJn39ywUO4O0sAl02trxQJBcjaunoq8n8QT67WlhAXf6MX5kAW7AFBUExG5z9NcNx/dFM uM9p8jhr7zux2n5XipcbimY5Ad1Jowpu/vOJTmGo05+X3t6QQQNBVjazHoj9BlltAqx7B7M8YYeir ZCedI/emlGzj6/30f3r0vhYJoDGJZKCMZ9nOwEMXIgTFl3kIDVUk+kOvttpXWNVyEG1QiDE5E4kOP afkJ2K2Tw9FF0iK78z5g==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1n7JfH-00Gr7P-Ru; Tue, 11 Jan 2022 16:06:28 +0000 Received: from mail-lf1-x131.google.com ([2a00:1450:4864:20::131]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1n7Jf2-00Gr2X-3t for linux-arm-kernel@lists.infradead.org; Tue, 11 Jan 2022 16:06:13 +0000 Received: by mail-lf1-x131.google.com with SMTP id h2so58017190lfv.9 for ; Tue, 11 Jan 2022 08:06:12 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=wirenboard-com.20210112.gappssmtp.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=V1d1hWvVycjkagHoYZGryo2W04Ierj/dRC0TMT4n6OY=; b=y8rp1KIPOzsnlGCTA0GxIEGQUtw3C0MU6ec2BVfyvtz8PUNPf5J9wUwE8FLMGk4sXx oG0fqVTD6dCRvYbdcOzAqwl3VOYK83IT/+UASzUmfs/cPfNjm2/u0B3DBKd827npRWmz 9Iu5RB+/iL/gJAt/+VX3Szxh21hTIevdOA4oOTwyzEPLZXiRrALax9c6/FZOBSeBxuOn xlvSx2y/VbvpwamZ1s2tyNt0n/tt5nse0lhZZxUKWLUOMEuLb68JalA/dW5TrVeq1cZe 9bpcefN0b3btLsY7G5PQzJALWRghHgxS1YflynDsCJX27FOusnqIELPZHx/GqFcVrqsc LGPA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=V1d1hWvVycjkagHoYZGryo2W04Ierj/dRC0TMT4n6OY=; b=ESklqnhz9jutxW4JbqiE2Zv/cZq8r6XHG3odeXNJ2Cc1v1d9Eb5/2qYlqgHFKxUWqL b/oEAz6cLoGwQ+eFss1EQGlwus0NACDMcTHTAsuUotWH5vYHcCiLk6vMjo+okobNB7Eh XRFuia7SA8X0qt4jrXykmA5kNIZMz5WFbWS4ulz9iPHYM/jqAg5glMvETendpKx5q03t yi/1yGlupPK/FJ9iLzN1ytWxzwRBJPbVBTtYOLgucnYxNY8NCD/5c7ktW1zjubN/WD+0 YpcBocsa17t9wcnTO1wkn6ukZV28MRg63scDAolrZHLxLuvww+qGII8W4h8PoT4BUr39 S8Fg== X-Gm-Message-State: AOAM5337RIC3GfaECps09t9nO4gU+z/BDBIrYXChYGwHdO9JHDYr1CdZ GxGyihxSiOI4hj/sKHcuIxoDIg== X-Google-Smtp-Source: ABdhPJzMZl2hD6yFwcvk58x69BcZXAdbh4ZgLJ5ZHt4M39q5O8Y6ZjhYRGJAXB6S+k7Qbz7VSS2vsw== X-Received: by 2002:a05:651c:8a:: with SMTP id 10mr2113109ljq.491.1641917170723; Tue, 11 Jan 2022 08:06:10 -0800 (PST) Received: from boger-laptop.lan (81.5.110.253.dhcp.mipt-telecom.ru. [81.5.110.253]) by smtp.gmail.com with ESMTPSA id k39sm564803lfv.150.2022.01.11.08.06.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 11 Jan 2022 08:06:10 -0800 (PST) From: Evgeny Boger To: Maxime Ripard , Chen-Yu Tsai , linux-arm-kernel@lists.infradead.org Cc: Evgeny Boger , devicetree@vger.kernel.org, Rob Herring , linux-sunxi@lists.linux.dev Subject: [PATCH v4 1/3] net: allwinner: reset control support Date: Tue, 11 Jan 2022 19:05:58 +0300 Message-Id: <20220111160600.58384-2-boger@wirenboard.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220111160600.58384-1-boger@wirenboard.com> References: <20220111160600.58384-1-boger@wirenboard.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220111_080612_184591_F58D5960 X-CRM114-Status: GOOD ( 17.86 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org R40 (aka V40/A40i/T3) and A10/A20 share the same EMAC IP. However, on R40 the EMAC reset needs to be deasserted. Signed-off-by: Evgeny Boger --- drivers/net/ethernet/allwinner/sun4i-emac.c | 64 +++++++++++++++++++-- 1 file changed, 59 insertions(+), 5 deletions(-) diff --git a/drivers/net/ethernet/allwinner/sun4i-emac.c b/drivers/net/ethernet/allwinner/sun4i-emac.c index 800ee022388f..368597f0ff76 100644 --- a/drivers/net/ethernet/allwinner/sun4i-emac.c +++ b/drivers/net/ethernet/allwinner/sun4i-emac.c @@ -28,6 +28,7 @@ #include #include #include +#include #include #include "sun4i-emac.h" @@ -68,6 +69,15 @@ MODULE_PARM_DESC(watchdog, "transmit timeout in milliseconds"); * devices, EMACA and EMACB. */ +/** + * struct emac_quirks - Differences between SoC variants. + * + * @has_reset: SoC needs reset deasserted. + */ +struct emac_quirks { + bool has_reset; +}; + struct emac_board_info { struct clk *clk; struct device *dev; @@ -85,6 +95,7 @@ struct emac_board_info { unsigned int link; unsigned int speed; unsigned int duplex; + struct reset_control *reset; phy_interface_t phy_interface; }; @@ -790,6 +801,7 @@ static int emac_probe(struct platform_device *pdev) struct emac_board_info *db; struct net_device *ndev; int ret = 0; + const struct emac_quirks *quirks; ndev = alloc_etherdev(sizeof(struct emac_board_info)); if (!ndev) { @@ -808,6 +820,13 @@ static int emac_probe(struct platform_device *pdev) spin_lock_init(&db->lock); + quirks = of_device_get_match_data(&pdev->dev); + if (!quirks) { + dev_err(&pdev->dev, "Failed to determine the quirks to use\n"); + ret = -ENODEV; + goto out; + } + db->membase = of_iomap(np, 0); if (!db->membase) { dev_err(&pdev->dev, "failed to remap registers\n"); @@ -824,16 +843,31 @@ static int emac_probe(struct platform_device *pdev) goto out_iounmap; } + if (quirks->has_reset) { + db->reset = devm_reset_control_get_exclusive(&pdev->dev, NULL); + if (IS_ERR(db->reset)) { + dev_err(&pdev->dev, "unable to request reset\n"); + ret = PTR_ERR(db->reset); + goto out_dispose_mapping; + } + + ret = reset_control_deassert(db->reset); + if (ret) { + dev_err(&pdev->dev, "could not deassert EMAC reset\n"); + goto out_dispose_mapping; + } + } + db->clk = devm_clk_get(&pdev->dev, NULL); if (IS_ERR(db->clk)) { ret = PTR_ERR(db->clk); - goto out_dispose_mapping; + goto out_assert_reset; } ret = clk_prepare_enable(db->clk); if (ret) { dev_err(&pdev->dev, "Error couldn't enable clock (%d)\n", ret); - goto out_dispose_mapping; + goto out_assert_reset; } ret = sunxi_sram_claim(&pdev->dev); @@ -889,6 +923,8 @@ static int emac_probe(struct platform_device *pdev) sunxi_sram_release(&pdev->dev); out_clk_disable_unprepare: clk_disable_unprepare(db->clk); +out_assert_reset: + reset_control_assert(db->reset); out_dispose_mapping: irq_dispose_mapping(ndev->irq); out_iounmap: @@ -909,6 +945,7 @@ static int emac_remove(struct platform_device *pdev) unregister_netdev(ndev); sunxi_sram_release(&pdev->dev); clk_disable_unprepare(db->clk); + reset_control_assert(db->reset); irq_dispose_mapping(ndev->irq); iounmap(db->membase); free_netdev(ndev); @@ -940,11 +977,28 @@ static int emac_resume(struct platform_device *dev) return 0; } -static const struct of_device_id emac_of_match[] = { - {.compatible = "allwinner,sun4i-a10-emac",}, +static const struct emac_quirks sun4i_a10_emac_quirks = { + .has_reset = false, +}; + +static const struct emac_quirks sun8i_r40_emac_quirks = { + .has_reset = true, +}; +static const struct of_device_id emac_of_match[] = { + { + .compatible = "allwinner,sun4i-a10-emac", + .data = &sun4i_a10_emac_quirks + }, + { + .compatible = "allwinner,sun8i-r40-emac", + .data = &sun8i_r40_emac_quirks + }, /* Deprecated */ - {.compatible = "allwinner,sun4i-emac",}, + { + .compatible = "allwinner,sun4i-emac", + .data = &sun4i_a10_emac_quirks + }, {}, };