commit 7fd25c82784335a8ea1bb227bdd1e3452a386425
author Linux Build Service Account <lnxbuild@localhost> Wed Mar 19 10:40:45 2014 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Wed Mar 19 10:40:43 2014 -0700
tree 23b5dc24d2f756dd44977251e740e734bc40c4e7
parent cc4a6525957704bf526ba2f5c06ae6a3bb974a41
parent 814c407ecb19061a9514139ad093b5cf57c49929

Merge "NFC: add hw reset before testing hw presence."

drivers/nfc/nfc-nci.c

diff --git a/drivers/nfc/nfc-nci.c b/drivers/nfc/nfc-nci.c
index 654408c..9d8b780 100644
--- a/drivers/nfc/nfc-nci.c
+++ b/drivers/nfc/nfc-nci.c
@@ -1264,8 +1264,12 @@
 		goto err_free_dev;
 	}
 
-	/* Put device in ULPM */
-	gpio_set_value(platform_data->dis_gpio, 0);
+	/* Guarantee that the NFCC starts in a clean state. */
+	gpio_set_value(platform_data->dis_gpio, 1);/* HPD */
+	usleep(200);
+	gpio_set_value(platform_data->dis_gpio, 0);/* ULPM */
+	usleep(200);
+
 	r = nfcc_hw_check(client, platform_data->reg);
 	if (r) {
 		/* We don't think there is hardware but just in case HPD */