From patchwork Mon Dec 2 10:30:36 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 180588 Delivered-To: patch@linaro.org Received: by 2002:a92:3001:0:0:0:0:0 with SMTP id x1csp5011986ile; Mon, 2 Dec 2019 02:31:06 -0800 (PST) X-Google-Smtp-Source: APXvYqwxNVZEqbSvo3Ka/cOHf2y5zCrRfuOBNKlloXJlq/SNMKmCFOdagfeV243WzGk7O708r6cS X-Received: by 2002:a50:dacd:: with SMTP id s13mr5358536edj.194.1575282665833; Mon, 02 Dec 2019 02:31:05 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1575282665; cv=none; d=google.com; s=arc-20160816; b=lzR8lvEBHM4SdEVnmiuoA4vPZI32U3aHnSdQJuqVrdCC/w3kf635Jlsjrs2MMvOEaR ZMrfpLJxU7g538OmQDtfl5bJL/Ye94EHpbCRHt/b84QZZdKMNC9VxaixlSOmClvH17tK IQQtyj+6mBemAltA6vFWpZH+GbZ56I62930k3ryBGQ0ioG/LadEKs3eQHA2BBZ+iLpr2 eUHzRvAq4OPBib3kyR2PZ3SesUzB6sTi6LxGnGzDOYlLMNvUYFpzS1jghgCQcSFIXX5f c0dnLFme5w6TVnYLeLa4M6/kAcJZxqvVgUwPsthyHAVNlp8trXRtvPL7F+ZZXYXgmJh8 oMuA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :message-id:date:subject:to:from:dkim-signature; bh=hCYfmL1/wCJrAvT+ACq87WMwGG7+rMaHvrzSdRlqSHM=; b=GWpy7cFkPZDpxdCj+xCIUts1e2421KfASATYA3N9DGqNhrvkKOQS0PLolC+JCupthC XNoTJvu6lrqnrb4fSlFG6qvsY4W8Z6FNtWB8QPkwlFnrqjboFWPUv9jlWGf8c+iXOj5L pScb/gbeb2KedJ+Okhm/vJs1E4E48QFkyZ+08Btk8tNdLThLZhvQr2U8JgDM4KgHYxNB HegOcNDmS3EnFAALJCxWDFKw4yIphQS09r5m8oYX52Uv23M6d20QV8Ik5IGb2xBt6eS5 /iID69i8TMZyPUazfcLKamitelEximz3Ez9iVz++M6GehA+KeoXw9sdqiu3ZRiNfadGS n0+Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="mD1bHEp/"; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id e21si4015152edq.191.2019.12.02.02.31.05; Mon, 02 Dec 2019 02:31:05 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="mD1bHEp/"; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727298AbfLBKbF (ORCPT + 15 others); Mon, 2 Dec 2019 05:31:05 -0500 Received: from mail-wm1-f67.google.com ([209.85.128.67]:51830 "EHLO mail-wm1-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726678AbfLBKbE (ORCPT ); Mon, 2 Dec 2019 05:31:04 -0500 Received: by mail-wm1-f67.google.com with SMTP id g206so21195963wme.1 for ; Mon, 02 Dec 2019 02:31:02 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=hCYfmL1/wCJrAvT+ACq87WMwGG7+rMaHvrzSdRlqSHM=; b=mD1bHEp/B8H6GN9AeiZIX5POlpTSpygz9avrY37hOfgPDxtmJcCUNT+CxdsiehAsu7 Bb9ltFeUR2qIG3sDitfpJ24oxFMolgOlQhen7R+m/9mOpvkdZRskty5Be+KHmUh3HuFd EQkzye6DGgLZPpstHBeT4vOkyiKPRRX8v6lAYOGqGsxm7O4gnW9YmndI49Jr0GRAiX4d YavfxdSBbuQG7C8U6Wn6tsHsN2tFKqCuy7kL7ktugJmio/7up83D4TqtVBhZrK/eufug o/mAc0nWtedg9NbGabK/8SU+bfEclnxshsE/WyJGX1+iRWxgestj65JHzaka6Mdv/j6U jDwA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=hCYfmL1/wCJrAvT+ACq87WMwGG7+rMaHvrzSdRlqSHM=; b=FVOCujS0SvKvVUVH88kGN6Zx8S6WUppWhhZNmnFT1SbGxSNulQ4BdDf9RJjMoZ0lU7 R1o6HEpGkhXJRlma4zIp/TQalLvEF1FaWxHAk65+Voiw03wqDYDBqT1tYvvQ4Xenmizc MnFkAY/7GE20Qp478Se0x0kiaDA6oWDryBitNjR+g1lO+W698B1JmwxF00mWpGe3Rqv7 hgFetNoWSz9l07qJgp+KogjtrU3dqeXIRtCJK6q49b/IlRt6ts19hS0pZpG75Sdy9rAn QHE2gCv5t5s/X/195oQ8YvEMyNMr+QifBI5NSq7rcI607D991DG2TYE9BuJy3+XXHaP/ GLhA== X-Gm-Message-State: APjAAAVJMErVMgScRjq08/iosOmjjfs4ncSIEuo3V5VXFM3U3ma+GJ4j Db59v11Lst6KpDuU7koQYrOkicTBtg0= X-Received: by 2002:a1c:e90b:: with SMTP id q11mr27102637wmc.125.1575282661938; Mon, 02 Dec 2019 02:31:01 -0800 (PST) Received: from localhost.localdomain ([2.27.35.155]) by smtp.gmail.com with ESMTPSA id r6sm26402860wrq.92.2019.12.02.02.31.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 02 Dec 2019 02:31:01 -0800 (PST) From: Lee Jones To: stable@vger.kernel.org Subject: [PATCH 4.19 01/15] clk: at91: fix update bit maps on CFG_MOR write Date: Mon, 2 Dec 2019 10:30:36 +0000 Message-Id: <20191202103050.2668-1-lee.jones@linaro.org> X-Mailer: git-send-email 2.24.0 MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Eugen Hristev [ Upstream commit 263eaf8f172d9f44e15d6aca85fe40ec18d2c477 ] The regmap update bits call was not selecting the proper mask, considering the bits which was updating. Update the mask from call to also include OSCBYPASS. Removed MOSCEN which was not updated. Fixes: 1bdf02326b71 ("clk: at91: make use of syscon/regmap internally") Signed-off-by: Eugen Hristev Link: https://lkml.kernel.org/r/1568042692-11784-1-git-send-email-eugen.hristev@microchip.com Acked-by: Alexandre Belloni Reviewed-by: Claudiu Beznea Signed-off-by: Stephen Boyd Signed-off-by: Lee Jones --- drivers/clk/at91/clk-main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.24.0 diff --git a/drivers/clk/at91/clk-main.c b/drivers/clk/at91/clk-main.c index 2f97a843d6d6..b29bc7ec2ef9 100644 --- a/drivers/clk/at91/clk-main.c +++ b/drivers/clk/at91/clk-main.c @@ -162,7 +162,7 @@ at91_clk_register_main_osc(struct regmap *regmap, if (bypass) regmap_update_bits(regmap, AT91_CKGR_MOR, MOR_KEY_MASK | - AT91_PMC_MOSCEN, + AT91_PMC_OSCBYPASS, AT91_PMC_OSCBYPASS | AT91_PMC_KEY); hw = &osc->hw;