Merge branch 'ux500/delete-u5500' into next/soc

Conflicts:
	arch/arm/mach-ux500/cache-l2x0.c
	arch/arm/mach-ux500/clock.c
	arch/arm/mach-ux500/cpu.c
	arch/arm/mach-ux500/mbox-db5500.c
	arch/arm/mach-ux500/platsmp.c
	arch/arm/mach-ux500/timer.c

Resolve lots of identical conflicts between the removal of
u5500 and the addition of u8540.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>

diff --cc arch/arm/mach-ux500/cache-l2x0.c
index 677bb76,df91344..dc12394
--- 1/arch/arm/mach-ux500/cache-l2x0.c
--- 2/arch/arm/mach-ux500/cache-l2x0.c
+++ b/arch/arm/mach-ux500/cache-l2x0.c
@@@ -36,11 -36,7 +36,9 @@@ static int __init ux500_l2x0_unlock(voi
  
  static int __init ux500_l2x0_init(void)
  {
 -      if (cpu_is_u8500())
 +      u32 aux_val = 0x3e000000;
 +
-       if (cpu_is_u5500())
-               l2x0_base = __io_address(U5500_L2CC_BASE);
-       else if (cpu_is_u8500_family())
++      if (cpu_is_u8500_family())
                l2x0_base = __io_address(U8500_L2CC_BASE);
        else
                ux500_unknown_soc();

diff --cc arch/arm/mach-ux500/clock.c
index cc87f77,9feb6bc..063f3db
--- 1/arch/arm/mach-ux500/clock.c
--- 2/arch/arm/mach-ux500/clock.c
+++ b/arch/arm/mach-ux500/clock.c
@@@ -149,9 -149,7 +149,7 @@@ static unsigned long clk_mtu_get_rate(s
        unsigned long mturate;
        unsigned long retclk;
  
-       if (cpu_is_u5500())
-               addr = __io_address(U5500_PRCMU_BASE);
-       else if (cpu_is_u8500_family())
 -      if (cpu_is_u8500())
++      if (cpu_is_u8500_family())
                addr = __io_address(U8500_PRCMU_BASE);
        else
                ux500_unknown_soc();

diff --cc arch/arm/mach-ux500/cpu.c
index 857e481,4b4e59b..0982279
--- 1/arch/arm/mach-ux500/cpu.c
--- 2/arch/arm/mach-ux500/cpu.c
+++ b/arch/arm/mach-ux500/cpu.c
@@@ -40,10 -39,7 +39,7 @@@ void __init ux500_init_irq(void
        void __iomem *dist_base;
        void __iomem *cpu_base;
  
-       if (cpu_is_u5500()) {
-               dist_base = __io_address(U5500_GIC_DIST_BASE);
-               cpu_base = __io_address(U5500_GIC_CPU_BASE);
-       } else if (cpu_is_u8500_family()) {
 -      if (cpu_is_u8500()) {
++      if (cpu_is_u8500_family()) {
                dist_base = __io_address(U8500_GIC_DIST_BASE);
                cpu_base = __io_address(U8500_GIC_CPU_BASE);
        } else
@@@ -60,9 -56,7 +56,7 @@@
         * Init clocks here so that they are available for system timer
         * initialization.
         */
-       if (cpu_is_u5500())
-               db5500_prcmu_early_init();
 -      if (cpu_is_u8500())
 +      if (cpu_is_u8500_family())
                db8500_prcmu_early_init();
        clk_init();
  }

diff --cc arch/arm/mach-ux500/include/mach/hardware.h
Simple merge

diff --cc arch/arm/mach-ux500/include/mach/irqs.h
Simple merge

diff --cc arch/arm/mach-ux500/platsmp.c
index f499a07,e8cd51a..da1d5ad
--- 1/arch/arm/mach-ux500/platsmp.c
--- 2/arch/arm/mach-ux500/platsmp.c
+++ b/arch/arm/mach-ux500/platsmp.c
@@@ -48,9 -48,7 +48,7 @@@ static void write_pen_release(int val
  
  static void __iomem *scu_base_addr(void)
  {
-       if (cpu_is_u5500())
-               return __io_address(U5500_SCU_BASE);
-       else if (cpu_is_u8500_family())
 -      if (cpu_is_u8500())
++      if (cpu_is_u8500_family())
                return __io_address(U8500_SCU_BASE);
        else
                ux500_unknown_soc();
@@@ -120,9 -118,7 +118,7 @@@ static void __init wakeup_secondary(voi
  {
        void __iomem *backupram;
  
-       if (cpu_is_u5500())
-               backupram = __io_address(U5500_BACKUPRAM0_BASE);
-       else if (cpu_is_u8500_family())
 -      if (cpu_is_u8500())
++      if (cpu_is_u8500_family())
                backupram = __io_address(U8500_BACKUPRAM0_BASE);
        else
                ux500_unknown_soc();

diff --cc arch/arm/mach-ux500/timer.c
index 3bfbfdf,52e5533..e263076
--- 1/arch/arm/mach-ux500/timer.c
--- 2/arch/arm/mach-ux500/timer.c
+++ b/arch/arm/mach-ux500/timer.c
@@@ -48,10 -46,7 +46,7 @@@ static void __init ux500_timer_init(voi
        void __iomem *mtu_timer_base;
        void __iomem *prcmu_timer_base;
  
-       if (cpu_is_u5500()) {
-               mtu_timer_base = __io_address(U5500_MTU0_BASE);
-               prcmu_timer_base = __io_address(U5500_PRCMU_TIMER_3_BASE);
-       } else if (cpu_is_u8500_family()) {
 -      if (cpu_is_u8500()) {
++      if (cpu_is_u8500_family()) {
                mtu_timer_base = __io_address(U8500_MTU0_BASE);
                prcmu_timer_base = __io_address(U8500_PRCMU_TIMER_4_BASE);
        } else {