aboutsummaryrefslogtreecommitdiff
path: root/drivers/nfc
Commit message (Expand)AuthorAgeFilesLines
* Merge 4.14.199 into kernel.lnx.4.14.r4-relNathan Chancellor2020-10-041-1/+1
* Merge 4.14.192 into kernel.lnx.4.14.r4-relNathan Chancellor2020-08-201-0/+1
* Merge remote-tracking branch 'als/kernel.lnx.4.14.r4-rel' into Q-raphaelYaroslav Furman2020-06-161-1/+3
* Merge remote-tracking branch 'als/kernel.lnx.4.14.r4-rel' into Q-raphaelYaroslav Furman2020-04-041-3/+2
|\
| * Merge 4.14.175 into kernel.lnx.4.14.r4-relNathan Chancellor2020-04-021-3/+2
| |\
| | * NFC: fdp: Fix a signedness bug in fdp_nci_send_patch()Dan Carpenter2020-04-021-3/+2
* | | Merge remote-tracking branch 'als/kernel.lnx.4.14.r4-rel' into Q-raphaelYaroslav Furman2020-03-221-0/+1
|\| |
| * | Merge 4.14.173 into kernel.lnx.4.14.r4-relNathan Chancellor2020-03-111-0/+1
| |\|
| | * nfc: pn544: Fix occasional HW initialization failureDmitry Osipenko2020-03-111-0/+1
* | | Merge remote-tracking branch 'als/kernel.lnx.4.14.r4-rel' into Q-raphaelYaroslav Furman2020-03-021-1/+1
|\| |
| * | Merge 4.14.172 into kernel.lnx.4.14.r4-relNathan Chancellor2020-03-021-1/+1
| |\|
| | * NFC: port100: Convert cpu_to_le16(le16_to_cpu(E1) + E2) to use le16_add_cpu().Mao Wenan2020-02-281-1/+1
* | | Merge remote-tracking branch 'als/kernel.lnx.4.14.r4-rel' into re-testYaroslav Furman2020-02-221-1/+1
|\| |
| * | Merge 4.14.171 into kernel.lnx.4.14.r4-relNathan Chancellor2020-02-181-1/+1
| |\|
| | * NFC: pn544: Adjust indentation in pn544_hci_check_presenceNathan Chancellor2020-02-141-1/+1
* | | Merge remote-tracking branch 'als/kernel.lnx.4.14.r4-rel' into Q-raphaelYaroslav Furman2020-01-231-1/+1
|\| |
| * | Merge 4.14.167 into kernel.lnx.4.14.r4-relNathan Chancellor2020-01-231-1/+1
| |\|
| | * NFC: pn533: fix bulk-message timeoutJohan Hovold2020-01-231-1/+1
* | | nfc: nq-nci: shut upYaroslav Furman2020-01-231-1/+1
* | | Merge remote-tracking branch 'als/kernel.lnx.4.14.r4-rel' into Q-raphaelYaroslav Furman2020-01-061-2/+4
|\| |
| * | Merge 4.14.159 into kernel.lnx.4.14.r4-relNathan Chancellor2019-12-241-2/+4
| |\|
| | * NFC: nxp-nci: Fix NULL pointer dereference after I2C communication errorStephan Gerhold2019-12-171-2/+4
* | | nfc: nq-nci: shut upYaroslav Furman2019-12-061-4/+4
* | | nfc: nq-nci: add print send, resv buffer changesUtsavisGreat2019-12-041-0/+32
* | | nfc: nq-nci: check availability of pin voting clkDemon0002019-12-041-5/+7
* | | nfc: nq-nci: mark IRQ as TRIGGER_RISINGDemon0002019-12-041-1/+1
* | | nfc: nq-nci: disable hardware checksDemon0002019-12-041-0/+10
|/ /
* | Merge 4.14.157 into kernel.lnx.4.14.r4-relNathan Chancellor2019-12-011-1/+1
|\|
| * nfc: port100: handle command failure cleanlyOliver Neukum2019-12-011-1/+1
* | Merge 4.14.154 into kernel.lnx.4.14.r4-relNathan Chancellor2019-11-122-1/+2
|\|
| * NFC: st21nfca: fix double freePan Bian2019-11-121-0/+1
| * NFC: fdp: fix incorrect free objectPan Bian2019-11-121-1/+1
* | Merge 4.14.152 into kernel.lnx.4.14.r4-relNathan Chancellor2019-11-061-1/+8
|\|
| * NFC: pn533: fix use-after-free and memleaksJohan Hovold2019-11-061-1/+8
* | Merge 4.14.141 into kernel.lnx.4.14.r4-relNathan Chancellor2019-09-262-0/+4
|\|
| * st_nci_hci_connectivity_event_received: null check the allocationNavid Emamdoost2019-08-291-0/+2
| * st21nfca_connectivity_event_received: null check the allocationNavid Emamdoost2019-08-291-0/+2
* | Merge 4.14.138 into kernel.lnx.4.14.r4-relNathan Chancellor2019-09-263-4/+5
|\|
| * NFC: nfcmrvl: fix gpio-handling regressionJohan Hovold2019-08-093-4/+5
* | Merge 4.14.120 into kernel.lnx.4.14.r4-relNathan Chancellor2019-09-261-0/+7
|\|
| * spi: ST ST95HF NFC: declare missing of tableDaniel Gomez2019-05-161-0/+7
* | NFC: Fix device node probing issueBhuvan Varshney2019-06-251-5/+15
* | NFC: Keep VEN gpio always high from bootBhuvan Varshney2019-05-211-52/+73
* | NFC: Add support for SN100 eSE power managementBhuvan Varshney2019-01-242-4/+66
* | NFC: Keep VEN gpio always high from bootGaurav Singhal2019-01-241-4/+9
* | Merge android-4.14-p.85 (e48b7f2) into msm-4.14Isaac J. Manjarres2018-12-171-3/+2
|\ \
| * | Merge 4.14.85 into android-4.14-pGreg Kroah-Hartman2018-12-011-3/+2
| |\|
| | * NFC: nfcmrvl_uart: fix OF child-node lookupJohan Hovold2018-12-011-3/+2
* | | NFC: Fix for nq-nci dev node recoveryBhuvan Varshney2018-11-151-4/+71
* | | NFC: Fix NFC enable issue after firmware downloadBhuvan Varshney2018-11-011-2/+15