summaryrefslogtreecommitdiff
path: root/include/linux/platform_data/gpio-omap.h
diff options
context:
space:
mode:
authorJanusz Krzysztofik <jmkrzyszt@gmail.com>2018-09-10 19:47:22 +0200
committerTony Lindgren <tony@atomide.com>2018-09-20 14:21:47 -0700
commit26683316c92ab2d1b330a3a38548328c9b136ad1 (patch)
treeef3db8a23161c69c80033c9d7b6e3c6f7370ce86 /include/linux/platform_data/gpio-omap.h
parentd3e952ad300e288e4f5bbdb2203a5a8c69e0946e (diff)
ARM: OMAP1: ams-delta-fiq: Use <linux/platform_data/gpio-omap.h>
Instead of defining symbols already defined in linux/platform_data/gpio-omap.h, use that header file. Since we include the header into an assembler code, prevent C only bits from being read in. Signed-off-by: Janusz Krzysztofik <jmkrzyszt@gmail.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
Diffstat (limited to 'include/linux/platform_data/gpio-omap.h')
-rw-r--r--include/linux/platform_data/gpio-omap.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/include/linux/platform_data/gpio-omap.h b/include/linux/platform_data/gpio-omap.h
index 8612855691b2..ed071f76b642 100644
--- a/include/linux/platform_data/gpio-omap.h
+++ b/include/linux/platform_data/gpio-omap.h
@@ -24,8 +24,10 @@
#ifndef __ASM_ARCH_OMAP_GPIO_H
#define __ASM_ARCH_OMAP_GPIO_H
+#ifndef __ASSEMBLER__
#include <linux/io.h>
#include <linux/platform_device.h>
+#endif
#define OMAP1_MPUIO_BASE 0xfffb5000
@@ -157,6 +159,7 @@
#define OMAP_MPUIO(nr) (OMAP_MAX_GPIO_LINES + (nr))
#define OMAP_GPIO_IS_MPUIO(nr) ((nr) >= OMAP_MAX_GPIO_LINES)
+#ifndef __ASSEMBLER__
struct omap_gpio_reg_offs {
u16 revision;
u16 direction;
@@ -215,5 +218,6 @@ static inline void omap2_gpio_resume_after_idle(void)
{
}
#endif
+#endif /* __ASSEMBLER__ */
#endif