From d0acd99334a74b345429ab81b2039e2b4ede7208 Mon Sep 17 00:00:00 2001 From: Peng Fan Date: Sat, 11 Jul 2015 11:38:42 +0800 Subject: imx: add cpu type for i.MX6QP/DP Add cpu type for i.MX6QP/DP. This patch also fix is_mx6dqp(), since get_cpu_rev can return MXC_CPU_MX6QP and MXC_CPU_MX6DP, we should use: (is_cpu_type(MXC_CPU_MX6QP) || is_cpu_type(MXC_CPU_MX6DP)). Signed-off-by: Peng Fan Acked-by: Stefano Babic --- arch/arm/imx-common/cpu.c | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'arch/arm/imx-common/cpu.c') diff --git a/arch/arm/imx-common/cpu.c b/arch/arm/imx-common/cpu.c index 5e56cfe8f2..096d22ea45 100644 --- a/arch/arm/imx-common/cpu.c +++ b/arch/arm/imx-common/cpu.c @@ -122,6 +122,10 @@ unsigned imx_ddr_size(void) const char *get_imx_type(u32 imxtype) { switch (imxtype) { + case MXC_CPU_MX6QP: + return "6QP"; /* Quad-Plus version of the mx6 */ + case MXC_CPU_MX6DP: + return "6DP"; /* Dual-Plus version of the mx6 */ case MXC_CPU_MX6Q: return "6Q"; /* Quad-core version of the mx6 */ case MXC_CPU_MX6D: -- cgit v1.2.3 From 8631c06e9b8563f8196ba26333c8f3a80bf45517 Mon Sep 17 00:00:00 2001 From: Peng Fan Date: Mon, 20 Jul 2015 19:28:21 +0800 Subject: imx: mx6ul: Add i.MX6UL CPU type Add MXC_CPU_MX6UL for i.MX6UL CPU type which is got at runtime from DIGPROG register. But the value has been occupied by MXC_CPU_MX6D which is not real id from DIGPROG register, so change i.MX6D to value 0x67 which was not occupied. Signed-off-by: Peng Fan Signed-off-by: Ye.Li --- arch/arm/imx-common/cpu.c | 2 ++ 1 file changed, 2 insertions(+) (limited to 'arch/arm/imx-common/cpu.c') diff --git a/arch/arm/imx-common/cpu.c b/arch/arm/imx-common/cpu.c index 096d22ea45..e27546c906 100644 --- a/arch/arm/imx-common/cpu.c +++ b/arch/arm/imx-common/cpu.c @@ -138,6 +138,8 @@ const char *get_imx_type(u32 imxtype) return "6SL"; /* Solo-Lite version of the mx6 */ case MXC_CPU_MX6SX: return "6SX"; /* SoloX version of the mx6 */ + case MXC_CPU_MX6UL: + return "6UL"; /* Ultra-Lite version of the mx6 */ case MXC_CPU_MX51: return "51"; case MXC_CPU_MX53: -- cgit v1.2.3