From patchwork Mon Dec 2 09:50:07 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 180556 Delivered-To: patch@linaro.org Received: by 2002:a92:3001:0:0:0:0:0 with SMTP id x1csp4969032ile; Mon, 2 Dec 2019 01:50:32 -0800 (PST) X-Google-Smtp-Source: APXvYqyAR+1vwqiNd3qo5z0FD475IMBWjpSs9N2jkTBx6vM8PBCZXg6yS6+YRgRcvP6XHLPasvEy X-Received: by 2002:a05:6402:17c6:: with SMTP id s6mr57380984edy.22.1575280232028; Mon, 02 Dec 2019 01:50:32 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1575280232; cv=none; d=google.com; s=arc-20160816; b=UydOfeJ+gILmmVRydPP6ZtQrAY/JJlMaPeja7YOUwWsf9hIYuv9Zx0CsuTU8UZKJz9 JP6ASc1y/5/5OlbmQeOrZG8ejwbn0fXHI4t5w4UE6eXE3n2DBPvJ23R1I8ZBStbvLdTE k3UFqKeu+cM6y90Klst86Z6e90Qe2iW8jYR2H7Erh5NT0VzvhuA2A7a+XZIBuNdr9aM0 FgIBsjfjIMwThJ8Wkp+gH2tnJQF3M6EY2hrIX7CTAAGsv7y9BDOsaDXg3cj+Qk0TpOt8 +RxJhU5pOc2hbSrPxVegMjkUGi9nkUjBHf/4WYOGsbZp7Rx48FLexsZxGlS76WDyv5aE aMug== 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=tGPM9KNZddAy0VCXmBdWEk2Vct5o9olnfbud6hnYml1EpHRUBVFNpcr4lniI2z6O+L 1Rkt5Ld2jeW2+WkLf5kLYDFA9OmXmvGpA5UdTB9clOpQst0tk68I5SKzDh/vJvXY/gpz AheYHZS+HAFyGDGPQ+1LYf/BhTEm9Y/M9qMZkQ9g2JE5JUlGBW4Bg0MjVOKfPBSy7Fex Go2MRmN1MfnC4hwcdIGrtCWIL4X58BUwLdTyxeBQyekUfpOFi13e6hk00gZB/jPBMpsM J/eEanKGVZID1rmKENx3rTs2Vl3g6ZCIZstfyFppmWLe/DptjQUKvF0v92C1Fy6w7AkL dkag== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=UGO2zcWW; 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 j29si22786482edj.327.2019.12.02.01.50.31; Mon, 02 Dec 2019 01:50:32 -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=UGO2zcWW; 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 S1726254AbfLBJub (ORCPT + 15 others); Mon, 2 Dec 2019 04:50:31 -0500 Received: from mail-wr1-f65.google.com ([209.85.221.65]:46747 "EHLO mail-wr1-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726251AbfLBJua (ORCPT ); Mon, 2 Dec 2019 04:50:30 -0500 Received: by mail-wr1-f65.google.com with SMTP id z7so39876151wrl.13 for ; Mon, 02 Dec 2019 01:50:29 -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=UGO2zcWWellV0haG6MUkR0NEECD4K4a5Ng0g8G1HjRGFICqwAKrxAqGPCciTv2Zjf0 ZoUjajmiS60wSU1b3Y8+LwSq+WknsDj9l2b44E5S2DGtvRPrcj0jT6D+65iDbwdGsx0W I0/zkrOW43P3MF2vxUtfDtZDsEXoKC7TxS2bucorGbtr5S7D0hOQieaBh5zFNUgeF2K2 paDlhDzr3o0n1drRR9ZELN1cJ0iauSb6WH7ZJkgqhN1f/SWXds4dwUarOy1wBgs10aXg 5+LYJV4aY+srPY7zlwuwv3KH1dKwf9OheJNxuRWLDESDgaXf9Kw9okXZFh2k2WRHt4nA CYCg== 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=PYZZjuWJXdGlJyacKLVkmL6xIvKcrV6HPB7aJSQLq0WmwEVdzyoPJqOpAMgbpjgTkA bZ4CAUyfNI6t4VuHkRLn0Gu+Xd24kyOZObNKWKVGexkT0G2S4WYN6vJpxgWUMzxgK7eL 7/Fq5+5B+az9sqsRs7/baZJZWesPKUBCRR0mLP5fN3qi7WJryX9dLV42FVZ2Bpswgv1i N1bw2j9Vta7hKhX7dRD246u8x/wEwgSKg7DpoGIQ5FVNvj2lEQ5ksfez6M0Ef46amdsV GE1/S/3nD916ofRguqF6nKjQ8y5zgV5sjzpW1OGvfadD5J0M0IZWw5msJX6oQYp2Us9k E8Rw== X-Gm-Message-State: APjAAAVzo4B0hLJPbBubUQMF8Eho1hgypZSjuQOIPc1amg7X7kIHGZ/k SgHPav98YE7xtf57jifECmsZ/u7rUr4= X-Received: by 2002:a5d:4d4a:: with SMTP id a10mr60894710wru.220.1575280228650; Mon, 02 Dec 2019 01:50:28 -0800 (PST) Received: from localhost.localdomain ([2.27.35.155]) by smtp.gmail.com with ESMTPSA id l3sm4629698wrt.29.2019.12.02.01.50.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 02 Dec 2019 01:50:28 -0800 (PST) From: Lee Jones To: stable@vger.kernel.org Subject: [PATCH 4.9 1/6] clk: at91: fix update bit maps on CFG_MOR write Date: Mon, 2 Dec 2019 09:50:07 +0000 Message-Id: <20191202095012.559-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;