Merge branch 'treewide/cleanup' into next/soc

Merge in cleanup to avoid internal conflicts with newly added code.

* treewide/cleanup:
  ARM: use "depends on" for SoC configs instead of "if" after prompt
  ARM/clocksource: use automatic DT probing for ux500 PRCMU
  ARM: use const and __initconst for smp_operations
  ARM: hisi: do not export smp_operations structures

Signed-off-by: Olof Johansson <olof@lixom.net>

4 files changed, 21 insertions, 12 deletions

diff --git a/arch/arm/mach-bcm/Kconfig b/arch/arm/mach-bcm/Kconfig
index 0207736674d6..c9723d82cb30 100644
--- a/arch/arm/mach-bcm/Kconfig
+++ b/arch/arm/mach-bcm/Kconfig
@@ -1,5 +1,6 @@
 menuconfig ARCH_BCM
-        bool "Broadcom SoC Support" if ARCH_MULTI_V6_V7
+        bool "Broadcom SoC Support"
+        depends on ARCH_MULTI_V6_V7
         help
           This enables support for Broadcom ARM based SoC chips
 
@@ -27,7 +28,8 @@ config ARCH_BCM_IPROC
           Currently supported SoCs are Cygnus.
 
 config ARCH_BCM_CYGNUS
-        bool "Broadcom Cygnus Support" if ARCH_MULTI_V7
+        bool "Broadcom Cygnus Support"
+        depends on ARCH_MULTI_V7
         select ARCH_BCM_IPROC
         help
           Enable support for the Cygnus family,
@@ -36,7 +38,8 @@ config ARCH_BCM_CYGNUS
           BCM58300, BCM58302, BCM58303, BCM58305.
 
 config ARCH_BCM_NSP
-        bool "Broadcom Northstar Plus SoC Support" if ARCH_MULTI_V7
+        bool "Broadcom Northstar Plus SoC Support"
+        depends on ARCH_MULTI_V7
         select ARCH_BCM_IPROC
         select ARM_ERRATA_754322
         select ARM_ERRATA_775420
@@ -52,7 +55,8 @@ config ARCH_BCM_NSP
           NAND flash, SATA and several other IO controllers.
 
 config ARCH_BCM_5301X
-        bool "Broadcom BCM470X / BCM5301X ARM SoC" if ARCH_MULTI_V7
+        bool "Broadcom BCM470X / BCM5301X ARM SoC"
+        depends on ARCH_MULTI_V7
         select ARCH_BCM_IPROC
         select ARM_ERRATA_754322
         select ARM_ERRATA_775420
@@ -89,7 +93,8 @@ config ARCH_BCM_MOBILE
           This enables support for systems based on Broadcom mobile SoCs.
 
 config ARCH_BCM_281XX
-        bool "Broadcom BCM281XX SoC family" if ARCH_MULTI_V7
+        bool "Broadcom BCM281XX SoC family"
+        depends on ARCH_MULTI_V7
         select ARCH_BCM_MOBILE
         select HAVE_SMP
         help
@@ -98,7 +103,8 @@ config ARCH_BCM_281XX
           variants.
 
 config ARCH_BCM_21664
-        bool "Broadcom BCM21664 SoC family" if ARCH_MULTI_V7
+        bool "Broadcom BCM21664 SoC family"
+        depends on ARCH_MULTI_V7
         select ARCH_BCM_MOBILE
         select HAVE_SMP
         help
@@ -129,7 +135,8 @@ config ARCH_BCM_MOBILE_SMP
 comment "Other Architectures"
 
 config ARCH_BCM2835
-        bool "Broadcom BCM2835 family" if ARCH_MULTI_V6
+        bool "Broadcom BCM2835 family"
+        depends on ARCH_MULTI_V6
         select ARCH_REQUIRE_GPIOLIB
         select ARM_AMBA
         select ARM_ERRATA_411920
@@ -142,7 +149,8 @@ config ARCH_BCM2835
           used in the Raspberry Pi and Roku 2 devices.
 
 config ARCH_BCM_63XX
-        bool "Broadcom BCM63xx DSL SoC" if ARCH_MULTI_V7
+        bool "Broadcom BCM63xx DSL SoC"
+        depends on ARCH_MULTI_V7
         depends on MMU
         select ARM_ERRATA_754322
         select ARM_ERRATA_764369 if SMP
@@ -159,7 +167,8 @@ config ARCH_BCM_63XX
           the BCM63138 variant.
 
 config ARCH_BRCMSTB
-        bool "Broadcom BCM7XXX based boards" if ARCH_MULTI_V7
+        bool "Broadcom BCM7XXX based boards"
+        depends on ARCH_MULTI_V7
         select ARM_GIC
         select ARM_ERRATA_798181 if SMP
         select HAVE_ARM_ARCH_TIMER
diff --git a/arch/arm/mach-bcm/bcm63xx_smp.c b/arch/arm/mach-bcm/bcm63xx_smp.c
index 19be90421f4d..9b6727ed68cd 100644
--- a/arch/arm/mach-bcm/bcm63xx_smp.c
+++ b/arch/arm/mach-bcm/bcm63xx_smp.c
@@ -161,7 +161,7 @@ static void __init bcm63138_smp_prepare_cpus(unsigned int max_cpus)
         }
 }
 
-struct smp_operations bcm63138_smp_ops __initdata = {
+static const struct smp_operations bcm63138_smp_ops __initconst = {
         .smp_prepare_cpus       = bcm63138_smp_prepare_cpus,
         .smp_boot_secondary     = bcm63138_smp_boot_secondary,
 };
diff --git a/arch/arm/mach-bcm/platsmp-brcmstb.c b/arch/arm/mach-bcm/platsmp-brcmstb.c
index 44d6bddf7a4e..40dc8448445e 100644
--- a/arch/arm/mach-bcm/platsmp-brcmstb.c
+++ b/arch/arm/mach-bcm/platsmp-brcmstb.c
@@ -356,7 +356,7 @@ static int brcmstb_boot_secondary(unsigned int cpu, struct task_struct *idle)
         return 0;
 }
 
-static struct smp_operations brcmstb_smp_ops __initdata = {
+static const struct smp_operations brcmstb_smp_ops __initconst = {
         .smp_prepare_cpus       = brcmstb_cpu_ctrl_setup,
         .smp_boot_secondary     = brcmstb_boot_secondary,
 #ifdef CONFIG_HOTPLUG_CPU
diff --git a/arch/arm/mach-bcm/platsmp.c b/arch/arm/mach-bcm/platsmp.c
index ea4201e6d0c9..575defcc53f9 100644
--- a/arch/arm/mach-bcm/platsmp.c
+++ b/arch/arm/mach-bcm/platsmp.c
@@ -276,7 +276,7 @@ out:
         return ret;
 }
 
-static struct smp_operations bcm_smp_ops __initdata = {
+static const struct smp_operations bcm_smp_ops __initconst = {
         .smp_prepare_cpus       = bcm_smp_prepare_cpus,
         .smp_boot_secondary     = kona_boot_secondary,
 };