mirror of
https://github.com/u-boot/u-boot.git
synced 2025-05-08 19:11:53 +00:00
powerpc: Rework interrupt_init_cpu()
The function interrupt_init_cpu() is given an int return type but does not return anything but 0. Rework this to be a void function. Signed-off-by: Tom Rini <trini@konsulko.com> Acked-by: Mario Six <mario.six@gdsys.cc>
This commit is contained in:
parent
76216211f8
commit
deff9b1d2a
6 changed files with 6 additions and 19 deletions
|
@ -20,7 +20,7 @@ struct irq_action {
|
||||||
ulong count;
|
ulong count;
|
||||||
};
|
};
|
||||||
|
|
||||||
int interrupt_init_cpu (unsigned *decrementer_count)
|
void interrupt_init_cpu (unsigned *decrementer_count)
|
||||||
{
|
{
|
||||||
volatile immap_t *immr = (immap_t *) CONFIG_SYS_IMMR;
|
volatile immap_t *immr = (immap_t *) CONFIG_SYS_IMMR;
|
||||||
|
|
||||||
|
@ -29,8 +29,6 @@ int interrupt_init_cpu (unsigned *decrementer_count)
|
||||||
/* Enable e300 time base */
|
/* Enable e300 time base */
|
||||||
|
|
||||||
immr->sysconf.spcr |= 0x00400000;
|
immr->sysconf.spcr |= 0x00400000;
|
||||||
|
|
||||||
return 0;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -20,7 +20,7 @@
|
||||||
#include <post.h>
|
#include <post.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
int interrupt_init_cpu(unsigned *decrementer_count)
|
void interrupt_init_cpu(unsigned *decrementer_count)
|
||||||
{
|
{
|
||||||
ccsr_pic_t __iomem *pic = (void *)CONFIG_SYS_MPC8xxx_PIC_ADDR;
|
ccsr_pic_t __iomem *pic = (void *)CONFIG_SYS_MPC8xxx_PIC_ADDR;
|
||||||
|
|
||||||
|
@ -77,8 +77,6 @@ int interrupt_init_cpu(unsigned *decrementer_count)
|
||||||
#ifdef CONFIG_POST
|
#ifdef CONFIG_POST
|
||||||
post_word_store(post_word);
|
post_word_store(post_word);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
return (0);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Install and free a interrupt handler. Not implemented yet. */
|
/* Install and free a interrupt handler. Not implemented yet. */
|
||||||
|
|
|
@ -23,7 +23,7 @@
|
||||||
#include <post.h>
|
#include <post.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
int interrupt_init_cpu(unsigned *decrementer_count)
|
void interrupt_init_cpu(unsigned *decrementer_count)
|
||||||
{
|
{
|
||||||
volatile immap_t *immr = (immap_t *)CONFIG_SYS_IMMR;
|
volatile immap_t *immr = (immap_t *)CONFIG_SYS_IMMR;
|
||||||
volatile ccsr_pic_t *pic = &immr->im_pic;
|
volatile ccsr_pic_t *pic = &immr->im_pic;
|
||||||
|
@ -73,8 +73,6 @@ int interrupt_init_cpu(unsigned *decrementer_count)
|
||||||
#ifdef CONFIG_POST
|
#ifdef CONFIG_POST
|
||||||
post_word_store(post_word);
|
post_word_store(post_word);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
return 0;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
|
|
@ -30,7 +30,7 @@ static void cpm_interrupt(void *regs);
|
||||||
|
|
||||||
/************************************************************************/
|
/************************************************************************/
|
||||||
|
|
||||||
int interrupt_init_cpu(unsigned *decrementer_count)
|
void interrupt_init_cpu(unsigned *decrementer_count)
|
||||||
{
|
{
|
||||||
immap_t __iomem *immr = (immap_t __iomem *)CONFIG_SYS_IMMR;
|
immap_t __iomem *immr = (immap_t __iomem *)CONFIG_SYS_IMMR;
|
||||||
|
|
||||||
|
@ -41,8 +41,6 @@ int interrupt_init_cpu(unsigned *decrementer_count)
|
||||||
|
|
||||||
/* Configure CPM interrupts */
|
/* Configure CPM interrupts */
|
||||||
cpm_interrupt_init();
|
cpm_interrupt_init();
|
||||||
|
|
||||||
return 0;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/************************************************************************/
|
/************************************************************************/
|
||||||
|
|
|
@ -122,7 +122,7 @@ static inline void set_msr(unsigned long msr)
|
||||||
void print_reginfo(void);
|
void print_reginfo(void);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
int interrupt_init_cpu(unsigned *);
|
void interrupt_init_cpu(unsigned *);
|
||||||
void timer_interrupt_cpu(struct pt_regs *);
|
void timer_interrupt_cpu(struct pt_regs *);
|
||||||
unsigned long search_exception_table(unsigned long addr);
|
unsigned long search_exception_table(unsigned long addr);
|
||||||
|
|
||||||
|
|
|
@ -63,13 +63,8 @@ int disable_interrupts (void)
|
||||||
|
|
||||||
int interrupt_init (void)
|
int interrupt_init (void)
|
||||||
{
|
{
|
||||||
int ret;
|
|
||||||
|
|
||||||
/* call cpu specific function from $(CPU)/interrupts.c */
|
/* call cpu specific function from $(CPU)/interrupts.c */
|
||||||
ret = interrupt_init_cpu (&decrementer_count);
|
interrupt_init_cpu (&decrementer_count);
|
||||||
|
|
||||||
if (ret)
|
|
||||||
return ret;
|
|
||||||
|
|
||||||
set_dec (decrementer_count);
|
set_dec (decrementer_count);
|
||||||
|
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue