Hi Daniel, Today's linux-next merge of the clockevents tree got conflicts between the renesas tree and the clockevents tree. I fixed it up (see below) and can carry the fix as necessary (no action is required). diff --cc arch/arm/mach-shmobile/Kconfig index 5249ff0511a8,c1a9538fb6bb..000000000000 --- a/arch/arm/mach-shmobile/Kconfig +++ b/arch/arm/mach-shmobile/Kconfig @@@ -116,7 -137,7 +130,8 @@@ config ARCH_R8A779 select MIGHT_HAVE_PCI select SH_CLK_CPG select RENESAS_IRQC + select ARCH_DMA_ADDR_T_64BIT if ARM_LPAE + select SYS_SUPPORTS_SH_CMT config ARCH_R8A7791 bool "R-Car M2 (R8A77910)" @@@ -126,7 -147,7 +141,8 @@@ select MIGHT_HAVE_PCI select SH_CLK_CPG select RENESAS_IRQC + select ARCH_DMA_ADDR_T_64BIT if ARM_LPAE + select SYS_SUPPORTS_SH_CMT config ARCH_EMEV2 bool "Emma Mobile EV2" diff --cc drivers/clocksource/Kconfig index 6510ec4f45ff,4f754a972139..000000000000 --- a/drivers/clocksource/Kconfig +++ b/drivers/clocksource/Kconfig @@@ -141,5 -141,46 +141,49 @@@ config VF_PIT_TIME help Support for Period Interrupt Timer on Freescale Vybrid Family SoCs. +config CLKSRC_QCOM + bool ++ + config SYS_SUPPORTS_SH_CMT + bool + + config SYS_SUPPORTS_SH_MTU2 + bool + + config SYS_SUPPORTS_SH_TMU + bool + + config SYS_SUPPORTS_EM_STI + bool + + config SH_TIMER_CMT + bool "Renesas CMT timer driver" if COMPILE_TEST + default SYS_SUPPORTS_SH_CMT + help + This enables build of a clocksource and clockevent driver for + the Compare Match Timer (CMT) hardware available in 16/32/48-bit + variants on a wide range of Mobile and Automotive SoCs from Renesas. + + config SH_TIMER_MTU2 + bool "Renesas MTU2 timer driver" if COMPILE_TEST + default SYS_SUPPORTS_SH_MTU2 + help + This enables build of a clockevent driver for the Multi-Function + Timer Pulse Unit 2 (TMU2) hardware available on SoCs from Renesas. + This hardware comes with 16 bit-timer registers. + + config SH_TIMER_TMU + bool "Renesas TMU timer driver" if COMPILE_TEST + default SYS_SUPPORTS_SH_TMU + help + This enables build of a clocksource and clockevent driver for + the 32-bit Timer Unit (TMU) hardware available on a wide range + SoCs from Renesas. + + config EM_TIMER_STI + bool "Renesas STI timer driver" if COMPILE_TEST + default SYS_SUPPORTS_EM_STI + help + This enables build of a clocksource and clockevent driver for + the 48-bit System Timer (STI) hardware available on a SoCs + such as EMEV2 from former NEC Electronics.
Attachment:
pgpErFUawmKtm.pgp
Description: PGP signature
