diff options
author | Thomas Backlund <tmb@mandriva.org> | 2007-08-10 17:42:15 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2007-10-12 18:03:15 -0400 |
commit | b205f6b2679c7fcf761ed726de8093ca69b6c26e (patch) | |
tree | 4a11ab285dccffedcefb43d3d3b74b3a2bc0e5bb /arch/x86/pci | |
parent | 3d034aecd8b70d34388a4e40ca50af0d014223e1 (diff) |
i386: add support for picopower irq router
Add 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)
Testing and confirmation that it works by Austin Acton
Cleaned up a little for inclusion in a 2.6.21-rc7 based kernel.
Added some more cleanups according to CodingStyle, as noted by
Randy Dunlap on LKML.
[akpm@linux-foundation.org: build fixes]
Signed-off-by: Thomas Backlund <tmb@mandriva.org>
Cc: Andi Kleen <ak@suse.de>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'arch/x86/pci')
-rw-r--r-- | arch/x86/pci/irq.c | 39 |
1 files changed, 39 insertions, 0 deletions
diff --git a/arch/x86/pci/irq.c b/arch/x86/pci/irq.c index d98c6b096f8e..c52150fdf82b 100644 --- a/arch/x86/pci/irq.c +++ b/arch/x86/pci/irq.c | |||
@@ -492,6 +492,26 @@ static int pirq_amd756_set(struct pci_dev *router, struct pci_dev *dev, int pirq | |||
492 | return 1; | 492 | return 1; |
493 | } | 493 | } |
494 | 494 | ||
495 | /* | ||
496 | * PicoPower PT86C523 | ||
497 | */ | ||
498 | static int pirq_pico_get(struct pci_dev *router, struct pci_dev *dev, int pirq) | ||
499 | { | ||
500 | outb(0x10 + ((pirq - 1) >> 1), 0x24); | ||
501 | return ((pirq - 1) & 1) ? (inb(0x26) >> 4) : (inb(0x26) & 0xf); | ||
502 | } | ||
503 | |||
504 | static int pirq_pico_set(struct pci_dev *router, struct pci_dev *dev, int pirq, | ||
505 | int irq) | ||
506 | { | ||
507 | unsigned int x; | ||
508 | outb(0x10 + ((pirq - 1) >> 1), 0x24); | ||
509 | x = inb(0x26); | ||
510 | x = ((pirq - 1) & 1) ? ((x & 0x0f) | (irq << 4)) : ((x & 0xf0) | (irq)); | ||
511 | outb(x, 0x26); | ||
512 | return 1; | ||
513 | } | ||
514 | |||
495 | #ifdef CONFIG_PCI_BIOS | 515 | #ifdef CONFIG_PCI_BIOS |
496 | 516 | ||
497 | static int pirq_bios_set(struct pci_dev *router, struct pci_dev *dev, int pirq, int irq) | 517 | static int pirq_bios_set(struct pci_dev *router, struct pci_dev *dev, int pirq, int irq) |
@@ -721,6 +741,24 @@ static __init int amd_router_probe(struct irq_router *r, struct pci_dev *router, | |||
721 | return 1; | 741 | return 1; |
722 | } | 742 | } |
723 | 743 | ||
744 | static __init int pico_router_probe(struct irq_router *r, struct pci_dev *router, u16 device) | ||
745 | { | ||
746 | switch (device) { | ||
747 | case PCI_DEVICE_ID_PICOPOWER_PT86C523: | ||
748 | r->name = "PicoPower PT86C523"; | ||
749 | r->get = pirq_pico_get; | ||
750 | r->set = pirq_pico_set; | ||
751 | return 1; | ||
752 | |||
753 | case PCI_DEVICE_ID_PICOPOWER_PT86C523BBP: | ||
754 | r->name = "PicoPower PT86C523 rev. BB+"; | ||
755 | r->get = pirq_pico_get; | ||
756 | r->set = pirq_pico_set; | ||
757 | return 1; | ||
758 | } | ||
759 | return 0; | ||
760 | } | ||
761 | |||
724 | static __initdata struct irq_router_handler pirq_routers[] = { | 762 | static __initdata struct irq_router_handler pirq_routers[] = { |
725 | { PCI_VENDOR_ID_INTEL, intel_router_probe }, | 763 | { PCI_VENDOR_ID_INTEL, intel_router_probe }, |
726 | { PCI_VENDOR_ID_AL, ali_router_probe }, | 764 | { PCI_VENDOR_ID_AL, ali_router_probe }, |
@@ -732,6 +770,7 @@ static __initdata struct irq_router_handler pirq_routers[] = { | |||
732 | { PCI_VENDOR_ID_VLSI, vlsi_router_probe }, | 770 | { PCI_VENDOR_ID_VLSI, vlsi_router_probe }, |
733 | { PCI_VENDOR_ID_SERVERWORKS, serverworks_router_probe }, | 771 | { PCI_VENDOR_ID_SERVERWORKS, serverworks_router_probe }, |
734 | { PCI_VENDOR_ID_AMD, amd_router_probe }, | 772 | { PCI_VENDOR_ID_AMD, amd_router_probe }, |
773 | { PCI_VENDOR_ID_PICOPOWER, pico_router_probe }, | ||
735 | /* Someone with docs needs to add the ATI Radeon IGP */ | 774 | /* Someone with docs needs to add the ATI Radeon IGP */ |
736 | { 0, NULL } | 775 | { 0, NULL } |
737 | }; | 776 | }; |