summaryrefslogtreecommitdiff
path: root/arch/arm/mach-pxa/gpio.c
diff options
context:
space:
mode:
authorEric Miao <eric.miao@marvell.com>2009-01-06 18:29:01 +0800
committerEric Miao <eric.miao@marvell.com>2009-03-09 21:22:37 +0800
commitda065a0b3611751feefeb0f0e277cd5830056dad (patch)
treeb54bc53e988afa4f114fbfe50f65bfcf99172140 /arch/arm/mach-pxa/gpio.c
parent0d9f768fce67a53b9c2296789129d4dfb3f4996b (diff)
[ARM] pxa: move GPIO register definitions into <mach/gpio.h>
This makes gpio.c fully independent of pxa-regs.h (except for the virtual address of the registers). Signed-off-by: Mike Rapoport <mike@compulab.co.il> Signed-off-by: Eric Miao <eric.miao@marvell.com>
Diffstat (limited to 'arch/arm/mach-pxa/gpio.c')
-rw-r--r--arch/arm/mach-pxa/gpio.c14
1 files changed, 5 insertions, 9 deletions
diff --git a/arch/arm/mach-pxa/gpio.c b/arch/arm/mach-pxa/gpio.c
index c9d9c702c7d5..9a33eb07fe0a 100644
--- a/arch/arm/mach-pxa/gpio.c
+++ b/arch/arm/mach-pxa/gpio.c
@@ -18,16 +18,12 @@
#include <linux/sysdev.h>
#include <linux/io.h>
-#include <asm/gpio.h>
-#include <mach/hardware.h>
-#include <mach/pxa-regs.h>
+#include <mach/gpio.h>
-#include "generic.h"
-
-#define GPIO0_BASE ((void __iomem *)io_p2v(0x40E00000))
-#define GPIO1_BASE ((void __iomem *)io_p2v(0x40E00004))
-#define GPIO2_BASE ((void __iomem *)io_p2v(0x40E00008))
-#define GPIO3_BASE ((void __iomem *)io_p2v(0x40E00100))
+#define GPIO0_BASE (GPIO_REGS_VIRT + 0x0000)
+#define GPIO1_BASE (GPIO_REGS_VIRT + 0x0004)
+#define GPIO2_BASE (GPIO_REGS_VIRT + 0x0008)
+#define GPIO3_BASE (GPIO_REGS_VIRT + 0x0100)
#define GPLR_OFFSET 0x00
#define GPDR_OFFSET 0x0C