From patchwork Thu Dec 15 22:30:43 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Geoff Lansberry X-Patchwork-Id: 9477047 X-Patchwork-Delegate: sameo@linux.intel.com Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id D742C60571 for ; Thu, 15 Dec 2016 22:31:22 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C91F12886A for ; Thu, 15 Dec 2016 22:31:22 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id BDBE82886E; Thu, 15 Dec 2016 22:31:22 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.4 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, RCVD_IN_DNSWL_HI, RCVD_IN_SORBS_SPAM autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4222125F3E for ; Thu, 15 Dec 2016 22:31:22 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756139AbcLOWa7 (ORCPT ); Thu, 15 Dec 2016 17:30:59 -0500 Received: from mail-qk0-f171.google.com ([209.85.220.171]:33975 "EHLO mail-qk0-f171.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755545AbcLOWa4 (ORCPT ); Thu, 15 Dec 2016 17:30:56 -0500 Received: by mail-qk0-f171.google.com with SMTP id q130so73041249qke.1 for ; Thu, 15 Dec 2016 14:30:55 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kuvee-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=mSeG2mfHXDXWpTwVDNO7q4/iJJ1/upvEzCKbisuk5Ao=; b=ceMouI4hGcxQxkZYbhZ/5ij+1f1LCi+OEyaV792M1PHMbM2HGGVZGNQyNNXf2YRsoc txEy3amZ0vf9xGw5sx6yODCmeM7C2TL1iQSOe0CsT+BgMT2DpixIsM1Z1x6CxQCwyd54 m6PKaLVo/QBJuuMxbdiEihMXy25tGeChUOIL4GYxnNW01GO825ufXGl5+8qbaPAQorkZ sPkkztde+U+kIm87FfK7gVrhOZXsi3RX2uum9itj+5KUSiiyQH6Yi9qboo7vX17mfI1O EywqiH+lDKEOcI0Me9dmIhOk05gRdvH63SZqvuxuxRkbUMLapc3XoFmWEPbkVz+z6DZy qiiw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=mSeG2mfHXDXWpTwVDNO7q4/iJJ1/upvEzCKbisuk5Ao=; b=mqDhYvldubbptCGrthzBNUmxRgdf448HhrPufYqMSJYv6Yn2lolQtPFdfN0/IqwpGi HFSS/nbSCxFvgY2K/I3jSHOkl/QLlO51hHeD7eD66v0hCNyrUheVCcYfPU6mS3vBT6KO hzX+xruhZlkAc7wuW6gVPMSRlZ6ozBi/L3CZFyoQSziekCChyBv7LZ6cdzIecUsjlHkV deujTPkiHukmfy1CjjipPd7idLIFJmhJvaZjgGQaBrR9I4OAkRg0fVRQf53Dcsh0j6v/ sRymdCV5qDT1Ovq+JSykoif6XoglC4ALeNvwyP0c3WPBjBZaL0yGjXDT/xmTe/ViDpwN tTYQ== X-Gm-Message-State: AIkVDXJvxgZeLLUmX+8dHaAmvrGbyws/0CB3swYR80iwM+ugimDeDLEOQCd/wpw65AeU6Q== X-Received: by 10.55.170.131 with SMTP id t125mr2522760qke.15.1481841055189; Thu, 15 Dec 2016 14:30:55 -0800 (PST) Received: from localhost.localdomain (c-73-119-141-105.hsd1.ma.comcast.net. [73.119.141.105]) by smtp.googlemail.com with ESMTPSA id f36sm2166515qkf.43.2016.12.15.14.30.54 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 15 Dec 2016 14:30:54 -0800 (PST) From: Geoff Lansberry X-Google-Original-From: Geoff Lansberry To: linux-wireless@vger.kernel.org Cc: lauro.venancio@openbossa.org, aloisio.almeida@openbossa.org, sameo@linux.intel.com, robh+dt@kernel.org, mark.rutland@arm.com, netdev@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, mgreer@animalcreek.com, justin@kuvee.com, Geoff Lansberry Subject: [PATCH 2/3] NFC: trf7970a: Add device tree option of 1.8 Volt IO voltage Date: Thu, 15 Dec 2016 17:30:43 -0500 Message-Id: <1481841044-4314-2-git-send-email-glansberry@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1481841044-4314-1-git-send-email-glansberry@gmail.com> References: <1481841044-4314-1-git-send-email-glansberry@gmail.com> Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Geoff Lansberry --- Documentation/devicetree/bindings/net/nfc/trf7970a.txt | 2 ++ drivers/nfc/trf7970a.c | 13 ++++++++++++- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/Documentation/devicetree/bindings/net/nfc/trf7970a.txt b/Documentation/devicetree/bindings/net/nfc/trf7970a.txt index 9dda879..208f045 100644 --- a/Documentation/devicetree/bindings/net/nfc/trf7970a.txt +++ b/Documentation/devicetree/bindings/net/nfc/trf7970a.txt @@ -21,6 +21,7 @@ Optional SoC Specific Properties: - 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 - crystal_27mhz: Set to specify that the input frequency to the trf7970a is 27.12MHz @@ -45,6 +46,7 @@ Example (for ARM-based BeagleBone with TRF7970A on SPI1): irq-status-read-quirk; en2-rf-quirk; t5t-rmb-extra-byte-quirk; + vdd_io_1v8; crystal_27mhz; status = "okay"; }; diff --git a/drivers/nfc/trf7970a.c b/drivers/nfc/trf7970a.c index 2d2a077..b4c37ab 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; @@ -1048,6 +1049,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; @@ -1764,7 +1770,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; @@ -2058,6 +2064,11 @@ 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; + dev_dbg(trf->dev, "trf7970a config vdd_io_1v8\n"); + } + if (of_property_read_bool(np, "crystal_27mhz")) { trf->modulator_sys_clk_ctrl = TRF7970A_MODULATOR_27MHZ; dev_dbg(trf->dev, "trf7970a configure crystal_27mhz\n");