diff options
Diffstat (limited to 'arch/arm/mach-iop13xx/pci.c')
-rw-r--r-- | arch/arm/mach-iop13xx/pci.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/arch/arm/mach-iop13xx/pci.c b/arch/arm/mach-iop13xx/pci.c index 1c9e94c38b7e..9d63d7f260ca 100644 --- a/arch/arm/mach-iop13xx/pci.c +++ b/arch/arm/mach-iop13xx/pci.c | |||
@@ -19,10 +19,11 @@ | |||
19 | 19 | ||
20 | #include <linux/pci.h> | 20 | #include <linux/pci.h> |
21 | #include <linux/delay.h> | 21 | #include <linux/delay.h> |
22 | 22 | #include <linux/jiffies.h> | |
23 | #include <asm/irq.h> | 23 | #include <asm/irq.h> |
24 | #include <asm/hardware.h> | 24 | #include <asm/hardware.h> |
25 | #include <asm/sizes.h> | 25 | #include <asm/sizes.h> |
26 | #include <asm/signal.h> | ||
26 | #include <asm/mach/pci.h> | 27 | #include <asm/mach/pci.h> |
27 | #include <asm/arch/pci.h> | 28 | #include <asm/arch/pci.h> |
28 | 29 | ||
@@ -144,7 +145,7 @@ void iop13xx_map_pci_memory(void) | |||
144 | } | 145 | } |
145 | } | 146 | } |
146 | 147 | ||
147 | static inline int iop13xx_atu_function(int atu) | 148 | static int iop13xx_atu_function(int atu) |
148 | { | 149 | { |
149 | int func = 0; | 150 | int func = 0; |
150 | /* the function number depends on the value of the | 151 | /* the function number depends on the value of the |
@@ -259,7 +260,7 @@ static int iop13xx_atux_pci_status(int clear) | |||
259 | * data. Note that the data dependency on %0 encourages an abort | 260 | * data. Note that the data dependency on %0 encourages an abort |
260 | * to be detected before we return. | 261 | * to be detected before we return. |
261 | */ | 262 | */ |
262 | static inline u32 iop13xx_atux_read(unsigned long addr) | 263 | static u32 iop13xx_atux_read(unsigned long addr) |
263 | { | 264 | { |
264 | u32 val; | 265 | u32 val; |
265 | 266 | ||
@@ -387,7 +388,7 @@ static int iop13xx_atue_pci_status(int clear) | |||
387 | return err; | 388 | return err; |
388 | } | 389 | } |
389 | 390 | ||
390 | static inline int __init | 391 | static int |
391 | iop13xx_pcie_map_irq(struct pci_dev *dev, u8 idsel, u8 pin) | 392 | iop13xx_pcie_map_irq(struct pci_dev *dev, u8 idsel, u8 pin) |
392 | { | 393 | { |
393 | WARN_ON(idsel != 0); | 394 | WARN_ON(idsel != 0); |
@@ -401,7 +402,7 @@ iop13xx_pcie_map_irq(struct pci_dev *dev, u8 idsel, u8 pin) | |||
401 | } | 402 | } |
402 | } | 403 | } |
403 | 404 | ||
404 | static inline u32 iop13xx_atue_read(unsigned long addr) | 405 | static u32 iop13xx_atue_read(unsigned long addr) |
405 | { | 406 | { |
406 | u32 val; | 407 | u32 val; |
407 | 408 | ||
@@ -989,7 +990,7 @@ void __init iop13xx_pci_init(void) | |||
989 | "imprecise external abort"); | 990 | "imprecise external abort"); |
990 | } | 991 | } |
991 | 992 | ||
992 | /* intialize the pci memory space. handle any combination of | 993 | /* initialize the pci memory space. handle any combination of |
993 | * atue and atux enabled/disabled | 994 | * atue and atux enabled/disabled |
994 | */ | 995 | */ |
995 | int iop13xx_pci_setup(int nr, struct pci_sys_data *sys) | 996 | int iop13xx_pci_setup(int nr, struct pci_sys_data *sys) |