diff options
| author |   Linus Walleij <linus.walleij@linaro.org> | 2018-09-25 08:49:07 +0200 |
|---|---|---|
| committer | Linus Walleij <linus.walleij@linaro.org> | 2018-09-25 08:49:07 +0200 |
| commit | ff19473bdc2b59f73b71d5d25a6bc42d2b531c60 (patch) | |
| tree | 0125dc4f8a7570e6ddc3a4a50455ea515c51595b /include/linux/platform_data | |
| parent | gpiolib: Fix array members of same chip processed separately (diff) | |
| parent | gpio: omap: Get rid of pm_runtime_irq_safe() (diff) | |
| download | linux-dev-ff19473bdc2b59f73b71d5d25a6bc42d2b531c60.tar.xz linux-dev-ff19473bdc2b59f73b71d5d25a6bc42d2b531c60.zip | |
Merge branch 'ib-omap' into devel
Diffstat (limited to 'include/linux/platform_data')
| -rw-r--r-- | include/linux/platform_data/gpio-omap.h | 15 |
1 files changed, 2 insertions, 13 deletions
diff --git a/include/linux/platform_data/gpio-omap.h b/include/linux/platform_data/gpio-omap.h index 8612855691b2..8485c6a9a383 100644 --- a/include/linux/platform_data/gpio-omap.h +++ b/include/linux/platform_data/gpio-omap.h @@ -197,23 +197,12 @@ struct omap_gpio_platform_data { bool is_mpuio; /* whether the bank is of type MPUIO */ u32 non_wakeup_gpios; + u32 quirks; /* Version specific quirks mask */ + struct omap_gpio_reg_offs *regs; /* Return context loss count due to PM states changing */ int (*get_context_loss_count)(struct device *dev); }; -#if IS_BUILTIN(CONFIG_GPIO_OMAP) -extern void omap2_gpio_prepare_for_idle(int off_mode); -extern void omap2_gpio_resume_after_idle(void); -#else -static inline void omap2_gpio_prepare_for_idle(int off_mode) -{ -} - -static inline void omap2_gpio_resume_after_idle(void) -{ -} -#endif - #endif |