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

Commit 37c8ac36 authored by Paul Mundt's avatar Paul Mundt
Browse files

sh: pci: Consolidate lboxre2 and r2d IRQ fixups. 



Signed-off-by: default avatarPaul Mundt <lethal@linux-sh.org>
parent 84972ec0

arch/sh/drivers/pci/Makefile

+2 −2
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ obj-$(CONFIG_CPU_SH5) += pci-sh5.o ops-sh5.o 
obj-$(CONFIG_SH_DREAMCAST)		+= ops-dreamcast.o fixups-dreamcast.o \

					   pci-dreamcast.o

obj-$(CONFIG_SH_SECUREEDGE5410)		+= fixups-snapgear.o

obj-$(CONFIG_SH_RTS7751R2D)		+= ops-rts7751r2d.o fixups-rts7751r2d.o

obj-$(CONFIG_SH_RTS7751R2D)		+= fixups-rts7751r2d.o

obj-$(CONFIG_SH_SH03)			+= fixups-sh03.o

obj-$(CONFIG_SH_HIGHLANDER)		+= fixups-r7780rp.o

obj-$(CONFIG_SH_SH7785LCR)		+= fixups-r7780rp.o
@@ -23,5 +23,5 @@ obj-$(CONFIG_SH_SDK7780) += fixups-sdk7780.o 
obj-$(CONFIG_SH_7780_SOLUTION_ENGINE)	+= fixups-sdk7780.o

obj-$(CONFIG_SH_TITAN)			+= fixups-titan.o

obj-$(CONFIG_SH_LANDISK)		+= fixups-landisk.o

obj-$(CONFIG_SH_LBOX_RE2)		+= fixups-lboxre2.o fixups-rts7751r2d.o

obj-$(CONFIG_SH_LBOX_RE2)		+= fixups-rts7751r2d.o

obj-$(CONFIG_SH_CAYMAN)			+= fixups-cayman.o

arch/sh/drivers/pci/fixups-lboxre2.c

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

 * linux/arch/sh/drivers/pci/ops-lboxre2.c

 *

 * Copyright (C) 2007 Nobuhiro Iwamatsu

 *

 * PCI initialization for the NTT COMWARE L-BOX RE2

 */

#include <linux/kernel.h>

#include <linux/types.h>

#include <linux/init.h>

#include <linux/pci.h>

#include <linux/io.h>

#include <mach/lboxre2.h>

#include "pci-sh4.h"



static char lboxre2_irq_tab[] __initdata = {

	IRQ_ETH0, IRQ_ETH1, IRQ_INTA, IRQ_INTD,

};



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

{

	return lboxre2_irq_tab[slot];

}

arch/sh/drivers/pci/fixups-rts7751r2d.c

+24 −1
Original line number Diff line number Diff line 
/*

 * arch/sh/drivers/pci/fixups-rts7751r2d.c

 *

 * RTS7751R2D PCI fixups

 * RTS7751R2D / LBOXRE2 PCI fixups

 *

 * Copyright (C) 2003  Lineo uSolutions, Inc.

 * Copyright (C) 2004  Paul Mundt

 * Copyright (C) 2007  Nobuhiro Iwamatsu

 *

 * 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/pci.h>

#include <mach/lboxre2.h>

#include <mach/r2d.h>

#include "pci-sh4.h"

#include <asm/machtypes.h>



#define PCIMCR_MRSET_OFF	0xBFFFFFFF

#define PCIMCR_RFSH_OFF		0xFFFFFFFB



static u8 rts7751r2d_irq_tab[] __initdata = {

	IRQ_PCI_INTA,

	IRQ_PCI_INTB,

	IRQ_PCI_INTC,

	IRQ_PCI_INTD,

};



static char lboxre2_irq_tab[] __initdata = {

	IRQ_ETH0, IRQ_ETH1, IRQ_INTA, IRQ_INTD,

};



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

{

	if (mach_is_lboxre2())

		return lboxre2_irq_tab[slot];

	else

		return rts7751r2d_irq_tab[slot];

}



int pci_fixup_pcic(struct pci_channel *chan)

{

	unsigned long bcr1, mcr;

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

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

 * linux/arch/sh/drivers/pci/ops-rts7751r2d.c

 *

 * Author:  Ian DaSilva (idasilva@mvista.com)

 *

 * Highly leveraged from pci-bigsur.c, written by Dustin McIntire.

 *

 * May be copied or modified under the terms of the GNU General Public

 * License.  See linux/COPYING for more information.

 *

 * PCI initialization for the Renesas SH7751R RTS7751R2D board

 */

#include <linux/kernel.h>

#include <linux/types.h>

#include <linux/init.h>

#include <linux/pci.h>

#include <linux/io.h>

#include <mach/r2d.h>

#include "pci-sh4.h"



static u8 rts7751r2d_irq_tab[] __initdata = {

	IRQ_PCI_INTA,

	IRQ_PCI_INTB,

	IRQ_PCI_INTC,

	IRQ_PCI_INTD,

};



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

{

	return rts7751r2d_irq_tab[slot];

}