litmus-rt.git - The LITMUS^RT kernel.

diff options

author	Jiri Kosina <jkosina@suse.cz>	2009-12-07 12:36:35 -0500
committer	Jiri Kosina <jkosina@suse.cz>	2009-12-07 12:36:35 -0500
commit	d014d043869cdc591f3a33243d3481fa4479c2d0 (patch)
tree	63626829498e647ba058a1ce06419fe7e4d5f97d /drivers/net/sky2.c
parent	6ec22f9b037fc0c2e00ddb7023fad279c365324d (diff)
parent	6070d81eb5f2d4943223c96e7609a53cdc984364 (diff)

Merge branch 'for-next' into for-linus

Conflicts: kernel/irq/chip.c

Diffstat (limited to 'drivers/net/sky2.c')

-rw-r--r--

drivers/net/sky2.c

1 files changed, 1 insertions, 1 deletions


diff --git a/drivers/net/sky2.c b/drivers/net/sky2.c index 6a10d7ba5877..a76cd66c2282 100644 --- a/drivers/net/sky2.c +++ b/drivers/net/sky2.c
@@ -1975,7 +1975,7 @@ static void sky2_link_down(struct sky2_port *sky2)
1975		1975
1976	netif_carrier_off(sky2->netdev);	1976	netif_carrier_off(sky2->netdev);
1977		1977
1978	/* Turn on link LED */	1978	/* Turn off link LED */
1979	sky2_write8(hw, SK_REG(port, LNK_LED_REG), LINKLED_OFF);	1979	sky2_write8(hw, SK_REG(port, LNK_LED_REG), LINKLED_OFF);
1980		1980
1981	if (netif_msg_link(sky2))	1981	if (netif_msg_link(sky2))

/* * $Id: pcmciamtd.c,v 1.51 2004/07/12 22:38:29 dwmw2 Exp $ * * pcmciamtd.c - MTD driver for PCMCIA flash memory cards * * Author: Simon Evans <spse@secret.org.uk> * * Copyright (C) 2002 Simon Evans * * Licence: GPL * */ #include <linux/module.h> #include <linux/slab.h> #include <linux/timer.h> #include <linux/init.h> #include <asm/io.h> #include <asm/system.h> #include <pcmcia/cs_types.h> #include <pcmcia/cs.h> #include <pcmcia/cistpl.h> #include <pcmcia/ds.h> #include <linux/mtd/map.h> #include <linux/mtd/mtd.h> #ifdef CONFIG_MTD_DEBUG static int debug = CONFIG_MTD_DEBUG_VERBOSE; MODULE_PARM(debug, "i"); MODULE_PARM_DESC(debug, "Set Debug Level 0=quiet, 5=noisy"); #undef DEBUG #define DEBUG(n, format, arg...) \ if (n <= debug) { \ printk(KERN_DEBUG __FILE__ ":%s(): " format "\n", __FUNCTION__ , ## arg); \ } #else #undef DEBUG #define DEBUG(n, arg...) static const int debug = 0; #endif #define err(format, arg...) printk(KERN_ERR "pcmciamtd: " format "\n" , ## arg) #define info(format, arg...) printk(KERN_INFO "pcmciamtd: " format "\n" , ## arg) #define warn(format, arg...) printk(KERN_WARNING "pcmciamtd: " format "\n" , ## arg) #define DRIVER_DESC "PCMCIA Flash memory card driver" #define DRIVER_VERSION "$Revision: 1.51 $" /* Size of the PCMCIA address space: 26 bits = 64 MB */ #define MAX_PCMCIA_ADDR 0x4000000 struct pcmciamtd_dev { dev_link_t link; /* PCMCIA link */ dev_node_t node; /* device node */ caddr_t win_base; /* ioremapped address of PCMCIA window */ unsigned int win_size; /* size of window */ unsigned int offset; /* offset into card the window currently points at */ struct map_info pcmcia_map; struct mtd_info *mtd_info; int vpp; char mtd_name[sizeof(struct cistpl_vers_1_t)]; }; static dev_info_t dev_info = "pcmciamtd"; static dev_link_t *dev_list; /* Module parameters */ /* 2 = do 16-bit transfers, 1 = do 8-bit transfers */ static int bankwidth = 2; /* Speed of memory accesses, in ns */ static int mem_speed; /* Force the size of an SRAM card */ static int force_size; /* Force Vpp */ static int vpp; /* Set Vpp */ static int setvpp; /* Force card to be treated as FLASH, ROM or RAM */ static int mem_type; MODULE_LICENSE("GPL"); MODULE_AUTHOR("Simon Evans <spse@secret.org.uk>"); MODULE_DESCRIPTION(DRIVER_DESC); MODULE_PARM(bankwidth, "i"); MODULE_PARM_DESC(bankwidth, "Set bankwidth (1=8 bit, 2=16 bit, default=2)"); MODULE_PARM(mem_speed, "i"); MODULE_PARM_DESC(mem_speed, "Set memory access speed in ns"); MODULE_PARM(force_size, "i"); MODULE_PARM_DESC(force_size, "Force size of card in MiB (1-64)"); MODULE_PARM(setvpp, "i"); MODULE_PARM_DESC(setvpp, "Set Vpp (0=Never, 1=On writes, 2=Always on, default=0)"); MODULE_PARM(vpp, "i"); MODULE_PARM_DESC(vpp, "Vpp value in 1/10ths eg 33=3.3V 120=12V (Dangerous)"); MODULE_PARM(mem_type, "i"); MODULE_PARM_DESC(mem_type, "Set Memory type (0=Flash, 1=RAM, 2=ROM, default=0)"); /* read/write{8,16} copy_{from,to} routines with window remapping to access whole card */ static caddr_t remap_window(struct map_info *map, unsigned long to) { struct pcmciamtd_dev *dev = (struct pcmciamtd_dev *)map->map_priv_1; window_handle_t win = (window_handle_t)map->map_priv_2; memreq_t mrq; int ret; if(!(dev->link.state & DEV_PRESENT)) { DEBUG(1, "device removed state = 0x%4.4X", dev->link.state); return 0; } mrq.CardOffset = to & ~(dev->win_size-1); if(mrq.CardOffset != dev->offset) { DEBUG(2, "Remapping window from 0x%8.8x to 0x%8.8x", dev->offset, mrq.CardOffset); mrq.Page = 0; if( (ret = pcmcia_map_mem_page(win, &mrq)) != CS_SUCCESS) { cs_error(dev->link.handle, MapMemPage, ret); return NULL; } dev->offset = mrq.CardOffset; } return dev->win_base + (to & (dev->win_size-1)); } static map_word pcmcia_read8_remap(struct map_info *map, unsigned long ofs) { caddr_t addr; map_word d = {{0}}; addr = remap_window(map, ofs); if(!addr) return d; d.x[0] = readb(addr); DEBUG(3, "ofs = 0x%08lx (%p) data = 0x%02x", ofs, addr, d.x[0]); return d; } static map_word pcmcia_read16_remap(struct map_info *map, unsigned long ofs) { caddr_t addr; map_word d = {{0}}; addr = remap_window(map, ofs); if(!addr) return d; d.x[0] = readw(addr); DEBUG(3, "ofs = 0x%08lx (%p) data = 0x%04x", ofs, addr, d.x[0]); return d; } static void pcmcia_copy_from_remap(struct map_info *map, void *to, unsigned long from, ssize_t len) { struct pcmciamtd_dev *dev = (struct pcmciamtd_dev *)map->map_priv_1; unsigned long win_size = dev->win_size; DEBUG(3, "to = %p from = %lu len = %u", to, from, len); while(len) { int toread = win_size - (from & (win_size-1)); caddr_t addr; if(toread > len) toread = len; addr = remap_window(map, from); if(!addr) return; DEBUG(4, "memcpy from %p to %p len = %d", addr, to, toread); memcpy_fromio(to, addr, toread); len -= toread; to += toread; from += toread; } } static void pcmcia_write8_remap(struct map_info *map, map_word d, unsigned long adr) { caddr_t addr = remap_window(map, adr); if(!addr) return; DEBUG(3, "adr = 0x%08lx (%p) data = 0x%02x", adr, addr, d.x[0]); writeb(d.x[0], addr); } static void pcmcia_write16_remap(struct map_info *map, map_word d, unsigned long adr) { caddr_t addr = remap_window(map, adr); if(!addr) return; DEBUG(3, "adr = 0x%08lx (%p) data = 0x%04x", adr, addr, d.x[0]); writew(d.x[0], addr); } static void pcmcia_copy_to_remap(struct map_info *map, unsigned long to, const void *from, ssize_t len) { struct pcmciamtd_dev *dev = (struct pcmciamtd_dev *)map->map_priv_1; unsigned long win_size = dev->win_size; DEBUG(3, "to = %lu from = %p len = %u", to, from, len); while(len) { int towrite = win_size - (to & (win_size-1)); caddr_t addr; if(towrite > len) towrite = len; addr = remap_window(map, to); if(!addr) return; DEBUG(4, "memcpy from %p to %p len = %d", from, addr, towrite); memcpy_toio(addr, from, towrite); len -= towrite; to += towrite; from += towrite; } } /* read/write{8,16} copy_{from,to} routines with direct access */ #define DEV_REMOVED(x) (!(*(u_int *)x->map_priv_1 & DEV_PRESENT)) static map_word pcmcia_read8(struct map_info *map, unsigned long ofs) { caddr_t win_base = (caddr_t)map->map_priv_2; map_word d = {{0}}; if(DEV_REMOVED(map)) return d; d.x[0] = readb(win_base + ofs); DEBUG(3, "ofs = 0x%08lx (%p) data = 0x%02x", ofs, win_base + ofs, d.x[0]); return d; } static map_word pcmcia_read16(struct map_info *map, unsigned long ofs) { caddr_t win_base = (caddr_t)map->map_priv_2; map_word d = {{0}};


context:
space:
mode: