[PATCH RESEND] ARM: tegra114: correctly output clk_32k

[PATCH RESEND] ARM: tegra114: correctly output clk_32k

[Alexandre Courbot]

Tegra has a blink timer register that allows to modulate the
clk_32k clock before outputting it. Since clk_32k is presented to the
kernel as a fixed clock, make sure this register does not tamper with
the clock frequency and that clk_32k is outputted as-is, similarly to
what is done on t20 and t30.

Signed-off-by: Alexandre Courbot <acourbot@nvidia.com>
Acked-by: Stephen Warren <swarren@nvidia.com>
---
 drivers/clk/tegra/clk-tegra114.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/drivers/clk/tegra/clk-tegra114.c b/drivers/clk/tegra/clk-tegra114.c
index d78e16e..dc76d67 100644
--- a/drivers/clk/tegra/clk-tegra114.c
+++ b/drivers/clk/tegra/clk-tegra114.c
@@ -127,6 +127,7 @@
 #define PMC_DPD_PADS_ORIDE_BLINK_ENB 20
 #define PMC_CTRL 0
 #define PMC_CTRL_BLINK_ENB 7
+#define PMC_BLINK_TIMER 0x40
 
 #define OSC_CTRL			0x50
 #define OSC_CTRL_OSC_FREQ_SHIFT		28
@@ -1625,6 +1626,8 @@ static void __init tegra114_pmc_clk_init(void __iomem *pmc_base)
 	clks[clk_out_3] = clk;
 
 	/* blink */
+	/* clear the blink timer register to directly output clk_32k */
+	writel_relaxed(0, pmc_base + PMC_BLINK_TIMER);
 	clk = clk_register_gate(NULL, "blink_override", "clk_32k", 0,
 				pmc_base + PMC_DPD_PADS_ORIDE,
 				PMC_DPD_PADS_ORIDE_BLINK_ENB, 0, NULL);
-- 
1.8.2.3

Re: [PATCH RESEND] ARM: tegra114: correctly output clk_32k

[Stephen Warren]

On 05/25/2013 08:56 PM, Alexandre Courbot wrote:
> Tegra has a blink timer register that allows to modulate the
> clk_32k clock before outputting it. Since clk_32k is presented to the
> kernel as a fixed clock, make sure this register does not tamper with
> the clock frequency and that clk_32k is outputted as-is, similarly to
> what is done on t20 and t30.

The patch subject here should be "clk: tegra:" rather than "ARM:
tegra114". I assume Mike can fix this up when applying it.

Re: [PATCH RESEND] ARM: tegra114: correctly output clk_32k

[Mike Turquette]

Quoting Alexandre Courbot (2013-05-25 19:56:31)
> Tegra has a blink timer register that allows to modulate the
> clk_32k clock before outputting it. Since clk_32k is presented to the
> kernel as a fixed clock, make sure this register does not tamper with
> the clock frequency and that clk_32k is outputted as-is, similarly to
> what is done on t20 and t30.
> 
> Signed-off-by: Alexandre Courbot <acourbot-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org>
> Acked-by: Stephen Warren <swarren-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org>

Taken into clk-next.

Regards,
Mike

> ---
>  drivers/clk/tegra/clk-tegra114.c | 3 +++
>  1 file changed, 3 insertions(+)
> 
> diff --git a/drivers/clk/tegra/clk-tegra114.c b/drivers/clk/tegra/clk-tegra114.c
> index d78e16e..dc76d67 100644
> --- a/drivers/clk/tegra/clk-tegra114.c
> +++ b/drivers/clk/tegra/clk-tegra114.c
> @@ -127,6 +127,7 @@
>  #define PMC_DPD_PADS_ORIDE_BLINK_ENB 20
>  #define PMC_CTRL 0
>  #define PMC_CTRL_BLINK_ENB 7
> +#define PMC_BLINK_TIMER 0x40
>  
>  #define OSC_CTRL                       0x50
>  #define OSC_CTRL_OSC_FREQ_SHIFT                28
> @@ -1625,6 +1626,8 @@ static void __init tegra114_pmc_clk_init(void __iomem *pmc_base)
>         clks[clk_out_3] = clk;
>  
>         /* blink */
> +       /* clear the blink timer register to directly output clk_32k */
> +       writel_relaxed(0, pmc_base + PMC_BLINK_TIMER);
>         clk = clk_register_gate(NULL, "blink_override", "clk_32k", 0,
>                                 pmc_base + PMC_DPD_PADS_ORIDE,
>                                 PMC_DPD_PADS_ORIDE_BLINK_ENB, 0, NULL);
> -- 
> 1.8.2.3

Re: [PATCH RESEND] ARM: tegra114: correctly output clk_32k

[Mike Turquette]

Quoting Stephen Warren (2013-05-28 08:19:21)
> On 05/25/2013 08:56 PM, Alexandre Courbot wrote:
> > Tegra has a blink timer register that allows to modulate the
> > clk_32k clock before outputting it. Since clk_32k is presented to the
> > kernel as a fixed clock, make sure this register does not tamper with
> > the clock frequency and that clk_32k is outputted as-is, similarly to
> > what is done on t20 and t30.
> 
> The patch subject here should be "clk: tegra:" rather than "ARM:
> tegra114". I assume Mike can fix this up when applying it.

I fixed it up.  Been fixing up lots of s/ARM/clk/ lately.

Regards,
Mike