summaryrefslogtreecommitdiff
path: root/arch/arm/include/asm/arch-mx25
diff options
context:
space:
mode:
authorMatthias Weisser <weisserm@arcor.de>2011-07-06 00:28:32 +0000
committerAlbert ARIBAUD <albert.u.boot@aribaud.net>2011-07-14 15:41:24 +0200
commit95d185894bcb6c3dffb70ef69f3c80516d19bd49 (patch)
treee67f030c5a249f3c589d232077b6eaf041203bf4 /arch/arm/include/asm/arch-mx25
parent23210d8e1b369404c27ec6cc4a44ed069c4bb5ac (diff)
downloadu-boot-imx-95d185894bcb6c3dffb70ef69f3c80516d19bd49.zip
u-boot-imx-95d185894bcb6c3dffb70ef69f3c80516d19bd49.tar.gz
u-boot-imx-95d185894bcb6c3dffb70ef69f3c80516d19bd49.tar.bz2
imx: Make imx25 compatible to mxc_gpio driver and fix in tx25
Adding support for mxc_gpio driver for imx25 and fix names of registers in tx25 board. Signed-off-by: Matthias Weisser <weisserm@arcor.de>
Diffstat (limited to 'arch/arm/include/asm/arch-mx25')
-rw-r--r--arch/arm/include/asm/arch-mx25/imx-regs.h10
1 files changed, 8 insertions, 2 deletions
diff --git a/arch/arm/include/asm/arch-mx25/imx-regs.h b/arch/arm/include/asm/arch-mx25/imx-regs.h
index 62ee4d5..2ccb445 100644
--- a/arch/arm/include/asm/arch-mx25/imx-regs.h
+++ b/arch/arm/include/asm/arch-mx25/imx-regs.h
@@ -86,8 +86,8 @@ struct esdramc_regs {
/* GPIO registers */
struct gpio_regs {
- u32 dr; /* data */
- u32 dir; /* direction */
+ u32 gpio_dr; /* data */
+ u32 gpio_dir; /* direction */
u32 psr; /* pad satus */
u32 icr1; /* interrupt config 1 */
u32 icr2; /* interrupt config 2 */
@@ -357,4 +357,10 @@ struct aips_regs {
#define WSR_UNLOCK1 0x5555
#define WSR_UNLOCK2 0xAAAA
+/* Names used in GPIO driver */
+#define GPIO1_BASE_ADDR IMX_GPIO1_BASE
+#define GPIO2_BASE_ADDR IMX_GPIO2_BASE
+#define GPIO3_BASE_ADDR IMX_GPIO3_BASE
+#define GPIO4_BASE_ADDR IMX_GPIO4_BASE
+
#endif /* _IMX_REGS_H */