Skip to content

Commit

Permalink
clk: tegra: fix ifdef for tegra_periph_reset_assert inline
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Stephen Warren authored and Mike Turquette committed Jun 24, 2013
1 parent 7064f6b commit 45e3ec3
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion include/linux/clk/tegra.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 45e3ec3

Please sign in to comment.