Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751997AbdHCVoD (ORCPT ); Thu, 3 Aug 2017 17:44:03 -0400 Received: from mail.kernel.org ([198.145.29.99]:45866 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751754AbdHCVoC (ORCPT ); Thu, 3 Aug 2017 17:44:02 -0400 DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 8C2C522B5D Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=kernel.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=helgaas@kernel.org Date: Thu, 3 Aug 2017 16:43:59 -0500 From: Bjorn Helgaas To: Philipp Zabel Cc: linux-kernel@vger.kernel.org, Shawn Lin , Bjorn Helgaas , Heiko Stuebner , linux-pci@vger.kernel.org, linux-rockchip@lists.infradead.org Subject: Re: [PATCH 054/102] PCI: rockchip: explicitly request exclusive reset control Message-ID: <20170803214359.GE20308@bhelgaas-glaptop.roam.corp.google.com> References: <20170719152646.25903-1-p.zabel@pengutronix.de> <20170719152646.25903-55-p.zabel@pengutronix.de> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20170719152646.25903-55-p.zabel@pengutronix.de> User-Agent: Mutt/1.5.21 (2010-09-15) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 3686 Lines: 87 On Wed, Jul 19, 2017 at 05:25:58PM +0200, Philipp Zabel wrote: > Commit a53e35db70d1 ("reset: Ensure drivers are explicit when requesting > reset lines") started to transition the reset control request API calls > to explicitly state whether the driver needs exclusive or shared reset > control behavior. Convert all drivers requesting exclusive resets to the > explicit API call so the temporary transition helpers can be removed. > > No functional changes. > > Cc: Shawn Lin > Cc: Bjorn Helgaas > Cc: Heiko Stuebner > Cc: linux-pci@vger.kernel.org > Cc: linux-rockchip@lists.infradead.org > Signed-off-by: Philipp Zabel Applied with Shawn's ack to pci/host-rockchip for v4.14, thanks! > --- > drivers/pci/host/pcie-rockchip.c | 15 ++++++++------- > 1 file changed, 8 insertions(+), 7 deletions(-) > > diff --git a/drivers/pci/host/pcie-rockchip.c b/drivers/pci/host/pcie-rockchip.c > index 7bb9870f6d8ce..e50d6f5a81f4b 100644 > --- a/drivers/pci/host/pcie-rockchip.c > +++ b/drivers/pci/host/pcie-rockchip.c > @@ -903,49 +903,50 @@ static int rockchip_pcie_parse_dt(struct rockchip_pcie *rockchip) > if (rockchip->link_gen < 0 || rockchip->link_gen > 2) > rockchip->link_gen = 2; > > - rockchip->core_rst = devm_reset_control_get(dev, "core"); > + rockchip->core_rst = devm_reset_control_get_exclusive(dev, "core"); > if (IS_ERR(rockchip->core_rst)) { > if (PTR_ERR(rockchip->core_rst) != -EPROBE_DEFER) > dev_err(dev, "missing core reset property in node\n"); > return PTR_ERR(rockchip->core_rst); > } > > - rockchip->mgmt_rst = devm_reset_control_get(dev, "mgmt"); > + rockchip->mgmt_rst = devm_reset_control_get_exclusive(dev, "mgmt"); > if (IS_ERR(rockchip->mgmt_rst)) { > if (PTR_ERR(rockchip->mgmt_rst) != -EPROBE_DEFER) > dev_err(dev, "missing mgmt reset property in node\n"); > return PTR_ERR(rockchip->mgmt_rst); > } > > - rockchip->mgmt_sticky_rst = devm_reset_control_get(dev, "mgmt-sticky"); > + rockchip->mgmt_sticky_rst = devm_reset_control_get_exclusive(dev, > + "mgmt-sticky"); > if (IS_ERR(rockchip->mgmt_sticky_rst)) { > if (PTR_ERR(rockchip->mgmt_sticky_rst) != -EPROBE_DEFER) > dev_err(dev, "missing mgmt-sticky reset property in node\n"); > return PTR_ERR(rockchip->mgmt_sticky_rst); > } > > - rockchip->pipe_rst = devm_reset_control_get(dev, "pipe"); > + rockchip->pipe_rst = devm_reset_control_get_exclusive(dev, "pipe"); > if (IS_ERR(rockchip->pipe_rst)) { > if (PTR_ERR(rockchip->pipe_rst) != -EPROBE_DEFER) > dev_err(dev, "missing pipe reset property in node\n"); > return PTR_ERR(rockchip->pipe_rst); > } > > - rockchip->pm_rst = devm_reset_control_get(dev, "pm"); > + rockchip->pm_rst = devm_reset_control_get_exclusive(dev, "pm"); > if (IS_ERR(rockchip->pm_rst)) { > if (PTR_ERR(rockchip->pm_rst) != -EPROBE_DEFER) > dev_err(dev, "missing pm reset property in node\n"); > return PTR_ERR(rockchip->pm_rst); > } > > - rockchip->pclk_rst = devm_reset_control_get(dev, "pclk"); > + rockchip->pclk_rst = devm_reset_control_get_exclusive(dev, "pclk"); > if (IS_ERR(rockchip->pclk_rst)) { > if (PTR_ERR(rockchip->pclk_rst) != -EPROBE_DEFER) > dev_err(dev, "missing pclk reset property in node\n"); > return PTR_ERR(rockchip->pclk_rst); > } > > - rockchip->aclk_rst = devm_reset_control_get(dev, "aclk"); > + rockchip->aclk_rst = devm_reset_control_get_exclusive(dev, "aclk"); > if (IS_ERR(rockchip->aclk_rst)) { > if (PTR_ERR(rockchip->aclk_rst) != -EPROBE_DEFER) > dev_err(dev, "missing aclk reset property in node\n"); > -- > 2.11.0 >