From: Mark A. Greer <mgreer@animalcreek.com>
Date: Tue, 2 Sep 2014 22:12:41 +0000 (-0700)
Subject: NFC: trf7970a: trf7970a_init() turns off the RF transmitter
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=7149d6bfecadc255e9d964782a9fdd70f610f1ea;p=deliverable%2Flinux.git

NFC: trf7970a: trf7970a_init() turns off the RF transmitter

When trf7970a_init() initializes the trf7970a it
implicitly turns off the RF transmitter.  Track
this by clearing the TRF7970A_CHIP_STATUS_RF_ON
bit in the cached trf->chip_status_ctrl.

Signed-off-by: Mark A. Greer <mgreer@animalcreek.com>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
---

diff --git a/drivers/nfc/trf7970a.c b/drivers/nfc/trf7970a.c
index 429146b7e6d8..ab6e276be6a6 100644
--- a/drivers/nfc/trf7970a.c
+++ b/drivers/nfc/trf7970a.c
@@ -826,6 +826,8 @@ static int trf7970a_init(struct trf7970a *trf)
 
 	usleep_range(1000, 2000);
 
+	trf->chip_status_ctrl &= ~TRF7970A_CHIP_STATUS_RF_ON;
+
 	ret = trf7970a_write(trf, TRF7970A_MODULATOR_SYS_CLK_CTRL, 0);
 	if (ret)
 		goto err_out;