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=-8.5 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, USER_AGENT_SANE_1 autolearn=unavailable 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 9E653ECDE20 for ; Wed, 11 Sep 2019 12:21:44 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 80724206A1 for ; Wed, 11 Sep 2019 12:21:44 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727834AbfIKMVn (ORCPT ); Wed, 11 Sep 2019 08:21:43 -0400 Received: from relay9-d.mail.gandi.net ([217.70.183.199]:33641 "EHLO relay9-d.mail.gandi.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726341AbfIKMVn (ORCPT ); Wed, 11 Sep 2019 08:21:43 -0400 X-Originating-IP: 148.69.85.38 Received: from localhost (unknown [148.69.85.38]) (Authenticated sender: alexandre.belloni@bootlin.com) by relay9-d.mail.gandi.net (Postfix) with ESMTPSA id 95794FF810; Wed, 11 Sep 2019 12:21:40 +0000 (UTC) Date: Wed, 11 Sep 2019 14:21:37 +0200 From: Alexandre Belloni To: Eugen.Hristev@microchip.com Cc: mturquette@baylibre.com, sboyd@kernel.org, linux-clk@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Nicolas.Ferre@microchip.com, Ludovic.Desroches@microchip.com Subject: Re: [PATCH 2/2] clk: at91: select parent if main oscillator or bypass is enabled Message-ID: <20190911122137.GM21254@piout.net> References: <1568042692-11784-1-git-send-email-eugen.hristev@microchip.com> <1568042692-11784-2-git-send-email-eugen.hristev@microchip.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1568042692-11784-2-git-send-email-eugen.hristev@microchip.com> User-Agent: Mutt/1.12.1 (2019-06-15) Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 09/09/2019 15:30:34+0000, Eugen.Hristev@microchip.com wrote: > From: Eugen Hristev > > Selecting the right parent for the main clock is done using only > main oscillator enabled bit. > In case we have this oscillator bypassed by an external signal (no driving > on the XOUT line), we still use external clock, but with BYPASS bit set. > So, in this case we must select the same parent as before. > Create a macro that will select the right parent considering both bits from > the MOR register. > Use this macro when looking for the right parent. > > Signed-off-by: Eugen Hristev Acked-by: Alexandre Belloni > --- > drivers/clk/at91/clk-main.c | 10 +++++++--- > 1 file changed, 7 insertions(+), 3 deletions(-) > > diff --git a/drivers/clk/at91/clk-main.c b/drivers/clk/at91/clk-main.c > index ebe9b99..87083b3 100644 > --- a/drivers/clk/at91/clk-main.c > +++ b/drivers/clk/at91/clk-main.c > @@ -21,6 +21,10 @@ > > #define MOR_KEY_MASK (0xff << 16) > > +#define clk_main_parent_select(s) (((s) & \ > + (AT91_PMC_MOSCEN | \ > + AT91_PMC_OSCBYPASS)) ? 1 : 0) > + > struct clk_main_osc { > struct clk_hw hw; > struct regmap *regmap; > @@ -113,7 +117,7 @@ static int clk_main_osc_is_prepared(struct clk_hw *hw) > > regmap_read(regmap, AT91_PMC_SR, &status); > > - return (status & AT91_PMC_MOSCS) && (tmp & AT91_PMC_MOSCEN); > + return (status & AT91_PMC_MOSCS) && clk_main_parent_select(tmp); > } > > static const struct clk_ops main_osc_ops = { > @@ -450,7 +454,7 @@ static u8 clk_sam9x5_main_get_parent(struct clk_hw *hw) > > regmap_read(clkmain->regmap, AT91_CKGR_MOR, &status); > > - return status & AT91_PMC_MOSCEN ? 1 : 0; > + return clk_main_parent_select(status); > } > > static const struct clk_ops sam9x5_main_ops = { > @@ -492,7 +496,7 @@ at91_clk_register_sam9x5_main(struct regmap *regmap, > clkmain->hw.init = &init; > clkmain->regmap = regmap; > regmap_read(clkmain->regmap, AT91_CKGR_MOR, &status); > - clkmain->parent = status & AT91_PMC_MOSCEN ? 1 : 0; > + clkmain->parent = clk_main_parent_select(status); > > hw = &clkmain->hw; > ret = clk_hw_register(NULL, &clkmain->hw); > -- > 2.7.4 > -- Alexandre Belloni, Bootlin Embedded Linux and Kernel engineering https://bootlin.com