From patchwork Tue Oct 9 12:52:09 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ben Whitten X-Patchwork-Id: 981181 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="GR1RBWXF"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 42Txvr4RRZz9s9G for ; Tue, 9 Oct 2018 23:52:24 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726846AbeJIUJK (ORCPT ); Tue, 9 Oct 2018 16:09:10 -0400 Received: from mail-wm1-f65.google.com ([209.85.128.65]:32952 "EHLO mail-wm1-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726418AbeJIUJK (ORCPT ); Tue, 9 Oct 2018 16:09:10 -0400 Received: by mail-wm1-f65.google.com with SMTP id y140-v6so10980788wmd.0 for ; Tue, 09 Oct 2018 05:52:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=saqAi4Z6hHpd+XEsDTc1v5xoBLrw5sOXtXfANd58v08=; b=GR1RBWXFy0GDAVW5x+Pi4dlO2KwiNoaS3XYdhmG5svf0N/3jG2bwjs8txmdjTZC39i XL9Sn6kkTyc5dEhZRCDOqW1ye6uUc2E6YawmLLWff722J7RQT1sXpMtSDqqYY7Fi1Pbf IhQ5HVh84c0ylqYGjI+BrCnOSTYZyLlwtK11klScKvzqTZJnl57fEKIenHjUGQDSOLvk qvFFbey7jgRSezLO9NkzlgmVmicjmRcOyUbBDBn0DsVniGJLF5ewFkhmnO3ZpvGi9X0b 1doTf45FHZu4AT07uitDLjV9eQ+YAEFwf1u2MUkFkblO+/Y/SDXKUUkUdPcx8Ke6csQZ re3w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=saqAi4Z6hHpd+XEsDTc1v5xoBLrw5sOXtXfANd58v08=; b=UAeS8Smau6clH/r3YoZWBDznTetebbXGICTJ5VKJ6NEqQoTWzzowWhIfFjURvlH3z9 Rg5VjdXqCxnJds5N+usLbi4oajp3wkoxvxtyGXnC1zAt+XxtXQ8vOsyreLw4Jda6bl5C i3ydwqg8ZDqUG1AEkjiqGSieMKFVUkQHq2rXJudsO/+y7PEWj1ySlkn89sq8M7jwksyl 0qx22K9XQjnA7RpJzYX0Zt86OhQ9Fy/xfMi+MOqB/C5BG4r+jeXs9SokN/hpLo/nDC3Y Rvqqe/JYWvHRpVJxth9pDATgL7U3vlAgY/XSRtl4FsSs0lGQyEZqD6rDvOw7mG1x6BmP syQw== X-Gm-Message-State: ABuFfohJjVr/0nxe5eyAShOWuzGKMfw0GduYC1EzoVrz1m9ikg4y9A1t BaZSk45a6gpSWSOXRwbEhpM= X-Google-Smtp-Source: ACcGV63XeA67HhA5I8nWnD85ouP3rL9kdE9imhApryAQtuB/HZenje3qd5zH2b9DgF7jRo2ZVbNAtQ== X-Received: by 2002:a1c:58f:: with SMTP id 137-v6mr1914872wmf.37.1539089540541; Tue, 09 Oct 2018 05:52:20 -0700 (PDT) Received: from Sarah.corp.lairdtech.com ([109.174.151.67]) by smtp.gmail.com with ESMTPSA id g3-v6sm17216942wrw.81.2018.10.09.05.52.19 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 09 Oct 2018 05:52:19 -0700 (PDT) From: Ben Whitten X-Google-Original-From: Ben Whitten To: afaerber@suse.de Cc: starnight@g.ncu.edu.tw, hasnain.virk@arm.com, netdev@vger.kernel.org, liuxuenetmail@gmail.com, shess@hessware.de, Ben Whitten Subject: [PATCH v2 lora-next 1/4] net: lora: sx1301: convert burst spi functions to regmap raw Date: Tue, 9 Oct 2018 13:52:09 +0100 Message-Id: <1539089532-2481-2-git-send-email-ben.whitten@lairdtech.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1539089532-2481-1-git-send-email-ben.whitten@lairdtech.com> References: <1539089532-2481-1-git-send-email-ben.whitten@lairdtech.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org As we have caching disabled we can access the regmap using raw for our firmware reading and writing bursts. We also remove the now defunct spi element from the structure as this completes the move to regmap. Signed-off-by: Ben Whitten --- drivers/net/lora/sx1301.c | 26 +++++++++++++++++--------- drivers/net/lora/sx1301.h | 2 -- 2 files changed, 17 insertions(+), 11 deletions(-) diff --git a/drivers/net/lora/sx1301.c b/drivers/net/lora/sx1301.c index fd29258..5ab0e2d 100644 --- a/drivers/net/lora/sx1301.c +++ b/drivers/net/lora/sx1301.c @@ -76,19 +76,28 @@ static struct regmap_config sx1301_regmap_config = { static int sx1301_read_burst(struct sx1301_priv *priv, u8 reg, u8 *val, size_t len) { - u8 addr = reg & 0x7f; - return spi_write_then_read(priv->spi, &addr, 1, val, len); + size_t max; + + max = regmap_get_raw_read_max(priv->regmap); + if (max && max < len) { + dev_err(priv->dev, "Burst greater then max raw read\n"); + return -EINVAL; + } + + return regmap_raw_read(priv->regmap, reg, val, len); } static int sx1301_write_burst(struct sx1301_priv *priv, u8 reg, const u8 *val, size_t len) { - u8 addr = reg | BIT(7); - struct spi_transfer xfr[2] = { - { .tx_buf = &addr, .len = 1 }, - { .tx_buf = val, .len = len }, - }; + size_t max; + + max = regmap_get_raw_write_max(priv->regmap); + if (max && max < len) { + dev_err(priv->dev, "Burst greater then max raw write\n"); + return -EINVAL; + } - return spi_sync_transfer(priv->spi, xfr, 2); + return regmap_raw_write(priv->regmap, reg, val, len); } static int sx1301_soft_reset(struct sx1301_priv *priv) @@ -566,7 +575,6 @@ static int sx1301_probe(struct spi_device *spi) spi_set_drvdata(spi, netdev); priv->dev = &spi->dev; - priv->spi = spi; priv->regmap = devm_regmap_init_spi(spi, &sx1301_regmap_config); if (IS_ERR(priv->regmap)) { diff --git a/drivers/net/lora/sx1301.h b/drivers/net/lora/sx1301.h index e939c02..e6400f8 100644 --- a/drivers/net/lora/sx1301.h +++ b/drivers/net/lora/sx1301.h @@ -12,7 +12,6 @@ #include #include #include -#include #define SX1301_CHIP_VERSION 103 @@ -64,7 +63,6 @@ struct sx1301_priv { struct lora_dev_priv lora; struct device *dev; - struct spi_device *spi; struct gpio_desc *rst_gpio; struct regmap *regmap; }; From patchwork Tue Oct 9 12:52:10 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ben Whitten X-Patchwork-Id: 981183 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="afg7fBdp"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 42Txvw3JcDz9s89 for ; Tue, 9 Oct 2018 23:52:28 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726970AbeJIUJN (ORCPT ); Tue, 9 Oct 2018 16:09:13 -0400 Received: from mail-wm1-f65.google.com ([209.85.128.65]:51127 "EHLO mail-wm1-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726855AbeJIUJN (ORCPT ); Tue, 9 Oct 2018 16:09:13 -0400 Received: by mail-wm1-f65.google.com with SMTP id i8-v6so1756017wmg.0 for ; Tue, 09 Oct 2018 05:52:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=ShT7nJfr5V6x9bMhWTMJrnT2TabC9tJ9siixDq42veM=; b=afg7fBdpdAWK9vMI+H/Zw5+WWbsYDKQeD1MZs7aBoFCskfdULJbUL0iNm3G/bqlSJ/ 1BwT6GeF6ZVI+c3tSs5MZA2awR6awzNVejEeK+7U1rOZM14lBUC7eUz2N+r57Z7R8xJ7 WOq2HF0I7X77wLywR2g2ohhYC0BY5c74CAJESaa0FVIp+iaK6lUdSoduYByx4Rcxzn+Y YppiFFB2QrjGdjzKyGd5qtvXStMVVL43qYVTNv53lyQw0m7glVF57hxyyr/Zbk54UEJ1 P7aqhHMnM0Mbo+/RSI2+eIOUS96JAqS66acu9yeu6IuC2MrnDzEKeuHgygKDLzWjRKLz GRdg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=ShT7nJfr5V6x9bMhWTMJrnT2TabC9tJ9siixDq42veM=; b=oglH2Sv8nVqMtra5eWwzDDSSdWdHQMBQ6yP124o62+1wyMDpSdz/tKbTIlY6XWo94r pMh+4x8+9ETBV5TTNsBTK7p62EiD/zeuW0+Sk/WDXUKEsv7Qy4QeLEZ0KS0mLU3fiJ5c +ezP/sF4RroQBPbTld1JxN6tEHbjM5BWlRr022LdPNQtCuGWTuEnwwDPMUcsWQ7V7jFO 6x7hZWVwa+t88TrlQHGUM0Kw6CU3CjEYS7svRFKirDODL4LKN0MhnVCTDLKY5zjKgOJi V9jzOhcahL4s3XlxgvJ3F+Ow+BbfbvOQABgVEPi+uujHIpsJhMG2eXsxlS5kDReEq6TD MM1g== X-Gm-Message-State: ABuFfoiZb0QZSa1Yh8flU8HyNELB6yruMws+WafDl5EePJRNghnGMpKf uE+RLTuo1q4PGKBHW9QemAo= X-Google-Smtp-Source: ACcGV60wvoBx3B40XK8I/G3SwmbblwB+Gz6qZ5Ue+HPxmeAm5LbWNZSePGYyZbNrKevoLolMJC3S1A== X-Received: by 2002:a1c:8c46:: with SMTP id o67-v6mr1869814wmd.35.1539089542032; Tue, 09 Oct 2018 05:52:22 -0700 (PDT) Received: from Sarah.corp.lairdtech.com ([109.174.151.67]) by smtp.gmail.com with ESMTPSA id g3-v6sm17216942wrw.81.2018.10.09.05.52.20 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 09 Oct 2018 05:52:21 -0700 (PDT) From: Ben Whitten X-Google-Original-From: Ben Whitten To: afaerber@suse.de Cc: starnight@g.ncu.edu.tw, hasnain.virk@arm.com, netdev@vger.kernel.org, liuxuenetmail@gmail.com, shess@hessware.de, Ben Whitten Subject: [PATCH v2 lora-next 2/4] net: lora: sx1301: convert to using regmap fields for bit ops Date: Tue, 9 Oct 2018 13:52:10 +0100 Message-Id: <1539089532-2481-3-git-send-email-ben.whitten@lairdtech.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1539089532-2481-1-git-send-email-ben.whitten@lairdtech.com> References: <1539089532-2481-1-git-send-email-ben.whitten@lairdtech.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Ben Whitten We convert to using regmap fields to allow bit access to the registers where regmap handles the read update write. Signed-off-by: Ben Whitten --- drivers/net/lora/sx1301.c | 240 +++++++++++++--------------------------------- drivers/net/lora/sx1301.h | 46 +++++++++ 2 files changed, 113 insertions(+), 173 deletions(-) diff --git a/drivers/net/lora/sx1301.c b/drivers/net/lora/sx1301.c index 5ab0e2d..eb89af6 100644 --- a/drivers/net/lora/sx1301.c +++ b/drivers/net/lora/sx1301.c @@ -24,27 +24,6 @@ #include "sx1301.h" -#define REG_PAGE_RESET_SOFT_RESET BIT(7) - -#define REG_16_GLOBAL_EN BIT(3) - -#define REG_17_CLK32M_EN BIT(0) - -#define REG_0_105_FORCE_HOST_RADIO_CTRL BIT(1) -#define REG_0_105_FORCE_HOST_FE_CTRL BIT(2) -#define REG_0_105_FORCE_DEC_FILTER_GAIN BIT(3) - -#define REG_0_MCU_RST_0 BIT(0) -#define REG_0_MCU_RST_1 BIT(1) -#define REG_0_MCU_SELECT_MUX_0 BIT(2) -#define REG_0_MCU_SELECT_MUX_1 BIT(3) - -#define REG_2_43_RADIO_A_EN BIT(0) -#define REG_2_43_RADIO_B_EN BIT(1) -#define REG_2_43_RADIO_RST BIT(2) - -#define REG_EMERGENCY_FORCE_HOST_CTRL BIT(0) - static const struct regmap_range_cfg sx1301_regmap_ranges[] = { { .name = "Pages", @@ -74,6 +53,12 @@ static struct regmap_config sx1301_regmap_config = { .max_register = SX1301_MAX_REGISTER, }; +static int sx1301_field_write(struct sx1301_priv *priv, + enum sx1301_fields field_id, u8 val) +{ + return regmap_field_write(priv->regmap_fields[field_id], val); +} + static int sx1301_read_burst(struct sx1301_priv *priv, u8 reg, u8 *val, size_t len) { size_t max; @@ -100,11 +85,6 @@ static int sx1301_write_burst(struct sx1301_priv *priv, u8 reg, const u8 *val, s return regmap_raw_write(priv->regmap, reg, val, len); } -static int sx1301_soft_reset(struct sx1301_priv *priv) -{ - return regmap_write(priv->regmap, SX1301_PAGE, REG_PAGE_RESET_SOFT_RESET); -} - static int sx1301_agc_ram_read(struct sx1301_priv *priv, u8 addr, unsigned int *val) { int ret; @@ -146,7 +126,7 @@ static int sx1301_arb_ram_read(struct sx1301_priv *priv, u8 addr, unsigned int * static int sx1301_load_firmware(struct sx1301_priv *priv, int mcu, const struct firmware *fw) { u8 *buf; - u8 rst, select_mux; + enum sx1301_fields rst, select_mux; unsigned int val; int ret; @@ -157,29 +137,26 @@ static int sx1301_load_firmware(struct sx1301_priv *priv, int mcu, const struct switch (mcu) { case 0: - rst = REG_0_MCU_RST_0; - select_mux = REG_0_MCU_SELECT_MUX_0; + rst = F_MCU_RST_0; + select_mux = F_MCU_SELECT_MUX_0; break; case 1: - rst = REG_0_MCU_RST_1; - select_mux = REG_0_MCU_SELECT_MUX_1; + rst = F_MCU_RST_1; + select_mux = F_MCU_SELECT_MUX_1; break; default: return -EINVAL; } - ret = regmap_read(priv->regmap, SX1301_MCU_CTRL, &val); + ret = sx1301_field_write(priv, rst, 1); if (ret) { - dev_err(priv->dev, "MCU read failed\n"); + dev_err(priv->dev, "MCU reset failed\n"); return ret; } - val |= rst; - val &= ~select_mux; - - ret = regmap_write(priv->regmap, SX1301_MCU_CTRL, val); + ret = sx1301_field_write(priv, select_mux, 0); if (ret) { - dev_err(priv->dev, "MCU reset / select mux write failed\n"); + dev_err(priv->dev, "MCU RAM select mux failed\n"); return ret; } @@ -220,17 +197,9 @@ static int sx1301_load_firmware(struct sx1301_priv *priv, int mcu, const struct kfree(buf); - ret = regmap_read(priv->regmap, SX1301_MCU_CTRL, &val); + ret = sx1301_field_write(priv, select_mux, 1); if (ret) { - dev_err(priv->dev, "MCU read (1) failed\n"); - return ret; - } - - val |= select_mux; - - ret = regmap_write(priv->regmap, SX1301_MCU_CTRL, val); - if (ret) { - dev_err(priv->dev, "MCU reset / select mux write (1) failed\n"); + dev_err(priv->dev, "MCU RAM release mux failed\n"); return ret; } @@ -256,17 +225,9 @@ static int sx1301_agc_calibrate(struct sx1301_priv *priv) return ret; } - ret = regmap_read(priv->regmap, SX1301_FORCE_CTRL, &val); + ret = sx1301_field_write(priv, F_FORCE_HOST_RADIO_CTRL, 0); if (ret) { - dev_err(priv->dev, "0|105 read failed\n"); - return ret; - } - - val &= ~REG_0_105_FORCE_HOST_RADIO_CTRL; - - ret = regmap_write(priv->regmap, SX1301_FORCE_CTRL, val); - if (ret) { - dev_err(priv->dev, "0|105 write failed\n"); + dev_err(priv->dev, "force host control failed\n"); return ret; } @@ -280,17 +241,9 @@ static int sx1301_agc_calibrate(struct sx1301_priv *priv) return ret; } - ret = regmap_read(priv->regmap, SX1301_MCU_CTRL, &val); + ret = sx1301_field_write(priv, F_MCU_RST_1, 0); if (ret) { - dev_err(priv->dev, "MCU read (0) failed\n"); - return ret; - } - - val &= ~REG_0_MCU_RST_1; - - ret = regmap_write(priv->regmap, SX1301_MCU_CTRL, val); - if (ret) { - dev_err(priv->dev, "MCU write (0) failed\n"); + dev_err(priv->dev, "MCU 1 reset failed\n"); return ret; } @@ -308,34 +261,18 @@ static int sx1301_agc_calibrate(struct sx1301_priv *priv) return -ENXIO; } - ret = regmap_read(priv->regmap, SX1301_EMERGENCY_FORCE_HOST_CTRL, &val); + ret = sx1301_field_write(priv, F_EMERGENCY_FORCE_HOST_CTRL, 0); if (ret) { - dev_err(priv->dev, "emergency force read failed\n"); - return ret; - } - - val &= ~REG_EMERGENCY_FORCE_HOST_CTRL; - - ret = regmap_write(priv->regmap, SX1301_EMERGENCY_FORCE_HOST_CTRL, val); - if (ret) { - dev_err(priv->dev, "emergency force write failed\n"); + dev_err(priv->dev, "emergency force failed\n"); return ret; } dev_err(priv->dev, "starting calibration...\n"); msleep(2300); - ret = regmap_read(priv->regmap, SX1301_EMERGENCY_FORCE_HOST_CTRL, &val); - if (ret) { - dev_err(priv->dev, "emergency force read (1) failed\n"); - return ret; - } - - val |= REG_EMERGENCY_FORCE_HOST_CTRL; - - ret = regmap_write(priv->regmap, SX1301_EMERGENCY_FORCE_HOST_CTRL, val); + ret = sx1301_field_write(priv, F_EMERGENCY_FORCE_HOST_CTRL, 1); if (ret) { - dev_err(priv->dev, "emergency force write (1) failed\n"); + dev_err(priv->dev, "emergency force release failed\n"); return ret; } @@ -382,19 +319,15 @@ static int sx1301_load_all_firmware(struct sx1301_priv *priv) if (ret) return ret; - ret = regmap_read(priv->regmap, SX1301_FORCE_CTRL, &val); - if (ret) { - dev_err(priv->dev, "0|105 read failed\n"); + ret = sx1301_field_write(priv, F_FORCE_HOST_RADIO_CTRL, 0); + if (ret) return ret; - } - - val &= ~(REG_0_105_FORCE_HOST_RADIO_CTRL | REG_0_105_FORCE_HOST_FE_CTRL | REG_0_105_FORCE_DEC_FILTER_GAIN); - - ret = regmap_write(priv->regmap, SX1301_FORCE_CTRL, val); - if (ret) { - dev_err(priv->dev, "0|105 write failed\n"); + ret = sx1301_field_write(priv, F_FORCE_HOST_FE_CTRL, 0); + if (ret) + return ret; + ret = sx1301_field_write(priv, F_FORCE_DEC_FILTER_GAIN, 0); + if (ret) return ret; - } ret = regmap_write(priv->regmap, SX1301_CHRS, 0); if (ret) { @@ -402,17 +335,15 @@ static int sx1301_load_all_firmware(struct sx1301_priv *priv) return ret; } - ret = regmap_read(priv->regmap, SX1301_MCU_CTRL, &val); + ret = sx1301_field_write(priv, F_MCU_RST_0, 0); if (ret) { - dev_err(priv->dev, "MCU read (0) failed\n"); + dev_err(priv->dev, "MCU 0 release failed\n"); return ret; } - val &= ~(REG_0_MCU_RST_1 | REG_0_MCU_RST_0); - - ret = regmap_write(priv->regmap, SX1301_MCU_CTRL, val); + ret = sx1301_field_write(priv, F_MCU_RST_1, 0); if (ret) { - dev_err(priv->dev, "MCU write (0) failed\n"); + dev_err(priv->dev, "MCU 1 release failed\n"); return ret; } @@ -464,7 +395,6 @@ static netdev_tx_t sx130x_loradev_start_xmit(struct sk_buff *skb, struct net_dev static int sx130x_loradev_open(struct net_device *netdev) { struct sx1301_priv *priv = netdev_priv(netdev); - unsigned int val; int ret; netdev_dbg(netdev, "%s", __func__); @@ -474,31 +404,15 @@ static int sx130x_loradev_open(struct net_device *netdev) return -ENXIO; } - ret = regmap_read(priv->regmap, SX1301_GEN, &val); + ret = sx1301_field_write(priv, F_GLOBAL_EN, 1); if (ret) { - netdev_err(netdev, "16 read (1) failed\n"); + dev_err(priv->dev, "enable global clocks failed\n"); return ret; } - val |= REG_16_GLOBAL_EN; - - ret = regmap_write(priv->regmap, SX1301_GEN, val); + ret = sx1301_field_write(priv, F_CLK32M_EN, 1); if (ret) { - netdev_err(netdev, "16 write (1) failed\n"); - return ret; - } - - ret = regmap_read(priv->regmap, SX1301_CKEN, &val); - if (ret) { - netdev_err(netdev, "17 read (1) failed\n"); - return ret; - } - - val |= REG_17_CLK32M_EN; - - ret = regmap_write(priv->regmap, SX1301_CKEN, val); - if (ret) { - netdev_err(netdev, "17 write (1) failed\n"); + dev_err(priv->dev, "enable 32M clock failed\n"); return ret; } @@ -545,6 +459,7 @@ static int sx1301_probe(struct spi_device *spi) struct sx1301_priv *priv; struct gpio_desc *rst; int ret; + int i; unsigned int ver; unsigned int val; @@ -583,6 +498,19 @@ static int sx1301_probe(struct spi_device *spi) return ret; } + for (i = 0; i < ARRAY_SIZE(sx1301_regmap_fields); i++) { + const struct reg_field *reg_fields = sx1301_regmap_fields; + + priv->regmap_fields[i] = devm_regmap_field_alloc(&spi->dev, + priv->regmap, + reg_fields[i]); + if (IS_ERR(priv->regmap_fields[i])) { + ret = PTR_ERR(priv->regmap_fields[i]); + dev_err(&spi->dev, "Cannot allocate regmap field: %d\n", ret); + return ret; + } + } + ret = regmap_read(priv->regmap, SX1301_VER, &ver); if (ret) { dev_err(&spi->dev, "version read failed\n"); @@ -600,83 +528,49 @@ static int sx1301_probe(struct spi_device *spi) return ret; } - ret = sx1301_soft_reset(priv); + ret = sx1301_field_write(priv, F_SOFT_RESET, 1); if (ret) { dev_err(&spi->dev, "soft reset failed\n"); return ret; } - ret = regmap_read(priv->regmap, SX1301_GEN, &val); + ret = sx1301_field_write(priv, F_GLOBAL_EN, 0); if (ret) { - dev_err(&spi->dev, "16 read failed\n"); + dev_err(&spi->dev, "gate global clocks failed\n"); return ret; } - val &= ~REG_16_GLOBAL_EN; - - ret = regmap_write(priv->regmap, SX1301_GEN, val); - if (ret) { - dev_err(&spi->dev, "16 write failed\n"); - return ret; - } - - ret = regmap_read(priv->regmap, SX1301_CKEN, &val); + ret = sx1301_field_write(priv, F_CLK32M_EN, 0); if (ret) { - dev_err(&spi->dev, "17 read failed\n"); + dev_err(&spi->dev, "gate 32M clock failed\n"); return ret; } - val &= ~REG_17_CLK32M_EN; - - ret = regmap_write(priv->regmap, SX1301_CKEN, val); + ret = sx1301_field_write(priv, F_RADIO_A_EN, 1); if (ret) { - dev_err(&spi->dev, "17 write failed\n"); + dev_err(&spi->dev, "radio a enable failed\n"); return ret; } - ret = regmap_read(priv->regmap, SX1301_RADIO_CFG, &val); - if (ret) { - dev_err(&spi->dev, "2|43 read failed\n"); - return ret; - } - - val |= REG_2_43_RADIO_B_EN | REG_2_43_RADIO_A_EN; - - ret = regmap_write(priv->regmap, SX1301_RADIO_CFG, val); + ret = sx1301_field_write(priv, F_RADIO_B_EN, 1); if (ret) { - dev_err(&spi->dev, "2|43 write failed\n"); + dev_err(&spi->dev, "radio b enable failed\n"); return ret; } msleep(500); - ret = regmap_read(priv->regmap, SX1301_RADIO_CFG, &val); + ret = sx1301_field_write(priv, F_RADIO_RST, 1); if (ret) { - dev_err(&spi->dev, "2|43 read failed\n"); - return ret; - } - - val |= REG_2_43_RADIO_RST; - - ret = regmap_write(priv->regmap, SX1301_RADIO_CFG, val); - if (ret) { - dev_err(&spi->dev, "2|43 write failed\n"); + dev_err(&spi->dev, "radio asert reset failed\n"); return ret; } msleep(5); - ret = regmap_read(priv->regmap, SX1301_RADIO_CFG, &val); - if (ret) { - dev_err(&spi->dev, "2|43 read failed\n"); - return ret; - } - - val &= ~REG_2_43_RADIO_RST; - - ret = regmap_write(priv->regmap, SX1301_RADIO_CFG, val); + ret = sx1301_field_write(priv, F_RADIO_RST, 0); if (ret) { - dev_err(&spi->dev, "2|43 write failed\n"); + dev_err(&spi->dev, "radio deasert reset failed\n"); return ret; } diff --git a/drivers/net/lora/sx1301.h b/drivers/net/lora/sx1301.h index e6400f8..0bbd948 100644 --- a/drivers/net/lora/sx1301.h +++ b/drivers/net/lora/sx1301.h @@ -60,11 +60,57 @@ #define SX1301_MAX_REGISTER (SX1301_PAGE_BASE(3) + 0x7F) +enum sx1301_fields { + F_SOFT_RESET, + F_GLOBAL_EN, + F_CLK32M_EN, + F_RADIO_A_EN, + F_RADIO_B_EN, + F_RADIO_RST, + + F_MCU_RST_0, + F_MCU_RST_1, + F_MCU_SELECT_MUX_0, + F_MCU_SELECT_MUX_1, + + F_FORCE_HOST_RADIO_CTRL, + F_FORCE_HOST_FE_CTRL, + F_FORCE_DEC_FILTER_GAIN, + + F_EMERGENCY_FORCE_HOST_CTRL, +}; + +static const struct reg_field sx1301_regmap_fields[] = { + /* PAGE */ + [F_SOFT_RESET] = REG_FIELD(SX1301_PAGE, 7, 7), + /* GEN */ + [F_GLOBAL_EN] = REG_FIELD(SX1301_GEN, 3, 3), + /* CKEN */ + [F_CLK32M_EN] = REG_FIELD(SX1301_CKEN, 0, 0), + /* RADIO_CFG */ + [F_RADIO_A_EN] = REG_FIELD(SX1301_RADIO_CFG, 0, 0), + [F_RADIO_B_EN] = REG_FIELD(SX1301_RADIO_CFG, 1, 1), + [F_RADIO_RST] = REG_FIELD(SX1301_RADIO_CFG, 2, 2), + /* MCU_CTRL */ + [F_MCU_RST_0] = REG_FIELD(SX1301_MCU_CTRL, 0, 0), + [F_MCU_RST_1] = REG_FIELD(SX1301_MCU_CTRL, 1, 1), + [F_MCU_SELECT_MUX_0] = REG_FIELD(SX1301_MCU_CTRL, 2, 2), + [F_MCU_SELECT_MUX_1] = REG_FIELD(SX1301_MCU_CTRL, 3, 3), + /* FORCE_CTRL */ + [F_FORCE_HOST_RADIO_CTRL] = REG_FIELD(SX1301_FORCE_CTRL, 1, 1), + [F_FORCE_HOST_FE_CTRL] = REG_FIELD(SX1301_FORCE_CTRL, 2, 2), + [F_FORCE_DEC_FILTER_GAIN] = REG_FIELD(SX1301_FORCE_CTRL, 3, 3), + /* EMERGENCY_FORCE_HOST_CTRL */ + [F_EMERGENCY_FORCE_HOST_CTRL] = + REG_FIELD(SX1301_EMERGENCY_FORCE_HOST_CTRL, 0, 0), +}; + struct sx1301_priv { struct lora_dev_priv lora; struct device *dev; struct gpio_desc *rst_gpio; struct regmap *regmap; + struct regmap_field *regmap_fields[ARRAY_SIZE(sx1301_regmap_fields)]; }; int __init sx130x_radio_init(void); From patchwork Tue Oct 9 12:52:11 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ben Whitten X-Patchwork-Id: 981184 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="uvh+7X/Q"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 42Txvx3TGqz9s9G for ; Tue, 9 Oct 2018 23:52:29 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726986AbeJIUJP (ORCPT ); Tue, 9 Oct 2018 16:09:15 -0400 Received: from mail-wr1-f68.google.com ([209.85.221.68]:45536 "EHLO mail-wr1-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726862AbeJIUJN (ORCPT ); Tue, 9 Oct 2018 16:09:13 -0400 Received: by mail-wr1-f68.google.com with SMTP id q5-v6so1682009wrw.12 for ; Tue, 09 Oct 2018 05:52:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=vykvvw6z8KbAShDoVOxsMwloQTTl5qXhoxhjAjE5d9g=; b=uvh+7X/Q4iHTkONa+Lew7Z28sjH++mL1JLgx0tqFKoPCuLL4AOQvSXY05gp3Tfl/YX OGXPRkKGxdTa2IKMYQG+YMdQpKF0/j/FdwlxxazfBYuORIhcyS/dbTTXRbFfj6HBbk/8 vWMtKSzs5sjXkm5k+sD/oLn2MzqzLX75XwvkVHSeQ1JTanT0875pPmZMKZEdG/b0Ai8R 57/1JrOm8GS1LmHW9RQy80CR/L2CY7IffGm6uzRuoYACopz1al4vogaEgT/OwoDlOgMi W/eK0cmk9Jpogf+uLNr+iuas+dHZ+S0dCi3kME5Sxb+6aFiGbhVIjrTH2o1ZLhCFZU4G Z0jg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=vykvvw6z8KbAShDoVOxsMwloQTTl5qXhoxhjAjE5d9g=; b=V6ZVOUztXmMVdN0XypydQET2CThzpCcDCMUNsw6r4dogWvQ/qREe84pbm/BeRjIAWi xFq9bJR8CwsfMdlKOEncHIB5DLP3zJBQeQaZFjwE/I72VIXJU8jKtZoYtBKNmyKqG0kZ MXBl8Wc1tjip9pyXTop5Rn7/HJB3tJ6Ujo6VYhbnoFmo0Vmp+Y04dRknFyO2gNAmkMAn brYUSz0sbFSG/0DIkPyIebXN0eVOg33WR5bJ6AqLfU5vVaODneksV/bAyB+araNC++ji uttbdfBS7o6ZL44T073KAGZiUmOMxM12orxb8sbSFasSDgsAtPUq9Enb4IbhaGmywAaE va+w== X-Gm-Message-State: ABuFfoi7QXWWU8y8Msyr2HpB0yFUjYGDz6DvQK+w/GpWp66J32kPgvkG eTeEwCVo1jjrlyoZODyWYuY= X-Google-Smtp-Source: ACcGV60bBB+OnkrIShISI9ZJ2X5rUC4m9wEnNAXSH92llFraJq6NH7ymnVt06B7o7wlNxhNATQ7uIA== X-Received: by 2002:a5d:47cb:: with SMTP id l11-v6mr19883434wrs.195.1539089543222; Tue, 09 Oct 2018 05:52:23 -0700 (PDT) Received: from Sarah.corp.lairdtech.com ([109.174.151.67]) by smtp.gmail.com with ESMTPSA id g3-v6sm17216942wrw.81.2018.10.09.05.52.22 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 09 Oct 2018 05:52:22 -0700 (PDT) From: Ben Whitten X-Google-Original-From: Ben Whitten To: afaerber@suse.de Cc: starnight@g.ncu.edu.tw, hasnain.virk@arm.com, netdev@vger.kernel.org, liuxuenetmail@gmail.com, shess@hessware.de, Ben Whitten Subject: [PATCH v2 lora-next 3/4] net: lora: sx125x: convert to regmap fields Date: Tue, 9 Oct 2018 13:52:11 +0100 Message-Id: <1539089532-2481-4-git-send-email-ben.whitten@lairdtech.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1539089532-2481-1-git-send-email-ben.whitten@lairdtech.com> References: <1539089532-2481-1-git-send-email-ben.whitten@lairdtech.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Ben Whitten We convert to using regmap fields to allow regmap to take care of read modify writes and bit shifting for ofset fields. Signed-off-by: Ben Whitten --- drivers/net/lora/sx125x.c | 59 ++++++++++++++++++++++++++++++++++++++++------- 1 file changed, 51 insertions(+), 8 deletions(-) diff --git a/drivers/net/lora/sx125x.c b/drivers/net/lora/sx125x.c index dc13d1a..36b61b1 100644 --- a/drivers/net/lora/sx125x.c +++ b/drivers/net/lora/sx125x.c @@ -25,11 +25,25 @@ #include "sx125x.h" -#define REG_CLK_SELECT_TX_DAC_CLK_SELECT_CLK_IN BIT(0) -#define REG_CLK_SELECT_CLK_OUT BIT(1) +enum sx125x_fields { + F_CLK_OUT, + F_TX_DAC_CLK_SEL, + F_SX1257_XOSC_GM_STARTUP, + F_SX1257_XOSC_DISABLE_CORE, +}; + +static const struct reg_field sx125x_regmap_fields[] = { + /* CLK_SELECT */ + [F_CLK_OUT] = REG_FIELD(SX125X_CLK_SELECT, 1, 1), + [F_TX_DAC_CLK_SEL] = REG_FIELD(SX125X_CLK_SELECT, 0, 0), + /* XOSC */ /* TODO maybe make this dynamic */ + [F_SX1257_XOSC_GM_STARTUP] = REG_FIELD(SX1257_XOSC, 0, 3), + [F_SX1257_XOSC_DISABLE_CORE] = REG_FIELD(SX1257_XOSC, 5, 5), +}; struct sx125x_priv { struct regmap *regmap; + struct regmap_field *regmap_fields[ARRAY_SIZE(sx125x_regmap_fields)]; }; static struct regmap_config __maybe_unused sx125x_regmap_config = { @@ -44,11 +58,18 @@ static struct regmap_config __maybe_unused sx125x_regmap_config = { .max_register = SX125X_MAX_REGISTER, }; +static int sx125x_field_write(struct sx125x_priv *priv, + enum sx125x_fields field_id, u8 val) +{ + return regmap_field_write(priv->regmap_fields[field_id], val); +} + static int __maybe_unused sx125x_regmap_probe(struct device *dev, struct regmap *regmap, unsigned int radio) { struct sx125x_priv *priv; unsigned int val; int ret; + int i; priv = devm_kzalloc(dev, sizeof(*priv), GFP_KERNEL); if (!priv) @@ -56,6 +77,18 @@ static int __maybe_unused sx125x_regmap_probe(struct device *dev, struct regmap dev_set_drvdata(dev, priv); priv->regmap = regmap; + for (i = 0; i < ARRAY_SIZE(sx125x_regmap_fields); i++) { + const struct reg_field *reg_fields = sx125x_regmap_fields; + + priv->regmap_fields[i] = devm_regmap_field_alloc(dev, + priv->regmap, + reg_fields[i]); + if (IS_ERR(priv->regmap_fields[i])) { + ret = PTR_ERR(priv->regmap_fields[i]); + dev_err(dev, "Cannot allocate regmap field: %d\n", ret); + return ret; + } + } if (true) { ret = regmap_read(priv->regmap, SX1255_VERSION, &val); @@ -66,24 +99,34 @@ static int __maybe_unused sx125x_regmap_probe(struct device *dev, struct regmap dev_info(dev, "SX125x version: %02x\n", val); } - val = REG_CLK_SELECT_TX_DAC_CLK_SELECT_CLK_IN; if (radio == 1) { /* HACK */ - val |= REG_CLK_SELECT_CLK_OUT; + ret = sx125x_field_write(priv, F_CLK_OUT, 1); + if (ret) { + dev_err(dev, "enabling clock output failed\n"); + return ret; + } + dev_info(dev, "enabling clock output\n"); } - ret = regmap_write(priv->regmap, SX125X_CLK_SELECT, val); + ret = sx125x_field_write(priv, F_TX_DAC_CLK_SEL, 1); if (ret) { - dev_err(dev, "clk write failed\n"); + dev_err(dev, "clock select failed\n"); return ret; } dev_dbg(dev, "clk written\n"); if (true) { - ret = regmap_write(priv->regmap, SX1257_XOSC, 13 + 2 * 16); + ret = sx125x_field_write(priv, F_SX1257_XOSC_DISABLE_CORE, 1); + if (ret) { + dev_err(dev, "xosc disable failed\n"); + return ret; + } + + ret = sx125x_field_write(priv, F_SX1257_XOSC_GM_STARTUP, 13); if (ret) { - dev_err(dev, "xosc write failed\n"); + dev_err(dev, "xosc startup adjust failed\n"); return ret; } } From patchwork Tue Oct 9 12:52:12 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ben Whitten X-Patchwork-Id: 981185 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="IXt/b8Cq"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 42Txvy4MSvz9s89 for ; Tue, 9 Oct 2018 23:52:30 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726996AbeJIUJQ (ORCPT ); Tue, 9 Oct 2018 16:09:16 -0400 Received: from mail-wr1-f68.google.com ([209.85.221.68]:43472 "EHLO mail-wr1-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726418AbeJIUJP (ORCPT ); Tue, 9 Oct 2018 16:09:15 -0400 Received: by mail-wr1-f68.google.com with SMTP id n1-v6so1693949wrt.10 for ; Tue, 09 Oct 2018 05:52:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=3hcLtoIx+3RMJy1iKFY0lbX0ZhVJFQV9l0heT1OGdaw=; b=IXt/b8CqRfX5c9DPBTiXjbbcHSgOw9adHNyr634tiMauYM3M1pRx5EOQLA7SuQ27JY H5umkL3QLoh1sdN2/CTM3gpqR/Q7bo5SQWygQpdwKlnAALjd2q79tie2np/tDxxI1J4N XQfTKFY8KhrolwkJ3EmZgPQ6iWrUoH7lG2ysbY9yoG5uhpfUaXtirlW+k7qd0N/KdNgl U65Q1EUc1xWZKe92o5IuO0N8JSZloMPaodpnUXzVM/DPiKKXlD+g9qgV7HTTV8rxbt3Y +AX7b4cvuWe4Uhw7OlX2PLuEOntkvDIKnSYrY+NDvBPtHHmfMHjMfcXmL584t3LdzRbt X/Sw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=3hcLtoIx+3RMJy1iKFY0lbX0ZhVJFQV9l0heT1OGdaw=; b=SwRCaHXh3l55NQeyRSdY4R+K5B5XrBep6lgHbJJLgTGXLAKgF3zoqjKAKx7aMHzO17 BGBYWJnzaL/hvIgBJ3nbSpZ9V0TZSvKs70HZ4S5dBMR7i0sO90kQZAC/ZylFmreVUHrc SlBUDw3Atyb40oH1AGNesShrwuO3rNypTDSsbqJFUiO2JK146VgL/h0PjqM1DbSdhIZE 0212XdNX0P1AA+Kv26FrRnRcNbHG/T8p808EgrZjM35A6ik7W3WzM+G6MNOkLUE5oKv8 zAeBTy+IzBk+eS7ofjWeYNslBejEO18v8ehFyoz8sjKM6cdaQ6VZf6suvHQ56erTzeyV wQ9A== X-Gm-Message-State: ABuFfojeToOnTFA/qMYi+ngylcw1eGfJetzVtxZ8aq0YN6f+kuIfHblH o8+9nT6AdVJzYBmD9+4l6HHTtubs8Er6Ow== X-Google-Smtp-Source: ACcGV63F31MeYYtRu7AUh1uAHSHU1/erN08LARwtXrM0wFQPVecSuToovV/Vt/7XNd0HVAavfDgA2g== X-Received: by 2002:a5d:694c:: with SMTP id r12-v6mr18726197wrw.170.1539089544550; Tue, 09 Oct 2018 05:52:24 -0700 (PDT) Received: from Sarah.corp.lairdtech.com ([109.174.151.67]) by smtp.gmail.com with ESMTPSA id g3-v6sm17216942wrw.81.2018.10.09.05.52.23 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 09 Oct 2018 05:52:23 -0700 (PDT) From: Ben Whitten X-Google-Original-From: Ben Whitten To: afaerber@suse.de Cc: starnight@g.ncu.edu.tw, hasnain.virk@arm.com, netdev@vger.kernel.org, liuxuenetmail@gmail.com, shess@hessware.de, Ben Whitten Subject: [PATCH v2 lora-next 4/4] net: lora: sx125x sx1301: allow radio to register as a clk provider Date: Tue, 9 Oct 2018 13:52:12 +0100 Message-Id: <1539089532-2481-5-git-send-email-ben.whitten@lairdtech.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1539089532-2481-1-git-send-email-ben.whitten@lairdtech.com> References: <1539089532-2481-1-git-send-email-ben.whitten@lairdtech.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Ben Whitten The 32M is run from the radio, before we just enabled it based on the radio number but now we can use the clk framework to request the clk is started when we need it. The 32M clock produced from the radio is really a gated version of tcxo which is a fixed clock provided by hardware, and isn't captured in this patch. The sx1301 brings the clock up prior to calibration once the radios have probed themselves. A sample dts showing the clk link: sx1301: sx1301@0 { ... clocks = <&radio1 0>; clock-names = "clk32m"; radio-spi { radio0: radio-a@0 { ... }; radio1: radio-b@1 { #clock-cells = <0>; clock-output-names = "clk32m"; }; }; }; Signed-off-by: Ben Whitten --- drivers/net/lora/sx125x.c | 112 ++++++++++++++++++++++++++++++++++++++++++---- drivers/net/lora/sx1301.c | 13 ++++++ drivers/net/lora/sx1301.h | 2 + 3 files changed, 119 insertions(+), 8 deletions(-) diff --git a/drivers/net/lora/sx125x.c b/drivers/net/lora/sx125x.c index 36b61b1..b7ca782 100644 --- a/drivers/net/lora/sx125x.c +++ b/drivers/net/lora/sx125x.c @@ -9,6 +9,8 @@ * Copyright (c) 2013 Semtech-Cycleo */ +#include +#include #include #include #include @@ -42,10 +44,16 @@ static const struct reg_field sx125x_regmap_fields[] = { }; struct sx125x_priv { + struct clk *clkout; + struct clk_hw clkout_hw; + + struct device *dev; struct regmap *regmap; struct regmap_field *regmap_fields[ARRAY_SIZE(sx125x_regmap_fields)]; }; +#define to_clkout(_hw) container_of(_hw, struct sx125x_priv, clkout_hw) + static struct regmap_config __maybe_unused sx125x_regmap_config = { .reg_bits = 8, .val_bits = 8, @@ -64,6 +72,96 @@ static int sx125x_field_write(struct sx125x_priv *priv, return regmap_field_write(priv->regmap_fields[field_id], val); } +static int sx125x_field_read(struct sx125x_priv *priv, + enum sx125x_fields field_id, unsigned int *val) +{ + return regmap_field_read(priv->regmap_fields[field_id], val); +} + +static int sx125x_clkout_enable(struct clk_hw *hw) +{ + struct sx125x_priv *priv = to_clkout(hw); + + dev_info(priv->dev, "enabling clkout\n"); + return sx125x_field_write(priv, F_CLK_OUT, 1); +} + +static void sx125x_clkout_disable(struct clk_hw *hw) +{ + struct sx125x_priv *priv = to_clkout(hw); + int ret; + + dev_info(priv->dev, "disabling clkout\n"); + ret = sx125x_field_write(priv, F_CLK_OUT, 0); + if (ret) + dev_err(priv->dev, "error disabling clkout\n"); +} + +static int sx125x_clkout_is_enabled(struct clk_hw *hw) +{ + struct sx125x_priv *priv = to_clkout(hw); + unsigned int enabled; + int ret; + + ret = sx125x_field_read(priv, F_CLK_OUT, &enabled); + if (ret) { + dev_err(priv->dev, "error reading clk enable\n"); + return 0; + } + return enabled; +} + +static const struct clk_ops sx125x_clkout_ops = { + .enable = sx125x_clkout_enable, + .disable = sx125x_clkout_disable, + .is_enabled = sx125x_clkout_is_enabled, +}; + +static int sx125x_register_clock_provider(struct sx125x_priv *priv) +{ + struct device *dev = priv->dev; + struct clk_init_data init; + const char *parent; + int ret; + + /* Disable CLKOUT */ + ret = sx125x_field_write(priv, F_CLK_OUT, 0); + if (ret) { + dev_err(dev, "unable to disable clkout\n"); + return ret; + } + + /* Register clock provider if expected in DTB */ + if (!of_find_property(dev->of_node, "#clock-cells", NULL)) + return 0; + + dev_info(dev, "registering clkout\n"); + + parent = of_clk_get_parent_name(dev->of_node, 0); + if (!parent) { + dev_err(dev, "Unable to find parent clk\n"); + return -ENODEV; + } + + init.ops = &sx125x_clkout_ops; + init.flags = CLK_IS_BASIC; + init.parent_names = &parent; + init.num_parents = 1; + priv->clkout_hw.init = &init; + + of_property_read_string_index(dev->of_node, "clock-output-names", 0, + &init.name); + + priv->clkout = devm_clk_register(dev, &priv->clkout_hw); + if (IS_ERR(priv->clkout)) { + dev_err(dev, "failed to register clkout\n"); + return PTR_ERR(priv->clkout); + } + ret = of_clk_add_hw_provider(dev->of_node, of_clk_hw_simple_get, + &priv->clkout_hw); + return ret; +} + static int __maybe_unused sx125x_regmap_probe(struct device *dev, struct regmap *regmap, unsigned int radio) { struct sx125x_priv *priv; @@ -76,6 +174,7 @@ static int __maybe_unused sx125x_regmap_probe(struct device *dev, struct regmap return -ENOMEM; dev_set_drvdata(dev, priv); + priv->dev = dev; priv->regmap = regmap; for (i = 0; i < ARRAY_SIZE(sx125x_regmap_fields); i++) { const struct reg_field *reg_fields = sx125x_regmap_fields; @@ -99,16 +198,13 @@ static int __maybe_unused sx125x_regmap_probe(struct device *dev, struct regmap dev_info(dev, "SX125x version: %02x\n", val); } - if (radio == 1) { /* HACK */ - ret = sx125x_field_write(priv, F_CLK_OUT, 1); - if (ret) { - dev_err(dev, "enabling clock output failed\n"); - return ret; - } - - dev_info(dev, "enabling clock output\n"); + ret = sx125x_register_clock_provider(priv); + if (ret) { + dev_err(dev, "failed to register clkout provider: %d\n", ret); + return ret; } + /* TODO Only needs setting on radio on the TX path */ ret = sx125x_field_write(priv, F_TX_DAC_CLK_SEL, 1); if (ret) { dev_err(dev, "clock select failed\n"); diff --git a/drivers/net/lora/sx1301.c b/drivers/net/lora/sx1301.c index eb89af6..44a7d0b 100644 --- a/drivers/net/lora/sx1301.c +++ b/drivers/net/lora/sx1301.c @@ -10,6 +10,7 @@ */ #include +#include #include #include #include @@ -404,6 +405,18 @@ static int sx130x_loradev_open(struct net_device *netdev) return -ENXIO; } + priv->clk32m = devm_clk_get(priv->dev, "clk32m"); + if (IS_ERR(priv->clk32m)) { + dev_err(priv->dev, "failed to get clk32m\n"); + return PTR_ERR(priv->clk32m); + } + + ret = clk_prepare_enable(priv->clk32m); + if (ret) { + dev_err(priv->dev, "failed to enable clk32m: %d\n", ret); + return ret; + } + ret = sx1301_field_write(priv, F_GLOBAL_EN, 1); if (ret) { dev_err(priv->dev, "enable global clocks failed\n"); diff --git a/drivers/net/lora/sx1301.h b/drivers/net/lora/sx1301.h index 0bbd948..a1a2e38 100644 --- a/drivers/net/lora/sx1301.h +++ b/drivers/net/lora/sx1301.h @@ -9,6 +9,7 @@ #ifndef _SX1301_ #define _SX1301_ +#include #include #include #include @@ -108,6 +109,7 @@ static const struct reg_field sx1301_regmap_fields[] = { struct sx1301_priv { struct lora_dev_priv lora; struct device *dev; + struct clk *clk32m; struct gpio_desc *rst_gpio; struct regmap *regmap; struct regmap_field *regmap_fields[ARRAY_SIZE(sx1301_regmap_fields)];