cpufreq: ARM: Arrange drivers in alphabetical order

Normally we keep drivers in alphabetical inside Kconfig and Makefile and over
time this was broken for ARM cpufreq drivers. Fix it.

Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org>
Acked-by: Stephen Warren <swarren@nvidia.com>
Tested-by: Stephen Warren <swarren@nvidia.com>
Acked-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>

diff --git a/drivers/cpufreq/Kconfig.arm b/drivers/cpufreq/Kconfig.arm
index 87b7e48698d06e489225d8b9b4e2bee560733798..25d866a32f51508c3e71a4be509f350b79b61506 100644 (file)
--- a/drivers/cpufreq/Kconfig.arm
+++ b/drivers/cpufreq/Kconfig.arm
@@ -14,6 +14,64 @@ config ARM_DT_BL_CPUFREQ
          This enables the Generic CPUfreq driver for ARM big.LITTLE platform.
          This gets frequency tables from DT.
 
+config ARM_EXYNOS_CPUFREQ
+       bool "SAMSUNG EXYNOS SoCs"
+       depends on ARCH_EXYNOS
+       default y
+       help
+         This adds the CPUFreq driver common part for Samsung
+         EXYNOS SoCs.
+
+         If in doubt, say N.
+
+config ARM_EXYNOS4210_CPUFREQ
+       def_bool CPU_EXYNOS4210
+       help
+         This adds the CPUFreq driver for Samsung EXYNOS4210
+         SoC (S5PV310 or S5PC210).
+
+config ARM_EXYNOS4X12_CPUFREQ
+       def_bool (SOC_EXYNOS4212 || SOC_EXYNOS4412)
+       help
+         This adds the CPUFreq driver for Samsung EXYNOS4X12
+         SoC (EXYNOS4212 or EXYNOS4412).
+
+config ARM_EXYNOS5250_CPUFREQ
+       def_bool SOC_EXYNOS5250
+       help
+         This adds the CPUFreq driver for Samsung EXYNOS5250
+         SoC.
+
+config ARM_HIGHBANK_CPUFREQ
+       tristate "Calxeda Highbank-based"
+       depends on ARCH_HIGHBANK
+       select CPU_FREQ_TABLE
+       select GENERIC_CPUFREQ_CPU0
+       select PM_OPP
+       select REGULATOR
+
+       default m
+       help
+         This adds the CPUFreq driver for Calxeda Highbank SoC
+         based boards.
+
+         If in doubt, say N.
+
+config ARM_IMX6Q_CPUFREQ
+       tristate "Freescale i.MX6Q cpufreq support"
+       depends on SOC_IMX6Q
+       depends on REGULATOR_ANATOP
+       help
+         This adds cpufreq driver support for Freescale i.MX6Q SOC.
+
+         If in doubt, say N.
+
+config ARM_KIRKWOOD_CPUFREQ
+       def_bool ARCH_KIRKWOOD && OF
+       help
+         This adds the CPUFreq driver for Marvell Kirkwood
+         SoCs.
+
 config ARM_OMAP2PLUS_CPUFREQ
        bool "TI OMAP2+"
        depends on ARCH_OMAP2PLUS
@@ -61,67 +119,9 @@ config ARM_S5PV210_CPUFREQ
 
          If in doubt, say N.
 
-config ARM_EXYNOS_CPUFREQ
-       bool "SAMSUNG EXYNOS SoCs"
-       depends on ARCH_EXYNOS
-       default y
-       help
-         This adds the CPUFreq driver common part for Samsung
-         EXYNOS SoCs.
-
-         If in doubt, say N.
-
-config ARM_EXYNOS4210_CPUFREQ
-       def_bool CPU_EXYNOS4210
-       help
-         This adds the CPUFreq driver for Samsung EXYNOS4210
-         SoC (S5PV310 or S5PC210).
-
-config ARM_EXYNOS4X12_CPUFREQ
-       def_bool (SOC_EXYNOS4212 || SOC_EXYNOS4412)
-       help
-         This adds the CPUFreq driver for Samsung EXYNOS4X12
-         SoC (EXYNOS4212 or EXYNOS4412).
-
-config ARM_EXYNOS5250_CPUFREQ
-       def_bool SOC_EXYNOS5250
-       help
-         This adds the CPUFreq driver for Samsung EXYNOS5250
-         SoC.
-
-config ARM_KIRKWOOD_CPUFREQ
-       def_bool ARCH_KIRKWOOD && OF
-       help
-         This adds the CPUFreq driver for Marvell Kirkwood
-         SoCs.
-
-config ARM_IMX6Q_CPUFREQ
-       tristate "Freescale i.MX6Q cpufreq support"
-       depends on SOC_IMX6Q
-       depends on REGULATOR_ANATOP
-       help
-         This adds cpufreq driver support for Freescale i.MX6Q SOC.
-
-         If in doubt, say N.
-
 config ARM_SPEAR_CPUFREQ
        bool "SPEAr CPUFreq support"
        depends on PLAT_SPEAR
        default y
        help
          This adds the CPUFreq driver support for SPEAr SOCs.
-
-config ARM_HIGHBANK_CPUFREQ
-       tristate "Calxeda Highbank-based"
-       depends on ARCH_HIGHBANK
-       select CPU_FREQ_TABLE
-       select GENERIC_CPUFREQ_CPU0
-       select PM_OPP
-       select REGULATOR
-
-       default m
-       help
-         This adds the CPUFreq driver for Calxeda Highbank SoC
-         based boards.
-
-         If in doubt, say N.

diff --git a/drivers/cpufreq/Makefile b/drivers/cpufreq/Makefile
index ba9a3e1b1e6944afd3e7d5086cd8555c98d55824..2c255043927918853aad168a9ef9e7d25e9a30bf 100644 (file)
--- a/drivers/cpufreq/Makefile
+++ b/drivers/cpufreq/Makefile
@@ -50,18 +50,18 @@ obj-$(CONFIG_ARM_BIG_LITTLE_CPUFREQ)        += arm_big_little.o
 obj-$(CONFIG_ARM_DT_BL_CPUFREQ)                += arm_big_little_dt.o
 
 obj-$(CONFIG_UX500_SOC_DB8500)         += dbx500-cpufreq.o
-obj-$(CONFIG_ARM_S3C2416_CPUFREQ)      += s3c2416-cpufreq.o
-obj-$(CONFIG_ARM_S3C64XX_CPUFREQ)      += s3c64xx-cpufreq.o
-obj-$(CONFIG_ARM_S5PV210_CPUFREQ)      += s5pv210-cpufreq.o
 obj-$(CONFIG_ARM_EXYNOS_CPUFREQ)       += exynos-cpufreq.o
 obj-$(CONFIG_ARM_EXYNOS4210_CPUFREQ)   += exynos4210-cpufreq.o
 obj-$(CONFIG_ARM_EXYNOS4X12_CPUFREQ)   += exynos4x12-cpufreq.o
 obj-$(CONFIG_ARM_EXYNOS5250_CPUFREQ)   += exynos5250-cpufreq.o
+obj-$(CONFIG_ARM_HIGHBANK_CPUFREQ)     += highbank-cpufreq.o
+obj-$(CONFIG_ARM_IMX6Q_CPUFREQ)                += imx6q-cpufreq.o
 obj-$(CONFIG_ARM_KIRKWOOD_CPUFREQ)     += kirkwood-cpufreq.o
 obj-$(CONFIG_ARM_OMAP2PLUS_CPUFREQ)    += omap-cpufreq.o
+obj-$(CONFIG_ARM_S3C2416_CPUFREQ)      += s3c2416-cpufreq.o
+obj-$(CONFIG_ARM_S3C64XX_CPUFREQ)      += s3c64xx-cpufreq.o
+obj-$(CONFIG_ARM_S5PV210_CPUFREQ)      += s5pv210-cpufreq.o
 obj-$(CONFIG_ARM_SPEAR_CPUFREQ)                += spear-cpufreq.o
-obj-$(CONFIG_ARM_HIGHBANK_CPUFREQ)     += highbank-cpufreq.o
-obj-$(CONFIG_ARM_IMX6Q_CPUFREQ)                += imx6q-cpufreq.o
 
 ##################################################################################
 # PowerPC platform drivers