From fdd6994fe0b1ed4e75ed47f6a7d056dea753ef2a Mon Sep 17 00:00:00 2001 From: =?utf8?q?Lothar=20Wa=C3=9Fmann?= Date: Thu, 22 Oct 2015 15:04:44 +0200 Subject: [PATCH] arm: mx6: fix the AIPS?_BASE_ADDR fsckup introduced by commit f5def95698f6 commit f5def95698f6f3d8923f0e38706e3e5ebed81a10 ("imx: mx6: Fixed AIPS3 base address issue") claimed to fix an AIPS3 base address issue, while it in fact messed up the AIPS1 and AIPS2 base addresses too. --- arch/arm/cpu/armv7/mx6/soc.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/arch/arm/cpu/armv7/mx6/soc.c b/arch/arm/cpu/armv7/mx6/soc.c index 08f2cdbe7f..6f74175c57 100644 --- a/arch/arm/cpu/armv7/mx6/soc.c +++ b/arch/arm/cpu/armv7/mx6/soc.c @@ -218,10 +218,10 @@ void init_aips(void) struct aipstz_regs *aips3; #endif - aips1 = (struct aipstz_regs *)AIPS1_ARB_BASE_ADDR; - aips2 = (struct aipstz_regs *)AIPS2_ARB_BASE_ADDR; + aips1 = (struct aipstz_regs *)AIPS1_BASE_ADDR; + aips2 = (struct aipstz_regs *)AIPS2_BASE_ADDR; #ifdef CONFIG_SOC_MX6SX - aips3 = (struct aipstz_regs *)AIPS3_ARB_BASE_ADDR; + aips3 = (struct aipstz_regs *)AIPS3_CONFIG_BASE_ADDR; #endif /* -- 2.39.2