Commit aa4a5db5 authored by Nobuhiro Iwamatsu's avatar Nobuhiro Iwamatsu Committed by Paul Mundt
Browse files

sh: Solution Engine 770x IPR irq setup. 



Fixups for external IPR IRQs for the SE770x FPGA.

Signed-off-by: default avatarNobuhiro Iwamatsu <hemamu@t-base.ne.jp>
Signed-off-by: default avatarPaul Mundt <lethal@linux-sh.org>
parent 08d2e099

arch/sh/boards/se/770x/irq.c

+74 −34
Original line number Diff line number Diff line
@@ -2,56 +2,96 @@ 
 * linux/arch/sh/boards/se/770x/irq.c

 *

 * Copyright (C) 2000  Kazumoto Kojima

 * Copyright (C) 2006  Nobuhiro Iwamatsu

 *

 * Hitachi SolutionEngine Support.

 *

 */



#include <linux/init.h>

#include <linux/interrupt.h>

#include <linux/irq.h>

#include <asm/irq.h>

#include <asm/io.h>

#include <asm/se.h>



/* 

 * If the problem of make_ipr_irq is solved, 

 * this code will become unnecessary. :-) 

 */

static void se770x_disable_ipr_irq(unsigned int irq)

{

	struct ipr_data *p = get_irq_chip_data(irq);



	ctrl_outw(ctrl_inw(p->addr) & (0xffff ^ (0xf << p->shift)), p->addr);

}



static void se770x_enable_ipr_irq(unsigned int irq)

{

	struct ipr_data *p = get_irq_chip_data(irq);



	ctrl_outw(ctrl_inw(p->addr) | (p->priority << p->shift), p->addr);

}



static struct irq_chip se770x_irq_chip = {

	.name           = "MS770xSE-FPGA",

	.mask           = se770x_disable_ipr_irq,

	.unmask         = se770x_enable_ipr_irq,

	.mask_ack       = se770x_disable_ipr_irq,

};



void make_se770x_irq(struct ipr_data *table, unsigned int nr_irqs)

{

	int i;



	for (i = 0; i < nr_irqs; i++) {

		unsigned int irq = table[i].irq;

		disable_irq_nosync(irq);

		set_irq_chip_and_handler_name(irq, &se770x_irq_chip,

			handle_level_irq, "level");

		set_irq_chip_data(irq, &table[i]);

		se770x_enable_ipr_irq(irq);

	}

}



static struct ipr_data se770x_ipr_map[] = {

#if defined(CONFIG_CPU_SUBTYPE_SH7705)

	/* This is default value */

	{ 0xf-0x2, BCR_ILCRA, 2, 0x2 },

	{ 0xf-0xa, BCR_ILCRA, 1, 0xa },

	{ 0xf-0x5, BCR_ILCRB, 0, 0x5 },

	{ 0xf-0x8, BCR_ILCRC, 1, 0x8 },

	{ 0xf-0xc, BCR_ILCRC, 0, 0xc },

	{ 0xf-0xe, BCR_ILCRD, 3, 0xe },

	{ 0xf-0x3, BCR_ILCRD, 1, 0x3 }, /* LAN */

	{ 0xf-0xd, BCR_ILCRE, 2, 0xd },

	{ 0xf-0x9, BCR_ILCRE, 1, 0x9 },

	{ 0xf-0x1, BCR_ILCRE, 0, 0x1 },

	{ 0xf-0xf, BCR_ILCRF, 3, 0xf },

	{ 0xf-0xb, BCR_ILCRF, 1, 0xb },

	{ 0xf-0x7, BCR_ILCRG, 3, 0x7 },

	{ 0xf-0x6, BCR_ILCRG, 2, 0x6 },

	{ 0xf-0x4, BCR_ILCRG, 1, 0x4 },

	{ 0xf-0x2, 0, 8,  0x2 , BCR_ILCRA},

	{ 0xf-0xa, 0, 4,  0xa , BCR_ILCRA},

	{ 0xf-0x5, 0, 0,  0x5 , BCR_ILCRB},

	{ 0xf-0x8, 0, 4,  0x8 , BCR_ILCRC},

	{ 0xf-0xc, 0, 0,  0xc , BCR_ILCRC},

	{ 0xf-0xe, 0, 12, 0xe , BCR_ILCRD},

	{ 0xf-0x3, 0, 4,  0x3 , BCR_ILCRD}, /* LAN */

	{ 0xf-0xd, 0, 8,  0xd , BCR_ILCRE},

	{ 0xf-0x9, 0, 4,  0x9 , BCR_ILCRE},

	{ 0xf-0x1, 0, 0,  0x1 , BCR_ILCRE},

	{ 0xf-0xf, 0, 12, 0xf , BCR_ILCRF},

	{ 0xf-0xb, 0, 4,  0xb , BCR_ILCRF},

	{ 0xf-0x7, 0, 12, 0x7 , BCR_ILCRG},

	{ 0xf-0x6, 0, 8,  0x6 , BCR_ILCRG},

	{ 0xf-0x4, 0, 4,  0x4 , BCR_ILCRG},

#else

	{ 14, BCR_ILCRA, 2, 0x0f-14 },

	{ 12, BCR_ILCRA, 1, 0x0f-12 },

	{  8, BCR_ILCRB, 1, 0x0f- 8 },

	{  6, BCR_ILCRC, 3, 0x0f- 6 },

	{  5, BCR_ILCRC, 2, 0x0f- 5 },

	{  4, BCR_ILCRC, 1, 0x0f- 4 },

	{  3, BCR_ILCRC, 0, 0x0f- 3 },

	{  1, BCR_ILCRD, 3, 0x0f- 1 },



	{ 10, BCR_ILCRD, 1, 0x0f-10 }, /* LAN */



	{  0, BCR_ILCRE, 3, 0x0f- 0 }, /* PCIRQ3 */

	{ 11, BCR_ILCRE, 2, 0x0f-11 }, /* PCIRQ2 */

	{  9, BCR_ILCRE, 1, 0x0f- 9 }, /* PCIRQ1 */

	{  7, BCR_ILCRE, 0, 0x0f- 7 }, /* PCIRQ0 */



	{ 14, 0,  8, 0x0f-14 ,BCR_ILCRA},

	{ 12, 0,  4, 0x0f-12 ,BCR_ILCRA},

	{  8, 0,  4, 0x0f- 8 ,BCR_ILCRB},

	{  6, 0, 12, 0x0f- 6 ,BCR_ILCRC},

	{  5, 0,  8, 0x0f- 5 ,BCR_ILCRC},

	{  4, 0,  4, 0x0f- 4 ,BCR_ILCRC},

	{  3, 0,  0, 0x0f- 3 ,BCR_ILCRC},

	{  1, 0, 12, 0x0f- 1 ,BCR_ILCRD},

	/* ST NIC */

	{ 10, 0,  4, 0x0f-10 ,BCR_ILCRD}, 	/* LAN */

	/* MRSHPC IRQs setting */

	{  0, 0, 12, 0x0f- 0 ,BCR_ILCRE},	/* PCIRQ3 */

	{ 11, 0,  8, 0x0f-11 ,BCR_ILCRE}, 	/* PCIRQ2 */

	{  9, 0,  4, 0x0f- 9 ,BCR_ILCRE}, 	/* PCIRQ1 */

	{  7, 0,  0, 0x0f- 7 ,BCR_ILCRE}, 	/* PCIRQ0 */

	/* #2, #13 are allocated for SLOT IRQ #1 and #2 (for now) */

	/* NOTE: #2 and #13 are not used on PC */

	{ 13, BCR_ILCRG, 1, 0x0f-13 }, /* SLOTIRQ2 */

	{  2, BCR_ILCRG, 0, 0x0f- 2 }, /* SLOTIRQ1 */

	{ 13, 0,  4, 0x0f-13 ,BCR_ILCRG}, 	/* SLOTIRQ2 */

	{  2, 0,  0, 0x0f- 2 ,BCR_ILCRG}, 	/* SLOTIRQ1 */

#endif

};
@@ -81,5 +121,5 @@ void __init init_se_IRQ(void) 
	ctrl_outw(0, BCR_ILCRF);

	ctrl_outw(0, BCR_ILCRG);

#endif

	make_ipr_irq(se770x_ipr_map, ARRAY_SIZE(se770x_ipr_map));

	make_se770x_irq(se770x_ipr_map, ARRAY_SIZE(se770x_ipr_map));

}

arch/sh/boards/se/770x/setup.c

+1 −7
Original line number Diff line number Diff line 
/* $Id: setup.c,v 1.1.2.4 2002/03/02 21:57:07 lethal Exp $

 *

/*

 * linux/arch/sh/boards/se/770x/setup.c

 *

 * Copyright (C) 2000  Kazumoto Kojima
@@ -36,11 +35,6 @@ static void __init smsc_setup(char **cmdline_p) 
	smsc_config(ACTIVATE_INDEX, 0x01);

	smsc_config(IRQ_SELECT_INDEX, 6); /* IRQ6 */



	/* IDE1 */

	smsc_config(CURRENT_LDN_INDEX, LDN_IDE1);

	smsc_config(ACTIVATE_INDEX, 0x01);

	smsc_config(IRQ_SELECT_INDEX, 14); /* IRQ14 */



	/* AUXIO (GPIO): to use IDE1 */

	smsc_config(CURRENT_LDN_INDEX, LDN_AUXIO);

	smsc_config(GPIO46_INDEX, 0x00); /* nIOROP */