From patchwork Wed Apr 26 13:48:33 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Geoff Lansberry X-Patchwork-Id: 9701413 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 DDED760245 for ; Wed, 26 Apr 2017 13:49:35 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D09ED2865D for ; Wed, 26 Apr 2017 13:49:35 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id C53B228667; Wed, 26 Apr 2017 13:49:35 +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.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,RCVD_IN_DNSWL_HI 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 EFB232865D for ; Wed, 26 Apr 2017 13:49:32 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S3000679AbdDZNtT (ORCPT ); Wed, 26 Apr 2017 09:49:19 -0400 Received: from mail-qt0-f170.google.com ([209.85.216.170]:34534 "EHLO mail-qt0-f170.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S3000669AbdDZNtP (ORCPT ); Wed, 26 Apr 2017 09:49:15 -0400 Received: by mail-qt0-f170.google.com with SMTP id c45so851088qtb.1 for ; Wed, 26 Apr 2017 06:49:15 -0700 (PDT) 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; bh=xW5t7JYD/KlCpzvWM/GA2ADfLhQRUuVhihRsKgIl8Ww=; b=2TGx0svQEfjFZS5psZnolNMmGBIOzVHY5dN+S76baw2npWiM6rGvC6Qsttd8yOIwIl zMCOrbwPvj4SXeJNnfDBdDlT9TL2PSntMqvGC5qgGfPVIS6QqUbHF4FkM1hGkRKuAX5b 1bFfid9lzVfl2CAdEeup6p8cwlR3GAFZOZJHz9h5jqOZ5NeYtteqyYmCRPiEbtFlvnSu Gb+ifl7U1crbxJcbIrN7Jh/XHtIxV+Oz+ayHZviCIM9+6TekY8e9FZ6Ec0lJ1x0AS9li F5iOnJia4j0c5dRneeO4ukzwOargnRsIus8nWmtR93ZfRFm2Lid0Ey2zeulWsBzfO9p0 9MOA== 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; bh=xW5t7JYD/KlCpzvWM/GA2ADfLhQRUuVhihRsKgIl8Ww=; b=fzWPuE9W6Xq97QFJmj3AqPUrIIKnpzvvKBqaamJ7b3t4vKdyE3E8W/bPQXuYXmJa1t RAPSV9FpcrGAIg79gGGNsC36m1aAMOqCyWdWlsenF79aBxLNYzGAvoFa2BQywae6To+Z nlOMGrfkfBzyx83qQf49Ird0F3T+J+sIJXD1tKQ5rrcQJw7EBSy8VJA/WZvVKq5FebNB YRFchqoVgj16t+pgDlN2QioZXjbC4a4Bo+p0fNRX8q8ygswul/3mjNEkveboquLGneaL 7LY20Zcwljnes/7wdpIBav1jW+SzWxZztc85gXmcQYZ2vIe9C4eFzysCjvgtlg6Yy8xJ pZ7Q== X-Gm-Message-State: AN3rC/663/X5e4tH3HibLzzVxHjCCEhKgNdZtoVuOWMdZZGkVlIOTRjv x4TR2Sx4kyZXLQ== X-Received: by 10.237.40.2 with SMTP id r2mr40555267qtd.173.1493214554719; Wed, 26 Apr 2017 06:49:14 -0700 (PDT) Received: from geoff-ubuntu-W540.lan ([2601:182:d041:2da7:89b9:b7da:344f:2e7f]) by smtp.googlemail.com with ESMTPSA id x67sm170335qkd.67.2017.04.26.06.49.12 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 26 Apr 2017 06:49:13 -0700 (PDT) From: Geoff Lansberry To: linux-wireless@vger.kernel.org, sameo@linux.intel.com Cc: kernel-janitors@vger.kernel.org, linux-kernel@vger.kernel.org, linux-nfc@lists.01.org, devicetree@vger.kernel.org, mgreer@animalcreek.com, justin@kuvee.com, colin.king@canonical.com, Geoff Lansberry Subject: [PATCH] NFC: trf7970a: Correct register settings for 27MHz clock Date: Wed, 26 Apr 2017 09:48:33 -0400 Message-Id: <1493214513-12245-1-git-send-email-geoff@kuvee.com> X-Mailer: git-send-email 2.7.4 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 In prior commits the selected clock frequency does not propagate correctly to what is written the the TRF7970A_MODULATOR_SYS_CLK_CTRL register. Also fixes a bug that causes the device tree property check to always pass. Signed-off-by: Geoff Lansberry --- drivers/nfc/trf7970a.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/drivers/nfc/trf7970a.c b/drivers/nfc/trf7970a.c index 2d1c8ca..c278b0e 100644 --- a/drivers/nfc/trf7970a.c +++ b/drivers/nfc/trf7970a.c @@ -2071,7 +2071,7 @@ static int trf7970a_probe(struct spi_device *spi) } of_property_read_u32(np, "clock-frequency", &clk_freq); - if ((clk_freq != TRF7970A_27MHZ_CLOCK_FREQUENCY) || + if ((clk_freq != TRF7970A_27MHZ_CLOCK_FREQUENCY) && (clk_freq != TRF7970A_13MHZ_CLOCK_FREQUENCY)) { dev_err(trf->dev, "clock-frequency (%u Hz) unsupported\n", @@ -2079,6 +2079,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; + } + if (of_property_read_bool(np, "en2-rf-quirk")) trf->quirks |= TRF7970A_QUIRK_EN2_MUST_STAY_LOW;