]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
NFC: trf7970a: Correct register settings for 27MHz clock
authorGeoff Lansberry <geoff@kuvee.com>
Thu, 27 Apr 2017 21:28:46 +0000 (17:28 -0400)
committerSamuel Ortiz <sameo@linux.intel.com>
Wed, 28 Jun 2017 07:16:54 +0000 (09:16 +0200)
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>
drivers/nfc/trf7970a.c

index 6ee7b038823ddb6e98daf154eb318865a593d790..eee5cc1a9220453139eb0e16f8ff732555f64438 100644 (file)
@@ -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,