From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Thomas Gleixner <tglx@linutronix•de>, Ingo Molnar <mingo@elte•hu>,
"H. Peter Anvin" <hpa@zytor•com>,
Peter Zijlstra <peterz@infradead•org>,
Olof Johansson <olof@lixom•net>, Arnd Bergmann <arnd@arndb•de>,
linux-arm-kernel@lists•infradead.org
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Kumar Gala <galak@codeaurora•org>,
Magnus Damm <damm@opensource•se>,
Daniel Lezcano <daniel.lezcano@linaro•org>,
Wolfram Sang <wsa@sang-engineering•com>
Subject: linux-next: manual merge of the tip tree with the arm-soc tree
Date: Mon, 17 Mar 2014 16:37:52 +1100 [thread overview]
Message-ID: <20140317163752.f93d266cffa1cbdfcd1f9f8d@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 2253 bytes --]
Hi all,
Today's linux-next merge of the tip tree got a conflict in
drivers/clocksource/Kconfig between commit 3f8e8cee2f4b ("clocksource:
qcom: Move clocksource code out of mach-msm") from the arm-soc tree and
commit fd3f1270d237 ("clocksource: Add Kconfig entries for CMT, MTU2, TMU
and STI") from the tip 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 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 --]
next reply other threads:[~2014-03-17 5:38 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-03-17 5:37 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2023-01-16 1:21 linux-next: manual merge of the tip tree with the arm-soc tree Stephen Rothwell
2018-10-08 2:32 Stephen Rothwell
2018-03-19 3:06 Stephen Rothwell
2018-04-02 23:48 ` Stephen Rothwell
2018-03-13 3:11 Stephen Rothwell
2015-07-28 2:20 Stephen Rothwell
2014-09-26 6:25 Stephen Rothwell
2014-09-29 18:12 ` Tony Lindgren
2014-03-28 3:50 Stephen Rothwell
2014-03-28 3:47 Stephen Rothwell
2014-03-28 3:39 Stephen Rothwell
2014-03-20 3:36 Stephen Rothwell
2014-04-02 0:47 ` Stephen Rothwell
2014-03-17 5:35 Stephen Rothwell
2014-03-17 16:41 ` Sören Brinkmann
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=20140317163752.f93d266cffa1cbdfcd1f9f8d@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=arnd@arndb$(echo .)de \
--cc=damm@opensource$(echo .)se \
--cc=daniel.lezcano@linaro$(echo .)org \
--cc=galak@codeaurora$(echo .)org \
--cc=hpa@zytor$(echo .)com \
--cc=linux-arm-kernel@lists$(echo .)infradead.org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=mingo@elte$(echo .)hu \
--cc=olof@lixom$(echo .)net \
--cc=peterz@infradead$(echo .)org \
--cc=tglx@linutronix$(echo .)de \
--cc=wsa@sang-engineering$(echo .)com \
/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