aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/mach-orion/common.c2
-rw-r--r--arch/arm/mach-orion/pci.c16
2 files changed, 9 insertions, 9 deletions
diff --git a/arch/arm/mach-orion/common.c b/arch/arm/mach-orion/common.c
index e271994d27fe..aae157d360e6 100644
--- a/arch/arm/mach-orion/common.c
+++ b/arch/arm/mach-orion/common.c
@@ -319,7 +319,7 @@ struct sys_timer orion_timer = {
319/* 319/*
320 * Identify device ID and rev from PCIE configuration header space '0'. 320 * Identify device ID and rev from PCIE configuration header space '0'.
321 */ 321 */
322static void orion_id(u32 *dev, u32 *rev, char **dev_name) 322static void __init orion_id(u32 *dev, u32 *rev, char **dev_name)
323{ 323{
324 orion_pcie_id(dev, rev); 324 orion_pcie_id(dev, rev);
325 325
diff --git a/arch/arm/mach-orion/pci.c b/arch/arm/mach-orion/pci.c
index 5240a245c7e4..18cdf3b505a5 100644
--- a/arch/arm/mach-orion/pci.c
+++ b/arch/arm/mach-orion/pci.c
@@ -35,7 +35,7 @@
35 ****************************************************************************/ 35 ****************************************************************************/
36#define PCIE_BASE ((void __iomem *)ORION_PCIE_VIRT_BASE) 36#define PCIE_BASE ((void __iomem *)ORION_PCIE_VIRT_BASE)
37 37
38void orion_pcie_id(u32 *dev, u32 *rev) 38void __init orion_pcie_id(u32 *dev, u32 *rev)
39{ 39{
40 *dev = orion_pcie_dev_id(PCIE_BASE); 40 *dev = orion_pcie_dev_id(PCIE_BASE);
41 *rev = orion_pcie_rev(PCIE_BASE); 41 *rev = orion_pcie_rev(PCIE_BASE);
@@ -136,7 +136,7 @@ struct pci_ops pcie_ops = {
136}; 136};
137 137
138 138
139static int pcie_setup(struct pci_sys_data *sys) 139static int __init pcie_setup(struct pci_sys_data *sys)
140{ 140{
141 struct resource *res; 141 struct resource *res;
142 int dev; 142 int dev;
@@ -362,7 +362,7 @@ struct pci_ops pci_ops = {
362 .write = orion_pci_wr_conf, 362 .write = orion_pci_wr_conf,
363}; 363};
364 364
365static void orion_pci_set_bus_nr(int nr) 365static void __init orion_pci_set_bus_nr(int nr)
366{ 366{
367 u32 p2p = orion_read(PCI_P2P_CONF); 367 u32 p2p = orion_read(PCI_P2P_CONF);
368 368
@@ -387,7 +387,7 @@ static void orion_pci_set_bus_nr(int nr)
387 } 387 }
388} 388}
389 389
390static void orion_pci_master_slave_enable(void) 390static void __init orion_pci_master_slave_enable(void)
391{ 391{
392 int bus_nr, dev_nr, func, reg; 392 int bus_nr, dev_nr, func, reg;
393 u32 val; 393 u32 val;
@@ -401,7 +401,7 @@ static void orion_pci_master_slave_enable(void)
401 orion_pci_hw_wr_conf(bus_nr, dev_nr, func, reg, 4, val | 0x7); 401 orion_pci_hw_wr_conf(bus_nr, dev_nr, func, reg, 4, val | 0x7);
402} 402}
403 403
404static void orion_setup_pci_wins(struct mbus_dram_target_info *dram) 404static void __init orion_setup_pci_wins(struct mbus_dram_target_info *dram)
405{ 405{
406 u32 win_enable; 406 u32 win_enable;
407 int bus; 407 int bus;
@@ -461,7 +461,7 @@ static void orion_setup_pci_wins(struct mbus_dram_target_info *dram)
461 orion_setbits(PCI_ADDR_DECODE_CTRL, 1); 461 orion_setbits(PCI_ADDR_DECODE_CTRL, 1);
462} 462}
463 463
464static int pci_setup(struct pci_sys_data *sys) 464static int __init pci_setup(struct pci_sys_data *sys)
465{ 465{
466 struct resource *res; 466 struct resource *res;
467 467
@@ -519,7 +519,7 @@ static int pci_setup(struct pci_sys_data *sys)
519/***************************************************************************** 519/*****************************************************************************
520 * General PCIE + PCI 520 * General PCIE + PCI
521 ****************************************************************************/ 521 ****************************************************************************/
522int orion_pci_sys_setup(int nr, struct pci_sys_data *sys) 522int __init orion_pci_sys_setup(int nr, struct pci_sys_data *sys)
523{ 523{
524 int ret = 0; 524 int ret = 0;
525 525
@@ -534,7 +534,7 @@ int orion_pci_sys_setup(int nr, struct pci_sys_data *sys)
534 return ret; 534 return ret;
535} 535}
536 536
537struct pci_bus *orion_pci_sys_scan_bus(int nr, struct pci_sys_data *sys) 537struct pci_bus __init *orion_pci_sys_scan_bus(int nr, struct pci_sys_data *sys)
538{ 538{
539 struct pci_bus *bus; 539 struct pci_bus *bus;
540 540