diff options
| author | Geoff Lansberry <geoff@kuvee.com> | 2017-04-27 17:28:46 -0400 |
|---|---|---|
| committer | Samuel Ortiz <sameo@linux.intel.com> | 2017-06-28 09:16:54 +0200 |
| commit | bd751808f9ff5e1822c627f6c4283009e66b2e53 (patch) | |
| tree | ad4118b5f810b8e7b0ed436c302d5b6a5d3ebaa5 /drivers/nfc | |
| parent | f6a5885fc4d68e7f25ffb42b9d8d80aebb3bacbb (diff) | |
| download | linux-stable-bd751808f9ff5e1822c627f6c4283009e66b2e53.tar.gz linux-stable-bd751808f9ff5e1822c627f6c4283009e66b2e53.tar.bz2 linux-stable-bd751808f9ff5e1822c627f6c4283009e66b2e53.zip | |
NFC: trf7970a: Correct register settings for 27MHz clock
In prior commits the selected clock frequency does not propagate
correctly to what is written to the TRF7970A_MODULATOR_SYS_CLK_CTRL
register.
Signed-off-by: Geoff Lansberry <geoff@kuvee.com>
Acked-by: Mark 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 | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/drivers/nfc/trf7970a.c b/drivers/nfc/trf7970a.c index 6ee7b038823d..eee5cc1a9220 100644 --- a/drivers/nfc/trf7970a.c +++ b/drivers/nfc/trf7970a.c @@ -2049,6 +2049,13 @@ static int trf7970a_probe(struct spi_device *spi) return -EINVAL; } + if (clk_freq == TRF7970A_27MHZ_CLOCK_FREQUENCY) { + trf->modulator_sys_clk_ctrl = TRF7970A_MODULATOR_27MHZ; + dev_dbg(trf->dev, "trf7970a configured for 27MHz crystal\n"); + } else { + trf->modulator_sys_clk_ctrl = 0; + } + ret = devm_request_threaded_irq(trf->dev, spi->irq, NULL, trf7970a_irq, IRQF_TRIGGER_RISING | IRQF_ONESHOT, |