ARM: config: sort select statements alphanumerically

As suggested by Andrew Morton:

  This is a pet peeve of mine.  Any time there's a long list of items
  (header file inclusions, kconfig entries, array initalisers, etc) and
  someone wants to add a new item, they *always* go and stick it at the
  end of the list.

  Guys, don't do this.  Either put the new item into a randomly-chosen
  position or, probably better, alphanumerically sort the list.

lets sort all our select statements alphanumerically.  This commit was
created by the following perl:

while (<>) {
	while (/\\\s*$/) {
		$_ .= <>;
	}
	undef %selects if /^\s*config\s+/;
	if (/^\s+select\s+(\w+).*/) {
		if (defined($selects{$1})) {
			if ($selects{$1} eq $_) {
				print STDERR "Warning: removing duplicated $1 entry\n";
			} else {
				print STDERR "Error: $1 differently selected\n".
					"\tOld: $selects{$1}\n".
					"\tNew: $_\n";
				exit 1;
			}
		}
		$selects{$1} = $_;
		next;
	}
	if (%selects and (/^\s*$/ or /^\s+help/ or /^\s+---help---/ or
			  /^endif/ or /^endchoice/)) {
		foreach $k (sort (keys %selects)) {
			print "$selects{$k}";
		}
		undef %selects;
	}
	print;
}
if (%selects) {
	foreach $k (sort (keys %selects)) {
		print "$selects{$k}";
	}
}

It found two duplicates:

Warning: removing duplicated S5P_SETUP_MIPIPHY entry
Warning: removing duplicated HARDIRQS_SW_RESEND entry

and they are identical duplicates, hence the shrinkage in the diffstat
of two lines.

We have four testers reporting success of this change (Tony, Stephen,
Linus and Sekhar.)

Acked-by: Jason Cooper <jason@lakedaemon.net>
Acked-by: Tony Lindgren <tony@atomide.com>
Acked-by: Stephen Warren <swarren@nvidia.com>
Acked-by: Linus Walleij <linus.walleij@linaro.org>
Acked-by: Sekhar Nori <nsekhar@ti.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

1 files changed, 8 insertions, 8 deletions

diff --git a/arch/arm/mach-ux500/Kconfig b/arch/arm/mach-ux500/Kconfig
index 5848206ee9b9..e8c3f0d70ca6 100644
--- a/arch/arm/mach-ux500/Kconfig
+++ b/arch/arm/mach-ux500/Kconfig
@@ -3,33 +3,33 @@ if ARCH_U8500
 config UX500_SOC_COMMON
         bool
         default y
-        select ARM_GIC
-        select HAS_MTU
-        select PL310_ERRATA_753970 if CACHE_PL310
         select ARM_ERRATA_754322
         select ARM_ERRATA_764369 if SMP
+        select ARM_GIC
         select CACHE_L2X0
+        select COMMON_CLK
+        select HAS_MTU
         select PINCTRL
         select PINCTRL_NOMADIK
-        select COMMON_CLK
+        select PL310_ERRATA_753970 if CACHE_PL310
 
 config UX500_SOC_DB8500
         bool
+        select CPU_FREQ_TABLE if CPU_FREQ
         select MFD_DB8500_PRCMU
+        select PINCTRL_DB8500
         select REGULATOR
         select REGULATOR_DB8500_PRCMU
-        select CPU_FREQ_TABLE if CPU_FREQ
-        select PINCTRL_DB8500
 
 menu "Ux500 target platform (boards)"
 
 config MACH_MOP500
         bool "U8500 Development platform, MOP500 versions"
-        select UX500_SOC_DB8500
         select I2C
         select I2C_NOMADIK
-        select SOC_BUS
         select REGULATOR_FIXED_VOLTAGE
+        select SOC_BUS
+        select UX500_SOC_DB8500
         help
           Include support for the MOP500 development platform.