UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
This commit is contained in:
Mark A. Greer 2014-03-25 08:54:37 -07:00 committed by Samuel Ortiz
parent ebcc5a0d08
commit a1d2dc5b40
1 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
drivers/nfc/trf7970a.c
View File

@ -779,11 +779,6 @@ static int trf7970a_init(struct trf7970a *trf)
trf->special_fcn_reg1 = 0; 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; trf->iso_ctrl = 0xff;
return 0; return 0;
@ -796,6 +791,10 @@ static void trf7970a_switch_rf_off(struct trf7970a *trf)
{ {
dev_dbg(trf->dev, "Switching rf off\n"); 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->en_gpio, 0);
gpio_set_value(trf->en2_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; 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; return 0;
} }