diff options
| -rw-r--r-- | arch/arm/cpu/armv7/mx6/soc.c | 4 | ||||
| -rw-r--r-- | drivers/pci/pcie_imx.c | 4 |
2 files changed, 2 insertions, 6 deletions
diff --git a/arch/arm/cpu/armv7/mx6/soc.c b/arch/arm/cpu/armv7/mx6/soc.c index 1ab6dbe..9b0f126 100644 --- a/arch/arm/cpu/armv7/mx6/soc.c +++ b/arch/arm/cpu/armv7/mx6/soc.c @@ -324,7 +324,7 @@ static void init_src(void) #ifdef CONFIG_MX6SX void vadc_power_up(void) { - struct iomuxc *iomux = (struct iomuxc *)IOMUXC_GPR_BASE_ADDR; + struct iomuxc *iomux = (struct iomuxc *)IOMUXC_BASE_ADDR; u32 val; /* csi0 */ @@ -356,7 +356,7 @@ void vadc_power_up(void) void vadc_power_down(void) { - struct iomuxc *iomux = (struct iomuxc *)IOMUXC_GPR_BASE_ADDR; + struct iomuxc *iomux = (struct iomuxc *)IOMUXC_BASE_ADDR; u32 val; /* Power down vadc ext power diff --git a/drivers/pci/pcie_imx.c b/drivers/pci/pcie_imx.c index b6d477e..497937e 100644 --- a/drivers/pci/pcie_imx.c +++ b/drivers/pci/pcie_imx.c @@ -100,11 +100,7 @@ static void print_regs(int contain_pcie_reg) { u32 val; -#ifndef CONFIG_MX6SX struct iomuxc *iomuxc_regs = (struct iomuxc *)IOMUXC_BASE_ADDR; -#else - struct iomuxc *iomuxc_regs = (struct iomuxc *)IOMUXC_GPR_BASE_ADDR; -#endif struct mxc_ccm_reg *ccm_regs = (struct mxc_ccm_reg *)CCM_BASE_ADDR; val = readl(&iomuxc_regs->gpr[1]); DBGF("GPR01 a:0x%08x v:0x%08x\n", (u32)&iomuxc_regs->gpr[1], val); |