From: Stephen Warren <swarren@nvidia.com>
Date: Mon, 24 Jun 2013 19:05:56 +0000 (-0600)
Subject: clk: tegra: fix ifdef for tegra_periph_reset_assert inline
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=45e3ec3784aec0d194740b75b547bfabca448ff3;p=deliverable%2Flinux.git

clk: tegra: fix ifdef for tegra_periph_reset_assert inline

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>
Tested-by: Paul Walmsley <pwalmsley@nvidia.com>
Signed-off-by: Mike Turquette <mturquette@linaro.org>
---

diff --git a/include/linux/clk/tegra.h b/include/linux/clk/tegra.h
index e3cc8721c30e..23a0ceee831f 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