[PATCH] clk: tegra: Fix wrong value written to PLLE_AUX

[PATCH] clk: tegra: Fix wrong value written to PLLE_AUX

[Tuomas Tynkkynen]

The value written to PLLE_AUX was incorrect due to a wrong variable
being used.

Signed-off-by: Tuomas Tynkkynen <ttynkkynen@nvidia.com>
Tested-by: Mikko Perttunen <mperttunen@nvidia.com>
---
  This fix is required for the (upcoming) SATA support.
 drivers/clk/tegra/clk-pll.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/clk/tegra/clk-pll.c b/drivers/clk/tegra/clk-pll.c
index 0d20241..e1769ad 100644
--- a/drivers/clk/tegra/clk-pll.c
+++ b/drivers/clk/tegra/clk-pll.c
@@ -1718,7 +1718,7 @@ struct clk *tegra_clk_register_plle_tegra114(const char *name,
 					"pll_re_vco");
 	} else {
 		val_aux &= ~(PLLE_AUX_PLLRE_SEL | PLLE_AUX_PLLP_SEL);
-		pll_writel(val, pll_params->aux_reg, pll);
+		pll_writel(val_aux, pll_params->aux_reg, pll);
 	}
 
 	clk = _tegra_clk_register_pll(pll, name, parent_name, flags,
-- 
1.7.9.5

Re: [PATCH] clk: tegra: Fix wrong value written to PLLE_AUX

[Thierry Reding]

[-- Attachment #1: Type: text/plain, Size: 962 bytes --]

On Fri, May 16, 2014 at 04:50:20PM +0300, Tuomas Tynkkynen wrote:
> The value written to PLLE_AUX was incorrect due to a wrong variable
> being used.
> 
> Signed-off-by: Tuomas Tynkkynen <ttynkkynen-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org>
> Tested-by: Mikko Perttunen <mperttunen-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org>
> ---
>   This fix is required for the (upcoming) SATA support.
>  drivers/clk/tegra/clk-pll.c |    2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)

Reviewed-by: Thierry Reding <treding-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org>
Tested-by: Thierry Reding <treding-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org>
Acked-by: Thierry Reding <treding-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org>

Mike, Peter, it might be good to have this go into 3.16 as a
prerequisite for the upcoming SATA driver (which presumably won't be
ready until 3.17, but in that case it would be good to have this
prerequisite merged already).

Thierry

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

Re: [PATCH] clk: tegra: Fix wrong value written to PLLE_AUX

[Stephen Warren]

On 05/16/2014 08:31 AM, Thierry Reding wrote:
> On Fri, May 16, 2014 at 04:50:20PM +0300, Tuomas Tynkkynen wrote:
>> The value written to PLLE_AUX was incorrect due to a wrong variable
>> being used.
>>
>> Signed-off-by: Tuomas Tynkkynen <ttynkkynen-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org>
>> Tested-by: Mikko Perttunen <mperttunen-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org>
>> ---
>>   This fix is required for the (upcoming) SATA support.
>>  drivers/clk/tegra/clk-pll.c |    2 +-
>>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> Reviewed-by: Thierry Reding <treding-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org>
> Tested-by: Thierry Reding <treding-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org>
> Acked-by: Thierry Reding <treding-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org>
> 
> Mike, Peter, it might be good to have this go into 3.16 as a
> prerequisite for the upcoming SATA driver (which presumably won't be
> ready until 3.17, but in that case it would be good to have this
> prerequisite merged already).

Probably even Cc: stable since it's a fix for a bug that I assume has
been in a kernel release or two?

Re: [PATCH] clk: tegra: Fix wrong value written to PLLE_AUX

[Thierry Reding]

[-- Attachment #1: Type: text/plain, Size: 1442 bytes --]

On Fri, May 16, 2014 at 10:05:18AM -0600, Stephen Warren wrote:
> On 05/16/2014 08:31 AM, Thierry Reding wrote:
> > On Fri, May 16, 2014 at 04:50:20PM +0300, Tuomas Tynkkynen wrote:
> >> The value written to PLLE_AUX was incorrect due to a wrong variable
> >> being used.
> >>
> >> Signed-off-by: Tuomas Tynkkynen <ttynkkynen-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org>
> >> Tested-by: Mikko Perttunen <mperttunen-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org>
> >> ---
> >>   This fix is required for the (upcoming) SATA support.
> >>  drivers/clk/tegra/clk-pll.c |    2 +-
> >>  1 file changed, 1 insertion(+), 1 deletion(-)
> > 
> > Reviewed-by: Thierry Reding <treding-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org>
> > Tested-by: Thierry Reding <treding-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org>
> > Acked-by: Thierry Reding <treding-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org>
> > 
> > Mike, Peter, it might be good to have this go into 3.16 as a
> > prerequisite for the upcoming SATA driver (which presumably won't be
> > ready until 3.17, but in that case it would be good to have this
> > prerequisite merged already).
> 
> Probably even Cc: stable since it's a fix for a bug that I assume has
> been in a kernel release or two?

Yeah, I guess that makes sense. The bug isn't visible yet, but back-
porting to stable might save somebody else from chasing this if they
ever decide to backport PCIe, SATA or XUSB.

Thierry

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

Re: [PATCH] clk: tegra: Fix wrong value written to PLLE_AUX

[Peter De Schrijver]

On Fri, May 16, 2014 at 04:31:11PM +0200, Thierry Reding wrote:
> * PGP Signed by an unknown key
> 
> On Fri, May 16, 2014 at 04:50:20PM +0300, Tuomas Tynkkynen wrote:
> > The value written to PLLE_AUX was incorrect due to a wrong variable
> > being used.
> > 
> > Signed-off-by: Tuomas Tynkkynen <ttynkkynen-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org>
> > Tested-by: Mikko Perttunen <mperttunen-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org>
> > ---
> >   This fix is required for the (upcoming) SATA support.
> >  drivers/clk/tegra/clk-pll.c |    2 +-
> >  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> Reviewed-by: Thierry Reding <treding-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org>
> Tested-by: Thierry Reding <treding-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org>
> Acked-by: Thierry Reding <treding-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org>
> 
> Mike, Peter, it might be good to have this go into 3.16 as a
> prerequisite for the upcoming SATA driver (which presumably won't be
> ready until 3.17, but in that case it would be good to have this
> prerequisite merged already).

Yes... We should also take Andrew's fixes. I will prepare a pull request for 3.16.

Cheers,

Peter.