| Message ID | 201306212232.27026.arnd@arndb.de (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On 06/21/2013 02:32 PM, Arnd Bergmann wrote: > We have some tegra device drivers that are written to be platform > independent but still use the tegra specific tegra_periph_reset_assert > function. In order to build and link them without errors, > this provides a static inline version of these functions that > does nothing when Tegra support is disabled. Oh, I thought this had been applied already. Acked-by: Stephen Warren <swarren@nvidia.com> Hopefully we'll be replacing these custom APIs with the standard module reset APIs soon (post 3.11 though). I've seen internally the first round of patches from Prashant for this, so chances are good they'll be finalized and sent upstream in the not-too-distant future.
On 06/21/2013 02:32 PM, Arnd Bergmann wrote: > We have some tegra device drivers that are written to be platform > independent but still use the tegra specific tegra_periph_reset_assert > function. In order to build and link them without errors, > this provides a static inline version of these functions that > does nothing when Tegra support is disabled. > diff --git a/include/linux/clk/tegra.h b/include/linux/clk/tegra.h > +#ifdef ARCH_TEGRA That should be CONFIG_ARCH_TEGRA, right? Sorry I didn't notice that before. This causes the Tegra i2c driver to fail on some platforms in next-20130624, resulting in a BUG() during boot. Do you want to amend this patch, or should I send a fixup?
diff --git a/include/linux/clk/tegra.h b/include/linux/clk/tegra.h index 642789b..1397190 100644 --- a/include/linux/clk/tegra.h +++ b/include/linux/clk/tegra.h @@ -120,8 +120,13 @@ static inline void tegra_cpu_clock_resume(void) } #endif +#ifdef ARCH_TEGRA void tegra_periph_reset_deassert(struct clk *c); void tegra_periph_reset_assert(struct clk *c); +#else +static inline void tegra_periph_reset_deassert(struct clk *c) {} +static inline void tegra_periph_reset_assert(struct clk *c) {} +#endif void tegra_clocks_init(void); void tegra_clocks_apply_init_table(void);
We have some tegra device drivers that are written to be platform independent but still use the tegra specific tegra_periph_reset_assert function. In order to build and link them without errors, this provides a static inline version of these functions that does nothing when Tegra support is disabled. Signed-off-by: Arnd Bergmann <arnd@arndb.de>