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

Commit 7e50b2b7 authored by Manuel Lauss's avatar Manuel Lauss Committed by Ralf Baechle
Browse files

MIPS: Alchemy: remove board_init_irq() function. 



remove board_init_irq():  On all in-kernel boards it is sufficient to
initialize board interrupts in an arch_initcall by using the default
linux irq functions.

Some small irqmap.c files have been folded into board_setup files.

Run-tested on DB1200; compile-tested on all other affected boards.

Signed-off-by: default avatarManuel Lauss <manuel.lauss@gmail.com>
Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
parent 95a43796

arch/mips/alchemy/common/irq.c

+7 −8
Original line number Diff line number Diff line
@@ -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 },
@@ -547,7 +550,7 @@ asmlinkage void plat_irq_dispatch(void) 
}



/* 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;
@@ -619,11 +622,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
Original line number Diff line number Diff line
@@ -5,4 +5,4 @@ 
# Makefile for the Alchemy Semiconductor DBAu1xx0 boards.

#



obj-y := board_setup.o irqmap.o
 
obj-y := board_setup.o

arch/mips/alchemy/devboards/db1x00/board_setup.c

+51 −0
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ 


#include <linux/gpio.h>

#include <linux/init.h>

#include <linux/interrupt.h>



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

#include <asm/mach-db1x00/db1x00.h>
@@ -36,6 +37,37 @@ 


#include <prom.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



const char *get_system_type(void)

{

#ifdef CONFIG_MIPS_BOSPORUS
@@ -149,3 +181,22 @@ void __init board_setup(void) 


	au_sync();

}



static int __init db1x00_init_irq(void)

{

#if defined(CONFIG_MIPS_MIRAGE)

	set_irq_type(AU1000_GPIO_7, IRQF_TRIGGER_RISING); /* TS pendown */

#elif defined(CONFIG_MIPS_DB1550)

	set_irq_type(AU1000_GPIO_3, IRQF_TRIGGER_LOW);	/* CARD0# */

	set_irq_type(AU1000_GPIO_5, IRQF_TRIGGER_LOW);	/* CARD1# */

#else

	set_irq_type(AU1000_GPIO_0, IRQF_TRIGGER_LOW);	/* CD0# */

	set_irq_type(AU1000_GPIO_3, IRQF_TRIGGER_LOW);	/* CD1# */

	set_irq_type(AU1000_GPIO_2, IRQF_TRIGGER_LOW);	/* CARD0# */

	set_irq_type(AU1000_GPIO_5, IRQF_TRIGGER_LOW);	/* CARD1# */

	set_irq_type(AU1000_GPIO_1, IRQF_TRIGGER_LOW);	/* STSCHG0# */

	set_irq_type(AU1000_GPIO_4, IRQF_TRIGGER_LOW);	/* STSCHG1# */

#endif

	return 0;

}

arch_initcall(db1x00_init_irq);

arch/mips/alchemy/devboards/db1x00/irqmap.c

deleted100644 → 0
+0 −90
Original line number Diff line number Diff line 
/*

 * BRIEF MODULE DESCRIPTION

 *	Au1xxx irq map table

 *

 * Copyright 2003 Embedded Edge, LLC

 *		dan@embeddededge.com

 *

 *  This program is free software; you can redistribute	 it and/or modify it

 *  under  the terms of	 the GNU General  Public License as published by the

 *  Free Software Foundation;  either version 2 of the	License, or (at your

 *  option) any later version.

 *

 *  THIS  SOFTWARE  IS PROVIDED	  ``AS	IS'' AND   ANY	EXPRESS OR IMPLIED

 *  WARRANTIES,	  INCLUDING, BUT NOT  LIMITED  TO, THE IMPLIED WARRANTIES OF

 *  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN

 *  NO	EVENT  SHALL   THE AUTHOR  BE	 LIABLE FOR ANY	  DIRECT, INDIRECT,

 *  INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT

 *  NOT LIMITED	  TO, PROCUREMENT OF  SUBSTITUTE GOODS	OR SERVICES; LOSS OF

 *  USE, DATA,	OR PROFITS; OR	BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON

 *  ANY THEORY OF LIABILITY, WHETHER IN	 CONTRACT, STRICT LIABILITY, OR TORT

 *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF

 *  THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

 *

 *  You should have received a copy of the  GNU General Public License along

 *  with this program; if not, write  to the Free Software Foundation, Inc.,

 *  675 Mass Ave, Cambridge, MA 02139, USA.

 */



#include <linux/init.h>

#include <linux/interrupt.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





struct au1xxx_irqmap __initdata au1xxx_irq_map[] = {



#ifndef CONFIG_MIPS_MIRAGE

#ifdef CONFIG_MIPS_DB1550

	{ AU1000_GPIO_3, IRQF_TRIGGER_LOW, 0 }, /* PCMCIA Card 0 IRQ# */

	{ AU1000_GPIO_5, IRQF_TRIGGER_LOW, 0 }, /* PCMCIA Card 1 IRQ# */

#else

	{ AU1000_GPIO_0, IRQF_TRIGGER_LOW, 0 }, /* PCMCIA Card 0 Fully_Interted# */

	{ AU1000_GPIO_1, IRQF_TRIGGER_LOW, 0 }, /* PCMCIA Card 0 STSCHG# */

	{ AU1000_GPIO_2, IRQF_TRIGGER_LOW, 0 }, /* PCMCIA Card 0 IRQ# */



	{ AU1000_GPIO_3, IRQF_TRIGGER_LOW, 0 }, /* PCMCIA Card 1 Fully_Interted# */

	{ AU1000_GPIO_4, IRQF_TRIGGER_LOW, 0 }, /* PCMCIA Card 1 STSCHG# */

	{ AU1000_GPIO_5, IRQF_TRIGGER_LOW, 0 }, /* PCMCIA Card 1 IRQ# */

#endif

#else

	{ AU1000_GPIO_7, IRQF_TRIGGER_RISING, 0 }, /* touchscreen pen down */

#endif



};



void __init board_init_irq(void)

{

	au1xxx_setup_irqmap(au1xxx_irq_map, ARRAY_SIZE(au1xxx_irq_map));

}

arch/mips/alchemy/devboards/pb1000/board_setup.c

+7 −10
Original line number Diff line number Diff line
@@ -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);