diff options
| author | Ryan Mallon <rmallon@gmail.com> | 2012-01-10 17:33:29 -0500 |
|---|---|---|
| committer | Ryan Mallon <rmallon@gmail.com> | 2012-03-13 20:41:09 -0400 |
| commit | 2ae18b471d91f7622e54f18ed3a4b5b20e9bf871 (patch) | |
| tree | 0f36de330238b29dc475758f5fc6193444d447c2 /arch/arm/mach-ep93xx | |
| parent | f15855bfaad29b2badd4a5c30ad73e0542a19d16 (diff) | |
ep93xx: Move GPIO defines to gpio-ep93xx.h
Move the GPIO related defines out of ep93xx-regs.h and into
gpio-ep93xx.h where they belong.
Signed-off-by: Ryan Mallon <rmallon@gmail.com>
Reviewed-by: Mika Westerberg <mika.westerberg@iki.fi>
Acked-by: Hartley Sweeten <hsweeten@visionengravers.com>
Diffstat (limited to 'arch/arm/mach-ep93xx')
| -rw-r--r-- | arch/arm/mach-ep93xx/include/mach/ep93xx-regs.h | 8 | ||||
| -rw-r--r-- | arch/arm/mach-ep93xx/include/mach/gpio-ep93xx.h | 10 |
2 files changed, 10 insertions, 8 deletions
diff --git a/arch/arm/mach-ep93xx/include/mach/ep93xx-regs.h b/arch/arm/mach-ep93xx/include/mach/ep93xx-regs.h index b029305c48c1..72b86878e196 100644 --- a/arch/arm/mach-ep93xx/include/mach/ep93xx-regs.h +++ b/arch/arm/mach-ep93xx/include/mach/ep93xx-regs.h | |||
| @@ -64,14 +64,6 @@ | |||
| 64 | 64 | ||
| 65 | #define EP93XX_SECURITY_BASE EP93XX_APB_IOMEM(0x00030000) | 65 | #define EP93XX_SECURITY_BASE EP93XX_APB_IOMEM(0x00030000) |
| 66 | 66 | ||
| 67 | #define EP93XX_GPIO_PHYS_BASE EP93XX_APB_PHYS(0x00040000) | ||
| 68 | #define EP93XX_GPIO_BASE EP93XX_APB_IOMEM(0x00040000) | ||
| 69 | #define EP93XX_GPIO_REG(x) (EP93XX_GPIO_BASE + (x)) | ||
| 70 | #define EP93XX_GPIO_F_INT_STATUS EP93XX_GPIO_REG(0x5c) | ||
| 71 | #define EP93XX_GPIO_A_INT_STATUS EP93XX_GPIO_REG(0xa0) | ||
| 72 | #define EP93XX_GPIO_B_INT_STATUS EP93XX_GPIO_REG(0xbc) | ||
| 73 | #define EP93XX_GPIO_EEDRIVE EP93XX_GPIO_REG(0xc8) | ||
| 74 | |||
| 75 | #define EP93XX_AAC_PHYS_BASE EP93XX_APB_PHYS(0x00080000) | 67 | #define EP93XX_AAC_PHYS_BASE EP93XX_APB_PHYS(0x00080000) |
| 76 | #define EP93XX_AAC_BASE EP93XX_APB_IOMEM(0x00080000) | 68 | #define EP93XX_AAC_BASE EP93XX_APB_IOMEM(0x00080000) |
| 77 | 69 | ||
diff --git a/arch/arm/mach-ep93xx/include/mach/gpio-ep93xx.h b/arch/arm/mach-ep93xx/include/mach/gpio-ep93xx.h index 8aff2ea35877..6d7c571a519f 100644 --- a/arch/arm/mach-ep93xx/include/mach/gpio-ep93xx.h +++ b/arch/arm/mach-ep93xx/include/mach/gpio-ep93xx.h | |||
| @@ -3,6 +3,16 @@ | |||
| 3 | #ifndef __GPIO_EP93XX_H | 3 | #ifndef __GPIO_EP93XX_H |
| 4 | #define __GPIO_EP93XX_H | 4 | #define __GPIO_EP93XX_H |
| 5 | 5 | ||
| 6 | #include <mach/ep93xx-regs.h> | ||
| 7 | |||
| 8 | #define EP93XX_GPIO_PHYS_BASE EP93XX_APB_PHYS(0x00040000) | ||
| 9 | #define EP93XX_GPIO_BASE EP93XX_APB_IOMEM(0x00040000) | ||
| 10 | #define EP93XX_GPIO_REG(x) (EP93XX_GPIO_BASE + (x)) | ||
| 11 | #define EP93XX_GPIO_F_INT_STATUS EP93XX_GPIO_REG(0x5c) | ||
| 12 | #define EP93XX_GPIO_A_INT_STATUS EP93XX_GPIO_REG(0xa0) | ||
| 13 | #define EP93XX_GPIO_B_INT_STATUS EP93XX_GPIO_REG(0xbc) | ||
| 14 | #define EP93XX_GPIO_EEDRIVE EP93XX_GPIO_REG(0xc8) | ||
| 15 | |||
| 6 | /* GPIO port A. */ | 16 | /* GPIO port A. */ |
| 7 | #define EP93XX_GPIO_LINE_A(x) ((x) + 0) | 17 | #define EP93XX_GPIO_LINE_A(x) ((x) + 0) |
| 8 | #define EP93XX_GPIO_LINE_EGPIO0 EP93XX_GPIO_LINE_A(0) | 18 | #define EP93XX_GPIO_LINE_EGPIO0 EP93XX_GPIO_LINE_A(0) |