diff options
| author | Janusz Krzysztofik <jmkrzyszt@gmail.com> | 2018-09-10 19:47:22 +0200 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2018-09-20 14:21:47 -0700 |
| commit | 26683316c92ab2d1b330a3a38548328c9b136ad1 (patch) | |
| tree | ef3db8a23161c69c80033c9d7b6e3c6f7370ce86 /arch/arm/mach-omap1 | |
| parent | d3e952ad300e288e4f5bbdb2203a5a8c69e0946e (diff) | |
| download | linux-0-day-26683316c92ab2d1b330a3a38548328c9b136ad1.tar.gz linux-0-day-26683316c92ab2d1b330a3a38548328c9b136ad1.tar.xz | |
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 'arch/arm/mach-omap1')
| -rw-r--r-- | arch/arm/mach-omap1/ams-delta-fiq-handler.S | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/arch/arm/mach-omap1/ams-delta-fiq-handler.S b/arch/arm/mach-omap1/ams-delta-fiq-handler.S index ddc27638ba2a5..e3faa0274b564 100644 --- a/arch/arm/mach-omap1/ams-delta-fiq-handler.S +++ b/arch/arm/mach-omap1/ams-delta-fiq-handler.S @@ -15,6 +15,7 @@ #include <linux/linkage.h> #include <linux/platform_data/ams-delta-fiq.h> +#include <linux/platform_data/gpio-omap.h> #include <asm/assembler.h> #include <mach/board-ams-delta.h> @@ -24,17 +25,10 @@ #include "soc.h" /* - * GPIO related definitions, copied from arch/arm/plat-omap/gpio.c. - * Unfortunately, those were not placed in a separate header file. + * OMAP1510 GPIO related symbol copied from arch/arm/mach-omap1/gpio15xx.c. + * Unfortunately, it was not placed in a separate header file. */ #define OMAP1510_GPIO_BASE 0xFFFCE000 -#define OMAP1510_GPIO_DATA_INPUT 0x00 -#define OMAP1510_GPIO_DATA_OUTPUT 0x04 -#define OMAP1510_GPIO_DIR_CONTROL 0x08 -#define OMAP1510_GPIO_INT_CONTROL 0x0c -#define OMAP1510_GPIO_INT_MASK 0x10 -#define OMAP1510_GPIO_INT_STATUS 0x14 -#define OMAP1510_GPIO_PIN_CONTROL 0x18 /* GPIO register bitmasks */ #define KEYBRD_DATA_MASK (0x1 << AMS_DELTA_GPIO_PIN_KEYBRD_DATA) |