From: David S. Miller Date: Mon, 29 Jul 2019 15:56:27 +0000 (-0700) Subject: Merge branch 'nfc-next' X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=e9e1dcda2e64281a6b66f136b79703763d93771c;p=linux.git Merge branch 'nfc-next' Andy Shevchenko says: ==================== NFC: nxp-nci: clean up and new device support Few people reported that some laptops are coming with new ACPI ID for the devices should be supported by nxp-nci driver. This series adds new ID (patch 2), cleans up the driver from legacy platform data and unifies GPIO request for Device Tree and ACPI (patches 3-6), removes dead or unneeded code (patches 7, 9, 11), constifies ID table (patch 8), removes comma in terminator line for better maintenance (patch 10) and rectifies Kconfig entry (patches 12-14). It also contains a fix for NFC subsystem as suggested by Sedat. Series has been tested by Sedat. Changelog v4: - rebased on top of latest linux-next - appended cover letter - elaborated removal of pr_fmt() in the patch 11 (David) ==================== Signed-off-by: David S. Miller --- e9e1dcda2e64281a6b66f136b79703763d93771c