From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: 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=-13.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 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 9CB00C433E0 for ; Tue, 23 Feb 2021 09:23:54 +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 88CC864E02 for ; Tue, 23 Feb 2021 09:23:53 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 88CC864E02 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=sntech.de Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-rockchip-bounces+linux-rockchip=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=dy41aNC1FjhVZeVLKMoTblTi3Pl9//tk+4IsVXMjIcU=; b=SRgAstJGXpqQvarIaMfb1i66J 5U0JKLAwACvqMBf02iHdh9z9Rc6jaoBG9WQzA+OQqKFRf+grjxnitf3LJZa4agiO/zKNDux3mIV/3 RFnkAc/IwRvXqy2nngX+d2fnOPJDywgVUYvtHAaksUkAkJYdOtJJNkoELHcOnjBVMpKgoy0GqtX5W L1P/u+6rgfkb9UmYCZFUUaxQiOrtOk6vAKh7J5X9Kf/A5tW1GhahtyoFt8T040JIg43IE3WAiliQ+ V+IbU556RRf+yO1WXpeSFnZLNnSxpGIuIFIKzWZRejhqDOlqvjadH9ND2DImB8Tb2RG55/tdWGNaS gshpxABkg==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1lETBH-0008W9-Pg; Tue, 23 Feb 2021 08:36:31 +0000 Received: from gloria.sntech.de ([185.11.138.130]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1lETBF-0008Vl-6B for linux-rockchip@lists.infradead.org; Tue, 23 Feb 2021 08:36:30 +0000 Received: from ip5f5aa64a.dynamic.kabel-deutschland.de ([95.90.166.74] helo=diego.localnet) by gloria.sntech.de with esmtpsa (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1lETB7-0007rd-72; Tue, 23 Feb 2021 09:36:21 +0100 From: Heiko =?ISO-8859-1?Q?St=FCbner?= To: linus.walleij@linaro.org, Jianqun Xu Subject: Re: [PATCH] pinctrl: rockchip: fix restore error in resume Date: Tue, 23 Feb 2021 09:36:20 +0100 Message-ID: <30831879.43St1lv6Oq@diego> In-Reply-To: <20210223064807.121358-1-jay.xu@rock-chips.com> References: <20210223064807.121358-1-jay.xu@rock-chips.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210223_033629_262918_78B02AA0 X-CRM114-Status: GOOD ( 17.28 ) X-BeenThere: linux-rockchip@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Upstream kernel work for Rockchip platforms List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-gpio@vger.kernel.org, Jianqun Xu , Wang Panzhenzhuan , linux-rockchip@lists.infradead.org Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "Linux-rockchip" Errors-To: linux-rockchip-bounces+linux-rockchip=archiver.kernel.org@lists.infradead.org Am Dienstag, 23. Februar 2021, 07:48:07 CET schrieb Jianqun Xu: > From: Wang Panzhenzhuan > > The restore in resume should match to suspend which only set for RK3288 > SoCs pinctrl. > > Fixes: 8dca933127024 ("pinctrl: rockchip: save and restore gpio6_c6 pinmux in suspend/resume") > Reviewed-by: Jianqun Xu > Signed-off-by: Wang Panzhenzhuan > Signed-off-by: Jianqun Xu Very good catch. Writing something to that register even on non-rk3288 socs probably can cause strange effects. Reviewed-by: Heiko Stuebner > --- > drivers/pinctrl/pinctrl-rockchip.c | 13 ++++++++----- > 1 file changed, 8 insertions(+), 5 deletions(-) > > diff --git a/drivers/pinctrl/pinctrl-rockchip.c b/drivers/pinctrl/pinctrl-rockchip.c > index aa1a1c850d05..53a0badc6b03 100644 > --- a/drivers/pinctrl/pinctrl-rockchip.c > +++ b/drivers/pinctrl/pinctrl-rockchip.c > @@ -3727,12 +3727,15 @@ static int __maybe_unused rockchip_pinctrl_suspend(struct device *dev) > static int __maybe_unused rockchip_pinctrl_resume(struct device *dev) > { > struct rockchip_pinctrl *info = dev_get_drvdata(dev); > - int ret = regmap_write(info->regmap_base, RK3288_GRF_GPIO6C_IOMUX, > - rk3288_grf_gpio6c_iomux | > - GPIO6C6_SEL_WRITE_ENABLE); > + int ret; > > - if (ret) > - return ret; > + if (info->ctrl->type == RK3288) { > + ret = regmap_write(info->regmap_base, RK3288_GRF_GPIO6C_IOMUX, > + rk3288_grf_gpio6c_iomux | > + GPIO6C6_SEL_WRITE_ENABLE); > + if (ret) > + return ret; > + } > > return pinctrl_force_default(info->pctl_dev); > } > _______________________________________________ Linux-rockchip mailing list Linux-rockchip@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-rockchip