From patchwork Wed Jul 19 15:26:02 2017
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Philipp Zabel
X-Patchwork-Id: 9852469
Return-Path:
Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org
[172.30.200.125])
by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id
9A42D602C8 for ;
Wed, 19 Jul 2017 15:31:21 +0000 (UTC)
Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1])
by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7E00D286E1
for ;
Wed, 19 Jul 2017 15:31:21 +0000 (UTC)
Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486)
id 7C349285DD; Wed, 19 Jul 2017 15:31:21 +0000 (UTC)
X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on
pdx-wl-mail.web.codeaurora.org
X-Spam-Level:
X-Spam-Status: No, score=-1.9 required=2.0 tests=BAYES_00,DKIM_SIGNED,
DKIM_VALID autolearn=ham version=3.3.1
Received: from bombadil.infradead.org (bombadil.infradead.org
[65.50.211.133])
(using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits))
(No client certificate requested)
by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 52FE0286F8
for ;
Wed, 19 Jul 2017 15:30:57 +0000 (UTC)
DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed;
d=lists.infradead.org; s=bombadil.20170209; h=Sender:
Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe:
List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id: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=guXWf8lAiSyphuVKQpjzZWPWN2zSzV5NuUPdkLlkCRQ=;
b=WUKFslEuKvN2MKoq5Vgx7/NL+s
87KUOqbBZ3uNIbv2+6+Q/A/3Z+c03LiUENSEMhtpwcyHep4sQDodVHFAv1Apnhwv5yYyNJ7Rz1k3y
ziSYuLQywuZYzlFnbmNGUqZr2X0IhVxJNzBO3M+BUJaT1/3NK6j6G2nwaLK0VDSaVE7LfhTDwH8te
SrIMsR/qPcLFnac4F9mnfdDKiPXfMeu4E25hwObx6IPK1bMryZ+KpbsidzvblUouLri14Lgk7u5qr
KSXkEQ+rL2PcgHkyHfxI4HXhhGB0mTVYUSy0j/XslNimwywgXSUoPsUOAoTjUK51FJ/SC5JQzOLkP
wBoI5+Lw==;
Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org)
by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux))
id 1dXqwC-0003mu-EA; Wed, 19 Jul 2017 15:30:56 +0000
Received: from metis.ext.pengutronix.de
([2001:67c:670:201:290:27ff:fe1d:cc33])
by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux))
id 1dXqux-0001L4-Te for linux-rockchip@lists.infradead.org;
Wed, 19 Jul 2017 15:29:46 +0000
Received: from dude.hi.pengutronix.de ([2001:67c:670:100:1d::7]
helo=dude.pengutronix.de.)
by metis.ext.pengutronix.de with esmtp (Exim 4.84_2)
(envelope-from )
id 1dXquf-0001si-Hq; Wed, 19 Jul 2017 17:29:21 +0200
From: Philipp Zabel
To: linux-kernel@vger.kernel.org
Subject: [PATCH 058/102] phy: rockchip-pcie: explicitly request exclusive
reset control
Date: Wed, 19 Jul 2017 17:26:02 +0200
Message-Id: <20170719152646.25903-59-p.zabel@pengutronix.de>
X-Mailer: git-send-email 2.11.0
In-Reply-To: <20170719152646.25903-1-p.zabel@pengutronix.de>
References: <20170719152646.25903-1-p.zabel@pengutronix.de>
X-SA-Exim-Connect-IP: 2001:67c:670:100:1d::7
X-SA-Exim-Mail-From: p.zabel@pengutronix.de
X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de);
SAEximRunCond expanded to false
X-PTX-Original-Recipient: linux-rockchip@lists.infradead.org
X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3
X-CRM114-CacheID: sfid-20170719_082940_578096_F9D245A9
X-CRM114-Status: UNSURE ( 8.68 )
X-CRM114-Notice: Please train this message.
X-BeenThere: linux-rockchip@lists.infradead.org
X-Mailman-Version: 2.1.21
Precedence: list
List-Id: Upstream kernel work for Rockchip platforms
List-Unsubscribe: ,
List-Archive:
List-Post:
List-Help:
List-Subscribe: ,
Cc: linux-rockchip@lists.infradead.org, Heiko Stuebner ,
Philipp Zabel ,
Kishon Vijay Abraham I
MIME-Version: 1.0
Sender: "Linux-rockchip"
Errors-To:
linux-rockchip-bounces+patchwork-linux-rockchip=patchwork.kernel.org@lists.infradead.org
X-Virus-Scanned: ClamAV using ClamSMTP
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: Kishon Vijay Abraham I
Cc: Heiko Stuebner
Cc: linux-rockchip@lists.infradead.org
Signed-off-by: Philipp Zabel
Reviewed-by: Shawn Lin
---
drivers/phy/rockchip/phy-rockchip-pcie.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/phy/rockchip/phy-rockchip-pcie.c b/drivers/phy/rockchip/phy-rockchip-pcie.c
index 6904633cad687..258220b7f481c 100644
--- a/drivers/phy/rockchip/phy-rockchip-pcie.c
+++ b/drivers/phy/rockchip/phy-rockchip-pcie.c
@@ -305,7 +305,7 @@ static int rockchip_pcie_phy_probe(struct platform_device *pdev)
rk_phy->phy_data = (struct rockchip_pcie_data *)of_id->data;
rk_phy->reg_base = grf;
- rk_phy->phy_rst = devm_reset_control_get(dev, "phy");
+ rk_phy->phy_rst = devm_reset_control_get_exclusive(dev, "phy");
if (IS_ERR(rk_phy->phy_rst)) {
if (PTR_ERR(rk_phy->phy_rst) != -EPROBE_DEFER)
dev_err(dev,