linux-kernel - linux-next: manual merge of the arm-soc tree with the arm tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [day] [month] [year] [list]

Message-Id: <20120313193641.674b271a134d9dba201cd644@canb.auug.org.au>
Date:	Tue, 13 Mar 2012 19:36:41 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Olof Johansson <olof@...om.net>, Arnd Bergmann <arnd@...db.de>,
	<linux-arm-kernel@...ts.infradead.org>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Marc Zyngier <marc.zyngier@....com>,
	Linus Walleij <linus.walleij@...aro.org>,
	Russell King <rmk@....linux.org.uk>
Subject: linux-next: manual merge of the arm-soc tree with the arm tree

Hi all,

Today's linux-next merge of the arm-soc tree got a conflict in
arch/arm/mach-ux500/timer.c between commit 8eed6eac103b ("ARM: ux500:
convert to twd_local_timer_register() interface") from the arm tree and
commit b9576623c421 ("ARM: plat-nomadik: get rid of global mtu base
pointer") from the arm-soc tree.

I fixed it up (I think - see below) and can carry the fix as necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au

diff --cc arch/arm/mach-ux500/timer.c
index cadf982,fd00024..0000000
--- a/arch/arm/mach-ux500/timer.c
+++ b/arch/arm/mach-ux500/timer.c
@@@ -15,38 -15,22 +15,39 @@@
  #include <mach/setup.h>
  #include <mach/hardware.h>
  
 +#ifdef CONFIG_HAVE_ARM_TWD
 +static DEFINE_TWD_LOCAL_TIMER(u5500_twd_local_timer,
 +			      U5500_TWD_BASE, IRQ_LOCALTIMER);
 +static DEFINE_TWD_LOCAL_TIMER(u8500_twd_local_timer,
 +			      U8500_TWD_BASE, IRQ_LOCALTIMER);
 +
 +static void __init ux500_twd_init(void)
 +{
 +	struct twd_local_timer *twd_local_timer;
 +	int err;
 +
 +	twd_local_timer = cpu_is_u5500() ? &u5500_twd_local_timer :
 +					   &u8500_twd_local_timer;
 +
 +	err = twd_local_timer_register(twd_local_timer);
 +	if (err)
 +		pr_err("twd_local_timer_register failed %d\n", err);
 +}
 +#else
 +#define ux500_twd_init()	do { } while(0)
 +#endif
 +
  static void __init ux500_timer_init(void)
  {
+ 	void __iomem *mtu_timer_base;
  	void __iomem *prcmu_timer_base;
 +	int err;
  
  	if (cpu_is_u5500()) {
- 		mtu_base = __io_address(U5500_MTU0_BASE);
 -#ifdef CONFIG_LOCAL_TIMERS
 -		twd_base = __io_address(U5500_TWD_BASE);
 -#endif
+ 		mtu_timer_base = __io_address(U5500_MTU0_BASE);
  		prcmu_timer_base = __io_address(U5500_PRCMU_TIMER_3_BASE);
  	} else if (cpu_is_u8500()) {
- 		mtu_base = __io_address(U8500_MTU0_BASE);
 -#ifdef CONFIG_LOCAL_TIMERS
 -		twd_base = __io_address(U8500_TWD_BASE);
 -#endif
+ 		mtu_timer_base = __io_address(U8500_MTU0_BASE);
  		prcmu_timer_base = __io_address(U8500_PRCMU_TIMER_4_BASE);
  	} else {
  		ux500_unknown_soc();
@@@ -69,9 -53,8 +70,9 @@@
  	 *
  	 */
  
- 	nmdk_timer_init();
+ 	nmdk_timer_init(mtu_timer_base);
  	clksrc_dbx500_prcmu_init(prcmu_timer_base);
 +	ux500_twd_init();
  }
  
  static void ux500_timer_reset(void)

Content of type "application/pgp-signature" skipped