From 94e6dd2bc51d0384422f148675efb31c5ae1a560 Mon Sep 17 00:00:00 2001 From: Fabio Estevam Date: Wed, 9 Nov 2011 04:15:01 +0000 Subject: [PATCH] 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 Acked-by: Stefano Babic --- arch/arm/cpu/arm1136/mx31/generic.c | 6 ++---- 1 file 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 #include -#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) -- 2.30.2