Alchemy: another round of IRQ changes
cover Alchemy: another round of IRQ changes
Here's another round of Alchemy IRQ changes, intended to be applied on top of the alchemy pcmcia changes in Ralf's linux-queue.git tree.
Major theme is to stop the name-sharing of certain Alchemy interrupt sources. Some parts of the alchemy core code currently rely on specially-named irq constants in order to save code (platform.c, and time.c for instance); however the au1000.h header is full of compile-time checks for a certain CPU subtype.
Eventually I'd like to get rid of all CONFIG_SOC_AU1??? checks in au1000.h altogether (for easier Au1300 integration); preferably also in the vast majority of the alchemy common code. But I'm not really convinced any more that it is at all possible.
Patch overview:
#1 tries to get rid of the special case for the usb device interrupt,
rather than adding #ifdefs for each cpu subtype with this particular usb device ip, i opted to use the hardware to do the prioritization.
I'm not sure whether this really is equivalent to the previous solution since I neither have the hardware nor a driver for the Au1000 UDC.
#2 changes the rtcmatch2 (system timer) irq priority to high.
not strictly related, but it fit into the irq upddate theme.
#3 re-introduces the alchemy cpu subtype detector, it's required
by changes in #4.
#4 does the constant renaming: irq sources are prefixed with a
cpu subtype string, and gpio int sources get the "_INT" postfix (they're interrupt sources, not gpio numbers after all).
Run-tested on the DB1200, and known to build for all db1x00/pb1x00, xxs1500, mtx-1.
Please apply (and test if you have any of the other boards). Thanks!
Manuel Lauss
Manuel Lauss (4):
Alchemy: remove USB_DEV_REQ_INT prioritization hack
Alchemy: higher priority for system timer.
Alchemy: simple cpu subtype detector
Alchemy: Stop IRQ name sharing
arch/mips/alchemy/common/dbdma.c | 61 ++- arch/mips/alchemy/common/dma.c | 36 +- arch/mips/alchemy/common/irq.c | 322 +++++----- arch/mips/alchemy/common/platform.c | 8 +- arch/mips/alchemy/common/time.c | 35 +- arch/mips/alchemy/devboards/db1x00/board_setup.c | 64 ++- arch/mips/alchemy/devboards/db1x00/platform.c | 52 +- arch/mips/alchemy/devboards/pb1000/board_setup.c | 2 +- arch/mips/alchemy/devboards/pb1100/board_setup.c | 8 +- arch/mips/alchemy/devboards/pb1100/platform.c | 6 +- arch/mips/alchemy/devboards/pb1200/board_setup.c | 4 +- arch/mips/alchemy/devboards/pb1500/board_setup.c | 20 +- arch/mips/alchemy/devboards/pb1500/platform.c | 6 +- arch/mips/alchemy/devboards/pb1550/board_setup.c | 10 +- arch/mips/alchemy/devboards/pb1550/platform.c | 8 +- arch/mips/alchemy/mtx-1/board_setup.c | 26 +- arch/mips/alchemy/xxs1500/board_setup.c | 24 +- arch/mips/include/asm/mach-au1x00/au1000.h | 704 +++++++++++----------- arch/mips/include/asm/mach-au1x00/gpio-au1000.h | 76 +-- 19 files changed, 788 insertions(+), 684 deletions(-)
PATCH 1/4 Alchemy: remove USB_DEV_REQ_INT prioritization hack
The Alchemy hardware provides a method to prioritize interrupts on a controller by assigning them to a differenct core request line. Assign usb device request interrupt to IC0 Request 0 (which has highest priority in the core and the dispatcher) and others to Request 1. The explicit check for usb device request occurrence should be obsolete now.
--- arch/mips/alchemy/common/irq.c | 50 +++++++++++++++++---------------------- 1 files changed, 22 insertions(+), 28 deletions(-)
arch/mips/alchemy/common/irq.c +22 -28
@@ -39,11 +39,18 @@static int au1x_ic_settype (unsigned int irq,unsigned int flow_type); +/* NOTE on interrupt priorities: The original writers of this code said: +* +* Because of the tight timing of SETUP token to reply transactions, +* the USB devices-side packet complete interrupt (USB_DEV_REQ_INT) +* needs the highest priority. +*/ +/* per-processor fixed function irqs */ struct au1xxx_irqmap {int im_irq;int im_type; -int im_request; +int im_request;/* set 1 to get higher priority */ } au1xxx_ic0_map[]__initdata = { #if defined(CONFIG_SOC_AU1000) { AU1000_UART0_INT, IRQ_TYPE_LEVEL_HIGH, 0 },
@@ -63,14 +70,14 @@ struct au1xxx_irqmap { { AU1000_TOY_INT, IRQ_TYPE_EDGE_RISING, 0 }, { AU1000_TOY_MATCH0_INT, IRQ_TYPE_EDGE_RISING, 0 }, { AU1000_TOY_MATCH1_INT, IRQ_TYPE_EDGE_RISING, 0 }, - { AU1000_TOY_MATCH2_INT, IRQ_TYPE_EDGE_RISING, 1 }, + { AU1000_TOY_MATCH2_INT, IRQ_TYPE_EDGE_RISING, 0 }, { AU1000_RTC_INT, IRQ_TYPE_EDGE_RISING, 0 }, { AU1000_RTC_MATCH0_INT, IRQ_TYPE_EDGE_RISING, 0 }, { AU1000_RTC_MATCH1_INT, IRQ_TYPE_EDGE_RISING, 0 }, { AU1000_RTC_MATCH2_INT, IRQ_TYPE_EDGE_RISING, 0 }, { AU1000_IRDA_TX_INT, IRQ_TYPE_LEVEL_HIGH, 0 }, { AU1000_IRDA_RX_INT, IRQ_TYPE_LEVEL_HIGH, 0 }, - { AU1000_USB_DEV_REQ_INT, IRQ_TYPE_LEVEL_HIGH, 0 }, + { AU1000_USB_DEV_REQ_INT, IRQ_TYPE_LEVEL_HIGH, 1 }, { AU1000_USB_DEV_SUS_INT, IRQ_TYPE_EDGE_RISING, 0 }, { AU1000_USB_HOST_INT, IRQ_TYPE_LEVEL_LOW, 0 }, { AU1000_ACSYNC_INT, IRQ_TYPE_EDGE_RISING, 0 },
@@ -97,12 +104,12 @@ struct au1xxx_irqmap { { AU1000_TOY_INT, IRQ_TYPE_EDGE_RISING, 0 }, { AU1000_TOY_MATCH0_INT, IRQ_TYPE_EDGE_RISING, 0 }, { AU1000_TOY_MATCH1_INT, IRQ_TYPE_EDGE_RISING, 0 }, - { AU1000_TOY_MATCH2_INT, IRQ_TYPE_EDGE_RISING, 1 }, + { AU1000_TOY_MATCH2_INT, IRQ_TYPE_EDGE_RISING, 0 }, { AU1000_RTC_INT, IRQ_TYPE_EDGE_RISING, 0 }, { AU1000_RTC_MATCH0_INT, IRQ_TYPE_EDGE_RISING, 0 }, { AU1000_RTC_MATCH1_INT, IRQ_TYPE_EDGE_RISING, 0 }, { AU1000_RTC_MATCH2_INT, IRQ_TYPE_EDGE_RISING, 0 }, - { AU1000_USB_DEV_REQ_INT, IRQ_TYPE_LEVEL_HIGH, 0 }, + { AU1000_USB_DEV_REQ_INT, IRQ_TYPE_LEVEL_HIGH, 1 }, { AU1000_USB_DEV_SUS_INT, IRQ_TYPE_EDGE_RISING, 0 }, { AU1000_USB_HOST_INT, IRQ_TYPE_LEVEL_LOW, 0 }, { AU1000_ACSYNC_INT, IRQ_TYPE_EDGE_RISING, 0 },
@@ -129,14 +136,14 @@ struct au1xxx_irqmap { { AU1000_TOY_INT, IRQ_TYPE_EDGE_RISING, 0 }, { AU1000_TOY_MATCH0_INT, IRQ_TYPE_EDGE_RISING, 0 }, { AU1000_TOY_MATCH1_INT, IRQ_TYPE_EDGE_RISING, 0 }, - { AU1000_TOY_MATCH2_INT, IRQ_TYPE_EDGE_RISING, 1 }, + { AU1000_TOY_MATCH2_INT, IRQ_TYPE_EDGE_RISING, 0 }, { AU1000_RTC_INT, IRQ_TYPE_EDGE_RISING, 0 }, { AU1000_RTC_MATCH0_INT, IRQ_TYPE_EDGE_RISING, 0 }, { AU1000_RTC_MATCH1_INT, IRQ_TYPE_EDGE_RISING, 0 }, { AU1000_RTC_MATCH2_INT, IRQ_TYPE_EDGE_RISING, 0 }, { AU1000_IRDA_TX_INT, IRQ_TYPE_LEVEL_HIGH, 0 }, { AU1000_IRDA_RX_INT, IRQ_TYPE_LEVEL_HIGH, 0 }, - { AU1000_USB_DEV_REQ_INT, IRQ_TYPE_LEVEL_HIGH, 0 }, + { AU1000_USB_DEV_REQ_INT, IRQ_TYPE_LEVEL_HIGH, 1 }, { AU1000_USB_DEV_SUS_INT, IRQ_TYPE_EDGE_RISING, 0 }, { AU1000_USB_HOST_INT, IRQ_TYPE_LEVEL_LOW, 0 }, { AU1000_ACSYNC_INT, IRQ_TYPE_EDGE_RISING, 0 },
@@ -163,13 +170,13 @@ struct au1xxx_irqmap { { AU1000_TOY_INT, IRQ_TYPE_EDGE_RISING, 0 }, { AU1000_TOY_MATCH0_INT, IRQ_TYPE_EDGE_RISING, 0 }, { AU1000_TOY_MATCH1_INT, IRQ_TYPE_EDGE_RISING, 0 }, - { AU1000_TOY_MATCH2_INT, IRQ_TYPE_EDGE_RISING, 1 }, + { AU1000_TOY_MATCH2_INT, IRQ_TYPE_EDGE_RISING, 0 }, { AU1000_RTC_INT, IRQ_TYPE_EDGE_RISING, 0 }, { AU1000_RTC_MATCH0_INT, IRQ_TYPE_EDGE_RISING, 0 }, { AU1000_RTC_MATCH1_INT, IRQ_TYPE_EDGE_RISING, 0 }, { AU1000_RTC_MATCH2_INT, IRQ_TYPE_EDGE_RISING, 0 }, { AU1550_NAND_INT, IRQ_TYPE_EDGE_RISING, 0 }, - { AU1550_USB_DEV_REQ_INT, IRQ_TYPE_LEVEL_HIGH, 0 }, + { AU1550_USB_DEV_REQ_INT, IRQ_TYPE_LEVEL_HIGH, 1 }, { AU1550_USB_DEV_SUS_INT, IRQ_TYPE_EDGE_RISING, 0 }, { AU1550_USB_HOST_INT, IRQ_TYPE_LEVEL_LOW, 0 }, { AU1550_MAC0_DMA_INT, IRQ_TYPE_LEVEL_HIGH, 0 },
@@ -191,7 +198,7 @@ struct au1xxx_irqmap { { AU1000_TOY_INT, IRQ_TYPE_EDGE_RISING, 0 }, { AU1000_TOY_MATCH0_INT, IRQ_TYPE_EDGE_RISING, 0 }, { AU1000_TOY_MATCH1_INT, IRQ_TYPE_EDGE_RISING, 0 }, - { AU1000_TOY_MATCH2_INT, IRQ_TYPE_EDGE_RISING, 1 }, + { AU1000_TOY_MATCH2_INT, IRQ_TYPE_EDGE_RISING, 0 }, { AU1000_RTC_INT, IRQ_TYPE_EDGE_RISING, 0 }, { AU1000_RTC_MATCH0_INT, IRQ_TYPE_EDGE_RISING, 0 }, { AU1000_RTC_MATCH1_INT, IRQ_TYPE_EDGE_RISING, 0 },
@@ -489,7 +496,7 @@ static int au1x_ic_settype(unsigned int irq, unsigned int flow_type) asmlinkage void plat_irq_dispatch(void) {unsigned int pending =read_c0_status () &read_c0_cause (); -unsigned long s, off, bit; +unsigned long s, off;if (pending &CAUSEF_IP7 ) {do_IRQ (MIPS_CPU_IRQ_BASE +7 );
@@ -509,25 +516,12 @@ asmlinkage void plat_irq_dispatch(void) }else goto spurious; - bit =0 ; s =au_readl (s);if (unlikely (!s)) { spurious:spurious_interrupt ();return ; } -#ifdef AU1000_USB_DEV_REQ_INT -/* -* Because of the tight timing of SETUP token to reply -* transactions, the USB devices-side packet complete -* interrupt needs the highest priority. -*/ - bit =1 << (AU1000_USB_DEV_REQ_INT -AU1000_INTC0_INT_BASE ); -if ((pending &CAUSEF_IP2 ) && (s & bit)) { -do_IRQ (AU1000_USB_DEV_REQ_INT ); -return ; - } -#endif do_IRQ (__ffs (s) + off); }
@@ -548,11 +542,11 @@ static void __init setup_irqmap(struct au1xxx_irqmap *map, int count)if (irq_nr >=AU1000_INTC1_INT_BASE ) { bit = irq_nr -AU1000_INTC1_INT_BASE ;if (map[count].im_request) -au_writel (1 << bit,IC1_ASSIGNCLR ); +au_writel (1 << bit,IC1_ASSIGNSET ); }else { bit = irq_nr -AU1000_INTC0_INT_BASE ;if (map[count].im_request) -au_writel (1 << bit,IC0_ASSIGNCLR ); +au_writel (1 << bit,IC0_ASSIGNSET ); }au1x_ic_settype (irq_nr, map[count].im_type);
@@ -570,7 +564,7 @@ void __init arch_init_irq(void)au_writel (0xffffffff ,IC0_CFG1CLR );au_writel (0xffffffff ,IC0_CFG2CLR );au_writel (0xffffffff ,IC0_MASKCLR ); -au_writel (0xffffffff ,IC0_ASSIGNSET ); +au_writel (0xffffffff ,IC0_ASSIGNCLR );au_writel (0xffffffff ,IC0_WAKECLR );au_writel (0xffffffff ,IC0_SRCSET );au_writel (0xffffffff ,IC0_FALLINGCLR );
@@ -581,7 +575,7 @@ void __init arch_init_irq(void)au_writel (0xffffffff ,IC1_CFG1CLR );au_writel (0xffffffff ,IC1_CFG2CLR );au_writel (0xffffffff ,IC1_MASKCLR ); -au_writel (0xffffffff ,IC1_ASSIGNSET ); +au_writel (0xffffffff ,IC1_ASSIGNCLR );au_writel (0xffffffff ,IC1_WAKECLR );au_writel (0xffffffff ,IC1_SRCSET );au_writel (0xffffffff ,IC1_FALLINGCLR );
Signature · 1 line
1.6.5.rc2
PATCH 2/4 Alchemy: higher priority for system timer.
Raise RTCMATCH2 interrupt priority in case it is used as the system timer tick.
--- arch/mips/alchemy/common/irq.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-)
arch/mips/alchemy/common/irq.c +5 -5
@@ -74,7 +74,7 @@ struct au1xxx_irqmap { { AU1000_RTC_INT, IRQ_TYPE_EDGE_RISING, 0 }, { AU1000_RTC_MATCH0_INT, IRQ_TYPE_EDGE_RISING, 0 }, { AU1000_RTC_MATCH1_INT, IRQ_TYPE_EDGE_RISING, 0 }, - { AU1000_RTC_MATCH2_INT, IRQ_TYPE_EDGE_RISING, 0 }, + { AU1000_RTC_MATCH2_INT, IRQ_TYPE_EDGE_RISING, 1 }, { AU1000_IRDA_TX_INT, IRQ_TYPE_LEVEL_HIGH, 0 }, { AU1000_IRDA_RX_INT, IRQ_TYPE_LEVEL_HIGH, 0 }, { AU1000_USB_DEV_REQ_INT, IRQ_TYPE_LEVEL_HIGH, 1 },
@@ -108,7 +108,7 @@ struct au1xxx_irqmap { { AU1000_RTC_INT, IRQ_TYPE_EDGE_RISING, 0 }, { AU1000_RTC_MATCH0_INT, IRQ_TYPE_EDGE_RISING, 0 }, { AU1000_RTC_MATCH1_INT, IRQ_TYPE_EDGE_RISING, 0 }, - { AU1000_RTC_MATCH2_INT, IRQ_TYPE_EDGE_RISING, 0 }, + { AU1000_RTC_MATCH2_INT, IRQ_TYPE_EDGE_RISING, 1 }, { AU1000_USB_DEV_REQ_INT, IRQ_TYPE_LEVEL_HIGH, 1 }, { AU1000_USB_DEV_SUS_INT, IRQ_TYPE_EDGE_RISING, 0 }, { AU1000_USB_HOST_INT, IRQ_TYPE_LEVEL_LOW, 0 },
@@ -140,7 +140,7 @@ struct au1xxx_irqmap { { AU1000_RTC_INT, IRQ_TYPE_EDGE_RISING, 0 }, { AU1000_RTC_MATCH0_INT, IRQ_TYPE_EDGE_RISING, 0 }, { AU1000_RTC_MATCH1_INT, IRQ_TYPE_EDGE_RISING, 0 }, - { AU1000_RTC_MATCH2_INT, IRQ_TYPE_EDGE_RISING, 0 }, + { AU1000_RTC_MATCH2_INT, IRQ_TYPE_EDGE_RISING, 1 }, { AU1000_IRDA_TX_INT, IRQ_TYPE_LEVEL_HIGH, 0 }, { AU1000_IRDA_RX_INT, IRQ_TYPE_LEVEL_HIGH, 0 }, { AU1000_USB_DEV_REQ_INT, IRQ_TYPE_LEVEL_HIGH, 1 },
@@ -174,7 +174,7 @@ struct au1xxx_irqmap { { AU1000_RTC_INT, IRQ_TYPE_EDGE_RISING, 0 }, { AU1000_RTC_MATCH0_INT, IRQ_TYPE_EDGE_RISING, 0 }, { AU1000_RTC_MATCH1_INT, IRQ_TYPE_EDGE_RISING, 0 }, - { AU1000_RTC_MATCH2_INT, IRQ_TYPE_EDGE_RISING, 0 }, + { AU1000_RTC_MATCH2_INT, IRQ_TYPE_EDGE_RISING, 1 }, { AU1550_NAND_INT, IRQ_TYPE_EDGE_RISING, 0 }, { AU1550_USB_DEV_REQ_INT, IRQ_TYPE_LEVEL_HIGH, 1 }, { AU1550_USB_DEV_SUS_INT, IRQ_TYPE_EDGE_RISING, 0 },
@@ -202,7 +202,7 @@ struct au1xxx_irqmap { { AU1000_RTC_INT, IRQ_TYPE_EDGE_RISING, 0 }, { AU1000_RTC_MATCH0_INT, IRQ_TYPE_EDGE_RISING, 0 }, { AU1000_RTC_MATCH1_INT, IRQ_TYPE_EDGE_RISING, 0 }, - { AU1000_RTC_MATCH2_INT, IRQ_TYPE_EDGE_RISING, 0 }, + { AU1000_RTC_MATCH2_INT, IRQ_TYPE_EDGE_RISING, 1 }, { AU1200_NAND_INT, IRQ_TYPE_EDGE_RISING, 0 }, { AU1200_USB_INT, IRQ_TYPE_LEVEL_HIGH, 0 }, { AU1200_LCD_INT, IRQ_TYPE_LEVEL_HIGH, 0 },
Signature · 1 line
1.6.5.rc2
PATCH 3/4 Alchemy: simple cpu subtype detector
extract the alchemy chip variant from c0_prid register.
--- arch/mips/include/asm/mach-au1x00/au1000.h | 30 ++++++++++++++++++++++++++++ 1 files changed, 30 insertions(+), 0 deletions(-)
arch/mips/include/asm/mach-au1x00/au1000.h +30 -0
@@ -130,6 +130,36 @@ static inline int au1xxx_cpu_needs_config_od(void)return 0 ; } +#define ALCHEMY_CPU_UNKNOWN -1 +#define ALCHEMY_CPU_AU1000 0 +#define ALCHEMY_CPU_AU1500 1 +#define ALCHEMY_CPU_AU1100 2 +#define ALCHEMY_CPU_AU1550 3 +#define ALCHEMY_CPU_AU1200 4 + +static inline int alchemy_get_cputype (void ) +{ +switch (read_c0_prid () &0xffff0000 ) { +case 0x00030000 : +return ALCHEMY_CPU_AU1000 ; +break ; +case 0x01030000 : +return ALCHEMY_CPU_AU1500 ; +break ; +case 0x02030000 : +return ALCHEMY_CPU_AU1100 ; +break ; +case 0x03030000 : +return ALCHEMY_CPU_AU1550 ; +break ; +case 0x04030000 : +return ALCHEMY_CPU_AU1200 ; +break ; + } + +return ALCHEMY_CPU_UNKNOWN ; +} +/* arch/mips/au1000/common/clocks.c */ extern void set_au1x00_speed (unsigned int new_freq);extern unsigned int get_au1x00_speed (void );
Signature · 1 line
1.6.5.rc2
PATCH 4/4 Alchemy: Stop IRQ name sharing
Eliminate the sharing of IRQ names among the differenct Alchemy variants. IRQ numbers need no longer be hidden behind a CONFIG_SOC_AU1XXX symbol: step 1 in my quest to make the Alchemy code less reliant on a hardcoded subtype.
This patch also renames the GPIO irq number constants. It's really an interrupt line, NOT a GPIO number!
Code which relied on certain irq numbers to have the same name across all supported cpu subtypes is changed to determine current cpu subtype at runtime; in some places this isn't possible so a "compat" symbol is used.
Run-tested on DB1200.
--- arch/mips/alchemy/common/dbdma.c | 61 ++- arch/mips/alchemy/common/dma.c | 36 +- arch/mips/alchemy/common/irq.c | 290 +++++----- arch/mips/alchemy/common/platform.c | 8 +- arch/mips/alchemy/common/time.c | 35 +- arch/mips/alchemy/devboards/db1x00/board_setup.c | 64 ++- arch/mips/alchemy/devboards/db1x00/platform.c | 52 +- arch/mips/alchemy/devboards/pb1000/board_setup.c | 2 +- arch/mips/alchemy/devboards/pb1100/board_setup.c | 8 +- arch/mips/alchemy/devboards/pb1100/platform.c | 6 +- arch/mips/alchemy/devboards/pb1200/board_setup.c | 4 +- arch/mips/alchemy/devboards/pb1500/board_setup.c | 20 +- arch/mips/alchemy/devboards/pb1500/platform.c | 6 +- arch/mips/alchemy/devboards/pb1550/board_setup.c | 10 +- arch/mips/alchemy/devboards/pb1550/platform.c | 8 +- arch/mips/alchemy/mtx-1/board_setup.c | 26 +- arch/mips/alchemy/xxs1500/board_setup.c | 24 +- arch/mips/include/asm/mach-au1x00/au1000.h | 674 +++++++++++----------- arch/mips/include/asm/mach-au1x00/gpio-au1000.h | 76 ++-- 19 files changed, 745 insertions(+), 665 deletions(-)
arch/mips/alchemy/common/dbdma.c +36 -25
@@ -30,6 +30,7 @@* */ +#include <linux/init.h> #include <linux/kernel.h> #include <linux/slab.h> #include <linux/spinlock.h>
@@ -58,7 +59,6 @@ static DEFINE_SPINLOCK(au1xxx_dbdma_spin_lock);static dbdma_global_t *dbdma_gptr = (dbdma_global_t *)DDMA_GLOBAL_BASE ;static int dbdma_initialized; -static void au1xxx_dbdma_init (void ); static dbdev_tab_t dbdev_tab[] = {#ifdef CONFIG_SOC_AU1550
@@ -250,8 +250,7 @@ u32 au1xxx_dbdma_chan_alloc(u32 srcid, u32 destid,* which can't be done successfully during board set up. */ if (!dbdma_initialized) -au1xxx_dbdma_init (); - dbdma_initialized =1 ; +return 0 ; stp =find_dbdev_id (srcid);if (stp ==NULL )
@@ -868,28 +867,6 @@ static irqreturn_t dbdma_interrupt(int irq, void *dev_id)return IRQ_RETVAL (1 ); } -static void au1xxx_dbdma_init (void ) -{ -int irq_nr; - - dbdma_gptr->ddma_config =0 ; - dbdma_gptr->ddma_throttle =0 ; - dbdma_gptr->ddma_inten =0xffff ; -au_sync (); - -#if defined(CONFIG_SOC_AU1550 ) - irq_nr =AU1550_DDMA_INT ; -#elif defined(CONFIG_SOC_AU1200 ) - irq_nr =AU1200_DDMA_INT ; -#else -#error Unknown Au1x00 SOC -#endif - -if (request_irq (irq_nr, dbdma_interrupt,IRQF_DISABLED , -"Au1xxx dbdma" , (void *)dbdma_gptr)) -printk (KERN_ERR "Can't get 1550 dbdma irq" ); -} -void au1xxx_dbdma_dump (u32 chanid) {chan_tab_t *ctp;
@@ -1038,4 +1015,38 @@ void au1xxx_dbdma_resume(void) } }#endif /* CONFIG_PM */ + +static int __init au1xxx_dbdma_init (void ) +{ +int irq_nr, ret; + + dbdma_gptr->ddma_config =0 ; + dbdma_gptr->ddma_throttle =0 ; + dbdma_gptr->ddma_inten =0xffff ; +au_sync (); + +switch (alchemy_get_cputype ()) { +case ALCHEMY_CPU_AU1550 : + irq_nr =AU1550_DDMA_INT ; +break ; +case ALCHEMY_CPU_AU1200 : + irq_nr =AU1200_DDMA_INT ; +break ; +default : +return -ENODEV ; + } + + ret =request_irq (irq_nr, dbdma_interrupt,IRQF_DISABLED , +"Au1xxx dbdma" , (void *)dbdma_gptr); +if (ret) +printk (KERN_ERR "Cannot grab DBDMA interrupt!\n" ); +else { + dbdma_initialized =1 ; +printk (KERN_INFO "Alchemy DBDMA initialized\n" ); + } + +return ret; +} +subsys_initcall (au1xxx_dbdma_init); +#endif /* defined(CONFIG_SOC_AU1550) || defined(CONFIG_SOC_AU1200) */
arch/mips/alchemy/common/dma.c +31 -5
@@ -29,6 +29,8 @@* 675 Mass Ave, Cambridge, MA 02139, USA. * */ + +#include <linux/init.h> #include <linux/module.h> #include <linux/kernel.h> #include <linux/errno.h>
@@ -188,17 +190,14 @@ int request_au1000_dma(int dev_id, const char *dev_str, dev = &dma_dev_table[dev_id];if (irqhandler) { - chan->irq =AU1000_DMA_INT_BASE + i; chan->irq_dev = irq_dev_id; ret =request_irq (chan->irq, irqhandler, irqflags, dev_str, chan->irq_dev);if (ret) { - chan->irq =0 ; chan->irq_dev =NULL ;return ret; } }else { - chan->irq =0 ; chan->irq_dev =NULL ; }
@@ -226,13 +225,40 @@ void free_au1000_dma(unsigned int dmanr) }disable_dma (dmanr); -if (chan->irq) +if (chan->irq_dev)free_irq (chan->irq, chan->irq_dev); - chan->irq =0 ; chan->irq_dev =NULL ; chan->dev_id =-1 ; }EXPORT_SYMBOL (free_au1000_dma); +static int __init au1000_dma_init (void ) +{ +int base, i; + +switch (alchemy_get_cputype ()) { +case ALCHEMY_CPU_AU1000 : + base =AU1000_DMA_INT_BASE ; +break ; +case ALCHEMY_CPU_AU1500 : + base =AU1500_DMA_INT_BASE ; +break ; +case ALCHEMY_CPU_AU1100 : + base =AU1100_DMA_INT_BASE ; +break ; +default : + goto out; + } + +for (i =0 ; i <NUM_AU1000_DMA_CHANNELS ; i++) + au1000_dma_table[i].irq = base + i; + +printk (KERN_INFO "Alchemy DMA initialized\n" ); + +out: +return 0 ; +} +arch_initcall (au1000_dma_init); +#endif /* AU1000 AU1500 AU1100 */
arch/mips/alchemy/common/irq.c +146 -144
324 lines not on this page · raw message
arch/mips/alchemy/common/platform.c +4 -4
@@ -73,8 +73,8 @@ static struct resource au1xxx_usb_ohci_resources[] = { .flags = IORESOURCE_MEM, }, [1] = { - .start = AU1000_USB_HOST_INT, - .end = AU1000_USB_HOST_INT, + .start = FOR_PLATFORM_C_USB_HOST_INT, + .end = FOR_PLATFORM_C_USB_HOST_INT, .flags = IORESOURCE_IRQ, }, };
@@ -132,8 +132,8 @@ static struct resource au1xxx_usb_ehci_resources[] = { .flags = IORESOURCE_MEM, }, [1] = { - .start = AU1000_USB_HOST_INT, - .end = AU1000_USB_HOST_INT, + .start = AU1200_USB_INT, + .end = AU1200_USB_INT, .flags = IORESOURCE_IRQ, }, };
arch/mips/alchemy/common/time.c +30 -5
@@ -1,5 +1,5 @@/* -* Copyright (C) 2008 Manuel Lauss <[email protected]> +* Copyright (C) 2008-2009 Manuel Lauss <[email protected]> * * Previous incarnations were: * Copyright (C) 2001, 2006, 2008 MontaVista Software, <[email protected]>
@@ -85,7 +85,6 @@ static struct clock_event_device au1x_rtcmatch2_clockdev = { .name = "rtcmatch2", .features = CLOCK_EVT_FEAT_ONESHOT, .rating = 100, - .irq = AU1000_RTC_MATCH2_INT, .set_next_event = au1x_rtcmatch2_set_next_event, .set_mode = au1x_rtcmatch2_set_mode, .cpumask = cpu_all_mask,
@@ -98,11 +97,13 @@ static struct irqaction au1x_rtcmatch2_irqaction = { .dev_id = &au1x_rtcmatch2_clockdev, }; -void __init plat_time_init (void ) +static int __init alchemy_time_init (unsigned int m2int) {struct clock_event_device *cd = &au1x_rtcmatch2_clockdev;unsigned long t; + au1x_rtcmatch2_clockdev.irq = m2int; +/* Check if firmware (YAMON, ...) has enabled 32kHz and clock * has been detected. If so install the rtcmatch2 clocksource, * otherwise don't bother. Note that both bits being set is by
@@ -148,13 +149,18 @@ void __init plat_time_init(void) cd->max_delta_ns =clockevent_delta2ns (0xffffffff , cd); cd->min_delta_ns =clockevent_delta2ns (8 , cd);/* ~0.25ms */ clockevents_register_device (cd); -setup_irq (AU1000_RTC_MATCH2_INT , &au1x_rtcmatch2_irqaction); +setup_irq (m2int, &au1x_rtcmatch2_irqaction);printk (KERN_INFO "Alchemy clocksource installed\n" ); -return ; +return 0 ; cntr_err: +return -1 ; +} + +static void __init alchemy_setup_c0timer (void ) +{/* * MIPS kernel assigns 'au1k_wait' to 'cpu_wait' before this * function is called. Because the Alchemy counters are unusable
@@ -166,3 +172,22 @@ cntr_err:r4k_clockevent_init ();init_r4k_clocksource (); } + +static int alchemy_m2inttab[]__initdata = { +AU1000_RTC_MATCH2_INT , +AU1500_RTC_MATCH2_INT , +AU1100_RTC_MATCH2_INT , +AU1550_RTC_MATCH2_INT , +AU1200_RTC_MATCH2_INT , +}; + +void __init plat_time_init (void ) +{ +int t; + + t =alchemy_get_cputype (); +if (t ==ALCHEMY_CPU_UNKNOWN ) +alchemy_setup_c0timer (); +else if (alchemy_time_init (alchemy_m2inttab[t])) +alchemy_setup_c0timer (); +}
arch/mips/alchemy/devboards/db1x00/board_setup.c +39 -25
92 lines not on this page · raw message
arch/mips/alchemy/devboards/db1x00/platform.c +33 -19
65 lines not on this page · raw message
arch/mips/alchemy/devboards/pb1000/board_setup.c +1 -1
@@ -186,7 +186,7 @@ void __init board_setup(void)static int __init pb1000_init_irq (void ) { -set_irq_type (AU1000_GPIO_15 ,IRQF_TRIGGER_LOW ); +set_irq_type (AU1000_GPIO15_INT ,IRQF_TRIGGER_LOW );return 0 ; }arch_initcall (pb1000_init_irq);
arch/mips/alchemy/devboards/pb1100/board_setup.c +4 -4
@@ -147,10 +147,10 @@ void __init board_setup(void)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# */ +set_irq_type (AU1100_GPIO9_INT ,IRQF_TRIGGER_LOW );/* PCCD# */ +set_irq_type (AU1100_GPIO10_INT ,IRQF_TRIGGER_LOW );/* PCSTSCHG# */ +set_irq_type (AU1100_GPIO11_INT ,IRQF_TRIGGER_LOW );/* PCCard# */ +set_irq_type (AU1100_GPIO13_INT ,IRQF_TRIGGER_LOW );/* DC_IRQ# */ return 0 ; }
arch/mips/alchemy/devboards/pb1100/platform.c +3 -3
@@ -33,9 +33,9 @@ static int __init pb1100_dev_init(void)PCMCIA_MEM_PSEUDO_PHYS +0x00040000 -1 ,PCMCIA_IO_PSEUDO_PHYS ,PCMCIA_IO_PSEUDO_PHYS +0x00001000 -1 , -AU1000_GPIO_11 ,/* card */ -AU1000_GPIO_9 ,/* insert */ -/*AU1000_GPIO_10*/ 0 ,/* stschg */ +AU1100_GPIO11_INT ,/* card */ +AU1100_GPIO9_INT ,/* insert */ +/*AU1100_GPIO10_INT*/ 0 ,/* stschg */ 0 ,/* eject */ 0); /* id */return 0 ;
arch/mips/alchemy/devboards/pb1200/board_setup.c +2 -2
@@ -173,8 +173,8 @@ static int __init pb1200_init_irq(void) }#endif -set_irq_type (AU1000_GPIO_7 ,IRQF_TRIGGER_LOW ); -bcsr_init_irq (PB1200_INT_BEGIN ,PB1200_INT_END ,AU1000_GPIO_7 ); +set_irq_type (AU1200_GPIO7_INT ,IRQF_TRIGGER_LOW ); +bcsr_init_irq (PB1200_INT_BEGIN ,PB1200_INT_END ,AU1200_GPIO7_INT );return 0 ; }
arch/mips/alchemy/devboards/pb1500/board_setup.c +10 -10
@@ -35,8 +35,8 @@char irq_tab_alchemy[][5 ]__initdata = { - [12 ] = {-1 ,INTA ,INTX ,INTX ,INTX },/* IDSEL 12 - HPT370 */ - [13 ] = {-1 ,INTA ,INTB ,INTC ,INTD },/* IDSEL 13 - PCI slot */ + [12 ] = {-1 ,AU1500_PCI_INTA ,0xff ,0xff ,0xff },/* IDSEL 12 - HPT370 */ + [13 ] = {-1 ,AU1500_PCI_INTA ,AU1500_PCI_INTB ,AU1500_PCI_INTC ,AU1500_PCI_INTD },/* IDSEL 13 - PCI slot */ };
@@ -155,14 +155,14 @@ void __init board_setup(void)static int __init pb1500_init_irq (void ) { -set_irq_type (AU1000_GPIO_9 ,IRQF_TRIGGER_LOW );/* CD0# */ -set_irq_type (AU1000_GPIO_10 ,IRQF_TRIGGER_LOW );/* CARD0 */ -set_irq_type (AU1000_GPIO_11 ,IRQF_TRIGGER_LOW );/* STSCHG0# */ -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_GPIO9_INT ,IRQF_TRIGGER_LOW );/* CD0# */ +set_irq_type (AU1500_GPIO10_INT ,IRQF_TRIGGER_LOW );/* CARD0 */ +set_irq_type (AU1500_GPIO11_INT ,IRQF_TRIGGER_LOW );/* STSCHG0# */ +set_irq_type (AU1500_GPIO204_INT ,IRQF_TRIGGER_HIGH ); +set_irq_type (AU1500_GPIO201_INT ,IRQF_TRIGGER_LOW ); +set_irq_type (AU1500_GPIO202_INT ,IRQF_TRIGGER_LOW ); +set_irq_type (AU1500_GPIO203_INT ,IRQF_TRIGGER_LOW ); +set_irq_type (AU1500_GPIO205_INT ,IRQF_TRIGGER_LOW );return 0 ; }
arch/mips/alchemy/devboards/pb1500/platform.c +3 -3
@@ -32,9 +32,9 @@ static int __init pb1500_dev_init(void)PCMCIA_MEM_PSEUDO_PHYS +0x00040000 -1 ,PCMCIA_IO_PSEUDO_PHYS ,PCMCIA_IO_PSEUDO_PHYS +0x00001000 -1 , -AU1000_GPIO_11 ,/* card */ -AU1000_GPIO_9 ,/* insert */ -/*AU1000_GPIO_10*/ 0 ,/* stschg */ +AU1500_GPIO11_INT ,/* card */ +AU1500_GPIO9_INT ,/* insert */ +/*AU1500_GPIO10_INT*/ 0 ,/* stschg */ 0 ,/* eject */ 0); /* id */return 0 ;
arch/mips/alchemy/devboards/pb1550/board_setup.c +5 -5
@@ -39,8 +39,8 @@char irq_tab_alchemy[][5 ]__initdata = { - [12 ] = {-1 ,INTB ,INTC ,INTD ,INTA },/* IDSEL 12 - PCI slot 2 (left) */ - [13 ] = {-1 ,INTA ,INTB ,INTC ,INTD },/* IDSEL 13 - PCI slot 1 (right) */ + [12 ] = {-1 ,AU1550_PCI_INTB ,AU1550_PCI_INTC ,AU1550_PCI_INTD ,AU1550_PCI_INTA },/* IDSEL 12 - PCI slot 2 (left) */ + [13 ] = {-1 ,AU1550_PCI_INTA ,AU1550_PCI_INTB ,AU1550_PCI_INTC ,AU1550_PCI_INTD },/* IDSEL 13 - PCI slot 1 (right) */ };const char *get_system_type (void )
@@ -89,9 +89,9 @@ void __init board_setup(void)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_HIGH ); +set_irq_type (AU1550_GPIO0_INT ,IRQF_TRIGGER_LOW ); +set_irq_type (AU1550_GPIO1_INT ,IRQF_TRIGGER_LOW ); +set_irq_type (AU1550_GPIO201_205_INT ,IRQF_TRIGGER_HIGH );/* enable both PCMCIA card irqs in the shared line */ alchemy_gpio2_enable_int (201 );
arch/mips/alchemy/devboards/pb1550/platform.c +4 -4
@@ -40,8 +40,8 @@ static int __init pb1550_dev_init(void)PCMCIA_MEM_PSEUDO_PHYS +0x00040000 -1 ,PCMCIA_IO_PSEUDO_PHYS ,PCMCIA_IO_PSEUDO_PHYS +0x00001000 -1 , -AU1500_GPIO_201_205 , -AU1000_GPIO_0 , +AU1550_GPIO201_205_INT , +AU1550_GPIO0_INT ,0 ,0 , 0);
@@ -52,8 +52,8 @@ static int __init pb1550_dev_init(void)PCMCIA_MEM_PSEUDO_PHYS +0x00840000 -1 ,PCMCIA_IO_PSEUDO_PHYS +0x00800000 ,PCMCIA_IO_PSEUDO_PHYS +0x00801000 -1 , -AU1500_GPIO_201_205 , -AU1000_GPIO_1 , +AU1550_GPIO201_205_INT , +AU1550_GPIO1_INT ,0 ,0 , 1);
arch/mips/alchemy/mtx-1/board_setup.c +13 -13
@@ -37,14 +37,14 @@#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) */ + [0 ] = {-1 ,AU1500_PCI_INTA ,AU1500_PCI_INTA ,0xff ,0xff },/* IDSEL 00 - AdapterA-Slot0 (top) */ + [1 ] = {-1 ,AU1500_PCI_INTB ,AU1500_PCI_INTA ,0xff ,0xff },/* IDSEL 01 - AdapterA-Slot1 (bottom) */ + [2 ] = {-1 ,AU1500_PCI_INTC ,AU1500_PCI_INTD ,0xff ,0xff },/* IDSEL 02 - AdapterB-Slot0 (top) */ + [3 ] = {-1 ,AU1500_PCI_INTD ,AU1500_PCI_INTC ,0xff ,0xff },/* IDSEL 03 - AdapterB-Slot1 (bottom) */ + [4 ] = {-1 ,AU1500_PCI_INTA ,AU1500_PCI_INTB ,0xff ,0xff },/* IDSEL 04 - AdapterC-Slot0 (top) */ + [5 ] = {-1 ,AU1500_PCI_INTB ,AU1500_PCI_INTA ,0xff ,0xff },/* IDSEL 05 - AdapterC-Slot1 (bottom) */ + [6 ] = {-1 ,AU1500_PCI_INTC ,AU1500_PCI_INTD ,0xff ,0xff },/* IDSEL 06 - AdapterD-Slot0 (top) */ + [7 ] = {-1 ,AU1500_PCI_INTD ,AU1500_PCI_INTC ,0xff ,0xff },/* IDSEL 07 - AdapterD-Slot1 (bottom) */ };extern int (*board_pci_idsel)(unsigned int devsel,int assert);
@@ -125,11 +125,11 @@ mtx1_pci_idsel(unsigned int devsel, int assert)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 ); +set_irq_type (AU1500_GPIO204_INT ,IRQF_TRIGGER_HIGH ); +set_irq_type (AU1500_GPIO201_INT ,IRQF_TRIGGER_LOW ); +set_irq_type (AU1500_GPIO202_INT ,IRQF_TRIGGER_LOW ); +set_irq_type (AU1500_GPIO203_INT ,IRQF_TRIGGER_LOW ); +set_irq_type (AU1500_GPIO205_INT ,IRQF_TRIGGER_LOW );return 0 ; }
arch/mips/alchemy/xxs1500/board_setup.c +12 -12
@@ -80,19 +80,19 @@ void __init board_setup(void)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 (AU1500_GPIO204_INT ,IRQF_TRIGGER_HIGH ); +set_irq_type (AU1500_GPIO201_INT ,IRQF_TRIGGER_LOW ); +set_irq_type (AU1500_GPIO202_INT ,IRQF_TRIGGER_LOW ); +set_irq_type (AU1500_GPIO203_INT ,IRQF_TRIGGER_LOW ); +set_irq_type (AU1500_GPIO205_INT ,IRQF_TRIGGER_LOW ); +set_irq_type (AU1500_GPIO207_INT ,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 ); +set_irq_type (AU1500_GPIO0_INT ,IRQF_TRIGGER_LOW ); +set_irq_type (AU1500_GPIO1_INT ,IRQF_TRIGGER_LOW ); +set_irq_type (AU1500_GPIO2_INT ,IRQF_TRIGGER_LOW ); +set_irq_type (AU1500_GPIO3_INT ,IRQF_TRIGGER_LOW ); +set_irq_type (AU1500_GPIO4_INT ,IRQF_TRIGGER_LOW );/* CF irq */ +set_irq_type (AU1500_GPIO5_INT ,IRQF_TRIGGER_LOW );return 0 ; }
arch/mips/include/asm/mach-au1x00/au1000.h +335 -339
744 lines not on this page · raw message
arch/mips/include/asm/mach-au1x00/gpio-au1000.h +34 -42
144 lines not on this page · raw message
Signature · 1 line
1.6.5.rc2
PATCH 1/1 MIPS: Alchemy: fix DB1550 PCI interrupt typo
Fix a copy-paste error in patch "Alchemy: Stop IRQ name sharing".
---
Ralf, please fold this into the patch "Alchemy: Stop IRQ name sharing" in lmo-queue!
Thanks!
arch/mips/alchemy/devboards/db1x00/board_setup.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-)
arch/mips/alchemy/devboards/db1x00/board_setup.c +3 -3
@@ -62,9 +62,9 @@ char irq_tab_alchemy[][5] __initdata = {#ifdef CONFIG_MIPS_DB1550 char irq_tab_alchemy[][5 ]__initdata = { - [11 ] = {-1 ,AU1500_PCI_INTC ,0xff ,0xff ,0xff },/* IDSEL 11 - on-board HPT371 */ - [12 ] = {-1 ,AU1500_PCI_INTB ,AU1500_PCI_INTC ,AU1500_PCI_INTD ,AU1500_PCI_INTA },/* IDSEL 12 - PCI slot 2 (left) */ - [13 ] = {-1 ,AU1500_PCI_INTA ,AU1500_PCI_INTB ,AU1500_PCI_INTC ,AU1500_PCI_INTD },/* IDSEL 13 - PCI slot 1 (right) */ + [11 ] = {-1 ,AU1550_PCI_INTC ,0xff ,0xff ,0xff },/* IDSEL 11 - on-board HPT371 */ + [12 ] = {-1 ,AU1550_PCI_INTB ,AU1550_PCI_INTC ,AU1550_PCI_INTD ,AU1550_PCI_INTA },/* IDSEL 12 - PCI slot 2 (left) */ + [13 ] = {-1 ,AU1550_PCI_INTA ,AU1550_PCI_INTB ,AU1550_PCI_INTC ,AU1550_PCI_INTD },/* IDSEL 13 - PCI slot 1 (right) */ };#endif
Signature · 1 line
1.6.5.rc2
Re: [PATCH] MIPS: Alchemy: fix DB1550 PCI interrupt typo
Quoted 6 lines · Manuel Lauss
Fix a copy-paste error in patch "Alchemy: Stop IRQ name sharing".
Signed-off-by Manuel Lauss <[email protected]>---
Ralf, please fold this into the patch "Alchemy: Stop IRQ name sharing" in lmo-queue!
Done. Thanks!
Ralf