summaryrefslogtreecommitdiffstats
path: root/drivers/nfc
Commit message (Expand)AuthorAgeFilesLines
* Merge tag 'gpio-v4.3-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linu...Linus Torvalds2015-09-041-7/+3
|\
| * NFC: nxp-nci_i2c: use flags argument of devm_gpiod_get_indexUwe Kleine-König2015-07-061-7/+3
* | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-nextLinus Torvalds2015-09-0319-27/+1966
|\ \
| * | nfc: s3fwrn5: Add driver for Samsung S3FWRN5 NFC ChipRobert Baldyga2015-08-2011-0/+1532
| * | NFC: trf7970a: Add NULL check to clear up smatch warningMark Greer2015-08-191-1/+3
| * | NFC: trf7970a: SDD_EN is bit 5 not bit 3Mark Greer2015-08-191-1/+1
| * | nfc: st-nci: Remove pr_err in rcv_queue when ndlc header is unknownChristophe Ricard2015-08-171-1/+0
| * | nfc: st-nci: Add spi phy support for st21nfcbChristophe Ricard2015-08-173-0/+406
| * | nfc: st-nci: Free data with irrelevant NDLC PCB_SYNC valueChristophe Ricard2015-08-171-1/+3
| * | nfc: st-nci: Remove data from ack_pending_q when receiving a SYNC_ACKChristophe Ricard2015-08-171-0/+2
| * | NFC: st-nci: fix use of uninitialized variables in error pathChristophe Ricard2015-08-171-4/+4
| * | NFC: st21nfca: fix use of uninitialized variables in error pathChristophe Ricard2015-08-171-5/+6
| * | nfc: st-nci: Fix non accurate comment for st_nci_i2c_readChristophe Ricard2015-08-171-7/+2
| * | nfc: st-nci: Fix typo when changing from st21nfcb to st-nciChristophe Ricard2015-08-171-9/+9
| * | nfc: st-nci: Remove duplicate file platform_data/st_nci.hChristophe Ricard2015-08-171-1/+1
| |/
* | mei: bus: add and call callback on notify eventAlexander Usyskin2015-08-031-1/+2
|/
* Merge tag 'char-misc-4.2-rc1' of git://git.kernel.org/pub/scm/linux/kernel/gi...Linus Torvalds2015-06-264-36/+301
|\
| * mei: fix up uuid matchingGreg Kroah-Hartman2015-05-311-1/+1
| * NFC: mei_phy: adjust mei nfc header according the specTomas Winkler2015-05-241-27/+31
| * NFC: mei_phy: move all nfc logic from mei driver to nfcTomas Winkler2015-05-242-35/+293
| * mei: bus: report also uuid in module aliasTomas Winkler2015-05-243-2/+5
* | NFC: nfcmrvl: set PB_BAIL_OUT at setupVincent Cuissard2015-06-132-0/+9
* | NFC: nfcmrvl: Allow ISO15693 protocolVincent Cuissard2015-06-131-0/+1
* | NFC: nfcmrvl: small fix in USB driverVincent Cuissard2015-06-131-0/+1
* | NFC: nfcmrvl: add UART driverVincent Cuissard2015-06-114-0/+246
* | NFC: nfcmrvl: add platform_data and DT configurationVincent Cuissard2015-06-113-26/+82
* | NFC: nfcmrvl: add chip reset managementVincent Cuissard2015-06-112-0/+38
* | NFC: nfcmrvl: update USB device idVincent Cuissard2015-06-111-1/+2
* | NFC: nfcmrvl: update nci recv frame APIVincent Cuissard2015-06-113-16/+23
* | NFC: nfcmrvl: add support of HCI-based transportVincent Cuissard2015-06-113-4/+52
* | NFC: nfcmrvl: remove integration related settingsVincent Cuissard2015-06-111-9/+0
* | nfc: st-nci: Rename st21nfcb to st-nciChristophe Ricard2015-06-1015-544/+547
* | NFC: st21nfcb: Configure CLF with NCI proprietary commandChristophe Ricard2015-06-093-1/+29
* | NFC: st21nfcb: disable irq when st21nfcb is disabledChristophe Ricard2015-06-091-4/+4
* | NFC: st21nfcb: Move powered flag from phy to ndlc layerChristophe Ricard2015-06-093-5/+5
* | NFC: st21nfcb: Move st21nfcb_nci_remove in ndlc_removeChristophe Ricard2015-06-091-2/+2
* | NFC: st21nfcb: Add support for nci proprietary commandsChristophe Ricard2015-06-092-0/+27
* | NFC: st21nfcb: Fix st21nfcb_nci_closeChristophe Ricard2015-06-091-1/+3
* | NFC: st21nfcb: Add ndlc_close in st21nfcb_nci_removeChristophe Ricard2015-06-091-0/+4
* | NFC: st21nfcb: remove st21nfcb_nci_i2c_disableChristophe Ricard2015-06-091-3/+0
* | NFC: st21nfcb: Do not remove header once the payload is sentChristophe Ricard2015-06-091-7/+0
* | NFC: st21nfcb: Remove inappropriate kfree on a devm_kzalloc pointerFiro Yang2015-06-091-3/+0
* | NFC: pn544: use flags argument of devm_gpiod_get to set directionUwe Kleine-König2015-06-091-32/+11
* | NFC: microread: drop unused variableTomas Winkler2015-06-091-3/+0
* | NFC: Remove obsolete setting of DEBUGValentin Rothberg2015-06-092-4/+0
* | NFC: trf7970a: Handle extra byte in response to Type 5 RMB commandsMark A. Greer2015-06-081-4/+19
* | NFC: nxp-nci: Fix build warningSamuel Ortiz2015-06-081-0/+1
* | NFC: nxp-nci_i2c: Add support for enumerating through ACPIOleg Zhurakivskyy2015-06-081-0/+51
|/
* NFC: logging neateningJoe Perches2015-04-078-43/+36
* NFC: pn533: fix error return codeJulia Lawall2015-04-061-1/+3
OpenPOWER on IntegriCloud