diff options
| author | Ye.Li <B37916@freescale.com> | 2015-03-23 15:52:14 +0800 |
|---|---|---|
| committer | Peng Fan <Peng.Fan@freescale.com> | 2015-04-29 15:03:07 +0800 |
| commit | 103094fd6547ec8de13e286327642f2a3285799e (patch) | |
| tree | 5dd5b3cde9a9f68ea7e8d4fa93da65811335e77a /include/configs | |
| parent | fc806c30a55abfdfaed9f653064b600601cc9836 (diff) | |
| download | u-boot-imx-103094fd6547ec8de13e286327642f2a3285799e.zip u-boot-imx-103094fd6547ec8de13e286327642f2a3285799e.tar.gz u-boot-imx-103094fd6547ec8de13e286327642f2a3285799e.tar.bz2 | |
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/configs')
| -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 b80a93d..607fe25 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 |