diff options
| author | Mark A. Greer <mgreer@animalcreek.com> | 2014-03-25 08:54:37 -0700 |
|---|---|---|
| committer | Samuel Ortiz <sameo@linux.intel.com> | 2014-04-22 00:37:27 +0200 |
| commit | a1d2dc5b407ae18b59b7a129c93c8eb5ad7b1c80 (patch) | |
| tree | a7ea854f277bd046f7c399e09466e3dcda9ea7d7 /drivers/nfc | |
| parent | ebcc5a0d08e6a680558ed74f5dd724427ff5a29b (diff) | |
| download | linux-a1d2dc5b407ae18b59b7a129c93c8eb5ad7b1c80.tar.bz2 | |
NFC: trf7970a: Turn RF on after hardware is configured
The NFC digital layer calls the 'switch_rf' hook to turn the RF on before
it configures the RF technology and framing. There is potential to confuse
a tag doing it this way so don't enable the RF until the RF technology and
initial framing have been configured.
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.c | 21 |
1 files changed, 16 insertions, 5 deletions
diff --git a/drivers/nfc/trf7970a.c b/drivers/nfc/trf7970a.c index 203d86fb1d54..0a46348f9af6 100644 --- a/drivers/nfc/trf7970a.c +++ b/drivers/nfc/trf7970a.c @@ -779,11 +779,6 @@ static int trf7970a_init(struct trf7970a *trf) trf->special_fcn_reg1 = 0; - ret = trf7970a_write(trf, TRF7970A_CHIP_STATUS_CTRL, - trf->chip_status_ctrl | TRF7970A_CHIP_STATUS_RF_ON); - if (ret) - goto err_out; - trf->iso_ctrl = 0xff; return 0; @@ -796,6 +791,10 @@ static void trf7970a_switch_rf_off(struct trf7970a *trf) { dev_dbg(trf->dev, "Switching rf off\n"); + trf->chip_status_ctrl &= ~TRF7970A_CHIP_STATUS_RF_ON; + + trf7970a_write(trf, TRF7970A_CHIP_STATUS_CTRL, trf->chip_status_ctrl); + gpio_set_value(trf->en_gpio, 0); gpio_set_value(trf->en2_gpio, 0); @@ -948,6 +947,18 @@ static int trf7970a_config_framing(struct trf7970a *trf, int framing) return ret; } + if (!(trf->chip_status_ctrl & TRF7970A_CHIP_STATUS_RF_ON)) { + ret = trf7970a_write(trf, TRF7970A_CHIP_STATUS_CTRL, + trf->chip_status_ctrl | + TRF7970A_CHIP_STATUS_RF_ON); + if (ret) + return ret; + + trf->chip_status_ctrl |= TRF7970A_CHIP_STATUS_RF_ON; + + usleep_range(5000, 6000); + } + return 0; } |