Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2d32ffa4 authored by Pete Popov's avatar Pete Popov Committed by Ralf Baechle
Browse files

Moved irq_tab_alchemy to the board specific irqmap.c files. 


Cleaned up a to of warnings in dbdma.c.

Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
parent e3ad1c23

arch/mips/au1000/common/dbdma.c

+10 −10
Original line number Diff line number Diff line
@@ -39,11 +39,11 @@ 
#include <linux/string.h>

#include <linux/delay.h>

#include <linux/interrupt.h>

#include <linux/module.h>

#include <asm/mach-au1x00/au1000.h>

#include <asm/mach-au1x00/au1xxx_dbdma.h>

#include <asm/system.h>



/* #include <linux/module.h> */



#if defined(CONFIG_SOC_AU1550) || defined(CONFIG_SOC_AU1200)
@@ -596,10 +596,10 @@ _au1xxx_dbdma_put_source(u32 chanid, void *buf, int nbytes, u32 flags) 
	 * these parts. If it is fixedin the future, these dma_cache_inv will

	 * just be nothing more than empty macros. See io.h.

	 * */

	dma_cache_wback_inv(buf,nbytes);

	dma_cache_wback_inv((unsigned long)buf, nbytes);

        dp->dscr_cmd0 |= DSCR_CMD0_V;        /* Let it rip */

	au_sync();

	dma_cache_wback_inv(dp, sizeof(dp));

	dma_cache_wback_inv((unsigned long)dp, sizeof(dp));

        ctp->chan_ptr->ddma_dbell = 0;



	/* return something not zero.
@@ -657,10 +657,10 @@ _au1xxx_dbdma_put_dest(u32 chanid, void *buf, int nbytes, u32 flags) 
	 * parts. If it is fixedin the future, these dma_cache_inv will just

	 * be nothing more than empty macros. See io.h.

	 * */

	dma_cache_inv(buf,nbytes);

	dma_cache_inv((unsigned long)buf,nbytes);

	dp->dscr_cmd0 |= DSCR_CMD0_V;	/* Let it rip */

	au_sync();

	dma_cache_wback_inv(dp, sizeof(dp));

	dma_cache_wback_inv((unsigned long)dp, sizeof(dp));

        ctp->chan_ptr->ddma_dbell = 0;



	/* Get next descriptor pointer.
@@ -820,8 +820,7 @@ au1xxx_dbdma_chan_free(u32 chanid) 


	au1xxx_dbdma_stop(chanid);



	if (ctp->chan_desc_base != NULL)

		kfree(ctp->chan_desc_base);

	kfree((void *)ctp->chan_desc_base);



	stp->dev_flags &= ~DEV_FLAGS_INUSE;

	dtp->dev_flags &= ~DEV_FLAGS_INUSE;
@@ -831,10 +830,10 @@ au1xxx_dbdma_chan_free(u32 chanid) 
}

EXPORT_SYMBOL(au1xxx_dbdma_chan_free);



static void

static irqreturn_t

dbdma_interrupt(int irq, void *dev_id, struct pt_regs *regs)

{

	u32        				intstat, flags;

	u32 intstat;

	u32 chan_index;

	chan_tab_t		*ctp;

	au1x_ddma_desc_t	*dp;
@@ -857,6 +856,7 @@ dbdma_interrupt(int irq, void *dev_id, struct pt_regs *regs) 
		(ctp->chan_callback)(irq, ctp->chan_callparam, regs);



	ctp->cur_ptr = phys_to_virt(DSCR_GET_NXTPTR(dp->dscr_nxtptr));

	return IRQ_RETVAL(1);

}



static void au1xxx_dbdma_init(void)

arch/mips/au1000/db1x00/irqmap.c

+32 −0
Original line number Diff line number Diff line
@@ -48,6 +48,38 @@ 
#include <asm/system.h>

#include <asm/mach-au1x00/au1000.h>



#ifdef CONFIG_MIPS_DB1500

char irq_tab_alchemy[][5] __initdata = {

 [12] =	{ -1, INTA, INTX, INTX, INTX},   /* IDSEL 12 - HPT371   */

 [13] =	{ -1, INTA, INTB, INTC, INTD},   /* IDSEL 13 - PCI slot */

};

#endif



#ifdef CONFIG_MIPS_BOSPORUS

char irq_tab_alchemy[][5] __initdata = {

 [11] =	{ -1, INTA, INTB, INTX, INTX},   /* IDSEL 11 - miniPCI  */

 [12] =	{ -1, INTA, INTX, INTX, INTX},   /* IDSEL 12 - SN1741   */

 [13] =	{ -1, INTA, INTB, INTC, INTD},   /* IDSEL 13 - PCI slot */

};

#endif



#ifdef CONFIG_MIPS_MIRAGE

char irq_tab_alchemy[][5] __initdata = {

 [11] =	{ -1, INTD, INTX, INTX, INTX},   /* IDSEL 11 - SMI VGX */

 [12] =	{ -1, INTX, INTX, INTC, INTX},   /* IDSEL 12 - PNX1300 */

 [13] =	{ -1, INTA, INTB, INTX, INTX},   /* IDSEL 13 - miniPCI */

};

#endif



#ifdef CONFIG_MIPS_DB1550

char irq_tab_alchemy[][5] __initdata = {

 [11] =	{ -1, INTC, INTX, INTX, INTX},   /* IDSEL 11 - on-board HPT371    */

 [12] =	{ -1, INTB, INTC, INTD, INTA},   /* IDSEL 12 - PCI slot 2 (left)  */

 [13] =	{ -1, INTA, INTB, INTC, INTD},   /* IDSEL 13 - PCI slot 1 (right) */

};

#endif





au1xxx_irq_map_t au1xxx_irq_map[] = {



#ifndef CONFIG_MIPS_MIRAGE

arch/mips/au1000/mtx-1/irqmap.c

+11 −0
Original line number Diff line number Diff line
@@ -47,6 +47,17 @@ 
#include <asm/system.h>

#include <asm/mach-au1x00/au1000.h>



char irq_tab_alchemy[][5] __initdata = {

 [0] = { -1, INTA, INTB, 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) */

};



au1xxx_irq_map_t au1xxx_irq_map[] = {

       { AU1500_GPIO_204, INTC_INT_HIGH_LEVEL, 0},

       { AU1500_GPIO_201, INTC_INT_LOW_LEVEL, 0 },

arch/mips/au1000/pb1500/irqmap.c

+5 −0
Original line number Diff line number Diff line
@@ -47,6 +47,11 @@ 
#include <asm/system.h>

#include <asm/mach-au1x00/au1000.h>



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 */

};



au1xxx_irq_map_t au1xxx_irq_map[] = {

	{ AU1500_GPIO_204, INTC_INT_HIGH_LEVEL, 0},

	{ AU1500_GPIO_201, INTC_INT_LOW_LEVEL, 0 },

arch/mips/au1000/pb1550/irqmap.c

+5 −0
Original line number Diff line number Diff line
@@ -47,6 +47,11 @@ 
#include <asm/system.h>

#include <asm/mach-au1x00/au1000.h>



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) */

};



au1xxx_irq_map_t au1xxx_irq_map[] = {

	{ AU1000_GPIO_0, INTC_INT_LOW_LEVEL, 0 },

	{ AU1000_GPIO_1, INTC_INT_LOW_LEVEL, 0 },