aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/pcmcia
AgeCommit message (Expand)AuthorFilesLines
2011-11-01Merge branch 'next/fixes' of git://git.linaro.org/people/arnd/arm-socLinus Torvalds1-1/+1
2011-10-31Merge branch 'depends/rmk/gpio' into next/fixesArnd Bergmann1-1/+1
2011-10-27Merge branch 'gpio' of http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-c...Linus Torvalds1-1/+1
2011-10-17ARM: 7024/1: simpad: Cleanup CS3 accessors.Jochen Friedrich1-19/+16
2011-10-08ARM: pxa: use correct __iomem annotationsArnd Bergmann1-1/+1
2011-08-08ARM: gpio: pxa: convert drivers to use asm/gpio.h rather than mach/gpio.hRussell King1-1/+1
2011-07-31Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6Linus Torvalds11-122/+15
2011-07-29pxa2xx pcmcia - stargate 2 use gpio array.Jonathan Cameron1-23/+11
2011-07-29pcmcia: pxa2xx: remove empty socket_init / socket_resume functions.Jonathan Cameron9-96/+0
2011-07-29drivers:pcmcia:soc_common: make socket_init and socket_suspend optionalJonathan Cameron1-3/+4
2011-07-25Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jik...Linus Torvalds4-12/+11
2011-07-25Merge branch 'next/cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/...Linus Torvalds2-7/+0
2011-07-11Merge branch 'master' into for-nextJiri Kosina1-0/+1
2011-07-11pcmcia: pxa2xx/trizeps4: remove unnecessary ifdefsJonathan Cameron1-4/+0
2011-07-11ARM: scoop: drop pcmcia_init callbackDmitry Eremin-Solenikov1-3/+0
2011-07-11pcmcia: pxa2xx/vpac270: free gpios on exist rather than requestingJonathan Cameron1-2/+2
2011-06-16gpio: include linux/gpio.h where neededRandy Dunlap1-0/+1
2011-06-10treewide: Convert uses of struct resource to resource_size(ptr)Joe Perches4-12/+11
2011-05-06pcmcia: Make declaration and uses of struct pcmcia_device_id constJoe Perches1-3/+3
2011-05-06pcmcia/sa1100: put sa11x0_pcmcia_hw_init[] to .devinit.dataUwe Kleine-König1-1/+1
2011-04-26Revert wrong fixes for common misspellingsLucas De Marchi1-1/+1
2011-04-13ARM: pxa: convert incorrect IRQ_TO_IRQ() to irq_to_gpio()Eric Miao1-6/+6
2011-04-12pcmcia: limit pxa2xx_trizeps4 subdriver to trizeps4 platformDmitry Eremin-Solenikov1-0/+3
2011-04-12pcmcia: limit pxa2xx_balloon3 subdriver to balloon3 platformDmitry Eremin-Solenikov1-0/+5
2011-03-31Fix common misspellingsLucas De Marchi4-4/+4
2011-03-30Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-armLinus Torvalds5-303/+114
2011-03-29drivers: Final irq namespace conversionThomas Gleixner5-11/+11
2011-03-26Merge branch 'devel' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/...Russell King5-303/+114
2011-03-16Merge branch 'devicetree/next' of git://git.secretlab.ca/git/linux-2.6Linus Torvalds2-10/+8
2011-03-16ARM: pxa: Update copyright notices for Palm devicesMarek Vasut4-5/+4
2011-03-16ARM: pxa: Use gpio arrays in vpac270_pcmcia driverMarek Vasut1-78/+29
2011-03-16ARM: pxa: Use gpio arrays in palmtx_pcmcia driverMarek Vasut1-44/+11
2011-03-16ARM: pxa: Use gpio arrays in palmtc_pcmcia driverMarek Vasut1-61/+12
2011-03-16ARM: pxa: Use gpio arrays in palmld_pcmcia driverMarek Vasut1-31/+9
2011-03-16ARM: pxa: Use gpio arrays in colibri_pcmcia driverMarek Vasut1-84/+49
2011-03-07Merge branch 'fixes' of master.kernel.org:/home/rmk/linux-2.6-armLinus Torvalds1-0/+3
2011-02-28dt: Eliminate of_platform_{,un}register_driverGrant Likely2-10/+8
2011-02-27ARM: pxa/colibri: don't register pxa2xx-pcmcia nodes on non-colibri platformsDmitry Eremin-Solenikov1-0/+3
2011-02-20pcmcia: re-enable Zoomed Video supportDominik Brodowski1-0/+2
2011-02-19pcmcia vs. MECR on pxa25x/sa1111Pavel Machek3-1/+3
2011-01-20kconfig: rename CONFIG_EMBEDDED to CONFIG_EXPERTDavid Rientjes1-6/+6
2011-01-13Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jiko...Linus Torvalds3-3/+3
2011-01-06Merge branch 'devel-stable' into develRussell King6-20/+292
2011-01-05Merge branches 'ftrace', 'gic', 'io', 'kexec', 'mod', 'sa11x0', 'sh' and 'ver...Russell King5-61/+293
2010-12-22Merge branch 'master' into for-nextJiri Kosina10-14/+20
2010-12-21ARM: 6458/1: pcmcia: Adds nanoEngine PCMCIA support.Marcelo Roberto Jimenez4-1/+225
2010-12-21ARM: 6457/1: pcmcia: Fix checkpatch.pl issues in drivers/pcmcia/soc_common.c.Marcelo Roberto Jimenez1-60/+68
2010-12-20ARM: pxa: Update Balloon3 for new FPGA firmwareMarek Vasut1-6/+5
2010-12-20ARM: pxa: Colibri PXA320 PCMCIA driverMarek Vasut3-2/+19
2010-12-20ARM: pxa: Toradex Colibri PXA270 CF supportMarek Vasut3-1/+216
2010-12-20ARM: pxa: Add pxa320 PCMCIA checkMarek Vasut1-3/+18
2010-12-16ARM: pxa: remove get_memclk_frequency_10khz()Eric Miao2-3/+17
2010-12-16ARM: pxa: Access SMEMC via virtual addressesMarek Vasut1-8/+20
2010-12-04ARM: 6456/1: Fix for building DEBUG with sa11xx_base.c as a module.Marcelo Roberto Jimenez1-0/+1
2010-11-10drivers/pcmcia/soc_common.c: Use printf extension %pVJoe Perches1-2/+7
2010-11-10pcmcia/sa1100: don't put machine specific init functions in .init.textUwe Kleine-König7-7/+7
2010-11-10pd6729: Coding Style fixesKomuro2-5/+5
2010-11-01tree-wide: fix comment/printk typosUwe Kleine-König3-3/+3
2010-10-24Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jiko...Linus Torvalds1-1/+1
2010-10-22pcmcia: IOCARD is also required for using IRQsDominik Brodowski1-1/+3
2010-10-18Update broken web addresses in the kernel.Justin P. Mattock1-1/+1
2010-10-16pcmcia: don't call flush_scheduled_work() spuriouslyTejun Heo2-7/+0
2010-10-15pcmcia/yenta: guide users in case of problems with O2-bridgesWolfram Sang1-2/+2
2010-10-14pcmcia: fix unused function compile warningMaciej Żenczykowski1-1/+1
2010-10-05pcmcia: vrc4173_cardu: Fix error path for pci_release_regions and pci_disable...Rahul Ruikar1-19/+39
2010-09-29pcmcia: add a few debug statementsDominik Brodowski1-0/+10
2010-09-29pcmcia: move driver name to struct pcmcia_driverDominik Brodowski1-10/+11
2010-09-29pcmcia: remove the "Finally, report what we've done" messageDominik Brodowski1-0/+7
2010-09-29pcmcia: use autoconfiguration feature for ioports and iomemDominik Brodowski1-11/+67
2010-09-29pcmcia: introduce autoconfiguration featureDominik Brodowski1-4/+32
2010-09-29pcmcia: Documentation updateDominik Brodowski1-22/+89
2010-09-29pcmcia: convert pcmcia_request_configuration to pcmcia_enable_deviceDominik Brodowski23-44/+17
2010-09-29pcmcia: move config_{base,index,regs} to struct pcmcia_deviceDominik Brodowski4-27/+24
2010-09-29pcmcia: simplify IntTypeDominik Brodowski2-10/+1
2010-09-29pcmcia: simplify Status, ExtStatus register accessDominik Brodowski2-10/+20
2010-09-29pcmcia: remove Pin, Copy configuration register accessDominik Brodowski2-7/+9
2010-09-29pcmcia: move Vpp setup to struct pcmcia_deviceDominik Brodowski1-1/+2
2010-09-29pcmcia: split up modify_configuration() into two fixup functionsDominik Brodowski1-65/+63
2010-09-29pcmcia: do not use win_req_t when calling pcmcia_request_window()Dominik Brodowski1-27/+33
2010-09-26pcmcia: pd6729: Fix error pathRahul Ruikar1-1/+1
2010-09-18pcmcia: preserve configuration information if request_io fails partlyDominik Brodowski1-0/+6
2010-09-15pcmcia: per-device, not per-socket debug messagesDominik Brodowski1-24/+27
2010-08-12Merge branch 'next-devicetree' of git://git.secretlab.ca/git/linux-2.6Linus Torvalds2-5/+5
2010-08-10Merge branches 'master' and 'devel' into for-linusRussell King3-1/+160
2010-08-06Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6Linus Torvalds27-1472/+320
2010-08-06Merge branch 'devel' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/...Russell King3-1/+160
2010-08-06of/device: Replace struct of_device with struct platform_deviceGrant Likely2-5/+5
2010-08-05Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/upstream-linusLinus Torvalds1-2/+2
2010-08-05MIPS: Alchemy: remove SOC_AU1X00 in favor of MIPS_ALCHEMYManuel Lauss1-2/+2
2010-08-05[ARM] pxa/balloon3: PCMCIA SupportMarek Vasut3-1/+160
2010-08-04Merge branch 'master' into for-nextJiri Kosina3-6/+6
2010-08-03pcmcia: avoid buffer overflow in pcmcia_setup_isa_irqDominik Brodowski1-1/+4
2010-08-03pcmcia: insert PCMCIA device resources into resource treeDominik Brodowski6-34/+60
2010-08-03pcmcia: export resource information to sysfsDominik Brodowski1-0/+13
2010-08-03pcmcia: use struct resource for PCMCIA devices, part 2Dominik Brodowski3-32/+45
2010-08-03pcmcia: remove memreq_tDominik Brodowski1-6/+3
2010-08-03pcmcia: move local definitions out of include/pcmcia/cs.hDominik Brodowski2-0/+6
2010-08-03pcmcia: do not use io_req_t when calling pcmcia_request_io()Dominik Brodowski1-27/+10
2010-08-03pcmcia: use struct resource for PCMCIA devicesDominik Brodowski3-69/+93
2010-08-03pcmcia: clean up cs.hDominik Brodowski1-0/+3
2010-08-03pcmcia: use pcmica_{read,write}_config_byteDominik Brodowski3-33/+48
2010-07-30pcmcia: remove cs_types.hDominik Brodowski24-25/+0
2010-07-30pcmcia: remove unused flag, simplify headersDominik Brodowski2-11/+7
2010-07-30pcmcia: split up central event handlerDominik Brodowski3-92/+54
2010-07-30pcmcia: simplify event callbackDominik Brodowski2-40/+10
2010-07-30pcmcia: remove obsolete ioctlDominik Brodowski7-1144/+6
2010-07-26Merge master.kernel.org:/home/rmk/linux-2.6-armLinus Torvalds1-3/+2
2010-07-21pcmcia: fix 'driver ... did not release config properly' warningPatrick McHardy1-1/+3
2010-07-13[ARM] pxa: fix frequency scaling for pcmcia/pxa2xx_baseMarek Vasut1-3/+2
2010-07-05pcmcia: do not initialize the present flag too late.Dominik Brodowski1-2/+1
2010-06-16Merge branch 'master' into for-nextJiri Kosina5-19/+36
2010-06-16fix typos concerning "initiali[zs]e"Uwe Kleine-König1-1/+1
2010-06-07pcmcia: avoid validate_cis failure on CIS overrideDominik Brodowski1-0/+1
2010-06-07pcmcia: yenta_socket.c Remove extra #ifdef CONFIG_YENTA_TIJustin P. Mattock1-8/+6
2010-06-07pcmcia: only keep saved I365_CSCINT flag if there is no PCI irqDominik Brodowski1-2/+3
2010-06-02of/pcmcia: m8xx_pcmcia.c: Fix build failuresAnatolij Gustschin1-2/+2
2010-05-24Merge branch 'bkl/ioctl' of git://git.kernel.org/pub/scm/linux/kernel/git/fre...Linus Torvalds1-3/+14
2010-05-22Merge remote branch 'origin' into secretlab/next-devicetreeGrant Likely18-864/+1192
2010-05-22of: Remove duplicate fields from of_platform_driverGrant Likely2-4/+10
2010-05-21sysfs: add struct file* to bin_attr callbacksChris Wright1-2/+2
2010-05-20Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6Linus Torvalds16-789/+893
2010-05-18of: Always use 'struct device.of_node' to get device node pointer.Grant Likely1-1/+1
2010-05-17pcmcia: disable PCMCIA ioctl also for ARMDominik Brodowski1-20/+0
2010-05-17drivers: Push down BKL into various driversArnd Bergmann1-3/+14
2010-05-11[ARM] pxa: add support for Voipac PXA270 PCMCIAMarek Vasut3-1/+232
2010-05-10pcmcia: remove suspend-related comment from yenta_socket.cDominik Brodowski1-7/+0
2010-05-10pcmcia: call pcmcia_{read,write}_cis_mem with ops_mutex heldDominik Brodowski3-19/+19
2010-05-10pcmcia: remove pcmcia_add_device_lockDominik Brodowski1-16/+2
2010-05-10pcmcia: update gfp/slab.h includesTejun Heo2-0/+2
2010-05-10pcmcia: do not autoadd root PCI bus resourcesDominik Brodowski1-6/+29
2010-05-10pcmcia: clarify alloc_io_space, move it to resource handlersDominik Brodowski5-99/+195
2010-05-10pcmcia: move all pcmcia_resource_ops providers into one moduleDominik Brodowski6-117/+141
2010-05-10pcmcia: move high level CIS access code to separate fileDominik Brodowski4-330/+356
2010-05-10pcmcia: dev_node removal (core)Dominik Brodowski2-14/+3
2010-05-10pcmcia: re-work pcmcia_request_irq()Dominik Brodowski2-85/+55
2010-05-10pcmcia: pass FORCED_PULSE parameter in pcmcia_request_configuration()Dominik Brodowski1-8/+3
2010-05-10pcmcia: replace struct irq with uint pcmcia_irq in struct pcmcia_socketDominik Brodowski6-27/+14
2010-05-10pcmcia: setup IRQ to be used by PCMCIA drivers at card insertDominik Brodowski3-94/+137
2010-05-10pcmcia: remove unused IRQ modification featureDominik Brodowski1-13/+3
2010-05-07Merge branch 'urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/brodo/...Linus Torvalds3-13/+11
2010-05-04pcmcia: fix compilation after 16bit state locking changesMarc Zyngier1-6/+1
2010-05-04pcmcia: order userspace suspend and resume requestsDominik Brodowski1-7/+9
2010-05-03pcmcia: avoid pccard_validate_cis failure in resume callpathDominik Brodowski1-0/+1
2010-04-30MIPS: DB1200: PCMCIA card detection must not be auto-enabled.Manuel Lauss1-12/+4
2010-04-26pcmcia: fix matching rules for pseudo-multi-function cardsAlexander Kurz1-3/+4
2010-04-21pcmcia: pcmcia_dev_present bugfixDominik Brodowski1-33/+14
2010-04-17drivers/pcmcia: Add missing local_irq_restoreJulia Lawall1-1/+3
2010-04-17pcmcia: avoid late calls to pccard_validate_cisDominik Brodowski1-2/+7
2010-04-15pcmcia: fix ioport size calculation in rsrc_nonstaticDominik Brodowski1-1/+3
2010-04-11pcmcia: re-start on MFC overrideDominik Brodowski1-8/+14
2010-04-11pcmcia: fix io_probe due to parent (PCI) resourcesDominik Brodowski1-3/+9
2010-04-11pcmcia: use previously assigned IRQ for all card functionsDominik Brodowski1-5/+5
2010-04-06Merge branch 'urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/brodo/...Linus Torvalds1-17/+14
2010-04-04pcmcia: fix up alignf issuesDominik Brodowski1-17/+14
2010-03-30include cleanup: Update gfp.h and slab.h includes to prepare for breaking imp...Tejun Heo24-6/+18
2010-03-26Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jba...Linus Torvalds1-8/+4
2010-03-24PCI: print resources consistently with %pRBjorn Helgaas1-8/+4
2010-03-24pcmcia: use dev_pm_ops for class pcmcia_socket_classDominik Brodowski18-282/+66
2010-03-24pcmcia: allow for four multifunction subdevices (again)Dominik Brodowski1-2/+6
2010-03-23pcmcia: do not use ioports < 0x100 on x86Dominik Brodowski1-0/+7
2010-03-23pd6729: Coding Style fixesKomuro1-25/+39
2010-03-16PCMCIA: resource, fix lock imbalanceJiri Slaby1-12/+16
2010-03-15pcmcia: re-route Cardbus IRQ to ISA on ti1130 bridges if necessaryJens Künzer2-13/+49
2010-03-15pcmcia: allow for cb_irq to differ from pci_dev's irq in yenta_socketJens Künzer1-3/+3
2010-03-15pcmcia: honor saved flags in yenta_socket's I365_CSCINT registerJens Künzer2-4/+12
2010-03-15pcmcia: revert "irq probe can be done without risking an IRQ storm"Dominik Brodowski1-8/+0
2010-03-15pcmcia: pd6729, i82092: use parent (PCI) resourcesDominik Brodowski2-0/+2
2010-03-15pcmcia/vrc4171: use local spinlock for device local lock.Yoichi Yuasa1-2/+3
2010-03-12Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-armLinus Torvalds1-5/+20
2010-03-08Merge branch 'origin' into devel-stableRussell King29-2824/+3007
2010-03-07Driver core: create lock/unlock functions for struct deviceGreg Kroah-Hartman1-4/+4
2010-03-03pcmcia: disable pcmcia ioctl for !ARM, prepare for removalDominik Brodowski1-4/+10
2010-03-03pcmcia: CodingStyle fixesDominik Brodowski3-971/+942
2010-03-02pcmcia: alchemy: fixup wrong commentsManuel Lauss2-28/+7
2010-03-02pcmcia: remove irq_list parameter from pd6729Komuro1-17/+1
2010-03-02yenta_socket: ENE CB712 CardBus bridge needs special treatment with Echo Audi...Michal Pecio1-4/+4
2010-03-02[ARM] sa1111: avoid using hardcoded IRQ numbers for PCMCIA driverEric Miao1-5/+20
2010-02-27Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linusLinus Torvalds9-643/+1003
2010-02-27Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6Linus Torvalds21-1228/+1108
2010-02-27MIPS: Alchemy: use 36bit addresses for PCMCIA resources.Manuel Lauss4-45/+23
2010-02-27MIPS: Alchemy: XXS1500 PCMCIA driver rewriteManuel Lauss4-189/+369
2010-02-27MIPS: PCMCIA: new socket driver for Au1000 demoboards.Manuel Lauss6-444/+644
2010-02-27MIPS: Alchemy: devboard register abstractionManuel Lauss1-37/+39
2010-02-25pcmcia: validate late-added resourcesDominik Brodowski1-19/+48
2010-02-23PCI: add pci_bus_for_each_resource(), remove direct bus->resource[] refsBjorn Helgaas2-4/+4
2010-02-22resource/PCI: mark struct resource as constDominik Brodowski2-4/+5
2010-02-22resource/PCI: align functions now return start of resourceDominik Brodowski2-13/+15
2010-02-17pcmcia: allow for extension of resource intervalDominik Brodowski1-2/+4
2010-02-17pcmcia: remove useless msleep in ds.cDominik Brodowski2-6/+3
2010-02-17pcmcia: use read_cis_mem return valueDominik Brodowski1-19/+44
2010-02-17pcmcia: add locking to pcmcia_{read,write}_cis_memDominik Brodowski2-6/+26
2010-02-17pcmcia: avoid prod_id memleakDominik Brodowski1-5/+14
2010-02-17pcmcia: avoid sysfs-related lockup for cardbusDominik Brodowski1-2/+10
2010-02-17pcmcia: use state machine for extended requeryDominik Brodowski1-70/+22
2010-02-17pcmcia: delay re-scanning and re-querying of PCMCIA busDominik Brodowski5-53/+59
2010-02-17pcmcia: use pccardd to handle eject, insert, suspend and resume requestsDominik Brodowski4-140/+81
2010-02-17pcmcia: use ops_mutex for rsrc_{mgr,nonstatic} lockingDominik Brodowski5-34/+20
2010-02-17pcmcia: use mutex for dynid lockDominik Brodowski1-8/+8
2010-02-17pcmcia: assert locking to struct pcmcia_deviceDominik Brodowski2-56/+104
2010-02-17pcmcia: simplify lockingDominik Brodowski6-74/+47