diff options
| author | Ye.Li <B37916@freescale.com> | 2015-03-23 15:52:14 +0800 |
|---|---|---|
| committer | Max Krummenacher <max.krummenacher@toradex.com> | 2016-03-09 14:42:17 +0100 |
| commit | b507134f2927d8b6d540b2e50c9a0a7699f9eb41 (patch) | |
| tree | 88a58ad0823d92ef054186ea86ce7e3305768cd9 /include | |
| parent | 1422a10ebc904c54c92e72d15ae2d1f05f02c67f (diff) | |
MLK-10448-3 mx6: ccm: Change the clock settings for i.MX6QP
Since i.MX6QP changes some CCM registers, so modify the clocks settings to
follow the hardware changes.
A new CONFIG_MX6QP is introduced here and is used for the CCM difference.
At default CONFIG_MX6Q is enabled along with the CONFIG_MX6QP.
Signed-off-by: Ye.Li <B37916@freescale.com>
(cherry picked from commit 5e4d1537ce9a476c8404126350f05d8976c5aa35)
Conflicts:
arch/arm/cpu/armv7/mx6/clock.c
arch/arm/include/asm/arch-mx6/crm_regs.h
include/configs/mx6_common.h
Diffstat (limited to 'include')
| -rw-r--r-- | include/configs/mx6_common.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/include/configs/mx6_common.h b/include/configs/mx6_common.h index b80a93d219..607fe25ceb 100644 --- a/include/configs/mx6_common.h +++ b/include/configs/mx6_common.h @@ -31,5 +31,8 @@ #define CONFIG_MP #define CONFIG_MXC_GPT_HCLK +#ifdef CONFIG_MX6QP +#define CONFIG_MX6Q +#endif #endif |