Alchemy: IRQ updates
PATCH 1/1 Alchemy: IRQ updates
remove board_init_irq(): On all in-kernel boards it is sufficient to initialize board interrupts in an arch_initcall.
Hide the au1xxx_irqmap structure and associated calls from public view; boards initialize irqs by calling the appropriate linux irq functions.
The small irqmap.c files have been folded into board_setup files.
Run-tested on DB1200; compile-tested on all other affected boards.
---
Applies on top of the "BCSR+PCMCIA" patches I sent a day ago; may conflict in xxs1500/Makefile if xxs1500-pcmcia patch is applied.
Please apply, I'd like to get this in before adding new devboards!
arch/mips/alchemy/common/irq.c | 15 ++-- arch/mips/alchemy/devboards/db1x00/Makefile | 2 +- arch/mips/alchemy/devboards/db1x00/board_setup.c | 55 ++++++++++++++++ arch/mips/alchemy/devboards/pb1000/board_setup.c | 17 ++--- arch/mips/alchemy/devboards/pb1100/board_setup.c | 24 +++---- arch/mips/alchemy/devboards/pb1200/Makefile | 2 +- arch/mips/alchemy/devboards/pb1200/board_setup.c | 48 +++++++++++++- arch/mips/alchemy/devboards/pb1200/irqmap.c | 75 ---------------------- arch/mips/alchemy/devboards/pb1500/board_setup.c | 32 +++++----- arch/mips/alchemy/devboards/pb1550/board_setup.c | 25 ++++---- arch/mips/alchemy/mtx-1/Makefile | 2 +- arch/mips/alchemy/mtx-1/board_setup.c | 24 +++++++ arch/mips/alchemy/mtx-1/irqmap.c | 56 ---------------- arch/mips/alchemy/xxs1500/Makefile | 2 +- arch/mips/alchemy/xxs1500/board_setup.c | 21 ++++++ arch/mips/alchemy/xxs1500/irqmap.c | 52 --------------- arch/mips/include/asm/mach-au1x00/au1000.h | 15 ---- arch/mips/include/asm/mach-db1x00/db1200.h | 1 + arch/mips/include/asm/mach-pb1x00/pb1200.h | 1 + 19 files changed, 205 insertions(+), 264 deletions(-) delete mode 100644 arch/mips/alchemy/devboards/pb1200/irqmap.c delete mode 100644 arch/mips/alchemy/mtx-1/irqmap.c delete mode 100644 arch/mips/alchemy/xxs1500/irqmap.c
arch/mips/alchemy/common/irq.c +7 -8
@@ -40,8 +40,11 @@static int au1x_ic_settype (unsigned int irq,unsigned int flow_type);/* per-processor fixed function irqs */ -struct au1xxx_irqmap au1xxx_ic0_map[] __initdata = { - +struct au1xxx_irqmap { +int im_irq; +int im_type; +int im_request; +} au1xxx_ic0_map[]__initdata = { #if defined(CONFIG_SOC_AU1000) {AU1000_UART0_INT ,IRQ_TYPE_LEVEL_HIGH ,0 }, { AU1000_UART1_INT, IRQ_TYPE_LEVEL_HIGH, 0 },
@@ -529,7 +532,7 @@ spurious: }/* setup edge/level and assign request 0/1 */ -void __init au1xxx_setup_irqmap (struct au1xxx_irqmap *map,int count) +static void __init setup_irqmap (struct au1xxx_irqmap *map,int count) {unsigned int bit, irq_nr;
@@ -601,11 +604,7 @@ void __init arch_init_irq(void)/* * Initialize IC0, which is fixed per processor. */ -au1xxx_setup_irqmap (au1xxx_ic0_map,ARRAY_SIZE (au1xxx_ic0_map)); - -/* Boards can register additional (GPIO-based) IRQs. -*/ -board_init_irq (); +setup_irqmap (au1xxx_ic0_map,ARRAY_SIZE (au1xxx_ic0_map));set_c0_status (IE_IRQ0 |IE_IRQ1 |IE_IRQ2 |IE_IRQ3 ); }
arch/mips/alchemy/devboards/db1x00/Makefile +1 -1
@@ -5,5 +5,5 @@ # Makefile for the Alchemy Semiconductor DBAu1xx0 boards. # -obj-y := board_setup.o irqmap.o platform.o +obj-y := board_setup.o platform.o
arch/mips/alchemy/devboards/db1x00/board_setup.c +55 -0
70 lines not on this page · raw message
arch/mips/alchemy/devboards/pb1000/board_setup.c +7 -10
@@ -32,11 +32,6 @@#include <prom.h> -struct au1xxx_irqmap __initdata au1xxx_irq_map[] = { - {AU1000_GPIO_15 ,IRQF_TRIGGER_LOW ,0 }, -}; - -const char *get_system_type (void ) {return "Alchemy Pb1000" ;
@@ -46,11 +41,6 @@ void board_reset(void) { } -void __init board_init_irq (void ) -{ -au1xxx_setup_irqmap (au1xxx_irq_map,ARRAY_SIZE (au1xxx_irq_map)); -} -void __init board_setup (void ) {u32 pin_func, static_cfg0;
@@ -193,3 +183,10 @@ void __init board_setup(void)break ; } } + +static int __init pb1000_init_irq (void ) +{ +set_irq_type (AU1000_GPIO_15 ,IRQF_TRIGGER_LOW ); +return 0 ; +} +arch_initcall (pb1000_init_irq);
arch/mips/alchemy/devboards/pb1100/board_setup.c +11 -13
@@ -35,14 +35,6 @@#include <prom.h> -struct au1xxx_irqmap __initdata au1xxx_irq_map[] = { - {AU1000_GPIO_9 ,IRQF_TRIGGER_LOW ,0 },/* PCMCIA Card Fully_Inserted# */ - {AU1000_GPIO_10 ,IRQF_TRIGGER_LOW ,0 },/* PCMCIA Card STSCHG# */ - {AU1000_GPIO_11 ,IRQF_TRIGGER_LOW ,0 },/* PCMCIA Card IRQ# */ - {AU1000_GPIO_13 ,IRQF_TRIGGER_LOW ,0 },/* DC_IRQ# */ -}; - -const char *get_system_type (void ) {return "Alchemy Pb1100" ;
@@ -53,11 +45,6 @@ void board_reset(void)bcsr_write (BCSR_SYSTEM ,0 ); } -void __init board_init_irq (void ) -{ -au1xxx_setup_irqmap (au1xxx_irq_map,ARRAY_SIZE (au1xxx_irq_map)); -} -void __init board_setup (void ) {volatile void __iomem *base = (volatile void __iomem *)0xac000000UL ;
@@ -158,3 +145,14 @@ void __init board_setup(void)au_sync (); } } + +static int __init pb1100_init_irq (void ) +{ +set_irq_type (AU1000_GPIO_9 ,IRQF_TRIGGER_LOW );/* PCCD# */ +set_irq_type (AU1000_GPIO_10 ,IRQF_TRIGGER_LOW );/* PCSTSCHG# */ +set_irq_type (AU1000_GPIO_11 ,IRQF_TRIGGER_LOW );/* PCCard# */ +set_irq_type (AU1000_GPIO_13 ,IRQF_TRIGGER_LOW );/* DC_IRQ# */ + +return 0 ; +} +arch_initcall (pb1100_init_irq);
arch/mips/alchemy/devboards/pb1200/Makefile +1 -1
@@ -2,6 +2,6 @@ # Makefile for the Alchemy Semiconductor Pb1200/DBAu1200 boards. # -obj-y := board_setup.o irqmap.o platform.o +obj-y := board_setup.o platform.o EXTRA_CFLAGS += -Werror
arch/mips/alchemy/devboards/pb1200/board_setup.c +46 -2
65 lines not on this page · raw message
arch/mips/alchemy/devboards/pb1200/irqmap.c deleted +0 -75
75 lines not on this page · raw message
arch/mips/alchemy/devboards/pb1500/board_setup.c +16 -16
@@ -40,17 +40,6 @@ char irq_tab_alchemy[][5] __initdata = { [13] = { -1, INTA, INTB, INTC, INTD }, /* IDSEL 13 - PCI slot */ }; -struct au1xxx_irqmap __initdata au1xxx_irq_map[] = { - {AU1000_GPIO_9 ,IRQF_TRIGGER_LOW ,0 }, - {AU1000_GPIO_10 ,IRQF_TRIGGER_LOW ,0 }, - {AU1000_GPIO_11 ,IRQF_TRIGGER_LOW ,0 }, - {AU1500_GPIO_204 ,IRQF_TRIGGER_HIGH ,0 }, - {AU1500_GPIO_201 ,IRQF_TRIGGER_LOW ,0 }, - {AU1500_GPIO_202 ,IRQF_TRIGGER_LOW ,0 }, - {AU1500_GPIO_203 ,IRQF_TRIGGER_LOW ,0 }, - {AU1500_GPIO_205 ,IRQF_TRIGGER_LOW ,0 }, -}; -const char *get_system_type (void ) {
@@ -62,11 +51,6 @@ void board_reset(void)bcsr_write (BCSR_SYSTEM ,0 ); } -void __init board_init_irq (void ) -{ -au1xxx_setup_irqmap (au1xxx_irq_map,ARRAY_SIZE (au1xxx_irq_map)); -} -void __init board_setup (void ) {u32 pin_func;
@@ -169,3 +153,19 @@ void __init board_setup(void)au_sync (); } } + +static int __init pb1500_init_irq (void ) +{ +set_irq_type (AU1000_GPIO_9 ,IRQF_TRIGGER_LOW );/* PCCD# */ +set_irq_type (AU1000_GPIO_10 ,IRQF_TRIGGER_LOW );/* PCSTSCHG# */ +set_irq_type (AU1000_GPIO_11 ,IRQF_TRIGGER_LOW );/* CARD# */ + +set_irq_type (AU1500_GPIO_204 ,IRQF_TRIGGER_HIGH ); +set_irq_type (AU1500_GPIO_201 ,IRQF_TRIGGER_LOW ); +set_irq_type (AU1500_GPIO_202 ,IRQF_TRIGGER_LOW ); +set_irq_type (AU1500_GPIO_203 ,IRQF_TRIGGER_LOW ); +set_irq_type (AU1500_GPIO_205 ,IRQF_TRIGGER_LOW ); + +return 0 ; +} +arch_initcall (pb1500_init_irq);
arch/mips/alchemy/devboards/pb1550/board_setup.c +12 -13
@@ -43,12 +43,6 @@ char irq_tab_alchemy[][5] __initdata = { [13] = { -1, INTA, INTB, INTC, INTD }, /* IDSEL 13 - PCI slot 1 (right) */ }; -struct au1xxx_irqmap __initdata au1xxx_irq_map[] = { - {AU1000_GPIO_0 ,IRQF_TRIGGER_LOW ,0 }, - {AU1000_GPIO_1 ,IRQF_TRIGGER_LOW ,0 }, - {AU1500_GPIO_201_205 ,IRQF_TRIGGER_LOW ,0 }, -}; -const char *get_system_type (void ) {return "Alchemy Pb1550" ;
@@ -59,13 +53,6 @@ void board_reset(void)bcsr_write (BCSR_SYSTEM ,0 ); } -void __init board_init_irq (void ) -{ -alchemy_gpio2_enable_int (201 ); -alchemy_gpio2_enable_int (202 ); -au1xxx_setup_irqmap (au1xxx_irq_map,ARRAY_SIZE (au1xxx_irq_map)); -} -void __init board_setup (void ) {u32 pin_func;
@@ -99,3 +86,15 @@ void __init board_setup(void)printk (KERN_INFO "AMD Alchemy Pb1550 Board\n" ); } + +static int __init pb1550_init_irq (void ) +{ +set_irq_type (AU1000_GPIO_0 ,IRQF_TRIGGER_LOW ); +set_irq_type (AU1000_GPIO_1 ,IRQF_TRIGGER_LOW ); +set_irq_type (AU1500_GPIO_201_205 ,IRQF_TRIGGER_LOW ); +alchemy_gpio2_enable_int (201 ); +alchemy_gpio2_enable_int (202 ); + +return 0 ; +} +arch_initcall (pb1550_init_irq);
arch/mips/alchemy/mtx-1/Makefile +1 -1
@@ -6,7 +6,7 @@ # Makefile for 4G Systems MTX-1 board. # -lib-y := init.o board_setup.o irqmap.o +lib-y := init.o board_setup.o obj-y := platform.o EXTRA_CFLAGS += -Werror
arch/mips/alchemy/mtx-1/board_setup.c +24 -0
@@ -30,11 +30,23 @@#include <linux/gpio.h> #include <linux/init.h> +#include <linux/interrupt.h> #include <asm/mach-au1x00/au1000.h> #include <prom.h> +char irq_tab_alchemy[][5 ]__initdata = { + [0 ] = {-1 ,INTA ,INTA ,INTX ,INTX },/* IDSEL 00 - AdapterA-Slot0 (top) */ + [1 ] = {-1 ,INTB ,INTA ,INTX ,INTX },/* IDSEL 01 - AdapterA-Slot1 (bottom) */ + [2 ] = {-1 ,INTC ,INTD ,INTX ,INTX },/* IDSEL 02 - AdapterB-Slot0 (top) */ + [3 ] = {-1 ,INTD ,INTC ,INTX ,INTX },/* IDSEL 03 - AdapterB-Slot1 (bottom) */ + [4 ] = {-1 ,INTA ,INTB ,INTX ,INTX },/* IDSEL 04 - AdapterC-Slot0 (top) */ + [5 ] = {-1 ,INTB ,INTA ,INTX ,INTX },/* IDSEL 05 - AdapterC-Slot1 (bottom) */ + [6 ] = {-1 ,INTC ,INTD ,INTX ,INTX },/* IDSEL 06 - AdapterD-Slot0 (top) */ + [7 ] = {-1 ,INTD ,INTC ,INTX ,INTX },/* IDSEL 07 - AdapterD-Slot1 (bottom) */ +}; +extern int (*board_pci_idsel)(unsigned int devsel,int assert);int mtx1_pci_idsel (unsigned int devsel,int assert);
@@ -110,3 +122,15 @@ mtx1_pci_idsel(unsigned int devsel, int assert)au_sync_udelay (1 );return 1 ; } + +static int __init mtx1_init_irq (void ) +{ +set_irq_type (AU1500_GPIO_204 ,IRQF_TRIGGER_HIGH ); +set_irq_type (AU1500_GPIO_201 ,IRQF_TRIGGER_LOW ); +set_irq_type (AU1500_GPIO_202 ,IRQF_TRIGGER_LOW ); +set_irq_type (AU1500_GPIO_203 ,IRQF_TRIGGER_LOW ); +set_irq_type (AU1500_GPIO_205 ,IRQF_TRIGGER_LOW ); + +return 0 ; +} +arch_initcall (mtx1_init_irq);
arch/mips/alchemy/mtx-1/irqmap.c deleted +0 -56
56 lines not on this page · raw message
arch/mips/alchemy/xxs1500/Makefile +1 -1
@@ -5,4 +5,4 @@ # Makefile for MyCable XXS1500 board. # -lib-y := init.o board_setup.o irqmap.o +lib-y := init.o board_setup.o
arch/mips/alchemy/xxs1500/board_setup.c +21 -0
@@ -25,6 +25,7 @@#include <linux/gpio.h> #include <linux/init.h> +#include <linux/interrupt.h> #include <linux/delay.h> #include <asm/mach-au1x00/au1000.h>
@@ -92,3 +93,23 @@ void __init board_setup(void)#endif #endif } + +static int __init xxs1500_init_irq (void ) +{ +set_irq_type (AU1500_GPIO_204 ,IRQF_TRIGGER_HIGH ); +set_irq_type (AU1500_GPIO_201 ,IRQF_TRIGGER_LOW ); +set_irq_type (AU1500_GPIO_202 ,IRQF_TRIGGER_LOW ); +set_irq_type (AU1500_GPIO_203 ,IRQF_TRIGGER_LOW ); +set_irq_type (AU1500_GPIO_205 ,IRQF_TRIGGER_LOW ); +set_irq_type (AU1500_GPIO_207 ,IRQF_TRIGGER_LOW ); + +set_irq_type (AU1000_GPIO_0 ,IRQF_TRIGGER_LOW ); +set_irq_type (AU1000_GPIO_1 ,IRQF_TRIGGER_LOW ); +set_irq_type (AU1000_GPIO_2 ,IRQF_TRIGGER_LOW ); +set_irq_type (AU1000_GPIO_3 ,IRQF_TRIGGER_LOW ); +set_irq_type (AU1000_GPIO_4 ,IRQF_TRIGGER_LOW );/* CF interrupt */ +set_irq_type (AU1000_GPIO_5 ,IRQF_TRIGGER_LOW ); + +return 0 ; +} +arch_initcall (xxs1500_init_irq);
arch/mips/alchemy/xxs1500/irqmap.c deleted +0 -52
52 lines not on this page · raw message
arch/mips/include/asm/mach-au1x00/au1000.h +0 -15
@@ -143,21 +143,6 @@ void au_sleep(void);void save_au1xxx_intctl (void );void restore_au1xxx_intctl (void ); -/* -* Every board describes its IRQ mapping with this table. -*/ -struct au1xxx_irqmap { -int im_irq; -int im_type; -int im_request; -}; - -/* core calls this function to let boards initialize other IRQ sources */ -void board_init_irq (void ); - -/* boards call this to register additional (GPIO) interrupts */ -void au1xxx_setup_irqmap (struct au1xxx_irqmap *map,int count); -#endif /* !defined (_LANGUAGE_ASSEMBLY) */ /*
arch/mips/include/asm/mach-db1x00/db1200.h +1 -0
@@ -25,6 +25,7 @@#define __ASM_DB1200_H#include <linux/types.h> +#include <asm/mach-au1x00/au1000.h> #include <asm/mach-au1x00/au1xxx_psc.h> #define DBDMA_AC97_TX_CHAN DSCR_CMD0_PSC1_TX
arch/mips/include/asm/mach-pb1x00/pb1200.h +1 -0
@@ -25,6 +25,7 @@#define __ASM_PB1200_H#include <linux/types.h> +#include <asm/mach-au1x00/au1000.h> #include <asm/mach-au1x00/au1xxx_psc.h> #define DBDMA_AC97_TX_CHAN DSCR_CMD0_PSC1_TX
Signature · 1 line
1.6.5.rc1