Message ID | 20210217042006.54559-4-samuel@sholland.org (mailing list archive) |
---|---|
State | New, archived |
Headers | show
Return-Path: <SRS0=Q6KY=HT=lists.infradead.org=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@kernel.org> X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id BAAADC433E9 for <linux-arm-kernel@archiver.kernel.org>; Wed, 17 Feb 2021 04:23:16 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 5136764DA8 for <linux-arm-kernel@archiver.kernel.org>; Wed, 17 Feb 2021 04:23:16 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 5136764DA8 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=sholland.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To:Message-Id:Date: Subject:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=8b2nXZSlzKkXTLpgWg7XuecYcaIvkyklDoaL99YCp6w=; b=BQgtU1KWSEYjrgPvYlBM3v7mM qY7LZM7GNtPRmZ0V6RBBbHW1Vxod2jB+kVy2otAH+Nfv7GYyGTsxAdw66lJgKgLf4fo0cr0bDkdSq J77DYGvnmlaDb6Tq3fre821ctVihhF9wMVom82D/4F/ObBxAEf6YCkCsVEYA+oXNy/dF+YIE7zuEB LXeAi04Pl/JBIEZFSD+Ezt27dqpLbT7dSpDjyu1uYusoEv1hS6wk+SHvLqmVGFOf08pe8nZP1y0m1 W0lhzfR7ia8tJD2xPJpWvPyt7N9kcG+CWaj7Bt5e3qyQnOAgRg6UjTd6Od/4Tepoqa38/7Jb4JPeM DvBNpfdOQ==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1lCEK6-000452-GX; Wed, 17 Feb 2021 04:20:22 +0000 Received: from new4-smtp.messagingengine.com ([66.111.4.230]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1lCEJx-00041c-Ve for linux-arm-kernel@lists.infradead.org; Wed, 17 Feb 2021 04:20:16 +0000 Received: from compute3.internal (compute3.nyi.internal [10.202.2.43]) by mailnew.nyi.internal (Postfix) with ESMTP id 763B3580377; Tue, 16 Feb 2021 23:20:09 -0500 (EST) Received: from mailfrontend1 ([10.202.2.162]) by compute3.internal (MEProxy); Tue, 16 Feb 2021 23:20:09 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sholland.org; h= from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; s=fm2; bh=QxEMMj3Dp9DFj qxYAtIXcSZ4AlixuxTBgKzn45m1S4o=; b=Zv1TjsD6JixTxUQLR7+KV2ldmp0k7 dWfz6Q3T+/eabAN/gygQdgwe77GjcHq/WPbKUZgQtdAU0oHP3Y4wulR7qwhhKf/R e6qAyvtz1YiNX37phIKZ7bz0vYRY7sg35r2ObioVsv82XI+L29IC5W35j04uoB1i XgU5/+qNMT3/eZd1GGfBVGRByay4Pncr7fJE+0BnvIbkZn2eOiXJnLoBZxrEnsq0 YodautgslkgL7dqRizER0oDhqfGFDk6Ixqpm7FEiKuHwQ8OiJNL5MThxeVsArEDW 3mnlBRtMziT7sBtVLovuFapXpx+RLSAPDf9/Ue/Va0He47XwglSxU7nXw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:date:from :in-reply-to:message-id:mime-version:references:subject:to :x-me-proxy:x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s= fm2; bh=QxEMMj3Dp9DFjqxYAtIXcSZ4AlixuxTBgKzn45m1S4o=; b=htDgzHnq QEFjpNJf1TgckBXIaseY0dgZKHoooiRvz5loptxGbamcAYHeh5USB8C0Fx1DwxQe q2oZ5WxzhIQ7pF4s8KQ+oErcKOMI9y8dGDLXaTaCiC+evNbJH0CyGUUUh4FKPGEh jIV26td48NSyUBLygaPvFlYl15cYJwBidWRVjdtJByPpU7v3rXLT9IjVQ4d10slb +G/I6ELUGpWGmATqays8vKYh1lJJxt8KDSnlHJC8FyPq+rIcowcQuCutwZQbQPMd DRMBtoMteZEC88l7Hg/5L//Dsvql7FwVPvgJs/EWLfd+06ts4qLhOunHMEtPXbH8 6XXFgRy59FxdPQ== X-ME-Sender: <xms:eZksYJGslb705nffwFNZvxYkI-n0Mz_ysV_6fgzi_qVHg6Ett6zcSg> <xme:eZksYORA5to7DBmEwT_sr2iPC_yrOe-q1qAx8Fn8d_PAfl1ZDAxASzAP0CXFZD214 F99xdqUV-I1QUF6eg> X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeduledrjedugdeikecutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmdenuc fjughrpefhvffufffkofgjfhgggfestdekredtredttdenucfhrhhomhepufgrmhhuvghl ucfjohhllhgrnhguuceoshgrmhhuvghlsehshhholhhlrghnugdrohhrgheqnecuggftrf grthhtvghrnhepudfhjeefvdfhgfefheetgffhieeigfefhefgvddvveefgeejheejvdfg jeehueeinecukfhppeejtddrudefhedrudegkedrudehudenucevlhhushhtvghrufhiii gvpedvnecurfgrrhgrmhepmhgrihhlfhhrohhmpehsrghmuhgvlhesshhhohhllhgrnhgu rdhorhhg X-ME-Proxy: <xmx:eZksYIBuqz0umpKk6pYAiei9Q9z_vyuD-BMAQc5zc8_LAex6JUnPgw> <xmx:eZksYG357-aQ9iK5KpRvy-NFQXk1ORqVaozO8D90Apm6EKZSAX7sDw> <xmx:eZksYOUqwHP3LImpoXtY8W64B2_8wzlyVstCwQIKiZLjJxcC8tVlaQ> <xmx:eZksYLBvMT__qietjT8_B23JJsN_lVkVCt2zSm3z0goWsPtlKEtf8A> Received: from titanium.stl.sholland.net (70-135-148-151.lightspeed.stlsmo.sbcglobal.net [70.135.148.151]) by mail.messagingengine.com (Postfix) with ESMTPA id D22EA240064; Tue, 16 Feb 2021 23:20:08 -0500 (EST) From: Samuel Holland <samuel@sholland.org> To: Giuseppe Cavallaro <peppe.cavallaro@st.com>, Alexandre Torgue <alexandre.torgue@st.com>, Jose Abreu <joabreu@synopsys.com>, "David S. Miller" <davem@davemloft.net>, Jakub Kicinski <kuba@kernel.org>, Maxime Ripard <mripard@kernel.org>, Chen-Yu Tsai <wens@csie.org>, Jernej Skrabec <jernej.skrabec@siol.net>, Corentin Labbe <clabbe@baylibre.com> Subject: [PATCH net-next v2 3/5] net: stmmac: dwmac-sun8i: Use reset_control_reset Date: Tue, 16 Feb 2021 22:20:04 -0600 Message-Id: <20210217042006.54559-4-samuel@sholland.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210217042006.54559-1-samuel@sholland.org> References: <20210217042006.54559-1-samuel@sholland.org> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210216_232014_247278_6CB97960 X-CRM114-Status: GOOD ( 11.46 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: <linux-arm-kernel.lists.infradead.org> List-Unsubscribe: <http://lists.infradead.org/mailman/options/linux-arm-kernel>, <mailto:linux-arm-kernel-request@lists.infradead.org?subject=unsubscribe> List-Archive: <http://lists.infradead.org/pipermail/linux-arm-kernel/> List-Post: <mailto:linux-arm-kernel@lists.infradead.org> List-Help: <mailto:linux-arm-kernel-request@lists.infradead.org?subject=help> List-Subscribe: <http://lists.infradead.org/mailman/listinfo/linux-arm-kernel>, <mailto:linux-arm-kernel-request@lists.infradead.org?subject=subscribe> Cc: Ondrej Jirman <megous@megous.com>, Samuel Holland <samuel@sholland.org>, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, linux-sunxi@googlegroups.com, linux-arm-kernel@lists.infradead.org Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" <linux-arm-kernel-bounces@lists.infradead.org> Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org |
Series |
dwmac-sun8i cleanup and shutdown hook
|
expand
|
diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-sun8i.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-sun8i.c index 3c3d0b99d3e8c..b61f442ed3033 100644 --- a/drivers/net/ethernet/stmicro/stmmac/dwmac-sun8i.c +++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-sun8i.c @@ -805,12 +805,12 @@ static int sun8i_dwmac_power_internal_phy(struct stmmac_priv *priv) /* Make sure the EPHY is properly reseted, as U-Boot may leave * it at deasserted state, and thus it may fail to reset EMAC. + * + * This assumes the driver has exclusive access to the EPHY reset. */ - reset_control_assert(gmac->rst_ephy); - - ret = reset_control_deassert(gmac->rst_ephy); + ret = reset_control_reset(gmac->rst_ephy); if (ret) { - dev_err(priv->device, "Cannot deassert internal phy\n"); + dev_err(priv->device, "Cannot reset internal PHY\n"); clk_disable_unprepare(gmac->ephy_clk); return ret; }