Merge tag 'ux500-machine-arm-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson into next/soc

These changes for ux500:
- Drops U8540 and U9540
- Cuts down the Kconfig options due to accumulated simplifications

* tag 'ux500-machine-arm-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson:
  ARM: ux500: Cut down Kconfig options
  ARM: ux500: Drop U8540/9540 support

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

3 files changed, 13 insertions, 60 deletions

diff --git a/arch/arm/mach-ux500/Kconfig b/arch/arm/mach-ux500/Kconfig
index f98332ea2ef2..c1086ebe0050 100644
--- a/arch/arm/mach-ux500/Kconfig
+++ b/arch/arm/mach-ux500/Kconfig
@@ -9,64 +9,33 @@ menuconfig ARCH_U8500
         select ARM_ERRATA_764369 if SMP
         select ARM_GIC
         select CACHE_L2X0
+        select CLKSRC_DBX500_PRCMU
         select CLKSRC_NOMADIK_MTU
         select GPIOLIB
         select HAVE_ARM_SCU if SMP
         select HAVE_ARM_TWD if SMP
+        select I2C
+        select I2C_NOMADIK
+        select MFD_DB8500_PRCMU
         select PINCTRL
+        select PINCTRL_AB8500
+        select PINCTRL_AB8505
         select PINCTRL_ABX500
+        select PINCTRL_DB8500
         select PINCTRL_NOMADIK
         select PL310_ERRATA_753970 if CACHE_L2X0
-        help
-          Support for ST-Ericsson's Ux500 architecture
-
-if ARCH_U8500
-
-config UX500_SOC_DB8500
-        bool
-        select MFD_DB8500_PRCMU
-        select PINCTRL_DB8500
-        select PINCTRL_DB8540
-        select PINCTRL_AB8500
-        select PINCTRL_AB8505
-        select PINCTRL_AB9540
-        select PINCTRL_AB8540
-        select REGULATOR
-        select REGULATOR_DB8500_PRCMU
-        select CLKSRC_DBX500_PRCMU
         select PM_GENERIC_DOMAINS if PM
-
-config MACH_MOP500
-        bool "U8500 Development platform, MOP500 versions"
-        select I2C
-        select I2C_NOMADIK
         select REGULATOR
+        select REGULATOR_DB8500_PRCMU
         select REGULATOR_FIXED_VOLTAGE
         select SOC_BUS
-        select UX500_SOC_DB8500
         help
-          Include support for the MOP500 development platform.
-
-config MACH_HREFV60
-        bool "U8500 Development platform, HREFv60 version"
-        select MACH_MOP500
-        help
-          Include support for the HREFv60 new development platform.
-          Includes HREFv70, v71 etc.
+          Support for ST-Ericsson's Ux500 architecture
 
-config MACH_SNOWBALL
-        bool "U8500 Snowball platform"
-        select MACH_MOP500
-        help
-          Include support for the snowball development platform.
+if ARCH_U8500
 
-config UX500_AUTO_PLATFORM
+config UX500_SOC_DB8500
         def_bool y
-        select MACH_MOP500
-        help
-          At least one platform needs to be selected in order to build
-          a working kernel. If everything else is disabled, this
-          automatically enables MACH_MOP500.
 
 config UX500_DEBUG_UART
         int "Ux500 UART to use for low-level debug"
diff --git a/arch/arm/mach-ux500/cpu-db8500.c b/arch/arm/mach-ux500/cpu-db8500.c
index 36cd23c8be9b..389ecf6faa00 100644
--- a/arch/arm/mach-ux500/cpu-db8500.c
+++ b/arch/arm/mach-ux500/cpu-db8500.c
@@ -111,11 +111,6 @@ static void ux500_restart(enum reboot_mode mode, const char *cmd)
         prcmu_system_reset(0);
 }
 
-static struct of_dev_auxdata u8540_auxdata_lookup[] __initdata = {
-        OF_DEV_AUXDATA("stericsson,db8500-prcmu", 0x80157000, "db8500-prcmu", NULL),
-        {},
-};
-
 static const struct of_device_id u8500_local_bus_nodes[] = {
         /* only create devices below soc node */
         { .compatible = "stericsson,db8500", },
@@ -129,20 +124,13 @@ static void __init u8500_init_machine(void)
         /* Initialize ux500 power domains */
         ux500_pm_domains_init();
 
-        /* automatically probe child nodes of dbx5x0 devices */
-        if (of_machine_is_compatible("st-ericsson,u8540"))
-                of_platform_populate(NULL, u8500_local_bus_nodes,
-                                     u8540_auxdata_lookup, NULL);
-        else
-                of_platform_populate(NULL, u8500_local_bus_nodes,
-                                     NULL, NULL);
+        of_platform_populate(NULL, u8500_local_bus_nodes,
+                             NULL, NULL);
 }
 
 static const char * stericsson_dt_platform_compat[] = {
         "st-ericsson,u8500",
-        "st-ericsson,u8540",
         "st-ericsson,u9500",
-        "st-ericsson,u9540",
         NULL,
 };
 
diff --git a/arch/arm/mach-ux500/db8500-regs.h b/arch/arm/mach-ux500/db8500-regs.h
index 27399553c841..3d6e1955119a 100644
--- a/arch/arm/mach-ux500/db8500-regs.h
+++ b/arch/arm/mach-ux500/db8500-regs.h
@@ -41,10 +41,6 @@
 /* ASIC ID is at 0xbf4 offset within this region */
 #define U8500_ASIC_ID_BASE      0x9001D000
 
-#define U9540_BOOT_ROM_BASE     0xFFFE0000
-/* ASIC ID is at 0xbf4 offset within this region */
-#define U9540_ASIC_ID_BASE      0xFFFFD000
-
 #define U8500_PER6_BASE         0xa03c0000
 #define U8500_PER7_BASE         0xa03d0000
 #define U8500_PER5_BASE         0xa03e0000