* Tony Lindgren <tony@xxxxxxxxxxx> [081014 13:09]:
> * David Brownell <david-b@xxxxxxxxxxx> [081014 11:53]:
> > On Tuesday 14 October 2008, Russell King wrote:
> > > Since the OMAP updates I merged from Tony are already broken due to
> > > missing definitions, and I'm not getting any response from Tony on
> > > fixing those,
>
> I just sent you a fix for that few hours ago.
>
> > Probably has to do with his travel plans, which he mentioned
> > last week (Thursday?). I think he's back online in the next
> > day or two.
> >
> >
> > > I will be dropping the problematical updates so we can
> > > at least keep mainline OMAP in a buildable state. That seems to mean
> > > dropping the new OMAP3 support.
>
> Yes, I'm back online. And please don't drop these patches, sounds
> like this is a trivial merge issue.
And here's the patch for Russell to avoid the merge conflict.
Also in Russell's patch tracking system as patch 5302/1.
>
> Regards,
>
> Tony
From: Tony Lindgren <tony@xxxxxxxxxxx>
Date: Tue, 14 Oct 2008 13:25:20 -0700
Subject: [PATCH] ARM: OMAP: Revert omap3 WDT changes to avoid merge conflict
With the upcoming WDT patches OMAP_WDT_BASE is no longer needed
in devices.c. Revert some earlier omap3 changes to avoid merge
conflicts with the WDT patches.
Signed-off-by: Tony Lindgren <tony@xxxxxxxxxxx>
--- a/arch/arm/plat-omap/devices.c
+++ b/arch/arm/plat-omap/devices.c
@@ -399,17 +399,8 @@ static inline void omap_init_uwire(void) {}
#if defined(CONFIG_OMAP_WATCHDOG) || defined(CONFIG_OMAP_WATCHDOG_MODULE)
-#if defined(CONFIG_ARCH_OMAP34XX)
-#define OMAP_WDT_BASE 0x48314000
-#elif defined(CONFIG_ARCH_OMAP24XX)
-
-#ifdef CONFIG_ARCH_OMAP2430
-/* WDT2 */
-#define OMAP_WDT_BASE 0x49016000
-#else
+#ifdef CONFIG_ARCH_OMAP24XX
#define OMAP_WDT_BASE 0x48022000
-#endif
-
#else
#define OMAP_WDT_BASE 0xfffeb000
#endif
