[U-Boot] [PATCH 2/4] mx31: Remove duplicate definition for GPR register

Fabio Estevam
2011-11-09T14:15:01Z

GPR register definition is already available at imx-regs.h, so remove the duplication.

Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
---
arch/arm/cpu/arm1136/mx31/generic.c | 6 ++----
1 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/arch/arm/cpu/arm1136/mx31/generic.c b/arch/arm/cpu/arm1136/mx31/generic.c
index 4f27e25..1621e9e 100644
--- a/arch/arm/cpu/arm1136/mx31/generic.c
+++ b/arch/arm/cpu/arm1136/mx31/generic.c
@@ -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)
--
1.7.1