From: Lothar Waßmann Date: Thu, 22 Oct 2015 13:04:44 +0000 (+0200) Subject: arm: mx6: fix the AIPS?_BASE_ADDR fsckup introduced by commit f5def95698f6 X-Git-Tag: KARO-TX6UL-2015-10-23~1 X-Git-Url: https://git.kernelconcepts.de/?p=karo-tx-uboot.git;a=commitdiff_plain;h=fdd6994fe0b1ed4e75ed47f6a7d056dea753ef2a;ds=sidebyside 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. --- 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 /*