From: Geoff Lansberry <geoff@kuvee.com>
To: linux-wireless@vger.kernel.org
Cc: lauro.venancio@openbossa.org, aloisio.almeida@openbossa.org,
sameo@linux.intel.com, mgreer@animalcreek.com, justin@kuvee.com,
Geoff Lansberry <geoff@kuvee.com>
Subject: [PATCH 4/4] NFC: trf7970a: Add device tree option of 1.8 Volt IO voltage
Date: Mon, 18 Apr 2016 15:48:41 -0400 [thread overview]
Message-ID: <1461008921-15100-5-git-send-email-geoff@kuvee.com> (raw)
In-Reply-To: <1461008921-15100-1-git-send-email-geoff@kuvee.com>
Signed-off-by: Geoff Lansberry <geoff@kuvee.com>
---
Documentation/devicetree/bindings/net/nfc/trf7970a.txt | 8 ++++++++
drivers/nfc/trf7970a.c | 11 ++++++++++-
2 files changed, 18 insertions(+), 1 deletion(-)
diff --git a/Documentation/devicetree/bindings/net/nfc/trf7970a.txt b/Documentation/devicetree/bindings/net/nfc/trf7970a.txt
index bf25f39..e605ebd 100644
--- a/Documentation/devicetree/bindings/net/nfc/trf7970a.txt
+++ b/Documentation/devicetree/bindings/net/nfc/trf7970a.txt
@@ -19,9 +19,13 @@ Optional SoC Specific Properties:
"IRQ Status Read" erratum.
- en2-rf-quirk: Specify that the trf7970a being used has the "EN2 RF"
erratum.
+<<<<<<< HEAD
- t5t-rmb-extra-byte-quirk: Specify that the trf7970a has the erratum
where an extra byte is returned by Read Multiple Block commands issued
to Type 5 tags.
+=======
+- vdd_io_1v8: Set to specify that the trf7970a io voltage should be set to 1.8V
+>>>>>>> e7ea4dd... NFC: trf7970a: Add device tree option of 1.8 Volt IO voltage
- crystal_27mhz: Set to specify that the input frequency to the trf7970a is 27.12MHz
Example (for ARM-based BeagleBone with TRF7970A on SPI1):
@@ -45,7 +49,11 @@ Example (for ARM-based BeagleBone with TRF7970A on SPI1):
autosuspend-delay = <30000>;
irq-status-read-quirk;
en2-rf-quirk;
+<<<<<<< HEAD
t5t-rmb-extra-byte-quirk;
+=======
+ vdd_io_1v8;
+>>>>>>> e7ea4dd... NFC: trf7970a: Add device tree option of 1.8 Volt IO voltage
crystal_27mhz;
status = "okay";
};
diff --git a/drivers/nfc/trf7970a.c b/drivers/nfc/trf7970a.c
index 74210f9..be56897 100644
--- a/drivers/nfc/trf7970a.c
+++ b/drivers/nfc/trf7970a.c
@@ -441,6 +441,7 @@ struct trf7970a {
u8 iso_ctrl_tech;
u8 modulator_sys_clk_ctrl;
u8 special_fcn_reg1;
+ u8 io_ctrl;
unsigned int guard_time;
int technology;
int framing;
@@ -1064,6 +1065,11 @@ static int trf7970a_init(struct trf7970a *trf)
if (ret)
goto err_out;
+ ret = trf7970a_write(trf, TRF7970A_REG_IO_CTRL,
+ trf->io_ctrl|TRF7970A_REG_IO_CTRL_VRS(0x1));
+ if (ret)
+ goto err_out;
+
ret = trf7970a_write(trf, TRF7970A_NFC_TARGET_LEVEL, 0);
if (ret)
goto err_out;
@@ -1768,7 +1774,7 @@ static int _trf7970a_tg_listen(struct nfc_digital_dev *ddev, u16 timeout,
goto out_err;
ret = trf7970a_write(trf, TRF7970A_REG_IO_CTRL,
- TRF7970A_REG_IO_CTRL_VRS(0x1));
+ trf->io_ctrl|TRF7970A_REG_IO_CTRL_VRS(0x1));
if (ret)
goto out_err;
@@ -2075,6 +2081,9 @@ static int trf7970a_probe(struct spi_device *spi)
return ret;
}
+ if (of_property_read_bool(np, "vdd_io_1v8"))
+ trf->io_ctrl = TRF7970A_REG_IO_CTRL_IO_LOW;
+
if (of_property_read_bool(np, "crystal_27MHz"))
trf->modulator_sys_clk_ctrl = TRF7970A_MODULATOR_27MHZ;
--
1.9.1
next prev parent reply other threads:[~2016-04-18 19:49 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-04-18 19:48 [Patch] NFC: trf7970a: Geoff Lansberry
2016-04-18 19:48 ` [PATCH 1/4] NFC: trf7970a: Add support for gpio as SS Geoff Lansberry
2016-04-19 0:07 ` Julian Calaby
[not found] ` <CAO7Z3WJofeT4agChaZ-NQ5TwrMygdGRhG7myJkNuEb9i_g-Y=A@mail.gmail.com>
2016-04-20 1:24 ` Geoffrey Lansberry
2016-04-18 19:48 ` [PATCH 2/4] NFC: trf7970a: add TI recommended write of zero to Register 0x18 Geoff Lansberry
2016-04-18 19:48 ` [PATCH 3/4] NFC: trf7970a: add device tree option for 27MHz clock Geoff Lansberry
2016-04-19 0:11 ` Julian Calaby
2016-04-18 19:48 ` Geoff Lansberry [this message]
2016-04-19 0:12 ` [PATCH 4/4] NFC: trf7970a: Add device tree option of 1.8 Volt IO voltage Julian Calaby
2016-04-22 0:01 ` [Patch] NFC: trf7970a: Mark Greer
2016-12-13 22:05 ` Mark Greer
[not found] ` <CAO7Z3WJwf80mCqubSYTeK=BHN9sd=mzmL9th4Su-E25de6TmAg@mail.gmail.com>
2016-12-14 15:57 ` Mark Greer
2016-12-14 16:17 ` Geoff Lansberry
2016-12-14 17:10 ` Mark Greer
2016-12-14 18:35 ` Geoff Lansberry
2016-12-14 22:31 ` Mark Greer
2016-12-16 4:52 ` Mark Greer
2016-12-16 20:35 ` Mark Greer
2016-12-17 21:19 ` Geoff Lansberry
2016-12-19 3:07 ` Mark Greer
2017-02-08 22:53 ` Mark Greer
2017-02-08 22:56 ` Mark Greer
2017-02-09 15:54 ` Geoff Lansberry
2017-02-09 21:27 ` Mark Greer
2017-02-10 0:41 ` Geoff Lansberry
2017-02-10 4:20 ` Mark Greer
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1461008921-15100-5-git-send-email-geoff@kuvee.com \
--to=geoff@kuvee.com \
--cc=aloisio.almeida@openbossa.org \
--cc=justin@kuvee.com \
--cc=lauro.venancio@openbossa.org \
--cc=linux-wireless@vger.kernel.org \
--cc=mgreer@animalcreek.com \
--cc=sameo@linux.intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).