From mboxrd@z Thu Jan 1 00:00:00 1970 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 837DBC432C3 for ; Tue, 3 Dec 2019 22:43:22 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 4BC822080F for ; Tue, 3 Dec 2019 22:43:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1575413002; bh=+Hz+Ao4dDcXjXczZVteRoqEv8s0WbV8i9BoU8i5d+K0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=ZZTcVtKy9MsoR9JSNI4ecctCrKp6+zRw4rc71hTa+PN3WaO1Zb1Aa77np7fszPOe3 b/Wjoz8E2+J5yEienUQ5H5/hkQ+23fZQ9PvkLvyPukOX1fO8EXrSYn43LrRR41r49u gLj03jM3J7xdJVdiWEMcCYsi+2wd9BwVdMNY0BU8= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727829AbfLCWnU (ORCPT ); Tue, 3 Dec 2019 17:43:20 -0500 Received: from mail.kernel.org ([198.145.29.99]:58666 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728782AbfLCWnR (ORCPT ); Tue, 3 Dec 2019 17:43:17 -0500 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (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 87FA920803; Tue, 3 Dec 2019 22:43:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1575412997; bh=+Hz+Ao4dDcXjXczZVteRoqEv8s0WbV8i9BoU8i5d+K0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Kkj8+zZ1566QykRn13DFei735H91C4EboQ/Jk4n5CznkUEaWyRpYcRZl/CaRls4l+ q7P60YTshAGsnj1qKw0jvFmIJzAKiv9P3ie8GIi3Mx51OS8M9g/fcuifBdcaokb0BW IyqxmDDPcBx+acJ+8VwwxWbwJV4t+YA3QkwFwjUI= 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 5.3 097/135] clk: at91: fix update bit maps on CFG_MOR write Date: Tue, 3 Dec 2019 23:35:37 +0100 Message-Id: <20191203213038.215230846@linuxfoundation.org> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191203213005.828543156@linuxfoundation.org> References: <20191203213005.828543156@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@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 @@ -156,7 +156,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;