mxc_gpio.c uses a 'gpio_' prefix for the dr and dir registers, so use it for the other gpio registers too.
Signed-off-by: Benoît Thébaudeau benoit.thebaudeau@advansee.com Cc: Stefano Babic sbabic@denx.de --- .../arch/arm/include/asm/arch-mx35/gpio.h | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-)
diff --git u-boot-4d3c95f.orig/arch/arm/include/asm/arch-mx35/gpio.h u-boot-4d3c95f/arch/arm/include/asm/arch-mx35/gpio.h index 7bcc3e8..0caca70 100644 --- u-boot-4d3c95f.orig/arch/arm/include/asm/arch-mx35/gpio.h +++ u-boot-4d3c95f/arch/arm/include/asm/arch-mx35/gpio.h @@ -27,14 +27,14 @@
/* GPIO registers */ struct gpio_regs { - u32 gpio_dr; /* data */ - u32 gpio_dir; /* direction */ - u32 psr; /* pad satus */ - u32 icr1; /* interrupt config 1 */ - u32 icr2; /* interrupt config 2 */ - u32 imr; /* interrupt mask */ - u32 isr; /* interrupt status */ - u32 edge_sel; /* edge select */ + u32 gpio_dr; /* data */ + u32 gpio_dir; /* direction */ + u32 gpio_psr; /* pad satus */ + u32 gpio_icr1; /* interrupt config 1 */ + u32 gpio_icr2; /* interrupt config 2 */ + u32 gpio_imr; /* interrupt mask */ + u32 gpio_isr; /* interrupt status */ + u32 gpio_edge_sel; /* edge select */ };
#endif