linux-arm-kernel.lists.infradead.org archive mirror
 help / color / mirror / Atom feed
From: mturquette@linaro.org (Mike Turquette)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH v1 1/5] clk: pxa: fix pxa27x CCCR bit usage
Date: Mon, 17 Nov 2014 11:25:55 -0800	[thread overview]
Message-ID: <20141117192555.25314.18664@quantum> (raw)
In-Reply-To: <1412636881-6211-2-git-send-email-robert.jarzmik@free.fr>

Quoting Robert Jarzmik (2014-10-06 16:07:57)
> Trivial fix to check the A bit of CCCR for memory frequency
> calculations, where the shift of the bit index was missing, triggering a
> wrong calculation of memory frequency.
> 
> Signed-off-by: Robert Jarzmik <robert.jarzmik@free.fr>

Applied to clk-fixes towards -rc6.

Regards,
Mike

> ---
>  drivers/clk/pxa/clk-pxa27x.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/clk/pxa/clk-pxa27x.c b/drivers/clk/pxa/clk-pxa27x.c
> index b345cc7..88b9fe1 100644
> --- a/drivers/clk/pxa/clk-pxa27x.c
> +++ b/drivers/clk/pxa/clk-pxa27x.c
> @@ -322,7 +322,7 @@ static unsigned long clk_pxa27x_memory_get_rate(struct clk_hw *hw,
>         unsigned long ccsr = CCSR;
>  
>         osc_forced = ccsr & (1 << CCCR_CPDIS_BIT);
> -       a = cccr & CCCR_A_BIT;
> +       a = cccr & (1 << CCCR_A_BIT);
>         l  = ccsr & CCSR_L_MASK;
>  
>         if (osc_forced || a)
> @@ -341,7 +341,7 @@ static u8 clk_pxa27x_memory_get_parent(struct clk_hw *hw)
>         unsigned long ccsr = CCSR;
>  
>         osc_forced = ccsr & (1 << CCCR_CPDIS_BIT);
> -       a = cccr & CCCR_A_BIT;
> +       a = cccr & (1 << CCCR_A_BIT);
>         if (osc_forced)
>                 return PXA_MEM_13Mhz;
>         if (a)
> -- 
> 2.1.0
> 

  reply	other threads:[~2014-11-17 19:25 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-10-06 23:07 [PATCH v1 0/5] Fixes for the pxa common clocks Robert Jarzmik
2014-10-06 23:07 ` [PATCH v1 1/5] clk: pxa: fix pxa27x CCCR bit usage Robert Jarzmik
2014-11-17 19:25   ` Mike Turquette [this message]
2014-10-06 23:07 ` [PATCH v1 2/5] clk: pxa: declare init function and data __init Robert Jarzmik
2014-10-06 23:07 ` [PATCH v1 3/5] clk: pxa: keep clocks initialization separated per variant Robert Jarzmik
2014-11-17 19:32   ` Mike Turquette
2014-10-06 23:08 ` [PATCH v1 4/5] DON'T MERGE ME: arm: pxa: change clocks init sequence Robert Jarzmik
2014-10-06 23:08 ` [PATCH v1 5/5] DON'T MERGE ME: clk: pxa: migrate to the clk_core API Robert Jarzmik
2014-10-30  6:51 ` [PATCH v1 0/5] Fixes for the pxa common clocks Robert Jarzmik
2014-11-07 22:05   ` Robert Jarzmik

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20141117192555.25314.18664@quantum \
    --to=mturquette@linaro.org \
    --cc=linux-arm-kernel@lists.infradead.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).