diff options
| author | Ye Li <ye.li@nxp.com> | 2016-04-12 12:24:30 +0800 |
|---|---|---|
| committer | Peng Fan <peng.fan@nxp.com> | 2016-04-12 12:24:30 +0800 |
| commit | 4543971c6078410078efbc830b9fc86363e7bebd (patch) | |
| tree | 561e59e406b8e15b6cb5d2228199bad7f8824c40 /arch | |
| parent | b2740fd7a0f8d80b416d4de1f57b6542407d23bd (diff) | |
| download | u-boot-imx-4543971c6078410078efbc830b9fc86363e7bebd.zip u-boot-imx-4543971c6078410078efbc830b9fc86363e7bebd.tar.gz u-boot-imx-4543971c6078410078efbc830b9fc86363e7bebd.tar.bz2 | |
MLK-12616-6 mx6ull: Update s_init to skip pfd reset
The PFD reset is not needed for mx6ull, since it uses runtime cpu id
checking here, add codes to skip it.
Signed-off-by: Ye Li <ye.li@nxp.com>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/cpu/armv7/mx6/soc.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/arm/cpu/armv7/mx6/soc.c b/arch/arm/cpu/armv7/mx6/soc.c index c725fca..6baaf66 100644 --- a/arch/arm/cpu/armv7/mx6/soc.c +++ b/arch/arm/cpu/armv7/mx6/soc.c @@ -2,7 +2,7 @@ * (C) Copyright 2007 * Sascha Hauer, Pengutronix * - * (C) Copyright 2009-2015 Freescale Semiconductor, Inc. + * (C) Copyright 2009-2016 Freescale Semiconductor, Inc. * * SPDX-License-Identifier: GPL-2.0+ */ @@ -741,7 +741,8 @@ void s_init(void) u32 mask528; u32 reg, periph1, periph2; - if (is_cpu_type(MXC_CPU_MX6SX) || is_cpu_type(MXC_CPU_MX6UL)) + if (is_cpu_type(MXC_CPU_MX6SX) || is_cpu_type(MXC_CPU_MX6UL) || + is_cpu_type(MXC_CPU_MX6ULL)) return; /* Due to hardware limitation, on MX6Q we need to gate/ungate all PFDs |