diff options
| author | Peng Fan <van.freenix@gmail.com> | 2016-05-23 18:35:56 +0800 |
|---|---|---|
| committer | Stefano Babic <sbabic@denx.de> | 2016-05-24 14:59:56 +0200 |
| commit | 27cd0da41e7c2f10d754efba0d178a5715d12bc2 (patch) | |
| tree | 360773817cd643aff1da3e339542f53f9a908249 /arch/arm/imx-common/init.c | |
| parent | 003f0c7eb2f257eddc5173def53fcb5a137045c2 (diff) | |
| download | blackbird-obmc-uboot-27cd0da41e7c2f10d754efba0d178a5715d12bc2.tar.gz blackbird-obmc-uboot-27cd0da41e7c2f10d754efba0d178a5715d12bc2.zip | |
imx-common: use simpler runtime cpu dection macros
Use simpler runtime cpu dection macros.
Signed-off-by: Peng Fan <van.freenix@gmail.com>
Cc: Stefano Babic <sbabic@denx.de>
Cc: Bhuvanchandra DV <bhuvanchandra.dv@toradex.com>
Cc: "Benoît Thébaudeau" <benoit.thebaudeau.dev@gmail.com>
Diffstat (limited to 'arch/arm/imx-common/init.c')
| -rw-r--r-- | arch/arm/imx-common/init.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/arch/arm/imx-common/init.c b/arch/arm/imx-common/init.c index 15dab1d904..3d2ce3a82e 100644 --- a/arch/arm/imx-common/init.c +++ b/arch/arm/imx-common/init.c @@ -44,7 +44,7 @@ void init_aips(void) writel(0x00000000, &aips2->opacr3); writel(0x00000000, &aips2->opacr4); - if (is_cpu_type(MXC_CPU_MX6SX) || is_soc_type(MXC_SOC_MX7)) { + if (is_mx6sx() || is_mx7()) { /* * Set all MPROTx to be non-bufferable, trusted for R/W, * not forced to user-mode. @@ -78,8 +78,7 @@ void imx_set_wdog_powerdown(bool enable) writew(enable, &wdog1->wmcr); writew(enable, &wdog2->wmcr); - if (is_cpu_type(MXC_CPU_MX6SX) || is_cpu_type(MXC_CPU_MX6UL) || - is_soc_type(MXC_SOC_MX7)) + if (is_mx6sx() || is_mx6ul() || is_mx7()) writew(enable, &wdog3->wmcr); #ifdef CONFIG_MX7D writew(enable, &wdog4->wmcr); |
