]> git.sur5r.net Git - u-boot/commitdiff
mx31: Remove duplicate definition for GPR register
authorFabio Estevam <fabio.estevam@freescale.com>
Wed, 9 Nov 2011 04:15:01 +0000 (04:15 +0000)
committerStefano Babic <sbabic@denx.de>
Fri, 11 Nov 2011 10:36:58 +0000 (11:36 +0100)
GPR register definition is already available at imx-regs.h, so remove the duplication.

Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
Acked-by: Stefano Babic <sbabic@denx.de>
arch/arm/cpu/arm1136/mx31/generic.c

index 4f27e250bd9c78d5e77c69af99db842b99b93843..1621e9eaa3962cdc3bd482681d4abeca91d0c682 100644 (file)
@@ -27,8 +27,6 @@
 #include <asm/io.h>
 #include <asm/arch/sys_proto.h>
 
-#define IOMUXGPR       (IOMUXC_BASE + 0x008)
-
 static u32 mx31_decode_pll(u32 reg, u32 infreq)
 {
        u32 mfi = GET_PLL_MFI(reg);
@@ -147,13 +145,13 @@ void mx31_set_gpr(enum iomux_gp_func gp, char en)
 {
        u32 l;
 
-       l = readl(IOMUXGPR);
+       l = readl(IOMUXC_GPR);
        if (en)
                l |= gp;
        else
                l &= ~gp;
 
-       writel(l, IOMUXGPR);
+       writel(l, IOMUXC_GPR);
 }
 
 void mxc_setup_weimcs(int cs, const struct mxc_weimcs *weimcs)