From patchwork Fri Sep 15 14:04:04 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Romain Izard X-Patchwork-Id: 814308 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.infradead.org (client-ip=65.50.211.133; helo=bombadil.infradead.org; envelope-from=linux-mtd-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="mZDW4hDq"; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="A6B2EtRF"; dkim-atps=neutral Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3xtyP20Ny0z9s0Z for ; Sat, 16 Sep 2017 00:25:42 +1000 (AEST) 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=soS9/y1xR5kCxM5cAsW3gzxv04FGYoivJOQGwcqiKTI=; b=mZDW4hDqWri0XTMOOkHvYzu8ai t9ixTJmCskvgcgXlMa2jaj/iUTe8Kia36RnbFo3TuAWqdyOhDOFnw0Q/lVyoeXFi7TxWZIk9KFxQ0 Yb8/YEQAjzBRyNkq/wkS0i/suyenP7ZBAmlwRacY3gQLo4zJqfOLFHwQfkUvucmDcOzMdnMmu13Xy GbZ+robLf1kxNgQdtPEnjZ49MxJoAK2VHqZDQZWZX4Myl5A4cZPoAcd0aLqmTmL5vKObw1Dq4H9V2 LgrD4/+miDe2ibUQYxOivrVrs5jftkHzT8Cg5+XGz9d6EB7Nom7uteY+BYJ4l+RD8nGlIcTd7IhaR VTRu4QVg==; 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 1dsrYp-0001TS-Ja; Fri, 15 Sep 2017 14:25:39 +0000 Received: from mail-wm0-x241.google.com ([2a00:1450:400c:c09::241]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1dsrF3-0003n0-Li; Fri, 15 Sep 2017 14:05:18 +0000 Received: by mail-wm0-x241.google.com with SMTP id i131so2898660wma.1; Fri, 15 Sep 2017 07:04:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=d2QPQyjMsXWSkJdc6MMuWv4m8CSK75I6LdWz80n+/Ss=; b=A6B2EtRFbbGmJntQM3/J5U2AOEYnWzhULhQGdWDo2Q59QYVhbMquu23ZQ37xcJZisW 4DsUhgwDclx3vc3d5FQcbDCbgsjxT4FIpdisQLpkWLw7/0U9uvGQjuMxTXS9BsK9SitL fR66liVy6ftVlmz6ejuhq4QeHaDLtwTILnZ6sxtvkjd02zUK0NNXHI2YUu/jKBI/ocJc XKQF/AWb0+Yfhw63xgJM+bICkXmahdnTyDfDaLRq4EOTVC+4vSDl1DxKb/1QDhBSpKk/ X44scVjApUaGqGDkvfV1OEHmLe448hVezH3+/dCya96apgw4SQZXmejbCHogAN0fKqYU 9Ftg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=d2QPQyjMsXWSkJdc6MMuWv4m8CSK75I6LdWz80n+/Ss=; b=ZcRQSw+GD7sMSZQUqKFbZ9GhmJgfi1+68ZtDl6GFgWT6U/H7Ik5xeCT2/KjXcLlBhZ QQhoH5d5aJB+D9Gw13WoO+00ncb8hxMYft7/S5t1BztU1k/9eaaTEqje3XeAVD9diZv5 985aURgOImpW7R0s8En0S5KgzA3/dt4KlH0QCUnwU7R+zRmOd/5zxuvAKhau5CjpLpb3 V8Yvd4SPN/1bLNT55ZHpsBPHxdM/GaJdO5XdYQ2DAxtqvrCuIcI5BXwPH6k6NMHcSPYK C4ZMqQOkgfIZmDlUZjEjkJOPDQSmGhMHyqMHGlZk00ZvZTBA0Bk4iABMVwS4CTWUzHQ+ vNlQ== X-Gm-Message-State: AHPjjUjZf+ZEjLH7faznSuucfkI0zsJeWTisLsC/5TnAs4BRmTAvujFn bae+uQiw36xw4v9ty4AdxOQ= X-Google-Smtp-Source: AOwi7QAw+CSr7pME9R8zS3lvKdo/wRfxxEmzXMqRo3Dclpy5X5gGHIjayhRZSQ+nX2mZReHNoI2fUA== X-Received: by 10.28.187.214 with SMTP id l205mr2720447wmf.9.1505484290916; Fri, 15 Sep 2017 07:04:50 -0700 (PDT) Received: from localhost.localdomain (146.187.3.109.rev.sfr.net. [109.3.187.146]) by smtp.gmail.com with ESMTPSA id 55sm1399225wrw.60.2017.09.15.07.04.45 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 15 Sep 2017 07:04:50 -0700 (PDT) From: Romain Izard To: Nicolas Ferre , Alexandre Belloni , Boris Brezillon , Michael Turquette , Stephen Boyd , Ludovic Desroches , Wenyou Yang , Josh Wu , David Woodhouse , Brian Norris , Marek Vasut , Cyrille Pitchen , Thierry Reding , Richard Genoud , Greg Kroah-Hartman , Alan Stern Subject: [PATCH v2 2/9] clk: at91: pmc: Save SCSR during suspend Date: Fri, 15 Sep 2017 16:04:04 +0200 Message-Id: <20170915140411.31716-3-romain.izard.pro@gmail.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170915140411.31716-1-romain.izard.pro@gmail.com> References: <20170915140411.31716-1-romain.izard.pro@gmail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20170915_070514_024263_9F887C5C X-CRM114-Status: GOOD ( 10.88 ) X-Spam-Score: -2.0 (--) X-Spam-Report: SpamAssassin version 3.4.1 on bombadil.infradead.org summary: Content analysis details: (-2.0 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at http://www.dnswl.org/, no trust [2a00:1450:400c:c09:0:0:0:241 listed in] [list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (romain.izard.pro[at]gmail.com) -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain X-BeenThere: linux-mtd@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: Linux MTD discussion mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-pwm@vger.kernel.org, linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org, linux-mtd@lists.infradead.org, linux-serial@vger.kernel.org, Romain Izard , linux-clk@vger.kernel.org, linux-arm-kernel@lists.infradead.org MIME-Version: 1.0 Sender: "linux-mtd" Errors-To: linux-mtd-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org The contents of the System Clock Status Register (SCSR) needs to be restored into the System Clock Enable Register (SCER). As the bootloader will restore some clocks by itself, the issue can be missed as only the USB controller, the LCD controller, the Image Sensor controller and the programmable clocks will be impacted. Fix the obvious typo in the suspend/resume code, as the IMR register does not need to be saved twice. Signed-off-by: Romain Izard Acked-by: Nicolas Ferre --- drivers/clk/at91/pmc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/clk/at91/pmc.c b/drivers/clk/at91/pmc.c index 5c2b26de303e..07dc2861ad3f 100644 --- a/drivers/clk/at91/pmc.c +++ b/drivers/clk/at91/pmc.c @@ -86,7 +86,7 @@ static int pmc_suspend(void) { int i; - regmap_read(pmcreg, AT91_PMC_IMR, &pmc_cache.scsr); + regmap_read(pmcreg, AT91_PMC_SCSR, &pmc_cache.scsr); regmap_read(pmcreg, AT91_PMC_PCSR, &pmc_cache.pcsr0); regmap_read(pmcreg, AT91_CKGR_UCKR, &pmc_cache.uckr); regmap_read(pmcreg, AT91_CKGR_MOR, &pmc_cache.mor); @@ -129,7 +129,7 @@ static void pmc_resume(void) if (pmc_cache.pllar != tmp) pr_warn("PLLAR was not configured properly by the firmware\n"); - regmap_write(pmcreg, AT91_PMC_IMR, pmc_cache.scsr); + regmap_write(pmcreg, AT91_PMC_SCER, pmc_cache.scsr); regmap_write(pmcreg, AT91_PMC_PCER, pmc_cache.pcsr0); regmap_write(pmcreg, AT91_CKGR_UCKR, pmc_cache.uckr); regmap_write(pmcreg, AT91_CKGR_MOR, pmc_cache.mor);