From 103094fd6547ec8de13e286327642f2a3285799e Mon Sep 17 00:00:00 2001 From: "Ye.Li" Date: Mon, 23 Mar 2015 15:52:14 +0800 Subject: 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 (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 --- include/configs/mx6_common.h | 3 +++ 1 file changed, 3 insertions(+) (limited to 'include/configs') 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 -- cgit v1.1