Commit 57739d81 authored by Russell King's avatar Russell King

[ARM] Miscellaneous fixes

- Adjust PCI minimum offsets for footbridge architectures
- Remove unnecessary <linux/config.h>
- Add comment about {in,out}[bwl]
- Remove obsolete 6th "flags" parameter to pci_pool_create
parent 9b4244ba
...@@ -76,4 +76,3 @@ __SA1100_start: ...@@ -76,4 +76,3 @@ __SA1100_start:
mov r0, #0x00200000 mov r0, #0x00200000
1: subs r0, r0, #1 1: subs r0, r0, #1
bne 1b bne 1b
...@@ -133,7 +133,7 @@ extern void cpld_modify(int mask, int set); ...@@ -133,7 +133,7 @@ extern void cpld_modify(int mask, int set);
#define pcibios_assign_all_busses() 1 #define pcibios_assign_all_busses() 1
#define PCIBIOS_MIN_IO 0x6000 #define PCIBIOS_MIN_IO 0x1000
#define PCIBIOS_MIN_MEM 0x40000000 #define PCIBIOS_MIN_MEM 0x81000000
#endif #endif
...@@ -22,7 +22,6 @@ ...@@ -22,7 +22,6 @@
#ifdef __KERNEL__ #ifdef __KERNEL__
#include <linux/config.h>
#include <linux/types.h> #include <linux/types.h>
#include <asm/byteorder.h> #include <asm/byteorder.h>
#include <asm/memory.h> #include <asm/memory.h>
...@@ -94,6 +93,8 @@ extern void __readwrite_bug(const char *fn); ...@@ -94,6 +93,8 @@ extern void __readwrite_bug(const char *fn);
* Note that we prevent GCC re-ordering or caching values in expressions * Note that we prevent GCC re-ordering or caching values in expressions
* by introducing sequence points into the in*() definitions. Note that * by introducing sequence points into the in*() definitions. Note that
* __raw_* do not guarantee this behaviour. * __raw_* do not guarantee this behaviour.
*
* The {in,out}[bwl] macros are for emulating x86-style PCI/ISA IO space.
*/ */
#ifdef __io #ifdef __io
#define outb(v,p) __raw_writeb(v,__io(p)) #define outb(v,p) __raw_writeb(v,__io(p))
......
...@@ -241,7 +241,7 @@ static inline int pci_dma_supported(struct pci_dev *hwdev, u64 mask) ...@@ -241,7 +241,7 @@ static inline int pci_dma_supported(struct pci_dev *hwdev, u64 mask)
/* kmem_cache style wrapper around pci_alloc_consistent() */ /* kmem_cache style wrapper around pci_alloc_consistent() */
struct pci_pool *pci_pool_create (const char *name, struct pci_dev *dev, struct pci_pool *pci_pool_create (const char *name, struct pci_dev *dev,
size_t size, size_t align, size_t allocation, int flags); size_t size, size_t align, size_t allocation);
void pci_pool_destroy (struct pci_pool *pool); void pci_pool_destroy (struct pci_pool *pool);
void *pci_pool_alloc (struct pci_pool *pool, int flags, dma_addr_t *handle); void *pci_pool_alloc (struct pci_pool *pool, int flags, dma_addr_t *handle);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment