Linux-Clk Archive on lore.kernel.org
 help / color / Atom feed
* [PATCH 1/2] clk: at91: fix update bit maps on CFG_MOR write
@ 2019-09-09 15:30 Eugen.Hristev
  2019-09-09 15:30 ` [PATCH 2/2] clk: at91: select parent if main oscillator or bypass is enabled Eugen.Hristev
                   ` (2 more replies)
  0 siblings, 3 replies; 6+ messages in thread
From: Eugen.Hristev @ 2019-09-09 15:30 UTC (permalink / raw)
  To: mturquette, sboyd, alexandre.belloni, linux-clk,
	linux-arm-kernel, linux-kernel
  Cc: Nicolas.Ferre, Ludovic.Desroches, Eugen.Hristev

From: Eugen Hristev <eugen.hristev@microchip.com>

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 <eugen.hristev@microchip.com>
---
 drivers/clk/at91/clk-main.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/clk/at91/clk-main.c b/drivers/clk/at91/clk-main.c
index f607ee7..ebe9b99 100644
--- a/drivers/clk/at91/clk-main.c
+++ b/drivers/clk/at91/clk-main.c
@@ -152,7 +152,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;
-- 
2.7.4


^ permalink raw reply	[flat|nested] 6+ messages in thread

* [PATCH 2/2] clk: at91: select parent if main oscillator or bypass is enabled
  2019-09-09 15:30 [PATCH 1/2] clk: at91: fix update bit maps on CFG_MOR write Eugen.Hristev
@ 2019-09-09 15:30 ` Eugen.Hristev
  2019-09-11 12:21   ` Alexandre Belloni
  2019-09-16 20:15   ` Stephen Boyd
  2019-09-10 15:16 ` [PATCH 1/2] clk: at91: fix update bit maps on CFG_MOR write Alexandre Belloni
  2019-09-16 20:15 ` Stephen Boyd
  2 siblings, 2 replies; 6+ messages in thread
From: Eugen.Hristev @ 2019-09-09 15:30 UTC (permalink / raw)
  To: mturquette, sboyd, alexandre.belloni, linux-clk,
	linux-arm-kernel, linux-kernel
  Cc: Nicolas.Ferre, Ludovic.Desroches, Eugen.Hristev

From: Eugen Hristev <eugen.hristev@microchip.com>

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 <eugen.hristev@microchip.com>
---
 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


^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [PATCH 1/2] clk: at91: fix update bit maps on CFG_MOR write
  2019-09-09 15:30 [PATCH 1/2] clk: at91: fix update bit maps on CFG_MOR write Eugen.Hristev
  2019-09-09 15:30 ` [PATCH 2/2] clk: at91: select parent if main oscillator or bypass is enabled Eugen.Hristev
@ 2019-09-10 15:16 ` Alexandre Belloni
  2019-09-16 20:15 ` Stephen Boyd
  2 siblings, 0 replies; 6+ messages in thread
From: Alexandre Belloni @ 2019-09-10 15:16 UTC (permalink / raw)
  To: Eugen.Hristev
  Cc: mturquette, sboyd, linux-clk, linux-arm-kernel, linux-kernel,
	Nicolas.Ferre, Ludovic.Desroches

On 09/09/2019 15:30:31+0000, Eugen.Hristev@microchip.com wrote:
> From: Eugen Hristev <eugen.hristev@microchip.com>
> 
> 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 <eugen.hristev@microchip.com>
Acked-by: Alexandre Belloni <alexandre.belloni@bootlin.com>

> ---
>  drivers/clk/at91/clk-main.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/clk/at91/clk-main.c b/drivers/clk/at91/clk-main.c
> index f607ee7..ebe9b99 100644
> --- a/drivers/clk/at91/clk-main.c
> +++ b/drivers/clk/at91/clk-main.c
> @@ -152,7 +152,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;
> -- 
> 2.7.4
> 

-- 
Alexandre Belloni, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [PATCH 2/2] clk: at91: select parent if main oscillator or bypass is enabled
  2019-09-09 15:30 ` [PATCH 2/2] clk: at91: select parent if main oscillator or bypass is enabled Eugen.Hristev
@ 2019-09-11 12:21   ` Alexandre Belloni
  2019-09-16 20:15   ` Stephen Boyd
  1 sibling, 0 replies; 6+ messages in thread
From: Alexandre Belloni @ 2019-09-11 12:21 UTC (permalink / raw)
  To: Eugen.Hristev
  Cc: mturquette, sboyd, linux-clk, linux-arm-kernel, linux-kernel,
	Nicolas.Ferre, Ludovic.Desroches

On 09/09/2019 15:30:34+0000, Eugen.Hristev@microchip.com wrote:
> From: Eugen Hristev <eugen.hristev@microchip.com>
> 
> 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 <eugen.hristev@microchip.com>
Acked-by: Alexandre Belloni <alexandre.belloni@bootlin.com>

> ---
>  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

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [PATCH 1/2] clk: at91: fix update bit maps on CFG_MOR write
  2019-09-09 15:30 [PATCH 1/2] clk: at91: fix update bit maps on CFG_MOR write Eugen.Hristev
  2019-09-09 15:30 ` [PATCH 2/2] clk: at91: select parent if main oscillator or bypass is enabled Eugen.Hristev
  2019-09-10 15:16 ` [PATCH 1/2] clk: at91: fix update bit maps on CFG_MOR write Alexandre Belloni
@ 2019-09-16 20:15 ` Stephen Boyd
  2 siblings, 0 replies; 6+ messages in thread
From: Stephen Boyd @ 2019-09-16 20:15 UTC (permalink / raw)
  To: Eugen.Hristev, alexandre.belloni, linux-arm-kernel, linux-clk,
	linux-kernel, mturquette
  Cc: Nicolas.Ferre, Ludovic.Desroches, Eugen.Hristev

Quoting Eugen.Hristev@microchip.com (2019-09-09 08:30:31)
> From: Eugen Hristev <eugen.hristev@microchip.com>
> 
> 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 <eugen.hristev@microchip.com>
> ---

Applied to clk-next


^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [PATCH 2/2] clk: at91: select parent if main oscillator or bypass is enabled
  2019-09-09 15:30 ` [PATCH 2/2] clk: at91: select parent if main oscillator or bypass is enabled Eugen.Hristev
  2019-09-11 12:21   ` Alexandre Belloni
@ 2019-09-16 20:15   ` Stephen Boyd
  1 sibling, 0 replies; 6+ messages in thread
From: Stephen Boyd @ 2019-09-16 20:15 UTC (permalink / raw)
  To: Eugen.Hristev, alexandre.belloni, linux-arm-kernel, linux-clk,
	linux-kernel, mturquette
  Cc: Nicolas.Ferre, Ludovic.Desroches, Eugen.Hristev

Quoting Eugen.Hristev@microchip.com (2019-09-09 08:30:34)
> From: Eugen Hristev <eugen.hristev@microchip.com>
> 
> 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 <eugen.hristev@microchip.com>
> ---

Applied to clk-next


^ permalink raw reply	[flat|nested] 6+ messages in thread

end of thread, back to index

Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-09-09 15:30 [PATCH 1/2] clk: at91: fix update bit maps on CFG_MOR write Eugen.Hristev
2019-09-09 15:30 ` [PATCH 2/2] clk: at91: select parent if main oscillator or bypass is enabled Eugen.Hristev
2019-09-11 12:21   ` Alexandre Belloni
2019-09-16 20:15   ` Stephen Boyd
2019-09-10 15:16 ` [PATCH 1/2] clk: at91: fix update bit maps on CFG_MOR write Alexandre Belloni
2019-09-16 20:15 ` Stephen Boyd

Linux-Clk Archive on lore.kernel.org

Archives are clonable:
	git clone --mirror https://lore.kernel.org/linux-clk/0 linux-clk/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 linux-clk linux-clk/ https://lore.kernel.org/linux-clk \
		linux-clk@vger.kernel.org linux-clk@archiver.kernel.org
	public-inbox-index linux-clk


Newsgroup available over NNTP:
	nntp://nntp.lore.kernel.org/org.kernel.vger.linux-clk


AGPL code for this site: git clone https://public-inbox.org/ public-inbox