LM
/
u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mx31: Remove duplicate definition for GPR register 

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>
This commit is contained in:
Fabio Estevam 2011-11-09 04:15:01 +00:00 committed by Stefano Babic
parent f631172ed1
commit 94e6dd2bc5
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
arch/arm/cpu/arm1136/mx31/generic.c
View File

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