aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
Diffstat (limited to 'arch')
-rw-r--r--arch/mips/include/asm/mach-ath79/pci.h20
-rw-r--r--arch/mips/pci/pci-ath724x.c3
2 files changed, 22 insertions, 1 deletions
diff --git a/arch/mips/include/asm/mach-ath79/pci.h b/arch/mips/include/asm/mach-ath79/pci.h
new file mode 100644
index 000000000000..e0c4b53590f4
--- /dev/null
+++ b/arch/mips/include/asm/mach-ath79/pci.h
@@ -0,0 +1,20 @@
1/*
2 * Atheros 724x PCI support
3 *
4 * Copyright (C) 2011 René Bolldorf <xsecute@googlemail.com>
5 *
6 * This program is free software; you can redistribute it and/or modify it
7 * under the terms of the GNU General Public License version 2 as published
8 * by the Free Software Foundation.
9 */
10
11#ifndef __ASM_MACH_ATH79_PCI_H
12#define __ASM_MACH_ATH79_PCI_H
13
14#if defined(CONFIG_PCI) && defined(CONFIG_SOC_AR724X)
15int ath724x_pcibios_init(void);
16#else
17static inline int ath724x_pcibios_init(void) { return 0; }
18#endif
19
20#endif /* __ASM_MACH_ATH79_PCI_H */
diff --git a/arch/mips/pci/pci-ath724x.c b/arch/mips/pci/pci-ath724x.c
index 1e810be22d26..be01b7f8d840 100644
--- a/arch/mips/pci/pci-ath724x.c
+++ b/arch/mips/pci/pci-ath724x.c
@@ -9,6 +9,7 @@
9 */ 9 */
10 10
11#include <linux/pci.h> 11#include <linux/pci.h>
12#include <asm/mach-ath79/pci.h>
12 13
13#define reg_read(_phys) (*(unsigned int *) KSEG1ADDR(_phys)) 14#define reg_read(_phys) (*(unsigned int *) KSEG1ADDR(_phys))
14#define reg_write(_phys, _val) ((*(unsigned int *) KSEG1ADDR(_phys)) = (_val)) 15#define reg_write(_phys, _val) ((*(unsigned int *) KSEG1ADDR(_phys)) = (_val))
@@ -130,7 +131,7 @@ static struct pci_controller ath724x_pci_controller = {
130 .mem_resource = &ath724x_mem_resource, 131 .mem_resource = &ath724x_mem_resource,
131}; 132};
132 133
133static int __init ath724x_pcibios_init(void) 134int __init ath724x_pcibios_init(void)
134{ 135{
135 register_pci_controller(&ath724x_pci_controller); 136 register_pci_controller(&ath724x_pci_controller);
136 137