Commit b9e5cd60 authored by Greg Ungerer's avatar Greg Ungerer Committed by Linus Torvalds

[PATCH] DragenEngine interrupt handler to use irqreturn_t

DragenEngine setup code updates:

 - Change interrupt handler return type to irqreturn_t
 - Allow configure time setting of boot parameters
 - Clean up warnings
parent 0516e708
...@@ -36,7 +36,7 @@ ...@@ -36,7 +36,7 @@
#define TICKS_PER_JIFFY 41450 #define TICKS_PER_JIFFY 41450
static void static void
dragen2_sched_init(void (*timer_routine) (int, void *, struct pt_regs *)) dragen2_sched_init(irqreturn_t (*timer_routine) (int, void *, struct pt_regs *))
{ {
/* disable timer 1 */ /* disable timer 1 */
TCTL = 0; TCTL = 0;
...@@ -183,14 +183,20 @@ static void init_hardware(void) ...@@ -183,14 +183,20 @@ static void init_hardware(void)
#endif #endif
} }
void config_BSP(char *command, int len) void config_BSP(char *command, int size)
{ {
printk("68VZ328 DragonBallVZ support (c) 2001 Lineo, Inc.\n"); printk("68VZ328 DragonBallVZ support (c) 2001 Lineo, Inc.\n");
command[0] = '\0'; /* no specific boot option */
#if defined(CONFIG_BOOTPARAM)
strncpy(command, CONFIG_BOOTPARAM_STRING, size);
command[size-1] = 0;
#else
memset(command, 0, size);
#endif
init_hardware(); init_hardware();
mach_sched_init = dragen2_sched_init; mach_sched_init = (void *)dragen2_sched_init;
mach_tick = dragen2_tick; mach_tick = dragen2_tick;
mach_gettimeoffset = dragen2_gettimeoffset; mach_gettimeoffset = dragen2_gettimeoffset;
mach_reset = dragen2_reset; mach_reset = dragen2_reset;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment