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

Commit 58796ce6 authored by Paul Mundt's avatar Paul Mundt
Browse files

sh: legacy PCI evt2irq migration. 



This converts over the legacy PCI IRQs to evt2irq() backed hwirq lookups.

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

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

+2 −1
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ 
#include <linux/init.h>

#include <linux/delay.h>

#include <linux/pci.h>

#include <linux/sh_intc.h>

#include "pci-sh4.h"



#define PCIMCR_MRSET_OFF	0xBFFFFFFF
@@ -27,7 +28,7 @@ int pcibios_map_platform_irq(const struct pci_dev *pdev, u8 slot, u8 pin) 
	 * slot2: pin1-4 = irq7,8,5,6

	 * slot3: pin1-4 = irq8,5,6,7

	 */

	int irq = ((slot + pin - 1) & 0x3) + 5;

	int irq = ((slot + pin - 1) & 0x3) + evt2irq(0x2a0);



	if ((slot | (pin - 1)) > 0x3) {

		printk(KERN_WARNING "PCI: Bad IRQ mapping request for slot %d pin %c\n",

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

+2 −5
Original line number Diff line number Diff line
@@ -12,13 +12,10 @@ 
 */

#include <linux/pci.h>

#include <linux/io.h>

#include <linux/sh_intc.h>

#include "pci-sh4.h"



static char irq_tab[] __initdata = {

	65, 66, 67, 68,

};



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

{

	return irq_tab[slot];

	return evt2irq(0xa20) + slot;

}

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

+14 −4
Original line number Diff line number Diff line
@@ -13,18 +13,28 @@ 
 */

#include <linux/pci.h>

#include <linux/io.h>

#include <linux/sh_intc.h>

#include "pci-sh4.h"



#define IRQ_INTA	evt2irq(0xa20)

#define IRQ_INTB	evt2irq(0xa40)

#define IRQ_INTC	evt2irq(0xa60)

#define IRQ_INTD	evt2irq(0xa80)



/* IDSEL [16][17][18][19][20][21][22][23][24][25][26][27][28][29][30][31] */

static char sdk7780_irq_tab[4][16] __initdata = {

	/* INTA */

	{ 65, 68, 67, 68, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1 },

	{ IRQ_INTA, IRQ_INTD, IRQ_INTC, IRQ_INTD, -1, -1, -1, -1, -1, -1,

	  -1, -1, -1, -1, -1, -1 },

	/* INTB */

	{ 66, 65, -1, 65, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1 },

	{ IRQ_INTB, IRQ_INTA, -1, IRQ_INTA, -1, -1, -1, -1, -1, -1, -1, -1,

	  -1, -1, -1, -1 },

	/* INTC */

	{ 67, 66, -1, 66, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1 },

	{ IRQ_INTC, IRQ_INTB, -1, IRQ_INTB, -1, -1, -1, -1, -1, -1, -1, -1,

	  -1, -1, -1, -1 },

	/* INTD */

	{ 68, 67, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1 },

	{ IRQ_INTD, IRQ_INTC, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,

	  -1, -1, -1 },

};



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

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

+3 −2
Original line number Diff line number Diff line
@@ -4,13 +4,14 @@ 
#include <linux/delay.h>

#include <linux/pci.h>

#include <linux/io.h>

#include <linux/sh_intc.h>

#include "pci-sh4.h"



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

{

        switch (slot) {

        case 0: return 13;

        case 1: return 13;	/* AMD Ethernet controller */

        case 0: return evt2irq(0x3a0);

        case 1: return evt2irq(0x3a0);	/* AMD Ethernet controller */

        case 2: return -1;

        case 3: return -1;

        case 4: return -1;

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

+10 −9
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ 
#include <linux/init.h>

#include <linux/types.h>

#include <linux/pci.h>

#include <linux/sh_intc.h>



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

{
@@ -9,21 +10,21 @@ int __init pcibios_map_platform_irq(const struct pci_dev *dev, u8 slot, u8 pin) 


	if (dev->bus->number == 0) {

		switch (slot) {

		case 4: return 5;	/* eth0       */

		case 8: return 5;	/* eth1       */

		case 6: return 2;	/* PCI bridge */

		case 4: return evt2irq(0x2a0);	/* eth0       */

		case 8: return evt2irq(0x2a0);	/* eth1       */

		case 6: return evt2irq(0x240);	/* PCI bridge */

		default:

			printk(KERN_ERR "PCI: Bad IRQ mapping request "

					"for slot %d\n", slot);

			return 2;

			return evt2irq(0x240);

		}

	} else {

		switch (pin) {

		case 0:   irq =  2; break;

		case 1:   irq =  2; break;

		case 2:   irq =  2; break;

		case 3:   irq =  2; break;

		case 4:   irq =  2; break;

		case 0:   irq =  evt2irq(0x240); break;

		case 1:   irq =  evt2irq(0x240); break;

		case 2:   irq =  evt2irq(0x240); break;

		case 3:   irq =  evt2irq(0x240); break;

		case 4:   irq =  evt2irq(0x240); break;

		default:  irq = -1; break;

		}

	}