MLK-10973 ARM: imx6: correct the soc_id on imx6qp

On i.MX6QP, the soc_id exported to the /sys/devices/soc0/soc_id
should be 'i.MX6QP'.

Signed-off-by: Bai Ping <b51503@freescale.com>
(cherry picked from commit 5b478870b0b936a6c89574e6fe62f5537e31ecf0)

diff --git a/arch/arm/mach-imx/cpu.c b/arch/arm/mach-imx/cpu.c
index b3347d3..b6a0508 100644 (file)
--- a/arch/arm/mach-imx/cpu.c
+++ b/arch/arm/mach-imx/cpu.c
@@ -126,7 +126,10 @@ struct device * __init imx_soc_device_init(void)
                soc_id = "i.MX6SX";
                break;
        case MXC_CPU_IMX6Q:
-               soc_id = "i.MX6Q";
+               if (imx_get_soc_revision() == IMX_CHIP_REVISION_2_0)
+                       soc_id = "i.MX6QP";
+               else
+                       soc_id = "i.MX6Q";
                break;
        case MXC_CPU_IMX6UL:
                soc_id = "i.MX6UL";