diff options
Diffstat (limited to 'arch/arm/mach-omap/omap4_generic.c')
-rw-r--r-- | arch/arm/mach-omap/omap4_generic.c | 41 |
1 files changed, 11 insertions, 30 deletions
diff --git a/arch/arm/mach-omap/omap4_generic.c b/arch/arm/mach-omap/omap4_generic.c index 406b686318..10190b152b 100644 --- a/arch/arm/mach-omap/omap4_generic.c +++ b/arch/arm/mach-omap/omap4_generic.c @@ -5,14 +5,14 @@ #include <init.h> #include <restart.h> #include <io.h> -#include <mach/omap4-clock.h> -#include <mach/omap4-silicon.h> -#include <mach/omap4-mux.h> -#include <mach/syslib.h> -#include <mach/generic.h> -#include <mach/gpmc.h> -#include <mach/omap4_rom_usb.h> -#include <mach/omap4-generic.h> +#include <mach/omap/omap4-clock.h> +#include <mach/omap/omap4-silicon.h> +#include <mach/omap/omap4-mux.h> +#include <mach/omap/syslib.h> +#include <mach/omap/generic.h> +#include <mach/omap/gpmc.h> +#include <mach/omap/omap4_rom_usb.h> +#include <mach/omap/omap4-generic.h> /* * The following several lines are taken from U-Boot to support @@ -65,18 +65,6 @@ void omap4_set_warmboot_order(u32 *device_list) writel(OMAP44XX_SAR_CH_START, OMAP44XX_SAR_CH_ADDRESS); } -#define WATCHDOG_WSPR 0x48 -#define WATCHDOG_WWPS 0x34 - -static void wait_for_command_complete(void) -{ - int pending = 1; - - do { - pending = readl(OMAP44XX_WDT2_BASE + WATCHDOG_WWPS); - } while (pending); -} - /* EMIF */ #define EMIF_MOD_ID_REV 0x0000 #define EMIF_STATUS 0x0004 @@ -463,14 +451,8 @@ unsigned int omap4_revision(void) */ static int watchdog_init(void) { - void __iomem *wd2_base = (void *)OMAP44XX_WDT2_BASE; - - if (!cpu_is_omap4()) - return 0; - - writel(WD_UNLOCK1, wd2_base + WATCHDOG_WSPR); - wait_for_command_complete(); - writel(WD_UNLOCK2, wd2_base + WATCHDOG_WSPR); + if (cpu_is_omap4()) + omap_watchdog_disable(IOMEM(OMAP44XX_WDT2_BASE)); return 0; } @@ -516,8 +498,7 @@ static int omap4_bootsource(void) src = BOOTSOURCE_UNKNOWN; } - bootsource_set(src); - bootsource_set_instance(0); + bootsource_set_raw(src, 0); omap_vector_init(); |