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: 814292 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=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=linux-pwm-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; 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 vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3xtxzd1T3cz9s7m for ; Sat, 16 Sep 2017 00:07:09 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751513AbdIOOEz (ORCPT ); Fri, 15 Sep 2017 10:04:55 -0400 Received: from mail-wm0-f68.google.com ([74.125.82.68]:33654 "EHLO mail-wm0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751501AbdIOOEw (ORCPT ); Fri, 15 Sep 2017 10:04:52 -0400 Received: by mail-wm0-f68.google.com with SMTP id 187so2895423wmn.0; Fri, 15 Sep 2017 07:04:51 -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=VQsLTvfNi0hxjm3AuFD904FcRJNnfEi0ENu90BzL+EVJAjzXobkkcGT0Xp4v5OF6Rk IWbnUAoZ1wDrB2F1dTnZr5osVF7W2ULUQzWFzsNYVfFwq+i6J7l08CKldAD09n2waVdx D3iFjIxFto+8scNQ96p+lCkYtP6Et53xCLqxXjoKeyLVIJ69TlFD+82yBRqhp0O05znA f4oyRCmuMt3nDjWOwN+/zClKt6E8P8CKgwC5Xz4G0fzK8jco/xuhpZOHGJFMndQYbfF7 gBejgPx1GStaoIotoetpXWUnp2PmoL+XiCD0wFdTn6VrjYJH8a0tsaodCwbJHbFdLt5/ G5yA== X-Gm-Message-State: AHPjjUgwg2NMLlhg0nx5s/s2RFJPDcw1g7JxJAhhZlcizLRlWWqScVmT LShmIuN+uKLvKZ+tLkgY7ns= 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 Cc: linux-clk@vger.kernel.org, linux-kernel@vger.kernel.org, linux-mtd@lists.infradead.org, linux-pwm@vger.kernel.org, linux-serial@vger.kernel.org, linux-usb@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Romain Izard 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> Sender: linux-pwm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pwm@vger.kernel.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);