diff options
Diffstat (limited to 'arch/arm/mach-omap/omap3_generic.c')
| -rw-r--r-- | arch/arm/mach-omap/omap3_generic.c | 37 |
1 files changed, 13 insertions, 24 deletions
diff --git a/arch/arm/mach-omap/omap3_generic.c b/arch/arm/mach-omap/omap3_generic.c index 3f6a346277..8230b37619 100644 --- a/arch/arm/mach-omap/omap3_generic.c +++ b/arch/arm/mach-omap/omap3_generic.c @@ -32,18 +32,17 @@ #include <init.h> #include <io.h> #include <restart.h> -#include <mach/omap3-silicon.h> -#include <mach/gpmc.h> -#include <mach/generic.h> -#include <mach/sdrc.h> -#include <mach/control.h> -#include <mach/omap3-smx.h> -#include <mach/clocks.h> -#include <mach/omap3-clock.h> -#include <mach/wdt.h> -#include <mach/sys_info.h> -#include <mach/syslib.h> -#include <mach/omap3-generic.h> +#include <mach/omap/omap3-silicon.h> +#include <mach/omap/gpmc.h> +#include <mach/omap/generic.h> +#include <mach/omap/sdrc.h> +#include <mach/omap/control.h> +#include <mach/omap/omap3-smx.h> +#include <mach/omap/clocks.h> +#include <mach/omap/omap3-clock.h> +#include <mach/omap/sys_info.h> +#include <mach/omap/syslib.h> +#include <mach/omap/omap3-generic.h> #include <reset_source.h> /** @@ -379,19 +378,10 @@ static void secureworld_exit(void) */ static void watchdog_init(void) { - int pending = 1; - sr32(OMAP3_CM_REG(FCLKEN_WKUP), 5, 1, 1); sr32(OMAP3_CM_REG(ICLKEN_WKUP), 5, 1, 1); - wait_on_value((0x1 << 5), 0x20, OMAP3_CM_REG(IDLEST_WKUP), 5); - - writel(WDT_DISABLE_CODE1, OMAP3_WDT_REG(WSPR)); - - do { - pending = readl(OMAP3_WDT_REG(WWPS)); - } while (pending); - writel(WDT_DISABLE_CODE2, OMAP3_WDT_REG(WSPR)); + omap_watchdog_disable(IOMEM(OMAP3_MPU_WDTIMER_BASE)); } /** @@ -485,8 +475,7 @@ static int omap3_bootsource(void) src = BOOTSOURCE_UNKNOWN; } - bootsource_set(src); - bootsource_set_instance(0); + bootsource_set_raw(src, 0); return 0; } |