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-13 11:28:03 +0800 |
| commit | 8ee6dc05a09744e5a489fb8dc756164bbd1d7dd0 (patch) | |
| tree | 6a54f2f229f4b064a8c1b7c19dbcb03eb190d759 | |
| parent | ca0df9c20a3b0e67bf95a077115cd43ef61df1b6 (diff) | |
| download | u-boot-imx-8ee6dc05a09744e5a489fb8dc756164bbd1d7dd0.zip u-boot-imx-8ee6dc05a09744e5a489fb8dc756164bbd1d7dd0.tar.gz u-boot-imx-8ee6dc05a09744e5a489fb8dc756164bbd1d7dd0.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>
(cherry picked from commit 4543971c6078410078efbc830b9fc86363e7bebd)
| -rw-r--r-- | arch/arm/cpu/armv7/mx6/soc.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/cpu/armv7/mx6/soc.c b/arch/arm/cpu/armv7/mx6/soc.c index af99b3e..3850e1f 100644 --- a/arch/arm/cpu/armv7/mx6/soc.c +++ b/arch/arm/cpu/armv7/mx6/soc.c @@ -738,7 +738,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 |