Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit aa59e19d authored by Tony Lindgren's avatar Tony Lindgren Committed by Russell King
Browse files

[ARM] 5302/1: 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: default avatarTony Lindgren <tony@atomide.com>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent a5a5b8c5

arch/arm/plat-omap/devices.c

+1 −10
Original line number Original line Diff line number Diff line
@@ -392,17 +392,8 @@ static inline void omap_init_uwire(void) {} 




#if	defined(CONFIG_OMAP_WATCHDOG) || defined(CONFIG_OMAP_WATCHDOG_MODULE)

#if	defined(CONFIG_OMAP_WATCHDOG) || defined(CONFIG_OMAP_WATCHDOG_MODULE)





#if defined(CONFIG_ARCH_OMAP34XX)

#ifdef CONFIG_ARCH_OMAP24XX

#define	OMAP_WDT_BASE		0x48314000

#elif defined(CONFIG_ARCH_OMAP24XX)



#ifdef CONFIG_ARCH_OMAP2430

/* WDT2 */

#define	OMAP_WDT_BASE		0x49016000

#else

#define	OMAP_WDT_BASE		0x48022000

#define	OMAP_WDT_BASE		0x48022000

#endif



#else

#else

#define	OMAP_WDT_BASE		0xfffeb000

#define	OMAP_WDT_BASE		0xfffeb000

#endif

#endif