projects
/
openwrt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ar71xx: allow overriding of the lan port names on AP91 based boards
[openwrt.git]
/
target
/
linux
/
ar71xx
/
files
/
arch
/
mips
/
pci
/
pci-ar71xx.c
diff --git
a/target/linux/ar71xx/files/arch/mips/pci/pci-ar71xx.c
b/target/linux/ar71xx/files/arch/mips/pci/pci-ar71xx.c
index
383a708
..
b2d36ca
100644
(file)
--- a/
target/linux/ar71xx/files/arch/mips/pci/pci-ar71xx.c
+++ b/
target/linux/ar71xx/files/arch/mips/pci/pci-ar71xx.c
@@
-1,7
+1,7
@@
/*
* Atheros AR71xx PCI host controller driver
*
/*
* Atheros AR71xx PCI host controller driver
*
- * Copyright (C) 2008 Gabor Juhos <juhosg@openwrt.org>
+ * Copyright (C) 2008
-2009
Gabor Juhos <juhosg@openwrt.org>
* Copyright (C) 2008 Imre Kaloz <kaloz@openwrt.org>
*
* Parts of this file are based on Atheros' 2.6.15 BSP
* Copyright (C) 2008 Imre Kaloz <kaloz@openwrt.org>
*
* Parts of this file are based on Atheros' 2.6.15 BSP
@@
-36,11
+36,9
@@
#define PCI_IDSEL_BASE 0
#endif
#define PCI_IDSEL_BASE 0
#endif
-static unsigned ar71xx_pci_nr_irqs;
-static struct ar71xx_pci_irq *ar71xx_pci_irq_map __initdata;
static void __iomem *ar71xx_pcicfg_base;
static void __iomem *ar71xx_pcicfg_base;
-
static DEFINE_SPINLOCK(ar71xx_pci_lock);
static DEFINE_SPINLOCK(ar71xx_pci_lock);
+static int ar71xx_pci_fixup_enable;
static inline void ar71xx_pci_delay(void)
{
static inline void ar71xx_pci_delay(void)
{
@@
-93,7
+91,7
@@
static inline u32 ar71xx_pci_bus_addr(struct pci_bus *bus, unsigned int devfn,
return ret;
}
return ret;
}
-
static int __
ar71xx_pci_be_handler(int is_fixup)
+
int
ar71xx_pci_be_handler(int is_fixup)
{
u32 pci_err;
u32 ahb_err;
{
u32 pci_err;
u32 ahb_err;
@@
-135,7
+133,7
@@
static inline int ar71xx_pci_set_cfgaddr(struct pci_bus *bus,
ar71xx_pcicfg_wr(PCI_REG_CFG_CBE,
cmd | ar71xx_pci_get_ble(where, size, 0));
ar71xx_pcicfg_wr(PCI_REG_CFG_CBE,
cmd | ar71xx_pci_get_ble(where, size, 0));
- return
__
ar71xx_pci_be_handler(1);
+ return ar71xx_pci_be_handler(1);
}
static int ar71xx_pci_read_config(struct pci_bus *bus, unsigned int devfn,
}
static int ar71xx_pci_read_config(struct pci_bus *bus, unsigned int devfn,
@@
-231,6
+229,9
@@
static void ar71xx_pci_fixup(struct pci_dev *dev)
{
u32 t;
{
u32 t;
+ if (!ar71xx_pci_fixup_enable)
+ return;
+
if (dev->bus->number != 0 || dev->devfn != 0)
return;
if (dev->bus->number != 0 || dev->devfn != 0)
return;
@@
-243,10
+244,10
@@
static void ar71xx_pci_fixup(struct pci_dev *dev)
pci_write_config_word(dev, PCI_COMMAND, t);
}
pci_write_config_word(dev, PCI_COMMAND, t);
}
-
DECLARE_PCI_FIXUP_EARLY(PCI_ANY_ID, PCI_ANY_ID, ar71xx_pci_fixup);
DECLARE_PCI_FIXUP_EARLY(PCI_ANY_ID, PCI_ANY_ID, ar71xx_pci_fixup);
-int __init pcibios_map_irq(const struct pci_dev *dev, uint8_t slot, uint8_t pin)
+int __init ar71xx_pcibios_map_irq(const struct pci_dev *dev, uint8_t slot,
+ uint8_t pin)
{
int irq = -1;
int i;
{
int irq = -1;
int i;
@@
-274,11
+275,6
@@
int __init pcibios_map_irq(const struct pci_dev *dev, uint8_t slot, uint8_t pin)
return irq;
}
return irq;
}
-int pcibios_plat_dev_init(struct pci_dev *dev)
-{
- return 0;
-}
-
static struct pci_ops ar71xx_pci_ops = {
.read = ar71xx_pci_read_config,
.write = ar71xx_pci_write_config,
static struct pci_ops ar71xx_pci_ops = {
.read = ar71xx_pci_read_config,
.write = ar71xx_pci_write_config,
@@
-304,8
+300,7
@@
static struct pci_controller ar71xx_pci_controller = {
.io_resource = &ar71xx_pci_io_resource,
};
.io_resource = &ar71xx_pci_io_resource,
};
-static int __init __ar71xx_pci_bios_init(unsigned nr_irqs,
- struct ar71xx_pci_irq *map)
+int __init ar71xx_pcibios_init(void)
{
ar71xx_device_stop(RESET_MODULE_PCI_BUS | RESET_MODULE_PCI_CORE);
ar71xx_pci_delay();
{
ar71xx_device_stop(RESET_MODULE_PCI_BUS | RESET_MODULE_PCI_CORE);
ar71xx_pci_delay();
@@
-328,20
+323,10
@@
static int __init __ar71xx_pci_bios_init(unsigned nr_irqs,
ar71xx_pci_delay();
/* clear bus errors */
ar71xx_pci_delay();
/* clear bus errors */
- (void)__ar71xx_pci_be_handler(1);
-
- ar71xx_pci_nr_irqs = nr_irqs;
- ar71xx_pci_irq_map = map;
- ar71xx_pci_be_handler = __ar71xx_pci_be_handler;
+ (void)ar71xx_pci_be_handler(1);
+ ar71xx_pci_fixup_enable = 1;
register_pci_controller(&ar71xx_pci_controller);
return 0;
}
register_pci_controller(&ar71xx_pci_controller);
return 0;
}
-
-static int __init __ar71xx_pci_init(void)
-{
- ar71xx_pci_bios_init = __ar71xx_pci_bios_init;
- return 0;
-}
-pure_initcall(__ar71xx_pci_init);
This page took
0.024129 seconds
and
4
git commands to generate.