diff options
author | Artem Bityutskiy <Artem.Bityutskiy@nokia.com> | 2011-03-25 11:41:20 -0400 |
---|---|---|
committer | Artem Bityutskiy <Artem.Bityutskiy@nokia.com> | 2011-03-25 11:41:20 -0400 |
commit | 7bf7e370d5919112c223a269462cd0b546903829 (patch) | |
tree | 03ccc715239df14ae168277dbccc9d9cf4d8a2c8 /drivers/net/smc91x.h | |
parent | 68b1a1e786f29c900fa1c516a402e24f0ece622a (diff) | |
parent | d39dd11c3e6a7af5c20bfac40594db36cf270f42 (diff) |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into for-linus-1
* 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6: (9356 commits)
[media] rc: update for bitop name changes
fs: simplify iget & friends
fs: pull inode->i_lock up out of writeback_single_inode
fs: rename inode_lock to inode_hash_lock
fs: move i_wb_list out from under inode_lock
fs: move i_sb_list out from under inode_lock
fs: remove inode_lock from iput_final and prune_icache
fs: Lock the inode LRU list separately
fs: factor inode disposal
fs: protect inode->i_state with inode->i_lock
lib, arch: add filter argument to show_mem and fix private implementations
SLUB: Write to per cpu data when allocating it
slub: Fix debugobjects with lockless fastpath
autofs4: Do not potentially dereference NULL pointer returned by fget() in autofs_dev_ioctl_setpipefd()
autofs4 - remove autofs4_lock
autofs4 - fix d_manage() return on rcu-walk
autofs4 - fix autofs4_expire_indirect() traversal
autofs4 - fix dentry leak in autofs4_expire_direct()
autofs4 - reinstate last used update on access
vfs - check non-mountpoint dentry might block in __follow_mount_rcu()
...
NOTE!
This merge commit was created to fix compilation error. The block
tree was merged upstream and removed the 'elv_queue_empty()'
function which the new 'mtdswap' driver is using. So a simple
merge of the mtd tree with upstream does not compile. And the
mtd tree has already be published, so re-basing it is not an option.
To fix this unfortunate situation, I had to merge upstream into the
mtd-2.6.git tree without committing, put the fixup patch on top of
this, and then commit this. The result is that we do not have commits
which do not compile.
In other words, this merge commit "merges" 3 things: the MTD tree, the
upstream tree, and the fixup patch.
Diffstat (limited to 'drivers/net/smc91x.h')
-rw-r--r-- | drivers/net/smc91x.h | 62 |
1 files changed, 0 insertions, 62 deletions
diff --git a/drivers/net/smc91x.h b/drivers/net/smc91x.h index ee747919a766..68d48ab6eacf 100644 --- a/drivers/net/smc91x.h +++ b/drivers/net/smc91x.h | |||
@@ -206,68 +206,6 @@ SMC_outw(u16 val, void __iomem *ioaddr, int reg) | |||
206 | #define RPC_LSA_DEFAULT RPC_LED_TX_RX | 206 | #define RPC_LSA_DEFAULT RPC_LED_TX_RX |
207 | #define RPC_LSB_DEFAULT RPC_LED_100_10 | 207 | #define RPC_LSB_DEFAULT RPC_LED_100_10 |
208 | 208 | ||
209 | #elif defined(CONFIG_MACH_LPD79520) || \ | ||
210 | defined(CONFIG_MACH_LPD7A400) || \ | ||
211 | defined(CONFIG_MACH_LPD7A404) | ||
212 | |||
213 | /* The LPD7X_IOBARRIER is necessary to overcome a mismatch between the | ||
214 | * way that the CPU handles chip selects and the way that the SMC chip | ||
215 | * expects the chip select to operate. Refer to | ||
216 | * Documentation/arm/Sharp-LH/IOBarrier for details. The read from | ||
217 | * IOBARRIER is a byte, in order that we read the least-common | ||
218 | * denominator. It would be wasteful to read 32 bits from an 8-bit | ||
219 | * accessible region. | ||
220 | * | ||
221 | * There is no explicit protection against interrupts intervening | ||
222 | * between the writew and the IOBARRIER. In SMC ISR there is a | ||
223 | * preamble that performs an IOBARRIER in the extremely unlikely event | ||
224 | * that the driver interrupts itself between a writew to the chip an | ||
225 | * the IOBARRIER that follows *and* the cache is large enough that the | ||
226 | * first off-chip access while handing the interrupt is to the SMC | ||
227 | * chip. Other devices in the same address space as the SMC chip must | ||
228 | * be aware of the potential for trouble and perform a similar | ||
229 | * IOBARRIER on entry to their ISR. | ||
230 | */ | ||
231 | |||
232 | #include <mach/constants.h> /* IOBARRIER_VIRT */ | ||
233 | |||
234 | #define SMC_CAN_USE_8BIT 0 | ||
235 | #define SMC_CAN_USE_16BIT 1 | ||
236 | #define SMC_CAN_USE_32BIT 0 | ||
237 | #define SMC_NOWAIT 0 | ||
238 | #define LPD7X_IOBARRIER readb (IOBARRIER_VIRT) | ||
239 | |||
240 | #define SMC_inw(a,r)\ | ||
241 | ({ unsigned short v = readw ((void*) ((a) + (r))); LPD7X_IOBARRIER; v; }) | ||
242 | #define SMC_outw(v,a,r) ({ writew ((v), (a) + (r)); LPD7X_IOBARRIER; }) | ||
243 | |||
244 | #define SMC_insw LPD7_SMC_insw | ||
245 | static inline void LPD7_SMC_insw (unsigned char* a, int r, | ||
246 | unsigned char* p, int l) | ||
247 | { | ||
248 | unsigned short* ps = (unsigned short*) p; | ||
249 | while (l-- > 0) { | ||
250 | *ps++ = readw (a + r); | ||
251 | LPD7X_IOBARRIER; | ||
252 | } | ||
253 | } | ||
254 | |||
255 | #define SMC_outsw LPD7_SMC_outsw | ||
256 | static inline void LPD7_SMC_outsw (unsigned char* a, int r, | ||
257 | unsigned char* p, int l) | ||
258 | { | ||
259 | unsigned short* ps = (unsigned short*) p; | ||
260 | while (l-- > 0) { | ||
261 | writew (*ps++, a + r); | ||
262 | LPD7X_IOBARRIER; | ||
263 | } | ||
264 | } | ||
265 | |||
266 | #define SMC_INTERRUPT_PREAMBLE LPD7X_IOBARRIER | ||
267 | |||
268 | #define RPC_LSA_DEFAULT RPC_LED_TX_RX | ||
269 | #define RPC_LSB_DEFAULT RPC_LED_100_10 | ||
270 | |||
271 | #elif defined(CONFIG_ARCH_VERSATILE) | 209 | #elif defined(CONFIG_ARCH_VERSATILE) |
272 | 210 | ||
273 | #define SMC_CAN_USE_8BIT 1 | 211 | #define SMC_CAN_USE_8BIT 1 |