From patchwork Wed Jul 19 15:26:26 2017
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Philipp Zabel
X-Patchwork-Id: 9852597
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
E5C6960388 for ;
Wed, 19 Jul 2017 15:45:32 +0000 (UTC)
Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1])
by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D66E427FA6
for ;
Wed, 19 Jul 2017 15:45:32 +0000 (UTC)
Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486)
id CB97F28655; Wed, 19 Jul 2017 15:45:32 +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 8B42927FA6
for ;
Wed, 19 Jul 2017 15:45:31 +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=Ha/7CGC1/8GG2EbvmpuOWc9MD5jPycXiCY3o50FVUXU=;
b=vATyyQTdahvyxuo5jRXXd/KoCc
rj1zd4hO+r8ov79hG9F+g3iowPcS9HmPKTkrlbC6wZCpdFH96z3gICbZbUYB4FMr1EZSPH0FIEktH
xuP+KC6WkqPurZFjvOWtuuHtzVz0Xkl1U+2uiCm8TIQuJ9rs7O8P793IXrEsv1/0jHIWQuu8SCwjt
8TbfErmd3oPskxA7TDH6FGDW675LK9LhhZ0HuUQh6ggn8IxLL82yifCIMCBdZ/4/QOhx0UGJerL4e
mUxed8ob40tYnmBf1HtYHm2kvGy1OJNeQHprq6bcuNPp6wZ/rGez1ZcKOcpw2kGmMz+JyEyc9wTxP
BkvE0aWQ==;
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 1dXrAI-0005ph-8V; Wed, 19 Jul 2017 15:45:30 +0000
Received: from casper.infradead.org ([2001:8b0:10b:1236::1])
by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux))
id 1dXr9k-0003Xq-7x for linux-rockchip@bombadil.infradead.org;
Wed, 19 Jul 2017 15:44:56 +0000
DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed;
d=infradead.org; s=casper.20170209;
h=References:In-Reply-To:Message-Id:Date:
Subject:Cc:To:From:Sender:Reply-To:MIME-Version:Content-Type:
Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date:
Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id:
List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive;
bh=zPqIETJcmULfgmJMo4qaFQHe4mBmdCAxAiPgX6kN10E=;
b=op06ZzerjPulaG/ycGiJOcIi2
p3XWcpaOWe25vCeoOaR/FXe6h5aWliiEWtbzDjVbjqgmZYatFq+XNTdXi4rRs9cGRZR5uilHJokBy
g08Z6OgQTvpOuwmNSvbmtai327LSKENewv4dEc6g8WBPcKmapd+RcDw2QNqv/YmT+amOHNH2W2tNX
PNm6BFjyLNpcsgOWeJWesIWlHw/1Gh329QFcTjUzvDrPk+owGErN2yWc4TL7M/We1bWmImt88xMFz
ZMVyid/ehLEkAABs6sPc1MdguWupMCSorZYSYhMmuknpEG9l/oQbjWV+82zcDl09gf9VctBju1VTL
w3F1MR0tA==;
Received: from metis.ext.pengutronix.de
([2001:67c:670:201:290:27ff:fe1d:cc33])
by casper.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux))
id 1dXqvW-0003pZ-Ap for linux-rockchip@lists.infradead.org;
Wed, 19 Jul 2017 15:30:15 +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 1dXqv6-0001si-U5; Wed, 19 Jul 2017 17:29:48 +0200
From: Philipp Zabel
To: linux-kernel@vger.kernel.org
Subject: [PATCH 082/102] thermal: rockchip: explicitly request exclusive
reset control
Date: Wed, 19 Jul 2017 17:26:26 +0200
Message-Id: <20170719152646.25903-83-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_163014_397115_778ED504
X-CRM114-Status: GOOD ( 10.33 )
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: Heiko Stuebner , linux-pm@vger.kernel.org,
Eduardo Valentin ,
linux-rockchip@lists.infradead.org,
Philipp Zabel , Zhang Rui
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: Zhang Rui
Cc: Eduardo Valentin
Cc: Heiko Stuebner
Cc: linux-pm@vger.kernel.org
Cc: linux-rockchip@lists.infradead.org
Signed-off-by: Philipp Zabel
---
drivers/thermal/rockchip_thermal.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/drivers/thermal/rockchip_thermal.c b/drivers/thermal/rockchip_thermal.c
index 4c77965124535..7ca53a4368124 100644
--- a/drivers/thermal/rockchip_thermal.c
+++ b/drivers/thermal/rockchip_thermal.c
@@ -1088,7 +1088,8 @@ static int rockchip_thermal_probe(struct platform_device *pdev)
if (IS_ERR(thermal->regs))
return PTR_ERR(thermal->regs);
- thermal->reset = devm_reset_control_get(&pdev->dev, "tsadc-apb");
+ thermal->reset = devm_reset_control_get_exclusive(&pdev->dev,
+ "tsadc-apb");
if (IS_ERR(thermal->reset)) {
error = PTR_ERR(thermal->reset);
dev_err(&pdev->dev, "failed to get tsadc reset: %d\n", error);