mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Michael Thalmeier <michael.thalmeier@hale.at>
To: Samuel Ortiz <sameo@linux.intel.com>
Cc: Lauro Ramos Venancio <lauro.venancio@openbossa.org>,
	Aloisio Almeida Jr <aloisio.almeida@openbossa.org>,
	linux-kernel@vger.kernel.org, linux-nfc@ml01.01.org,
	michael@thalmeier.at
Subject: [PATCH 11/11] nfc: pn533: increase clock frequency for PN532
Date: Thu, 21 Apr 2016 16:43:59 +0200	[thread overview]
Message-ID: <1461249839-16962-12-git-send-email-michael.thalmeier@hale.at> (raw)
In-Reply-To: <1461249839-16962-1-git-send-email-michael.thalmeier@hale.at>

Default clock frequency of PN532 is 6.78 MHz. Increase the frequency to 27.12
MHz to increase throughput.

Signed-off-by: Michael Thalmeier <michael.thalmeier@hale.at>
---
 drivers/nfc/pn533/pn533.c | 70 +++++++++++++++++++++++++++++++++++++++++++++++
 drivers/nfc/pn533/pn533.h |  2 ++
 2 files changed, 72 insertions(+)

diff --git a/drivers/nfc/pn533/pn533.c b/drivers/nfc/pn533/pn533.c
index 44bc5e0..19ee4ba 100644
--- a/drivers/nfc/pn533/pn533.c
+++ b/drivers/nfc/pn533/pn533.c
@@ -2469,6 +2469,63 @@ static int pn532_sam_configuration(struct nfc_dev *nfc_dev)
 	return 0;
 }
 
+#define PN533_CFR_27	0x00
+#define PN533_CFR_13	0x01
+#define PN533_CFR_6	0x02
+
+static int pn533_get_cfr(struct nfc_dev *nfc_dev)
+{
+	struct pn533 *dev = nfc_get_drvdata(nfc_dev);
+	struct sk_buff *skb;
+	struct sk_buff *resp;
+	int clk;
+
+	dev_dbg(dev->dev, "%s\n", __func__);
+
+	skb = pn533_alloc_skb(dev, 2);
+	if (!skb)
+		return -ENOMEM;
+
+	*skb_put(skb, 1) = 0x02;
+	*skb_put(skb, 1) = 0xFF;
+
+	resp = pn533_send_cmd_sync(dev, PN533_CMD_READ_REGISTER, skb);
+	if (IS_ERR(resp))
+		return PTR_ERR(resp);
+
+	if (resp->len != 1)
+		return -EINVAL;
+
+	clk = resp->data[0];
+
+	dev_kfree_skb(resp);
+	return clk;
+}
+
+static int pn533_set_cfr(struct nfc_dev *nfc_dev, int clk)
+{
+	struct pn533 *dev = nfc_get_drvdata(nfc_dev);
+	struct sk_buff *skb;
+	struct sk_buff *resp;
+
+	dev_dbg(dev->dev, "%s\n", __func__);
+
+	skb = pn533_alloc_skb(dev, 3);
+	if (!skb)
+		return -ENOMEM;
+
+	*skb_put(skb, 1) = 0x02;
+	*skb_put(skb, 1) = 0xFF;
+	*skb_put(skb, 1) = clk & 0x03;
+
+	resp = pn533_send_cmd_sync(dev, PN533_CMD_WRITE_REGISTER, skb);
+	if (IS_ERR(resp))
+		return PTR_ERR(resp);
+
+	dev_kfree_skb(resp);
+	return 0;
+}
+
 static int pn533_dev_up(struct nfc_dev *nfc_dev)
 {
 	struct pn533 *dev = nfc_get_drvdata(nfc_dev);
@@ -2478,6 +2535,10 @@ static int pn533_dev_up(struct nfc_dev *nfc_dev)
 
 		if (rc)
 			return rc;
+
+		rc = pn533_set_cfr(nfc_dev, PN533_CFR_27);
+		if (rc)
+			return rc;
 	}
 
 	return pn533_rf_field(nfc_dev, 1);
@@ -2485,6 +2546,15 @@ static int pn533_dev_up(struct nfc_dev *nfc_dev)
 
 static int pn533_dev_down(struct nfc_dev *nfc_dev)
 {
+	struct pn533 *dev = nfc_get_drvdata(nfc_dev);
+
+	if (dev->device_type == PN533_DEVICE_PN532) {
+		int rc = pn533_set_cfr(nfc_dev, PN533_CFR_6);
+
+		if (rc)
+			return rc;
+	}
+
 	return pn533_rf_field(nfc_dev, 0);
 }
 
diff --git a/drivers/nfc/pn533/pn533.h b/drivers/nfc/pn533/pn533.h
index 553c7d1..2bd3816 100644
--- a/drivers/nfc/pn533/pn533.h
+++ b/drivers/nfc/pn533/pn533.h
@@ -74,6 +74,8 @@
 #define PN533_FRAME_CMD(f) (f->data[1])
 
 #define PN533_CMD_GET_FIRMWARE_VERSION 0x02
+#define PN533_CMD_READ_REGISTER 0x06
+#define PN533_CMD_WRITE_REGISTER 0x08
 #define PN533_CMD_SAM_CONFIGURATION 0x14
 #define PN533_CMD_RF_CONFIGURATION 0x32
 #define PN533_CMD_IN_DATA_EXCHANGE 0x40
-- 
2.5.5

  parent reply	other threads:[~2016-04-21 14:44 UTC|newest]

Thread overview: 19+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-04-21 14:43 [PATCH 00/11] NFC: pn533: bug fixes and improvements Michael Thalmeier
2016-04-21 14:43 ` [PATCH 01/11] NFC: pn533: i2c: free irq on driver remove Michael Thalmeier
2016-04-21 14:43 ` [PATCH 02/11] NFC: pn533: fix order of initialization Michael Thalmeier
2016-04-21 14:43 ` [PATCH 03/11] NFC: pn533: i2c: do not call pn533_recv_frame with aborted commands Michael Thalmeier
2016-04-21 14:43 ` [PATCH 04/11] NFC: pn533: reset poll modulation list before calling nfc_targets_found Michael Thalmeier
2016-04-21 14:43 ` [PATCH 05/11] NFC: pn533: handle interrupted commands in pn533_recv_frame Michael Thalmeier
2016-04-21 14:43 ` [PATCH 06/11] NFC: pn533: usb: fix errors when poll is stopped Michael Thalmeier
2016-05-01 23:17   ` Samuel Ortiz
2016-04-21 14:43 ` [PATCH 07/11] NFC: pn533: improve cmd queue handling Michael Thalmeier
2016-05-01 23:17   ` Samuel Ortiz
2016-04-21 14:43 ` [PATCH 08/11] NFC: pn533: reduce output when stopping poll Michael Thalmeier
2016-05-01 23:18   ` Samuel Ortiz
2016-04-21 14:43 ` [PATCH 09/11] NFC: pn533: use nfc_alloc_recv_skb for skb allocation Michael Thalmeier
2016-05-01 23:17   ` Samuel Ortiz
2016-04-21 14:43 ` [PATCH 10/11] NFC: pn533: set cmd status when not set Michael Thalmeier
2016-04-21 14:43 ` Michael Thalmeier [this message]
2016-04-28 18:18 ` [PATCH 00/11] NFC: pn533: bug fixes and improvements Olliver Schinagl
2016-05-04 15:18   ` Olliver Schinagl
2016-05-09 11:59     ` Olliver Schinagl

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=1461249839-16962-12-git-send-email-michael.thalmeier@hale.at \
    --to=michael.thalmeier@hale.at \
    --cc=aloisio.almeida@openbossa.org \
    --cc=lauro.venancio@openbossa.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-nfc@ml01.01.org \
    --cc=michael@thalmeier.at \
    --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

all inboxes | Powered by JetHome®