| Message ID | 1493304119-16605-1-git-send-email-geoff@kuvee.com (mailing list archive) |
|---|---|
| State | Superseded |
| Delegated to: | Samuel Ortiz |
| Headers | show |
On Thu, Apr 27, 2017 at 10:41:59AM -0400, Geoff Lansberry wrote: > In prior commits the selected clock frequency does not propagate > correctly to what is written the the TRF7970A_MODULATOR_SYS_CLK_CTRL ^^^^^^^ s/the the/to the/ > register. > > Signed-off-by: Geoff Lansberry <geoff@kuvee.com> > --- > drivers/nfc/trf7970a.c | 7 +++++++ > 1 file changed, 7 insertions(+) > > diff --git a/drivers/nfc/trf7970a.c b/drivers/nfc/trf7970a.c > index 6ed5d7e..f7fee7d 100644 > --- a/drivers/nfc/trf7970a.c > +++ b/drivers/nfc/trf7970a.c > @@ -2067,6 +2067,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, > -- > 2.7.4 With the suggested fix above: Acked-by: Mark Greer <mgreer@animalcreek.com>
diff --git a/drivers/nfc/trf7970a.c b/drivers/nfc/trf7970a.c index 6ed5d7e..f7fee7d 100644 --- a/drivers/nfc/trf7970a.c +++ b/drivers/nfc/trf7970a.c @@ -2067,6 +2067,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,
In prior commits the selected clock frequency does not propagate correctly to what is written the the TRF7970A_MODULATOR_SYS_CLK_CTRL register. Signed-off-by: Geoff Lansberry <geoff@kuvee.com> --- drivers/nfc/trf7970a.c | 7 +++++++ 1 file changed, 7 insertions(+)