[patch] Add support for picopower irq router

Thomas Backlund
2007-05-01T09:40:33Z

[-- Attachment #1: Type: text/plain, Size: 0 bytes --]

[-- Attachment #2: picopower-irq-router.patch --]
[-- Type: text/plain, Size: 3173 bytes --]

This patch adds support for PicoPower PT86C523 IRQ router to be used
with the in-kernel yenta driver for CardBus.
With this patch cardbus works on e.g. Dell Latitude XPi P150CD.

Initial patch for kernel 2.4 series by Sune MÃ¸lgaard
http://molgaard.org/code/linux-2.4.31-picopower.patch

Ported to 2.6.20 by Chmouel Boudjnah (http://www.chmouel.com)

Tested and confirmed that it works by Austin Acton.

Cleaned up a little for inclusion in a 2.6.21-rc7 & 2.6.21.1 based kernel.

Signed-Off-By: Thomas Backlund <tmb@mandriva.org>

arch/i386/pci/irq.c | 38 ++++++++++++++++++++++++++++++++++++++
include/linux/pci_ids.h | 3 +++
2 files changed, 41 insertions(+)

diff -Nurp 2.6.21-rc7/arch/i386/pci/irq.c 2.6.21-rc7.picopower/arch/i386/pci/irq.c
--- 2.6.21-rc7/arch/i386/pci/irq.c 2007-02-04 20:44:54.000000000 +0200
+++ 2.6.21-rc7.picopower/arch/i386/pci/irq.c 2007-04-24 15:26:21.000000000 +0300
@@ -491,6 +491,24 @@ static int pirq_amd756_set(struct pci_de
return 1;
}

+/*
+ * PicoPower PT86C523
+ */
+static int pirq_pico_get(struct pci_dev *router, struct pci_dev *dev, int pirq)
+{
+ outb(0x10+((pirq-1)>>1), 0x24);
+ return ((pirq-1)&1) ? (inb(0x26)>>4) : (inb(0x26)&0xf);
+}
+
+static int pirq_pico_set(struct pci_dev *router, struct pci_dev *dev, int pirq, int irq)
+{
+ outb(0x10+((pirq-1)>>1), 0x24);
+ unsigned int x;
+ x = inb(0x26);
+ x = ((pirq-1)&1) ? ((x&0x0f)|(irq<<4)) : ((x&0xf0)|(irq));
+ outb(x,0x26);
+}
+
#ifdef CONFIG_PCI_BIOS

static int pirq_bios_set(struct pci_dev *router, struct pci_dev *dev, int pirq, int irq)
@@ -719,6 +737,25 @@ static __init int amd_router_probe(struc
return 1;
}

+static __init int pico_router_probe(struct irq_router *r, struct pci_dev *router, u16 device)
+{
+ switch(device)
+ {
+ case PCI_DEVICE_ID_PICOPOWER_PT86C523:
+ r->name = "PicoPower PT86C523";
+ r->get = pirq_pico_get;
+ r->set = pirq_pico_set;
+ return 1;
+
+ case PCI_DEVICE_ID_PICOPOWER_PT86C523BBP:
+ r->name = "PicoPower PT86C523 rev. BB+";
+ r->get = pirq_pico_get;
+ r->set = pirq_pico_set;
+ return 1;
+ }
+ return 0;
+}
+
static __initdata struct irq_router_handler pirq_routers[] = {
{ PCI_VENDOR_ID_INTEL, intel_router_probe },
{ PCI_VENDOR_ID_AL, ali_router_probe },
@@ -730,6 +767,7 @@ static __initdata struct irq_router_hand
{ PCI_VENDOR_ID_VLSI, vlsi_router_probe },
{ PCI_VENDOR_ID_SERVERWORKS, serverworks_router_probe },
{ PCI_VENDOR_ID_AMD, amd_router_probe },
+ { PCI_VENDOR_ID_PICOPOWER, pico_router_probe },
/* Someone with docs needs to add the ATI Radeon IGP */
{ 0, NULL }
};
diff -Nurp 2.6.21-rc7/include/linux/pci_ids.h 2.6.21-rc7.picopower/include/linux/pci_ids.h
--- 2.6.21-rc7/include/linux/pci_ids.h 2007-04-24 14:37:59.000000000 +0300
+++ 2.6.21-rc7.picopower/include/linux/pci_ids.h 2007-04-24 15:26:21.000000000 +0300