diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-01-10 20:06:08 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-01-10 20:06:08 -0500 |
| commit | 0be8c8bd1de21d75ef14eb6af35b664f70a35746 (patch) | |
| tree | fac1d514dcdb4146d4504f965a7f394c998c6b82 /include/asm-generic | |
| parent | e54be894eae10eca9892e965cc9532f5d5a11767 (diff) | |
| parent | a780c6e86851c6479851186c5d5b9fb2b201bec7 (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/vapier/blackfin
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/vapier/blackfin: (52 commits)
Blackfin: encode cpu-rev into uImage name
Blackfin: bf54x: don't ack GPIO ints when unmasking them
Blackfin: sram_free_with_lsl: do not ignore return value of sram_free
Blackfin: boards: add missing "static" to peripheral lists
Blackfin: DNP5370: new board port
Blackfin: bf518f-ezbrd: fix dsa resources
Blackfin: move "-m elf32bfin" to general LDFLAGS
Blackfin: kgdb_test: make sure to initialize num2
Blackfin: kgdb: disable preempt schedule when running single step in kgdb
Blackfin: kgdb: disable interrupt when single stepping in ADEOS
Blackfin: SMP: kgdb: apply anomaly 257 work around
Blackfin: fix building IPIPE code when XIP is enabled
Blackfin: SMP: kgdb: flush core internal write buffer before flushinv
Blackfin: sport_uart resources: remove unused secondary RX/TX pins
Blackfin: tll6527m: fix spelling in unused code (struct name)
Blackfin: bf527-ezkit: add adau1373 chip address
Blackfin: no-mpu: fix masking of small uncached dma region
Blackfin: pm: drop irq save/restore in standby and suspend to mem callback
MAINTAINERS: update Analog Devices support info
Blackfin: dpmc.h: pull in new pll.h
...
Diffstat (limited to 'include/asm-generic')
| -rw-r--r-- | include/asm-generic/io.h | 30 |
1 files changed, 30 insertions, 0 deletions
diff --git a/include/asm-generic/io.h b/include/asm-generic/io.h index 3577ca11a0be..4644c9a7f724 100644 --- a/include/asm-generic/io.h +++ b/include/asm-generic/io.h | |||
| @@ -211,6 +211,36 @@ static inline void outsl(unsigned long addr, const void *buffer, int count) | |||
| 211 | } | 211 | } |
| 212 | #endif | 212 | #endif |
| 213 | 213 | ||
| 214 | static inline void readsl(const void __iomem *addr, void *buf, int len) | ||
| 215 | { | ||
| 216 | insl((unsigned long)addr, buf, len); | ||
| 217 | } | ||
| 218 | |||
| 219 | static inline void readsw(const void __iomem *addr, void *buf, int len) | ||
| 220 | { | ||
| 221 | insw((unsigned long)addr, buf, len); | ||
| 222 | } | ||
| 223 | |||
| 224 | static inline void readsb(const void __iomem *addr, void *buf, int len) | ||
| 225 | { | ||
| 226 | insb((unsigned long)addr, buf, len); | ||
| 227 | } | ||
| 228 | |||
| 229 | static inline void writesl(const void __iomem *addr, const void *buf, int len) | ||
| 230 | { | ||
| 231 | outsl((unsigned long)addr, buf, len); | ||
| 232 | } | ||
| 233 | |||
| 234 | static inline void writesw(const void __iomem *addr, const void *buf, int len) | ||
| 235 | { | ||
| 236 | outsw((unsigned long)addr, buf, len); | ||
| 237 | } | ||
| 238 | |||
| 239 | static inline void writesb(const void __iomem *addr, const void *buf, int len) | ||
| 240 | { | ||
| 241 | outsb((unsigned long)addr, buf, len); | ||
| 242 | } | ||
| 243 | |||
| 214 | #ifndef CONFIG_GENERIC_IOMAP | 244 | #ifndef CONFIG_GENERIC_IOMAP |
| 215 | #define ioread8(addr) readb(addr) | 245 | #define ioread8(addr) readb(addr) |
| 216 | #define ioread16(addr) readw(addr) | 246 | #define ioread16(addr) readw(addr) |
