Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit e8cdeefc222ff32a80282dd571be0426156cd9d9

Authored by Ye.Li
Committed by Stefano Babic
1 parent 9598f8c30c
Exists in v2017.01-smarct4x and in 37 other branches 8qm-imx_v2020.04_5.4.70_2.3.0, emb_lf_v2022.04, imx_v2015.04_4.1.15_1.0.0_ga, pitx_8mp_lf_v2020.04, smarc-8m-android-10.0.0_2.6.0, smarc-8m-android-11.0.0_2.0.0, smarc-8mp-android-11.0.0_2.0.0, smarc-imx6_v2018.03_4.14.98_2.0.0_ga, smarc-imx7_v2017.03_4.9.11_1.0.0_ga, smarc-imx7_v2018.03_4.14.98_2.0.0_ga, smarc-imx_v2015.04_4.1.15_1.0.0_ga, smarc-imx_v2017.03_4.9.11_1.0.0_ga, smarc-imx_v2017.03_4.9.88_2.0.0_ga, smarc-imx_v2017.03_o8.1.0_1.3.0_8m, smarc-imx_v2018.03_4.14.78_1.0.0_ga, smarc-m6.0.1_2.1.0-ga, smarc-n7.1.2_2.0.0-ga, smarc-rel_imx_4.1.15_2.0.0_ga, smarc_8m-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8m-imx_v2019.04_4.19.35_1.1.0, smarc_8m_00d0-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8mm-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8mm-imx_v2019.04_4.19.35_1.1.0, smarc_8mm-imx_v2020.04_5.4.24_2.1.0, smarc_8mp_lf_v2020.04, smarc_8mq-imx_v2020.04_5.4.24_2.1.0, smarc_8mq_lf_v2020.04, ti-u-boot-2015.07, v2015.07-smarct33, v2015.07-smarct33-emmc, v2015.07-smarct4x, v2016.05-dlt, v2016.05-smarct3x, v2016.05-smarct3x-emmc, v2016.05-smarct4x, v2017.01-smarct3x, v2017.01-smarct3x-emmc

imx: mx6: Fixed AIPS3 base address issue 

Should use AIPS3 configuration address 0x0227C000 to set AIPS3,
not the AIPS3 base address.
Additional, replace AIPS1_BASE_ADDR to AIPS3_ARB_BASE_ADDR to align with
AIPS1 and AIPS2, and resolve the AIPS3_ARB_BASE_ADDR undefine problem.

Signed-off-by: Ye.Li <B37916@freescale.com>

Showing 2 changed files with 3 additions and 3 deletions Side-by-side Diff

arch/arm/cpu/armv7/mx6/soc.c
Diff comments   View file @ e8cdeef
... ... @@ -109,7 +109,7 @@
109 109 aips1 = (struct aipstz_regs *)AIPS1_BASE_ADDR;
110 110 aips2 = (struct aipstz_regs *)AIPS2_BASE_ADDR;
111 111 #ifdef CONFIG_MX6SX
112   - aips3 = (struct aipstz_regs *)AIPS3_BASE_ADDR;
  112 + aips3 = (struct aipstz_regs *)AIPS3_CONFIG_BASE_ADDR;
113 113 #endif
114 114  
115 115 /*
arch/arm/include/asm/arch-mx6/imx-regs.h
Diff comments   View file @ e8cdeef
... ... @@ -88,8 +88,8 @@
88 88 #define AIPS2_ARB_BASE_ADDR 0x02100000
89 89 #define AIPS2_ARB_END_ADDR 0x021FFFFF
90 90 #ifdef CONFIG_MX6SX
91   -#define AIPS3_BASE_ADDR 0x02200000
92   -#define AIPS3_END_ADDR 0x022FFFFF
  91 +#define AIPS3_ARB_BASE_ADDR 0x02200000
  92 +#define AIPS3_ARB_END_ADDR 0x022FFFFF
93 93 #define WEIM_ARB_BASE_ADDR 0x50000000
94 94 #define WEIM_ARB_END_ADDR 0x57FFFFFF
95 95 #define QSPI0_AMBA_BASE 0x60000000