Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id B2141C43603 for ; Wed, 4 Dec 2019 18:07:22 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 688102084B for ; Wed, 4 Dec 2019 18:07:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1575482842; bh=Nf0DVFVuptbAyQMUFY7AZ2jp/QtCcsFowue809GM62E=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=u6axpF2KxpxOL6HKUu6y8hIvaO88/AvjaAacoqbZdfC3W1fh4H0ukZgwXZEGAyfhJ b67VAF2oqpuYoPtfgpAJWzZM7O3kFmsoU7XRSH9rHzj7P1w8hwmO74AQOsGQ+oLm2W 8ibJATnlfOlIInMfKg/vbrt/N8cpHvKCaGd8BmkM= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730741AbfLDSHV (ORCPT ); Wed, 4 Dec 2019 13:07:21 -0500 Received: from mail.kernel.org ([198.145.29.99]:57036 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728812AbfLDSHU (ORCPT ); Wed, 4 Dec 2019 13:07:20 -0500 Received: from localhost (unknown [217.68.49.72]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 3A04420674; Wed, 4 Dec 2019 18:07:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1575482839; bh=Nf0DVFVuptbAyQMUFY7AZ2jp/QtCcsFowue809GM62E=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ZwdvSzBpxPrqF52e3BmzvYIhsDtoULoG3p4CVnseW9BDLGTmeOuwtuagz3dFYQCsy M71WU6D4EPC/ULVDRN+u+O8OHd7p2UJlwZ33tjkmOqQb8QAjpH3nGLhVFmIaHI/ZSb +CuIgiFlhML3B9HkdS4zFUJnR5fcVIi4sOzEtjQk= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Eugen Hristev , Alexandre Belloni , Claudiu Beznea , Stephen Boyd , Lee Jones Subject: [PATCH 4.14 156/209] clk: at91: fix update bit maps on CFG_MOR write Date: Wed, 4 Dec 2019 18:56:08 +0100 Message-Id: <20191204175334.223122318@linuxfoundation.org> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191204175321.609072813@linuxfoundation.org> References: <20191204175321.609072813@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Eugen Hristev commit 263eaf8f172d9f44e15d6aca85fe40ec18d2c477 upstream. 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 Signed-off-by: Greg Kroah-Hartman --- drivers/clk/at91/clk-main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- 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 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;