From: Arnd Bergmann <arnd@arndb.de>
Date: Mon, 14 May 2012 14:29:32 +0000 (+0200)
Subject: Merge branch 'ux500/delete-u5500' into next/soc
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=815acebff7ac578970986ca3f0ff406c92a0e243;p=GitHub%2Fexynos8895%2Fandroid_kernel_samsung_universal8895.git

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>
---

815acebff7ac578970986ca3f0ff406c92a0e243
diff --cc arch/arm/mach-ux500/cache-l2x0.c
index 677bb7683c71,df91344aa2db..dc12394295d5
--- a/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 cc87f7788ff5,9feb6bc7f20e..063f3dbd45a9
--- a/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 857e48167526,4b4e59b30d81..0982279f51f3
--- a/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/platsmp.c
index f499a0703928,e8cd51aa61e4..da1d5ad5bd45
--- a/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 3bfbfdf833c6,52e55337aa9b..e263076bb119
--- a/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 {