evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

sh: r7780rp: Kill off unneded ifdefs for irq setup.

Browse source 
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
This commit is contained in:
Paul Mundt 2008-04-25 17:58:21 +09:00
parent e305ec80ea
commit ae8a5348ac
5 changed files with 7 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
arch/sh/boards/renesas/r7780rp/irq-r7780mp.c
View file

@ -62,7 +62,7 @@ static unsigned char irl2irq[HL_NR_IRL] __initdata = {
static DECLARE_INTC_DESC(intc_desc, "r7780mp", vectors, static DECLARE_INTC_DESC(intc_desc, "r7780mp", vectors,
NULL, mask_registers, NULL, NULL); NULL, mask_registers, NULL, NULL);
unsigned char * __init highlander_init_irq_r7780mp(void) unsigned char * __init highlander_plat_irq_setup(void)
{ {
if ((ctrl_inw(0xa4000700) & 0xf000) == 0x2000) { if ((ctrl_inw(0xa4000700) & 0xf000) == 0x2000) {
printk(KERN_INFO "Using r7780mp interrupt controller.\n"); printk(KERN_INFO "Using r7780mp interrupt controller.\n");

2
arch/sh/boards/renesas/r7780rp/irq-r7780rp.c
View file

@ -55,7 +55,7 @@ static unsigned char irl2irq[HL_NR_IRL] __initdata = {
static DECLARE_INTC_DESC(intc_desc, "r7780rp", vectors, static DECLARE_INTC_DESC(intc_desc, "r7780rp", vectors,
NULL, mask_registers, NULL, NULL); NULL, mask_registers, NULL, NULL);
unsigned char * __init highlander_init_irq_r7780rp(void) unsigned char * __init highlander_plat_irq_setup(void)
{ {
if (ctrl_inw(0xa5000600)) { if (ctrl_inw(0xa5000600)) {
printk(KERN_INFO "Using r7780rp interrupt controller.\n"); printk(KERN_INFO "Using r7780rp interrupt controller.\n");

2
arch/sh/boards/renesas/r7780rp/irq-r7785rp.c
View file

@ -64,7 +64,7 @@ static unsigned char irl2irq[HL_NR_IRL] __initdata = {
static DECLARE_INTC_DESC(intc_desc, "r7785rp", vectors, static DECLARE_INTC_DESC(intc_desc, "r7785rp", vectors,
NULL, mask_registers, NULL, NULL); NULL, mask_registers, NULL, NULL);
unsigned char * __init highlander_init_irq_r7785rp(void) unsigned char * __init highlander_plat_irq_setup(void)
{ {
if ((ctrl_inw(0xa4000158) & 0xf000) != 0x1000) if ((ctrl_inw(0xa4000158) & 0xf000) != 0x1000)
return NULL; return NULL;

24
arch/sh/boards/renesas/r7780rp/setup.c
View file

@ -316,7 +316,7 @@ static void __init highlander_setup(char **cmdline_p)
static unsigned char irl2irq[HL_NR_IRL]; static unsigned char irl2irq[HL_NR_IRL];
int highlander_irq_demux(int irq) static int highlander_irq_demux(int irq)
{ {
if (irq >= HL_NR_IRL || !irl2irq[irq]) if (irq >= HL_NR_IRL || !irl2irq[irq])
return irq; return irq;
@ -324,27 +324,9 @@ int highlander_irq_demux(int irq)
return irl2irq[irq]; return irl2irq[irq];
} }
void __init highlander_init_irq(void) static void __init highlander_init_irq(void)
{ {
unsigned char *ucp = NULL; unsigned char *ucp = highlander_plat_irq_setup();
do {
#ifdef CONFIG_SH_R7780MP
ucp = highlander_init_irq_r7780mp();
if (ucp)
break;
#endif
#ifdef CONFIG_SH_R7785RP
ucp = highlander_init_irq_r7785rp();
if (ucp)
break;
#endif
#ifdef CONFIG_SH_R7780RP
ucp = highlander_init_irq_r7780rp();
if (ucp)
break;
#endif
} while (0);
if (ucp) { if (ucp) {
plat_irq_setup_pins(IRQ_MODE_IRL3210); plat_irq_setup_pins(IRQ_MODE_IRL3210);

4
include/asm-sh/r7780rp.h
View file

@ -193,8 +193,6 @@
#define IRQ_SCIF0 (HL_FPGA_IRQ_BASE + 15) #define IRQ_SCIF0 (HL_FPGA_IRQ_BASE + 15)
#define IRQ_SCIF1 (HL_FPGA_IRQ_BASE + 16) #define IRQ_SCIF1 (HL_FPGA_IRQ_BASE + 16)
unsigned char *highlander_init_irq_r7780mp(void); unsigned char *highlander_plat_irq_setup(void);
unsigned char *highlander_init_irq_r7780rp(void);
unsigned char *highlander_init_irq_r7785rp(void);
#endif /* __ASM_SH_RENESAS_R7780RP */ #endif /* __ASM_SH_RENESAS_R7780RP */