summaryrefslogtreecommitdiffstats
path: root/include/linux/clk
diff options
context:
space:
mode:
authorStephen Warren <swarren@nvidia.com>2013-06-24 13:05:56 -0600
committerMike Turquette <mturquette@linaro.org>2013-06-24 14:17:59 -0700
commit45e3ec3784aec0d194740b75b547bfabca448ff3 (patch)
tree6d12572bb41cdaa0d2929157d4c1ce92d04d48d7 /include/linux/clk
parent7064f6bd86278029348c36d30bd325e7e05b6fee (diff)
downloadop-kernel-dev-45e3ec3784aec0d194740b75b547bfabca448ff3.zip
op-kernel-dev-45e3ec3784aec0d194740b75b547bfabca448ff3.tar.gz
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>
Diffstat (limited to 'include/linux/clk')
-rw-r--r--include/linux/clk/tegra.h2
1 files changed, 1 insertions, 1 deletions
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
OpenPOWER on IntegriCloud