[PATCH] clk: tegra: fix ifdef for tegra_periph_reset_assert inline

[PATCH] clk: tegra: fix ifdef for tegra_periph_reset_assert inline

[Stephen Warren]

From: Stephen Warren <swarren-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org>

Commit 7064f6b "clk: tegra: provide tegra_periph_reset_assert
alternative" added ifdef'd static inline versions of some functions,
but tested ARCH_TEGRA rather than CONFIG_ARCH_TEGRA, thus disabling
these function in all cases. In some cases, this caused HW modules to
misbehave; for example, the Tegra I2C driver BUG()d during boot on
Seaboard.

Reported-by: Olof Johansson <olof-nZhT3qVonbNeoWH0uzbU5w@public.gmane.org>
Signed-off-by: Stephen Warren <swarren-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org>
---
 include/linux/clk/tegra.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/linux/clk/tegra.h b/include/linux/clk/tegra.h
index e3cc872..23a0cee 100644
--- a/include/linux/clk/tegra.h
+++ b/include/linux/clk/tegra.h
@@ -120,7 +120,7 @@ static inline void tegra_cpu_clock_resume(void)
 }
 #endif
 
-#ifdef ARCH_TEGRA
+#ifdef CONFIG_ARCH_TEGRA
 void tegra_periph_reset_deassert(struct clk *c);
 void tegra_periph_reset_assert(struct clk *c);
 #else
-- 
1.8.1.5

Re: [PATCH] clk: tegra: fix ifdef for tegra_periph_reset_assert inline

[Mike Turquette]

Quoting Stephen Warren (2013-06-24 12:05:56)
> From: Stephen Warren <swarren@nvidia.com>
> 
> Commit 7064f6b "clk: tegra: provide tegra_periph_reset_assert
> alternative" added ifdef'd static inline versions of some functions,
> but tested ARCH_TEGRA rather than CONFIG_ARCH_TEGRA, thus disabling
> these function in all cases. In some cases, this caused HW modules to
> misbehave; for example, the Tegra I2C driver BUG()d during boot on
> Seaboard.
> 
> Reported-by: Olof Johansson <olof@lixom.net>
> Signed-off-by: Stephen Warren <swarren@nvidia.com>

Thanks for the fixup. I had already published the offending commit and
can't rebase it, so I just applied this patch on top.

Pulled into clk-next for 3.11.

Regards,
Mike

> ---
>  include/linux/clk/tegra.h | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/include/linux/clk/tegra.h b/include/linux/clk/tegra.h
> index e3cc872..23a0cee 100644
> --- a/include/linux/clk/tegra.h
> +++ b/include/linux/clk/tegra.h
> @@ -120,7 +120,7 @@ static inline void tegra_cpu_clock_resume(void)
>  }
>  #endif
>  
> -#ifdef ARCH_TEGRA
> +#ifdef CONFIG_ARCH_TEGRA
>  void tegra_periph_reset_deassert(struct clk *c);
>  void tegra_periph_reset_assert(struct clk *c);
>  #else
> -- 
> 1.8.1.5

Re: [PATCH] clk: tegra: fix ifdef for tegra_periph_reset_assert inline

[Stephen Warren]

On 06/24/2013 03:03 PM, Mike Turquette wrote:
> Quoting Stephen Warren (2013-06-24 12:05:56)
>> From: Stephen Warren <swarren-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org>
>>
>> Commit 7064f6b "clk: tegra: provide tegra_periph_reset_assert
>> alternative" added ifdef'd static inline versions of some functions,
>> but tested ARCH_TEGRA rather than CONFIG_ARCH_TEGRA, thus disabling
>> these function in all cases. In some cases, this caused HW modules to
>> misbehave; for example, the Tegra I2C driver BUG()d during boot on
>> Seaboard.
>>
>> Reported-by: Olof Johansson <olof-nZhT3qVonbNeoWH0uzbU5w@public.gmane.org>
>> Signed-off-by: Stephen Warren <swarren-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org>
> 
> Thanks for the fixup. I had already published the offending commit and
> can't rebase it, so I just applied this patch on top.
> 
> Pulled into clk-next for 3.11.

Did that get pushed out to the git server? The patch isn't in next-20130627.

Re: [PATCH] clk: tegra: fix ifdef for tegra_periph_reset_assert inline

[Mike Turquette]

Quoting Stephen Warren (2013-06-27 15:59:04)
> On 06/24/2013 03:03 PM, Mike Turquette wrote:
> > Quoting Stephen Warren (2013-06-24 12:05:56)
> >> From: Stephen Warren <swarren@nvidia.com>
> >>
> >> Commit 7064f6b "clk: tegra: provide tegra_periph_reset_assert
> >> alternative" added ifdef'd static inline versions of some functions,
> >> but tested ARCH_TEGRA rather than CONFIG_ARCH_TEGRA, thus disabling
> >> these function in all cases. In some cases, this caused HW modules to
> >> misbehave; for example, the Tegra I2C driver BUG()d during boot on
> >> Seaboard.
> >>
> >> Reported-by: Olof Johansson <olof@lixom.net>
> >> Signed-off-by: Stephen Warren <swarren@nvidia.com>
> > 
> > Thanks for the fixup. I had already published the offending commit and
> > can't rebase it, so I just applied this patch on top.
> > 
> > Pulled into clk-next for 3.11.
> 
> Did that get pushed out to the git server? The patch isn't in next-20130627.

It was sitting in my local tree. Sorry about that. Pushed to the public
tree now.

Regards,
Mike

Re: [PATCH] clk: tegra: fix ifdef for tegra_periph_reset_assert inline

[Paul Walmsley]

On 06/24/2013 12:05 PM, Stephen Warren wrote:
> From: Stephen Warren <swarren-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org>
>
> Commit 7064f6b "clk: tegra: provide tegra_periph_reset_assert
> alternative" added ifdef'd static inline versions of some functions,
> but tested ARCH_TEGRA rather than CONFIG_ARCH_TEGRA, thus disabling
> these function in all cases. In some cases, this caused HW modules to
> misbehave; for example, the Tegra I2C driver BUG()d during boot on
> Seaboard.
>
> Reported-by: Olof Johansson <olof-nZhT3qVonbNeoWH0uzbU5w@public.gmane.org>
> Signed-off-by: Stephen Warren <swarren-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org>

Tested-by: Paul Walmsley <pwalmsley-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org> # for the Tegra30 Beaver
board

Stephen pointed me at this patch to fix the boot on Tegra30 Beaver boad
with linux-next 20130624.  Thanks Stephen!

- Paul