LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
* linux-next: manual merge of the clockevents tree with the arm tree
@ 2015-01-27  5:24 Stephen Rothwell
  0 siblings, 0 replies; 2+ messages in thread
From: Stephen Rothwell @ 2015-01-27  5:24 UTC (permalink / raw)
  To: Daniel Lezcano, Russell King
  Cc: linux-next, linux-kernel, Dmitry Eremin-Solenikov, Oleksij Rempel

[-- Attachment #1: Type: text/plain, Size: 1244 bytes --]

Hi Daniel,

Today's linux-next merge of the clockevents tree got a conflict in
drivers/clocksource/Kconfig between commit e074ff86e8b4 ("ARM: 8251/1:
clocksource: enable pxa_timer for SA-1100 platform") from the arm tree
and commit e4940cd76934 ("ARM: clocksource: add asm9260_timer driver")
from the clockevents tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc drivers/clocksource/Kconfig
index 6b6f1e4950df,4f2240c9c145..000000000000
--- a/drivers/clocksource/Kconfig
+++ b/drivers/clocksource/Kconfig
@@@ -232,11 -236,13 +239,20 @@@ config CLKSRC_MIPS_GI
  	depends on MIPS_GIC
  	select CLKSRC_OF
  
 +config CLKSRC_PXA
 +	def_bool y if ARCH_PXA || ARCH_SA1100
 +	select CLKSRC_OF if USE_OF
 +	help
 +	  This enables OST0 support available on PXA and SA-11x0
 +	  platforms.
 +
+ config ASM9260_TIMER
+ 	bool "Alphascale ASM9260 timer driver"
+ 	select CLKSRC_MMIO
+ 	select CLKSRC_OF
+ 	default y if MACH_ASM9260
+ 	help
+ 	  This enables build of a clocksource and clockevent driver for
+ 	  the 32-bit System Timer hardware available on a Alphascale ASM9260.
+ 
  endmenu

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

^ permalink raw reply	[flat|nested] 2+ messages in thread

* linux-next: manual merge of the clockevents tree with the arm tree
@ 2015-06-02  4:52 Stephen Rothwell
  0 siblings, 0 replies; 2+ messages in thread
From: Stephen Rothwell @ 2015-06-02  4:52 UTC (permalink / raw)
  To: Daniel Lezcano, Russell King
  Cc: linux-next, linux-kernel, Sudeep Holla, Maxime Coquelin

[-- Attachment #1: Type: text/plain, Size: 1125 bytes --]

Hi Daniel,

Today's linux-next merge of the clockevents tree got a conflict in
drivers/clocksource/Makefile between commit 5261ef2ea836 ("ARM: 8366/1:
move Dual-Timer SP804 driver to drivers/clocksource") from the arm tree
and commit 17b85e25f282 ("clocksource/drivers/armv7m_systick: Add ARM
System timer driver") from the clockevents tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc drivers/clocksource/Makefile
index 12ec793f7fff,06919b619084..000000000000
--- a/drivers/clocksource/Makefile
+++ b/drivers/clocksource/Makefile
@@@ -45,7 -46,7 +47,8 @@@ obj-$(CONFIG_MTK_TIMER)		+= mtk_timer.
  
  obj-$(CONFIG_ARM_ARCH_TIMER)		+= arm_arch_timer.o
  obj-$(CONFIG_ARM_GLOBAL_TIMER)		+= arm_global_timer.o
 +obj-$(CONFIG_ARM_TIMER_SP804)		+= timer-sp804.o
+ obj-$(CONFIG_ARMV7M_SYSTICK)		+= armv7m_systick.o
  obj-$(CONFIG_CLKSRC_METAG_GENERIC)	+= metag_generic.o
  obj-$(CONFIG_ARCH_HAS_TICK_BROADCAST)	+= dummy_timer.o
  obj-$(CONFIG_ARCH_KEYSTONE)		+= timer-keystone.o

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2015-06-02  4:52 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-01-27  5:24 linux-next: manual merge of the clockevents tree with the arm tree Stephen Rothwell
2015-06-02  4:52 Stephen Rothwell

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).