X-Git-Url: http://git.rohieb.name/openwrt.git/blobdiff_plain/572b00c7f4e2514b8797778dd896352fb105dd9e..HEAD:/target/linux/adm5120/files/arch/mips/pci/pci-adm5120.c

diff --git a/target/linux/adm5120/files/arch/mips/pci/pci-adm5120.c b/target/linux/adm5120/files/arch/mips/pci/pci-adm5120.c
index 5aa5a633d..86657ce84 100644
--- a/target/linux/adm5120/files/arch/mips/pci/pci-adm5120.c
+++ b/target/linux/adm5120/files/arch/mips/pci/pci-adm5120.c
@@ -1,51 +1,43 @@
 /*
- *  $Id$
- *
  *  ADM5120 PCI Host Controller driver
  *
- *  Copyright (C) ADMtek Incorporated.
- *  Copyright (C) 2005 Jeroen Vreeken (pe1rxq@amsat.org)
- *  Copyright (C) 2007 Gabor Juhos <juhosg at openwrt.org>
- *  Copyright (C) 2007 OpenWrt.org
+ *  Copyright (C) 2007-2008 Gabor Juhos <juhosg@openwrt.org>
  *
- *  This program is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU General Public License
- *  as published by the Free Software Foundation; either version 2
- *  of the License, or (at your option) any later version.
+ *  This code was based on the ADM5120 specific port of the Linux 2.6.10 kernel
+ *  done by Jeroen Vreeken
+ *	Copyright (C) 2005 Jeroen Vreeken (pe1rxq@amsat.org)
  *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
+ *  Jeroen's code was based on the Linux 2.4.xx source codes found in various
+ *  tarballs released by Edimax for it's ADM5120 based devices
+ *	Copyright (C) ADMtek Incorporated
  *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the
- *  Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- *  Boston, MA  02110-1301, USA.
+ *  This program is free software; you can redistribute it and/or modify it
+ *  under the terms of the GNU General Public License version 2 as published
+ *  by the Free Software Foundation.
  *
  */
 #include <linux/types.h>
 #include <linux/kernel.h>
 #include <linux/init.h>
 #include <linux/spinlock.h>
+#include <linux/io.h>
+#include <linux/delay.h>
 
 #include <linux/pci.h>
 #include <linux/pci_ids.h>
 #include <linux/pci_regs.h>
 
-#include <asm/io.h>
-#include <asm/delay.h>
 #include <asm/bootinfo.h>
 
-#include <adm5120_defs.h>
-#include <adm5120_info.h>
-#include <adm5120_defs.h>
-#include <adm5120_platform.h>
+#include <asm/mach-adm5120/adm5120_defs.h>
+#include <asm/mach-adm5120/adm5120_info.h>
+#include <asm/mach-adm5120/adm5120_defs.h>
+#include <asm/mach-adm5120/adm5120_platform.h>
 
 #undef DEBUG
 
 #ifdef DEBUG
-#define DBG(f, a...)	printk(KERN_DEBUG f, ## a )
+#define DBG(f, a...)	printk(KERN_DEBUG f, ## a)
 #else
 #define DBG(f, a...)	do {} while (0)
 #endif
@@ -54,8 +46,8 @@
 
 /* -------------------------------------------------------------------------*/
 
-static unsigned int adm5120_pci_nr_irqs __initdata = 0;
-static struct adm5120_pci_irq *adm5120_pci_irq_map __initdata = NULL;
+static unsigned int adm5120_pci_nr_irqs __initdata;
+static struct adm5120_pci_irq *adm5120_pci_irq_map __initdata;
 
 static spinlock_t pci_lock = SPIN_LOCK_UNLOCKED;
 
@@ -79,8 +71,8 @@ static inline u32 read_cfgdata(void)
 
 static inline u32 mkaddr(struct pci_bus *bus, unsigned int devfn, int where)
 {
-	return (((bus->number & 0xFF) << 16) | ((devfn & 0xFF) << 8) | \
-		(where & 0xFC));
+	return ((bus->number & 0xFF) << 16) | ((devfn & 0xFF) << 8) | \
+		(where & 0xFC);
 }
 
 /* -------------------------------------------------------------------------*/
@@ -93,7 +85,7 @@ static int pci_config_read(struct pci_bus *bus, unsigned int devfn, int where,
 
 	spin_lock_irqsave(&pci_lock, flags);
 
-	write_cfgaddr(mkaddr(bus,devfn,where));
+	write_cfgaddr(mkaddr(bus, devfn, where));
 	data = read_cfgdata();
 
 	DBG("PCI: cfg_read  %02u.%02u.%01u/%02X:%01d, cfg:0x%08X",
@@ -132,7 +124,7 @@ static int pci_config_write(struct pci_bus *bus, unsigned int devfn, int where,
 
 	spin_lock_irqsave(&pci_lock, flags);
 
-	write_cfgaddr(mkaddr(bus,devfn,where));
+	write_cfgaddr(mkaddr(bus, devfn, where));
 	data = read_cfgdata();
 
 	DBG("PCI: cfg_write %02u.%02u.%01u/%02X:%01d, cfg:0x%08X",
@@ -209,7 +201,7 @@ int __init pcibios_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)
 		goto out;
 	}
 
-	if (slot < 1 || slot > 3) {
+	if (slot < 1 || slot > 4) {
 		printk(KERN_ALERT "PCI: slot number %u is not supported\n",
 			slot);
 		goto out;
@@ -226,10 +218,10 @@ int __init pcibios_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)
 
 	if (irq < 0) {
 		printk(KERN_ALERT "PCI: no irq found for %s pin:%u\n",
-			pci_name(dev), pin);
+			pci_name((struct pci_dev *)dev), pin);
 	} else {
 		printk(KERN_INFO "PCI: mapping irq for %s pin:%u, irq:%d\n",
-			pci_name(dev), pin, irq);
+			pci_name((struct pci_dev *)dev), pin, irq);
 	}
 
 out:
@@ -265,14 +257,10 @@ static struct pci_controller adm5120_controller = {
 
 static int __init adm5120_pci_setup(void)
 {
-	int pci_bios;
-
-	pci_bios = adm5120_has_pci();
-
-	printk(KERN_INFO "adm5120: system has %sPCI BIOS\n",
-		pci_bios ? "" : "no ");
-	if (pci_bios == 0)
+	if (adm5120_package_pqfp()) {
+		printk(KERN_INFO "PCI: not available on ADM5120P\n");
 		return -1;
+	}
 
 	/* Avoid ISA compat ranges.  */
 	PCIBIOS_MIN_IO = 0x00000000;