summaryrefslogtreecommitdiffstats
path: root/drivers/nfc
diff options
context:
space:
mode:
authorMark A. Greer <mgreer@animalcreek.com>2014-09-02 15:12:41 -0700
committerSamuel Ortiz <sameo@linux.intel.com>2014-09-07 23:13:45 +0200
commit7149d6bfecadc255e9d964782a9fdd70f610f1ea (patch)
tree9122f9fefd2f99bde833b7ad8066033e6177229a /drivers/nfc
parentcfc708dbe4022324bcd2bcb5817dd29f1f91299d (diff)
downloadop-kernel-dev-7149d6bfecadc255e9d964782a9fdd70f610f1ea.zip
op-kernel-dev-7149d6bfecadc255e9d964782a9fdd70f610f1ea.tar.gz
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>
Diffstat (limited to 'drivers/nfc')
-rw-r--r--drivers/nfc/trf7970a.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/nfc/trf7970a.c b/drivers/nfc/trf7970a.c
index 429146b..ab6e276 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;
OpenPOWER on IntegriCloud