Commit da2d7f4b authored by Magnus Damm's avatar Magnus Damm Committed by Paul Mundt
Browse files

sh: update r7780rp interrupt code 



This patch updates the board specific irq code for r7780rp. The new code is
very similar to the other highlander implementations, with the exception that
the r7780rp handles pci interrupts using IRL. To simplify the pci code and
use the same interrupt numbers as r7780mp and r7785rp we hook in to the
cpu specific pci vectors.

The pci interrupts and the push switch all work well with and without this
patch. CF and AX88796 are not ok though and the source of the problem is
unknown at this point. The AX88796 does for not detect it's proper mac
address (IPL gets it right) and the kernel hangs on CF access. As a workaround
this patch removes the CF and the AX88796 from the platform datain case of
r7780rp.

Signed-off-by: default avatarMagnus Damm <damm@igel.co.jp>
Signed-off-by: default avatarPaul Mundt <lethal@linux-sh.org>
parent d4dca67b

arch/sh/boards/renesas/r7780rp/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ 
#

irqinit-$(CONFIG_SH_R7780MP)	:= irq-r7780mp.o

irqinit-$(CONFIG_SH_R7785RP)	:= irq-r7785rp.o

irqinit-$(CONFIG_SH_R7780RP)	:= irq-r7780rp.o irq.o

irqinit-$(CONFIG_SH_R7780RP)	:= irq-r7780rp.o

obj-y				:= setup.o $(irqinit-y)



ifneq ($(CONFIG_SH_R7785RP),y)

arch/sh/boards/renesas/r7780rp/irq-r7780rp.c

+48 −4
Original line number Diff line number Diff line
@@ -3,21 +3,65 @@ 
 *

 * Copyright (C) 2002  Atom Create Engineering Co., Ltd.

 * Copyright (C) 2006  Paul Mundt

 * Copyright (C) 2008  Magnus Damm

 *

 * This file is subject to the terms and conditions of the GNU General Public

 * License.  See the file "COPYING" in the main directory of this archive

 * for more details.

 */

#include <linux/init.h>

#include <linux/irq.h>

#include <linux/io.h>

#include <asm/r7780rp.h>



enum {

	UNUSED = 0,



	/* board specific interrupt sources */



	AX88796,          /* Ethernet controller */

	PSW,              /* Push Switch */

	CF,               /* Compact Flash */



	PCI_A,

	PCI_B,

	PCI_C,

	PCI_D,

};



static struct intc_vect vectors[] __initdata = {

	INTC_IRQ(PCI_A, 65), /* dirty: overwrite cpu vectors for pci */

	INTC_IRQ(PCI_B, 66),

	INTC_IRQ(PCI_C, 67),

	INTC_IRQ(PCI_D, 68),

	INTC_IRQ(CF, IRQ_CF),

	INTC_IRQ(PSW, IRQ_PSW),

	INTC_IRQ(AX88796, IRQ_AX88796),

};



static struct intc_mask_reg mask_registers[] __initdata = {

	{ 0xa5000000, 0, 16, /* IRLMSK */

	  { PCI_A, PCI_B, PCI_C, PCI_D, CF, 0, 0, 0,

	    0, 0, 0, 0, 0, 0, PSW, AX88796 } },

};



static unsigned char irl2irq[HL_NR_IRL] __initdata = {

	65, 66, 67, 68,

	IRQ_CF, 0, 0, 0,

	0, 0, 0, 0,

	IRQ_AX88796, IRQ_PSW

};



static DECLARE_INTC_DESC(intc_desc, "r7780rp", vectors,

			 NULL, mask_registers, NULL, NULL);



unsigned char * __init highlander_init_irq_r7780rp(void)

{

	int i;



	for (i = 0; i < 15; i++)

		make_r7780rp_irq(i);

	if (ctrl_inw(0xa5000600)) {

		printk(KERN_INFO "Using r7780rp interrupt controller.\n");

		register_intc_controller(&intc_desc);

		return irl2irq;

	}



	return NULL;

}

arch/sh/boards/renesas/r7780rp/irq.c

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

 * Renesas Solutions Highlander R7780RP-1 Support.

 *

 * Copyright (C) 2002  Atom Create Engineering Co., Ltd.

 * Copyright (C) 2006  Paul Mundt

 *

 * This file is subject to the terms and conditions of the GNU General Public

 * License.  See the file "COPYING" in the main directory of this archive

 * for more details.

 */

#include <linux/init.h>

#include <linux/irq.h>

#include <linux/interrupt.h>

#include <linux/io.h>

#include <asm/r7780rp.h>



#ifdef CONFIG_SH_R7780RP

static int mask_pos[] = {15, 14, 13, 12, 11, 10, 9, 8, 7, 5, 6, 4, 0, 1, 2, 0};

#elif defined(CONFIG_SH_R7780MP)

static int mask_pos[] = {12, 11, 9, 14, 15, 8, 13, 6, 5, 4, 3, 2, 0, 0, 1, 0};

#elif defined(CONFIG_SH_R7785RP)

static int mask_pos[] = {2, 11, 2, 2, 2, 2, 9, 8, 7, 5, 10, 2, 2, 2, 2, 2};

#endif



static void enable_r7780rp_irq(unsigned int irq)

{

	/* Set priority in IPR back to original value */

	ctrl_outw(ctrl_inw(IRLCNTR1) | (1 << mask_pos[irq]), IRLCNTR1);

}



static void disable_r7780rp_irq(unsigned int irq)

{

	/* Set the priority in IPR to 0 */

	ctrl_outw(ctrl_inw(IRLCNTR1) & (0xffff ^ (1 << mask_pos[irq])),

		  IRLCNTR1);

}



static struct irq_chip r7780rp_irq_chip __read_mostly = {

	.name		= "R7780RP",

	.mask		= disable_r7780rp_irq,

	.unmask		= enable_r7780rp_irq,

	.mask_ack	= disable_r7780rp_irq,

};



void make_r7780rp_irq(unsigned int irq)

{

	disable_irq_nosync(irq);

	set_irq_chip_and_handler_name(irq, &r7780rp_irq_chip,

				      handle_level_irq, "level");

	enable_r7780rp_irq(irq);

}

arch/sh/boards/renesas/r7780rp/setup.c

+6 −4
Original line number Diff line number Diff line
@@ -179,9 +179,11 @@ static struct platform_device ax88796_device = { 
static struct platform_device *r7780rp_devices[] __initdata = {

	&r8a66597_usb_host_device,

	&m66592_usb_peripheral_device,

	&cf_ide_device,

	&heartbeat_device,

#ifndef CONFIG_SH_R7780RP

	&cf_ide_device,

	&ax88796_device,

#endif

};



static int __init r7780rp_devices_setup(void)
@@ -316,8 +318,8 @@ void __init highlander_init_irq(void) 
			break;

#endif

#ifdef CONFIG_SH_R7780RP

		highlander_init_irq_r7780rp();

		ucp = irl2irq;

		ucp = highlander_init_irq_r7780rp();

		if (ucp)

			break;

#endif

	} while (0);

arch/sh/drivers/pci/ops-r7780rp.c

+2 −14
Original line number Diff line number Diff line
@@ -17,25 +17,13 @@ 
#include <asm/io.h>

#include "pci-sh4.h"



static char r7780rp_irq_tab[] __initdata = {

	0, 1, 2, 3,

};



static char r7780mp_irq_tab[] __initdata = {

static char irq_tab[] __initdata = {

	65, 66, 67, 68,

};



int __init pcibios_map_platform_irq(struct pci_dev *pdev, u8 slot, u8 pin)

{

	if (mach_is_r7780rp())

		return r7780rp_irq_tab[slot];

	if (mach_is_r7780mp() || mach_is_r7785rp())

		return r7780mp_irq_tab[slot];



	printk(KERN_ERR "PCI: Bad IRQ mapping "

	       "request for slot %d, func %d\n", slot, pin-1);



	return -1;

	return irq_tab[slot];

}



static struct resource sh7780_io_resource = {

CRA Git | Maintained and supported by SUSTech CRA and CCSE