ENGR00276593-2 [iMX6x] - Remove references to iMX6Q

Rename iMX6Q CPUFREQ references to iMX6 as the code is
common to all chips in the iMX6x family.

Signed-off-by: Ranjani Vaidyanathan <ra5478@freescale.com>

2 files changed, 3 insertions, 3 deletions

diff --git a/arch/arm/mach-imx/Makefile b/arch/arm/mach-imx/Makefile
index d1e29d1afdef..e53fb59eaf95 100644
--- a/arch/arm/mach-imx/Makefile
+++ b/arch/arm/mach-imx/Makefile
@@ -104,7 +104,7 @@ obj-$(CONFIG_SOC_IMX6SL) += clk-imx6sl.o mach-imx6sl.o
 AFLAGS_suspend-imx6.o :=-Wa,-march=armv7-a
 obj-$(CONFIG_PM) += pm-imx6.o headsmp.o suspend-imx6.o
 
-ifeq ($(CONFIG_ARM_IMX6Q_CPUFREQ),y)
+ifeq ($(CONFIG_ARM_IMX6_CPUFREQ),y)
 obj-y += busfreq-imx6.o
 obj-$(CONFIG_SOC_IMX6Q) += ddr3_freq_imx6.o busfreq_ddr3.o
 endif
diff --git a/arch/arm/mach-imx/mach-imx6q.c b/arch/arm/mach-imx/mach-imx6q.c
index cfa93827c9ad..99ada1118fb6 100644
--- a/arch/arm/mach-imx/mach-imx6q.c
+++ b/arch/arm/mach-imx/mach-imx6q.c
@@ -273,7 +273,7 @@ put_node:
 }
 
 static struct platform_device imx6q_cpufreq_pdev = {
-        .name = "imx6q-cpufreq",
+        .name = "imx6-cpufreq",
 };
 
 static void __init imx6q_init_late(void)
@@ -299,7 +299,7 @@ static void __init imx6q_init_late(void)
                 IMX_CHIP_REVISION_1_0))
                 imx6q_cpuidle_init();
 
-        if (IS_ENABLED(CONFIG_ARM_IMX6Q_CPUFREQ)) {
+        if (IS_ENABLED(CONFIG_ARM_IMX6_CPUFREQ)) {
                 imx6q_opp_init(&imx6q_cpufreq_pdev.dev);
                 platform_device_register(&imx6q_cpufreq_pdev);
         }