From: Mark Brown <broonie@kernel•org>
To: Daniel Lezcano <daniel.lezcano@linaro•org>,
Magnus Damm <damm@opensource•se>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org
Subject: linux-next: manual merge of the clockevents tree with the sh tree
Date: Wed, 12 Mar 2014 22:45:07 +0000 [thread overview]
Message-ID: <20140312224507.c7b9e7f45b1135ff6a7942c8@kernel.org> (raw)
[-- Attachment #1: Type: text/plain, Size: 2637 bytes --]
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 #2: Type: application/pgp-signature, Size: 836 bytes --]
reply other threads:[~2014-03-12 22:45 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20140312224507.c7b9e7f45b1135ff6a7942c8@kernel.org \
--to=broonie@kernel$(echo .)org \
--cc=damm@opensource$(echo .)se \
--cc=daniel.lezcano@linaro$(echo .)org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox