* Jarkko Nikula <jarkko.nikula@xxxxxxxxx> [080821 02:34]:
> Signed-off line was missing...
>
> ----------------------------->
>
> omap_wdt driver will do unhandled fault on 2420 if support for 2430 is
> compiled in since wrong base address is defined in that case. Assign
> omap_wdt base address runtime depending on cpu type.
Pushing today.
Tony
> Signed-off-by: Jarkko Nikula <jarkko.nikula@xxxxxxxxx>
> ---
> arch/arm/plat-omap/devices.c | 30 +++++++++++++-----------------
> 1 files changed, 13 insertions(+), 17 deletions(-)
>
> diff --git a/arch/arm/plat-omap/devices.c b/arch/arm/plat-omap/devices.c
> index f22ccbb..3bd1da2 100644
> --- a/arch/arm/plat-omap/devices.c
> +++ b/arch/arm/plat-omap/devices.c
> @@ -454,25 +454,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
> -#define OMAP_WDT_BASE 0x48022000
> -#endif
> -
> -#else
> -#define OMAP_WDT_BASE 0xfffeb000
> -#endif
> -
> static struct resource wdt_resources[] = {
> {
> - .start = OMAP_WDT_BASE,
> - .end = OMAP_WDT_BASE + 0x4f,
> .flags = IORESOURCE_MEM,
> },
> };
> @@ -486,6 +469,19 @@ static struct platform_device omap_wdt_device = {
>
> static void omap_init_wdt(void)
> {
> + if (cpu_is_omap16xx())
> + wdt_resources[0].start = 0xfffeb000;
> + else if (cpu_is_omap2420())
> + wdt_resources[0].start = 0x48022000; /* WDT2 */
> + else if (cpu_is_omap2430())
> + wdt_resources[0].start = 0x49016000; /* WDT2 */
> + else if (cpu_is_omap343x())
> + wdt_resources[0].start = 0x48314000; /* WDT2 */
> + else
> + return;
> +
> + wdt_resources[0].end = wdt_resources[0].start + 0x4f;
> +
> (void) platform_device_register(&omap_wdt_device);
> }
> #else
> --
> 1.5.6.3
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-omap" in
> the body of a message to majordomo@xxxxxxxxxxxxxxx
> More majordomo info at http://vger.kernel.org/majordomo-info.html
--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
