From: tony@atomide•com (Tony Lindgren)
To: linux-arm-kernel@lists•infradead.org
Subject: [GIT PULL 8/10] omap timer cleanup for v3.5 merge window
Date: Thu, 10 May 2012 11:51:31 -0700 [thread overview]
Message-ID: <20120510185130.GJ21851@atomide.com> (raw)
In-Reply-To: <E1SSYJA-0006UJ-4H@merlin.infradead.org>
* Tony Lindgren <tony@atomide•com> [120510 11:49]:
> The following changes since commit bfd17879866b36e95c58721da070d9f2ac7f8901:
>
> Merge tag 'omap-devel-c-for-3.5' of git://git.kernel.org/pub/scm/linux/kernel/git/pjw/omap-pending into devel-hwmod-data (2012-05-09 09:58:42 -0700)
>
> are available in the git repository at:
>
>
> git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-cleanup-timer-for-v3.5
>
> for you to fetch changes up to 1fe97c8f6a1de67a5f56e029a818903d5bed8017:
>
> ARM: OMAP: Make OMAP clocksource source selection using kernel param (2012-05-09 10:07:05 -0700)
>
> ----------------------------------------------------------------
> Timer changes to make it easier to support various SoCs
>
> ----------------------------------------------------------------
And this has a conflict for common headers:
--- a/arch/arm/mach-omap1/common.h
+++ b/arch/arm/mach-omap1/common.h
@@@ -57,16 -56,15 +57,22 @@@ void omap1_init_early(void)
void omap1_init_irq(void);
void omap1_restart(char, const char *);
+extern void __init omap_check_revision(void);
+
+extern void omap1_nand_cmd_ctl(struct mtd_info *mtd, int cmd,
+ unsigned int ctrl);
+
- extern struct sys_timer omap1_timer;
- extern bool omap_32k_timer_init(void);
-
+extern u32 omap_irq_flags;
-
+extern int ocpi_enable(void);
++
+ extern struct sys_timer omap1_timer;
+ #ifdef CONFIG_OMAP_32K_TIMER
+ extern int omap_32k_timer_init(void);
+ #else
+ static inline int __init omap_32k_timer_init(void)
+ {
+ return -ENODEV;
+ }
+ #endif
-extern void __init omap_init_consistent_dma_size(void);
#endif /* __ARCH_ARM_MACH_OMAP1_COMMON_H */
diff --cc arch/arm/plat-omap/include/plat/common.h
index a557b84,55c514b..d1cb6f5
--- a/arch/arm/plat-omap/include/plat/common.h
+++ b/arch/arm/plat-omap/include/plat/common.h
@@@ -30,10 -30,8 +30,10 @@@
#include <plat/i2c.h>
#include <plat/omap_hwmod.h>
- extern int __init omap_init_clocksource_32k(void);
+ extern int __init omap_init_clocksource_32k(void __iomem *vbase);
+extern void __init omap_check_revision(void);
+
extern void omap_reserve(void);
extern int omap_dss_reset(struct omap_hwmod *);
next prev parent reply other threads:[~2012-05-10 18:51 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-05-10 18:39 [GIT PULL 1/10] omap non-critical fixes for v3.5 merge window Tony Lindgren
2012-05-10 18:39 ` [GIT PULL 3/10] more omap soc clean-up " Tony Lindgren
2012-05-10 18:39 ` [GIT PULL 2/10] " Tony Lindgren
2012-05-10 18:39 ` [GIT PULL 7/10] omap device init clean-up for v3.5 Tony Lindgren
2012-05-10 18:39 ` [GIT PULL 4/10] updates for omap PRCM (Power, Reset, Clock Management) Tony Lindgren
2012-05-10 18:39 ` [GIT PULL 5/10] omap board file changes for v3.5 merge window Tony Lindgren
2012-05-10 18:39 ` [GIT PULL 6/10] omap hwmod data additions for v3.5, depends on devel-prcm Tony Lindgren
2012-05-10 18:39 ` [GIT PULL 9/10] omap devicetree updates for v3.5 merge window Tony Lindgren
2012-05-10 18:39 ` [GIT PULL 8/10] omap timer cleanup " Tony Lindgren
2012-05-10 18:39 ` [GIT PULL 10/10] omap dss clean up " Tony Lindgren
[not found] ` <E1SSYIv-0006IZ-NG@merlin.infradead.org>
2012-05-10 18:50 ` [GIT PULL 9/10] omap devicetree updates " Tony Lindgren
[not found] ` <E1SSYJA-0006UJ-4H@merlin.infradead.org>
2012-05-10 18:51 ` Tony Lindgren [this message]
2012-05-10 20:24 ` [GIT PULL 8/10] omap timer cleanup " Tony Lindgren
2012-05-11 7:07 ` Olof Johansson
[not found] ` <E1SSYJW-0006gd-Dw@merlin.infradead.org>
2012-05-10 18:53 ` [GIT PULL 10/10] omap dss clean up " Tony Lindgren
[not found] ` <E1SSYHG-0005cy-Cu@merlin.infradead.org>
2012-05-10 18:55 ` [GIT PULL 2/10] omap soc clean-up " Tony Lindgren
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=20120510185130.GJ21851@atomide.com \
--to=tony@atomide$(echo .)com \
--cc=linux-arm-kernel@lists$(echo .)infradead.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