From patchwork Mon Dec 2 10:58:09 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 180603 Delivered-To: patch@linaro.org Received: by 2002:a92:3001:0:0:0:0:0 with SMTP id x1csp5037596ile; Mon, 2 Dec 2019 02:58:27 -0800 (PST) X-Google-Smtp-Source: APXvYqz78et/p588SFSWjA5Nh8Rsh1UuFyGh7SlW2DO3S/Oo2OO0ckcjGvfISsMcbyVkCF2UFTLe X-Received: by 2002:a17:906:5256:: with SMTP id y22mr27582138ejm.192.1575284307516; Mon, 02 Dec 2019 02:58:27 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1575284307; cv=none; d=google.com; s=arc-20160816; b=fZFm9LlIrN5wy1bvH/lDPXyeSsWyaWrLRgx6B1c+OluoK9U2KLXnu/ON65d/c+0oLx 80lDInXHwIe/3i048hKEXNOhuWjV0X/PxVbbEfZYSbfwxO1uTPEGeQi2EMXWtRAZUQ+0 c2d56d7cb7G9nqgZyWKDyiTkqDZV0St1NocyhcoHdzOaYLKKSVidOwOku6L2kGtu72nL WUmbaEBhg0yegl/Nv6v92l3Z8QzzlH7JH8FCmGe72/J8I424uZwgMALvNv3Es/2/ince NfEpAWhUu88jL3Vqfu5QSKWz7J3Mip7bw8KpEAaESXqWV0ElApiWogqY4Ygm46CaXtqf Vikw== 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=aLUFa4tV4a+fQ9GWI2gwGlyZ99iH1jGRMyQougWlTfU=; b=jZCDAYQPap9rXe6jo+tb7MNrekW31lrnrZC9HvO3nx2JtYFqUN0UZUc5uI6hZlRCyy j/TBzSu6Ng5QiQKhIMv2xfSWX74Ym1HUZD7J/4eSRwaczymi0V/2PV4xgO7nP14MPhbj iIvcr0a/c+Fr/e9aQspaPnWqebtzU/Mj+Rf+BnkRjAAZH1cZ3vuMg2hAG/t8h0vfSKKd FCQ2qtzIrl7+GLGRpDWz9nRJH73CuqJ1eYXsjsTJpdgpI7uO1qYP0kJ3XHMP+b4BVw34 G8kmIM4Igc4LOzIQDpsTpLWBjETq9UGQFLz9MDc1TgWi5dxVbDLTWQZobve2wZ1BpcAF BOHg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=fbzCjX9E; 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 u9si20350729ejk.388.2019.12.02.02.58.26; Mon, 02 Dec 2019 02:58:27 -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=fbzCjX9E; 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 S1727326AbfLBK6X (ORCPT + 15 others); Mon, 2 Dec 2019 05:58:23 -0500 Received: from mail-wm1-f67.google.com ([209.85.128.67]:36453 "EHLO mail-wm1-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727308AbfLBK6X (ORCPT ); Mon, 2 Dec 2019 05:58:23 -0500 Received: by mail-wm1-f67.google.com with SMTP id p17so16812809wma.1 for ; Mon, 02 Dec 2019 02:58:22 -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=aLUFa4tV4a+fQ9GWI2gwGlyZ99iH1jGRMyQougWlTfU=; b=fbzCjX9ETrtu9GZJ96GFRdJq05dUYLMJjU1QoWRxg3lIUuSQJ0DfpbmLvA+BYoVUrD s63xS11NUt+9hCKAkRlbHAqN1WzRAoDOiSb+xnqixsEcy0wUVhasE8oL4T1VEHYAOeqy UBQucjlYBAnhUH3Q+gctpbhbe2zbNFTk8AU5YeMMZ7Y7HLzO40PMEoz6IDjwTkKkG4dV Tf2pEFIzvlGi+XN/3sIcExiRlXC9U/V4p4kmssMhkHAcPIOh+Vikj6wqTiRINuFbQuJH hs1gkK12CDteOMTIGtdjfD1Fd+gWiYI+6cYwoEleftiUJORRZNP3IKp2f4YANlZ1t+DH Nqaw== 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=aLUFa4tV4a+fQ9GWI2gwGlyZ99iH1jGRMyQougWlTfU=; b=jnHRYe77NAPLqJEHbSDWvy5Q9m/3ze0qdbVWoOk+6DBxCN8+NwmH3aq1CNJl7OIaoz X1saP3w89OpLGLerMvUu/93y/4U5hl89IC1MDMbrvwZxnb5jC8BL30JWyh8aNWsfzanK +fPRcsueAbRjIadJaTpaQl8QiUn4uwpw3OY3f1gkdCDyzTjblFX5r4yYVKSHDFOPIo1b 6c1EZLEpgCQD5/e8GRu3V01Od/c2MDElpY9gOvYwMvE28xbvwQQATTJMzLAEs4qdGJjF C4cnHHJwtaWmFdpOnmEx7fIwYoZ7+TyA37D6MgRVfx0RgVz7OhQ6q6lTt7CdWPYNH40h y0TA== X-Gm-Message-State: APjAAAXLQa1ue1HS15ziDp0LuJJXrDoEeMpnJC0aMHJYx1WqVtbZX3TX +hScj3Qy/bnP8AWvAsVE7Ul4PobjsLs= X-Received: by 2002:a7b:c357:: with SMTP id l23mr27570863wmj.152.1575284301707; Mon, 02 Dec 2019 02:58:21 -0800 (PST) Received: from localhost.localdomain ([2.27.35.155]) by smtp.gmail.com with ESMTPSA id k19sm5766121wmi.42.2019.12.02.02.58.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 02 Dec 2019 02:58:21 -0800 (PST) From: Lee Jones To: stable@vger.kernel.org Subject: [PATCH 5.3 1/1] clk: at91: fix update bit maps on CFG_MOR write Date: Mon, 2 Dec 2019 10:58:09 +0000 Message-Id: <20191202105809.4227-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 311cea0c3ae2..87083b3a2769 100644 --- a/drivers/clk/at91/clk-main.c +++ b/drivers/clk/at91/clk-main.c @@ -156,7 +156,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;