diff options
| author | Fabio Estevam <fabio.estevam@freescale.com> | 2011-11-09 04:15:01 +0000 |
|---|---|---|
| committer | Stefano Babic <sbabic@denx.de> | 2011-11-11 11:36:58 +0100 |
| commit | 94e6dd2bc51d0384422f148675efb31c5ae1a560 (patch) | |
| tree | 5fcc6c798f82a77336d9bbd99b2ca024e04139eb /arch/arm/cpu/arm1136 | |
| parent | f631172ed13c17a1be8cdc4114cb731726600327 (diff) | |
| download | blackbird-obmc-uboot-94e6dd2bc51d0384422f148675efb31c5ae1a560.tar.gz blackbird-obmc-uboot-94e6dd2bc51d0384422f148675efb31c5ae1a560.zip | |
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>
Diffstat (limited to 'arch/arm/cpu/arm1136')
| -rw-r--r-- | 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 4f27e250bd..1621e9eaa3 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) |
