From patchwork Mon Aug 15 06:16:17 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcus Folkesson X-Patchwork-Id: 12943136 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2B8E3C25B0E for ; Mon, 15 Aug 2022 06:12:02 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240383AbiHOGMA (ORCPT ); Mon, 15 Aug 2022 02:12:00 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42106 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233220AbiHOGL4 (ORCPT ); Mon, 15 Aug 2022 02:11:56 -0400 Received: from mail-lf1-x131.google.com (mail-lf1-x131.google.com [IPv6:2a00:1450:4864:20::131]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 943CB18E08; Sun, 14 Aug 2022 23:11:50 -0700 (PDT) Received: by mail-lf1-x131.google.com with SMTP id a9so9368100lfm.12; Sun, 14 Aug 2022 23:11:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc; bh=FbGrIGAHhJp/faYmz82qs7Q5FS2VF0GR2GJ1cl1M5UM=; b=D1+OfmD5GO0fpiE6Lg9OK7DkGEUiFx3zRisIdjz+INm0JGQTec0sZw8GmX2TmQtqeU /RdjvlmAV2HoCAcHvKspftXHohupEZUp6R16QV3zixbcWO6NWDshzUIYO2MQzVVwVbQp 19E3HH8bAWFqNOMccDRkeURejCYMTRGrvxy/4ToYckCdL2s7D/YvK7BvPMqZ6FtdQpu6 EqosJZ3UIK0NlqbA+bmH1EB02h+3qHkFcDUgjoLe6gqmHolqivuIjZCa9K+QrPc+koVa vvYvpb3fDiN6icLjwkQviNFSXG4VNGQ6hSv7RbHySkH7mMDBqelmMhQLo/DmXi1K+WxU xyJg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc; bh=FbGrIGAHhJp/faYmz82qs7Q5FS2VF0GR2GJ1cl1M5UM=; b=l6zPFElmyvYelXdzsfPpVMqXqs6YL+ltyd5k1fu8/JpSFGkL+hcP3jacQf44Kbs5ak ywGcBkFB0/yA4DiSpXuBqmJcqtEvVqtA9eglq8ZXU1Z7hEbwZ611+eyM0lptOf1/CruD U5Kf9BqkxetTp1So8Gb4DnlQreZ+8ppnX2iItGZO8WLFoTkXXtNiyXNwEsU012UhAgUN m1TLUNFyO8ra5Wu7tRSi1R8yebun963Ycw5VdPbyJ6KCLRfGK19rGq7/GgoOfDUUpL6+ 9gR0faJVFWq4up1+r7n8QidvNzKHqDRDjqg5+vm7wiBo4JLuz/hnUZdbRRr+a+SmjuVr 0pEA== X-Gm-Message-State: ACgBeo20qgbL5W+Z0nMnDdcmEu2u0QPsBp9AAFnZhIjSnV7Sb/uvAMr4 Qn6CDNEuOTWmG6YpmcjAzio= X-Google-Smtp-Source: AA6agR7twZGn5lbQI9YIb5xA2ZLMQ63l2OF8VH3d4tCkAz4l0ySOJ9Na/V8BrK7X72O/OGrVbIwfxw== X-Received: by 2002:a05:6512:13a4:b0:477:a28a:2280 with SMTP id p36-20020a05651213a400b00477a28a2280mr4640624lfa.689.1660543908834; Sun, 14 Aug 2022 23:11:48 -0700 (PDT) Received: from localhost.localdomain (82-209-154-112.cust.bredband2.com. [82.209.154.112]) by smtp.gmail.com with ESMTPSA id g17-20020a2eb5d1000000b0025d70efeaaasm1296464ljn.75.2022.08.14.23.11.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 14 Aug 2022 23:11:48 -0700 (PDT) From: Marcus Folkesson To: Marcus Folkesson , Kent Gustavsson , Jonathan Cameron , Lars-Peter Clausen , Rob Herring , Krzysztof Kozlowski , Andy Shevchenko Cc: linux-iio@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v6 1/9] iio: adc: mcp3911: make use of the sign bit Date: Mon, 15 Aug 2022 08:16:17 +0200 Message-Id: <20220815061625.35568-2-marcus.folkesson@gmail.com> X-Mailer: git-send-email 2.37.1 In-Reply-To: <20220815061625.35568-1-marcus.folkesson@gmail.com> References: <20220815061625.35568-1-marcus.folkesson@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-iio@vger.kernel.org The device supports negative values as well. Fixes: 3a89b289df5d ("iio: adc: add support for mcp3911") Signed-off-by: Marcus Folkesson Reviewed-by: Andy Shevchenko --- drivers/iio/adc/mcp3911.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/iio/adc/mcp3911.c b/drivers/iio/adc/mcp3911.c index 1cb4590fe412..f581cefb6719 100644 --- a/drivers/iio/adc/mcp3911.c +++ b/drivers/iio/adc/mcp3911.c @@ -113,6 +113,8 @@ static int mcp3911_read_raw(struct iio_dev *indio_dev, if (ret) goto out; + *val = sign_extend32(*val, 23); + ret = IIO_VAL_INT; break; From patchwork Mon Aug 15 06:16:18 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcus Folkesson X-Patchwork-Id: 12943135 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id C9CB3C00140 for ; Mon, 15 Aug 2022 06:12:01 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S239757AbiHOGL6 (ORCPT ); Mon, 15 Aug 2022 02:11:58 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42108 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229883AbiHOGL4 (ORCPT ); Mon, 15 Aug 2022 02:11:56 -0400 Received: from mail-lf1-x12c.google.com (mail-lf1-x12c.google.com [IPv6:2a00:1450:4864:20::12c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BF63818E09; Sun, 14 Aug 2022 23:11:51 -0700 (PDT) Received: by mail-lf1-x12c.google.com with SMTP id r17so9372198lfm.11; Sun, 14 Aug 2022 23:11:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc; bh=KE7Doo8+PSeMnrmOEri8h44PeWIbSZ8XCkY/na8+SzA=; b=VmBDoQQ9WGgBw/vh9zx81bo1VrynPsT4KZqrCk5M77yMWq0tPdBUHK953G3Eel4vIP k+TN3ydT9hw355/+QhomoIT3aVEUzvKQk16GNxWb53JbhWZBR3iHBL+vu0GlEu/bDcrX 6UWWpwN8QWcO6HcRIeIwr82vh90o8xrGW4VjL1BB6drq8TjEJMGGMONFk3Ioi7W9V3Im wYKdXUma3CngzpOS1+ddB/xH0H8rxAiUXqYttJvZEy6DY4cDtYeh3l/pDSUSojDSwVjM z8JHhidA7thK3SvWfr4gS1Lh0LiJeZk9JXUxhLs2+tJQMQbyTUcYxZAU4RsFEGkI6EMy myqA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc; bh=KE7Doo8+PSeMnrmOEri8h44PeWIbSZ8XCkY/na8+SzA=; b=obTmv7Z8dILtHM4R7tO4XlIdD/E55K1K/IpTfouJA+5TYXoaBb9TFDYFgvyaFuMotD JAMowEyMpEa5hsZ8+qBtfHmgmZW0mxS+Q2G9jtn9EGmpMxwZ1WpCUzCD+CU5ozC55kl9 ohboZzU2NwMt7rOUmo6T4loCRh2rTSjusuA+DdrG4tzuGyKd/JZXIqKmZ3/X9WMc8Ir9 LqPUSKRCSJI6UWf2C5fAhFKYuYKyX70OquvM71sWA+83sVCxm1k6GlLq/4kG1KhbPZgu 3wwtAItRYN6ABpvbUUtG7FsAxleUQZzIAs9UqpSqzcF0l/uSbr2+lMQFfmHELFcFbZX1 BmhA== X-Gm-Message-State: ACgBeo1etnse0sxYzKh2PM78tnt+Jb7HflncVR7zkkRMm5mJmxItSuNB Ahjf3rV62T+ON6ABFeW1FII= X-Google-Smtp-Source: AA6agR6CG2hZmlkRXjNXVTCywbA+MLg4k5oVAR7dgkG5A0gAVZlQajUGkKSwZsVWw4fgG8gCKxm/tA== X-Received: by 2002:ac2:4c81:0:b0:48a:e6de:213d with SMTP id d1-20020ac24c81000000b0048ae6de213dmr4903521lfl.366.1660543910105; Sun, 14 Aug 2022 23:11:50 -0700 (PDT) Received: from localhost.localdomain (82-209-154-112.cust.bredband2.com. [82.209.154.112]) by smtp.gmail.com with ESMTPSA id g17-20020a2eb5d1000000b0025d70efeaaasm1296464ljn.75.2022.08.14.23.11.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 14 Aug 2022 23:11:49 -0700 (PDT) From: Marcus Folkesson To: Marcus Folkesson , Kent Gustavsson , Jonathan Cameron , Lars-Peter Clausen , Rob Herring , Krzysztof Kozlowski , Andy Shevchenko Cc: linux-iio@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v6 2/9] iio: adc: mcp3911: correct "microchip,device-addr" property Date: Mon, 15 Aug 2022 08:16:18 +0200 Message-Id: <20220815061625.35568-3-marcus.folkesson@gmail.com> X-Mailer: git-send-email 2.37.1 In-Reply-To: <20220815061625.35568-1-marcus.folkesson@gmail.com> References: <20220815061625.35568-1-marcus.folkesson@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-iio@vger.kernel.org Go for the right property name that is documented in the bindings. Fixes: 3a89b289df5d ("iio: adc: add support for mcp3911") Signed-off-by: Marcus Folkesson Reviewed-by: Andy Shevchenko --- drivers/iio/adc/mcp3911.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/drivers/iio/adc/mcp3911.c b/drivers/iio/adc/mcp3911.c index f581cefb6719..f8875076ae80 100644 --- a/drivers/iio/adc/mcp3911.c +++ b/drivers/iio/adc/mcp3911.c @@ -210,7 +210,14 @@ static int mcp3911_config(struct mcp3911 *adc) u32 configreg; int ret; - device_property_read_u32(dev, "device-addr", &adc->dev_addr); + ret = device_property_read_u32(dev, "microchip,device-addr", &adc->dev_addr); + + /* + * Fallback to "device-addr" due to historical mismatch between + * dt-bindings and implementation + */ + if (ret) + device_property_read_u32(dev, "device-addr", &adc->dev_addr); if (adc->dev_addr > 3) { dev_err(&adc->spi->dev, "invalid device address (%i). Must be in range 0-3.\n", From patchwork Mon Aug 15 06:16:19 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcus Folkesson X-Patchwork-Id: 12943140 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id D849FC282E7 for ; Mon, 15 Aug 2022 06:13:11 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240828AbiHOGMn (ORCPT ); Mon, 15 Aug 2022 02:12:43 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42174 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S239909AbiHOGL7 (ORCPT ); Mon, 15 Aug 2022 02:11:59 -0400 Received: from mail-lf1-x131.google.com (mail-lf1-x131.google.com [IPv6:2a00:1450:4864:20::131]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1192418E0C; Sun, 14 Aug 2022 23:11:53 -0700 (PDT) Received: by mail-lf1-x131.google.com with SMTP id r17so9372257lfm.11; Sun, 14 Aug 2022 23:11:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc; bh=ZnlLRiHQsCpOZ8GUpmYe1fQICBNpJYF4yJ5P9XeXI20=; b=pLe3EbU08HPX/hE5ab2YnG5HutPXIisYwVbhzo82pYYFC69kO3t8IRHDiapXgHCU5H lfduR7eAOX3NAOQiWU26Q6x+ZTCU1w3FmgbVvXnjKlRBT+GrgIiACHeOsQ7ApjwuFvzT yaME+Xw4kuw1k6J8iJp3qKeAe8PwEoQQfmCF2AN5Po4o/hRinsikJcRpdkQ+MzV6HWWz FPL3mj047Vg8agEphXPSmWwa8LbhtzfN92VhkQpjsTfTHoYiLlFYqGCHWEFriwg/vy8o cIcQGJ7kiwE182jbMC3Z5cSZEMX8d/JxWkojjrhzTcbvozoW/R18xQQ9ePMMelor3y0m SZmQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc; bh=ZnlLRiHQsCpOZ8GUpmYe1fQICBNpJYF4yJ5P9XeXI20=; b=JiUpXlkpIOODDgZH3QhErzfK0g3R+Jak1xDk13FuBROXHDHGoH9FQBAhQzpo5VgjY6 5BfXY1AtfOZwusZZJH/ewc3w+gHBxsLoCK1xOjNCa2dsxeMK535IPG7se71VzGSkRqN6 ZQ6GGQpOSiREofu8dJamRHt+SwrCR0xK9PuAL5Zov/zbAOfTwiUjHKkV/Y3VjbQtnwhz qZ9EemPxb1L/X0wCGmXuBUPFGveJ9arfMQMKDD+hpxENT0p7ZFu2Bt21CxMKr1QTGVpD MsqHwBR+8BFNIHsBvwmgH7z+oqUHW50hA6L3NHns7MsSRywzvrBd/gldC63UBXdDppS7 15+g== X-Gm-Message-State: ACgBeo25cVlF5q44dGeqTWla1L0gKX6ibMcB8wwnE8If+5nfAZ7Vkh6U Ms5Rm9i9KfCGi70MQHwtEAY= X-Google-Smtp-Source: AA6agR7uwZ1BQT7z7B1+ytAxs9fjrKlgcefo/Z44vdyPmR5Q2nChoF8ZJoTpVoFRcMoBQKfzhDuQVQ== X-Received: by 2002:a05:6512:3ba9:b0:48a:e66b:77c3 with SMTP id g41-20020a0565123ba900b0048ae66b77c3mr4686602lfv.204.1660543911410; Sun, 14 Aug 2022 23:11:51 -0700 (PDT) Received: from localhost.localdomain (82-209-154-112.cust.bredband2.com. [82.209.154.112]) by smtp.gmail.com with ESMTPSA id g17-20020a2eb5d1000000b0025d70efeaaasm1296464ljn.75.2022.08.14.23.11.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 14 Aug 2022 23:11:50 -0700 (PDT) From: Marcus Folkesson To: Marcus Folkesson , Kent Gustavsson , Jonathan Cameron , Lars-Peter Clausen , Rob Herring , Krzysztof Kozlowski , Andy Shevchenko Cc: linux-iio@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v6 3/9] iio: adc: mcp3911: use correct formula for AD conversion Date: Mon, 15 Aug 2022 08:16:19 +0200 Message-Id: <20220815061625.35568-4-marcus.folkesson@gmail.com> X-Mailer: git-send-email 2.37.1 In-Reply-To: <20220815061625.35568-1-marcus.folkesson@gmail.com> References: <20220815061625.35568-1-marcus.folkesson@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-iio@vger.kernel.org The ADC conversion is actually not rail-to-rail but with a factor 1.5. Make use of this factor when calculating actual voltage. Fixes: 3a89b289df5d ("iio: adc: add support for mcp3911") Signed-off-by: Marcus Folkesson Reviewed-by: Andy Shevchenko --- drivers/iio/adc/mcp3911.c | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/drivers/iio/adc/mcp3911.c b/drivers/iio/adc/mcp3911.c index f8875076ae80..890af7dca62d 100644 --- a/drivers/iio/adc/mcp3911.c +++ b/drivers/iio/adc/mcp3911.c @@ -40,8 +40,8 @@ #define MCP3911_CHANNEL(x) (MCP3911_REG_CHANNEL0 + x * 3) #define MCP3911_OFFCAL(x) (MCP3911_REG_OFFCAL_CH0 + x * 6) -/* Internal voltage reference in uV */ -#define MCP3911_INT_VREF_UV 1200000 +/* Internal voltage reference in mV */ +#define MCP3911_INT_VREF_MV 1200 #define MCP3911_REG_READ(reg, id) ((((reg) << 1) | ((id) << 5) | (1 << 0)) & 0xff) #define MCP3911_REG_WRITE(reg, id) ((((reg) << 1) | ((id) << 5) | (0 << 0)) & 0xff) @@ -139,11 +139,18 @@ static int mcp3911_read_raw(struct iio_dev *indio_dev, *val = ret / 1000; } else { - *val = MCP3911_INT_VREF_UV; + *val = MCP3911_INT_VREF_MV; } - *val2 = 24; - ret = IIO_VAL_FRACTIONAL_LOG2; + /* + * For 24bit Conversion + * Raw = ((Voltage)/(Vref) * 2^23 * Gain * 1.5 + * Voltage = Raw * (Vref)/(2^23 * Gain * 1.5) + */ + + /* val2 = (2^23 * 1.5) */ + *val2 = 12582912; + ret = IIO_VAL_FRACTIONAL; break; } From patchwork Mon Aug 15 06:16:20 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcus Folkesson X-Patchwork-Id: 12943138 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 39A70C282E7 for ; Mon, 15 Aug 2022 06:12:09 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240843AbiHOGMH (ORCPT ); Mon, 15 Aug 2022 02:12:07 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42322 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240434AbiHOGMD (ORCPT ); Mon, 15 Aug 2022 02:12:03 -0400 Received: from mail-lf1-x133.google.com (mail-lf1-x133.google.com [IPv6:2a00:1450:4864:20::133]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5B81A18E1F; Sun, 14 Aug 2022 23:11:54 -0700 (PDT) Received: by mail-lf1-x133.google.com with SMTP id u3so9380180lfk.8; Sun, 14 Aug 2022 23:11:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc; bh=A94+rVG8JrCDTtewt08INKI8qvn+pZTQbHqa2vUYGEk=; b=MumJUolJo3QnQmbo7lvmH1fA551GjksTC9JoipFnYnXeuKIs3lAdIz/7iBqdeR6PbI LpO/RZ+KENHNzO5Q26kCWhVImY7+9CzJLuLD+eORqnU1L997vRAA+tGagiXYDr8wvg/U OlRWtC8G3jfJg9a+ii6ajL0aOYp1Yvl/HGaYsftN3B4NehtYPee8mEQCcDQV5d75JeFf hHLnZRfd7yMexTgsdXAoJCLP158cwN8wm6diRaq5ac7/5c+6hDRra+EY7CKjzBDnMv+I zadVuU8+sllVsQ74UhJ97IoxVIzT+43Rg3oqSU8Z18a6av0wyzvz5T/VAm+fU2bKvpQK c0xA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc; bh=A94+rVG8JrCDTtewt08INKI8qvn+pZTQbHqa2vUYGEk=; b=Aki/0PqKBw14Mi2lwlsqmv0n2MCTnxX8mU7brdI0/MCd3KEvr+BuPuk0cjbHtdSbBp 1+uyNdG/vSE9x8PgPpmbahPyiAD4BafkYHUUdbZIYohMA7nmmhQL+qj8yp1P1IxToX4s WFtBlvNrKTurrtsVck2OfzEbx5f4QF3lIKHdy9v3sbJ59iRFW+oN7E3emwyyulOG3WCm W7lFAVm0s88hO1hnY5xsdufyB5JIWB7BaiDMOVfT7XifBYX2CfMhSpCS0JnrKpiVCDS1 p12/02+qV6hkS0uZxShogYqEiuERwrmetAt3tjRKjT/tF1KOWu4hv2zv9X+hsiONT2BH Ds0Q== X-Gm-Message-State: ACgBeo0Rg2r2Prk7JEO9nAUfVtQf0A+BMLubVDGQ8cSNkJIlTFpwL/lO rw06SxIQipPX6CDmbvz6naWychbnwdAAcA== X-Google-Smtp-Source: AA6agR55WB6eTLFqV9LpQJyQRqXgaQGHnNBh0FaayENZfOvzh28cW016E8pDvvjpCYqlmScdtAeTbg== X-Received: by 2002:a05:6512:3faa:b0:48a:f17a:579e with SMTP id x42-20020a0565123faa00b0048af17a579emr5334597lfa.30.1660543912635; Sun, 14 Aug 2022 23:11:52 -0700 (PDT) Received: from localhost.localdomain (82-209-154-112.cust.bredband2.com. [82.209.154.112]) by smtp.gmail.com with ESMTPSA id g17-20020a2eb5d1000000b0025d70efeaaasm1296464ljn.75.2022.08.14.23.11.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 14 Aug 2022 23:11:51 -0700 (PDT) From: Marcus Folkesson To: Marcus Folkesson , Kent Gustavsson , Jonathan Cameron , Lars-Peter Clausen , Rob Herring , Krzysztof Kozlowski , Andy Shevchenko Cc: linux-iio@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v6 4/9] iio: adc: mcp3911: use resource-managed version of iio_device_register Date: Mon, 15 Aug 2022 08:16:20 +0200 Message-Id: <20220815061625.35568-5-marcus.folkesson@gmail.com> X-Mailer: git-send-email 2.37.1 In-Reply-To: <20220815061625.35568-1-marcus.folkesson@gmail.com> References: <20220815061625.35568-1-marcus.folkesson@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-iio@vger.kernel.org Keep using managed resources as much as possible. Signed-off-by: Marcus Folkesson Reviewed-by: Andy Shevchenko --- drivers/iio/adc/mcp3911.c | 53 ++++++++++++--------------------------- 1 file changed, 16 insertions(+), 37 deletions(-) diff --git a/drivers/iio/adc/mcp3911.c b/drivers/iio/adc/mcp3911.c index 890af7dca62d..7e2efe702e57 100644 --- a/drivers/iio/adc/mcp3911.c +++ b/drivers/iio/adc/mcp3911.c @@ -258,6 +258,13 @@ static int mcp3911_config(struct mcp3911 *adc) return mcp3911_write(adc, MCP3911_REG_CONFIG, configreg, 2); } +static void mcp3911_cleanup_regulator(void *_adc) +{ + struct mcp3911 *adc = _adc; + + regulator_disable(adc->vref); +} + static int mcp3911_probe(struct spi_device *spi) { struct iio_dev *indio_dev; @@ -286,9 +293,14 @@ static int mcp3911_probe(struct spi_device *spi) ret = regulator_enable(adc->vref); if (ret) return ret; + + ret = devm_add_action_or_reset(&spi->dev, + mcp3911_cleanup_regulator, adc); + if (ret) + return ret; } - adc->clki = devm_clk_get(&adc->spi->dev, NULL); + adc->clki = devm_clk_get_enabled(&adc->spi->dev, NULL); if (IS_ERR(adc->clki)) { if (PTR_ERR(adc->clki) == -ENOENT) { adc->clki = NULL; @@ -296,21 +308,13 @@ static int mcp3911_probe(struct spi_device *spi) dev_err(&adc->spi->dev, "failed to get adc clk (%ld)\n", PTR_ERR(adc->clki)); - ret = PTR_ERR(adc->clki); - goto reg_disable; - } - } else { - ret = clk_prepare_enable(adc->clki); - if (ret < 0) { - dev_err(&adc->spi->dev, - "Failed to enable clki: %d\n", ret); - goto reg_disable; + return PTR_ERR(adc->clki); } } ret = mcp3911_config(adc); if (ret) - goto clk_disable; + return ret; indio_dev->name = spi_get_device_id(spi)->name; indio_dev->modes = INDIO_DIRECT_MODE; @@ -322,31 +326,7 @@ static int mcp3911_probe(struct spi_device *spi) mutex_init(&adc->lock); - ret = iio_device_register(indio_dev); - if (ret) - goto clk_disable; - - return ret; - -clk_disable: - clk_disable_unprepare(adc->clki); -reg_disable: - if (adc->vref) - regulator_disable(adc->vref); - - return ret; -} - -static void mcp3911_remove(struct spi_device *spi) -{ - struct iio_dev *indio_dev = spi_get_drvdata(spi); - struct mcp3911 *adc = iio_priv(indio_dev); - - iio_device_unregister(indio_dev); - - clk_disable_unprepare(adc->clki); - if (adc->vref) - regulator_disable(adc->vref); + return devm_iio_device_register(&adc->spi->dev, indio_dev); } static const struct of_device_id mcp3911_dt_ids[] = { @@ -367,7 +347,6 @@ static struct spi_driver mcp3911_driver = { .of_match_table = mcp3911_dt_ids, }, .probe = mcp3911_probe, - .remove = mcp3911_remove, .id_table = mcp3911_id, }; module_spi_driver(mcp3911_driver); From patchwork Mon Aug 15 06:16:21 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcus Folkesson X-Patchwork-Id: 12943137 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id D100EC25B0E for ; Mon, 15 Aug 2022 06:12:07 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240811AbiHOGMG (ORCPT ); Mon, 15 Aug 2022 02:12:06 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42332 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240419AbiHOGMD (ORCPT ); Mon, 15 Aug 2022 02:12:03 -0400 Received: from mail-lf1-x132.google.com (mail-lf1-x132.google.com [IPv6:2a00:1450:4864:20::132]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CED3318E34; Sun, 14 Aug 2022 23:11:55 -0700 (PDT) Received: by mail-lf1-x132.google.com with SMTP id e15so9446996lfs.0; Sun, 14 Aug 2022 23:11:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc; bh=nySt5r8RBUWJyAwoMP25rpQPbX0MGFg7D6eUR2CrCKw=; b=C2VOQjEU0J5JtK2+jRfvLhmQLD/14wnfrCe4oP9sCX8jHeNv4YbVZ9rVJF05PvM2/b CBvMU09RafkqgOo7XSBT+QtD8FcGiHGkwWMXowfaDTDx7ZWSSyXI3zYFJQxZM5UqV4ZO xApiJj0gAHH8YZqz7y7DhgSmx1ecSsdAAj0V89w/U7tEMFFbdBnCzQIjdiwKejy0Nd3G oBCD5H9KTTwLsaqgCO4gzVcdNW4K+fCrhMRf7okA/5YAw/c7lCgSDx8GAme6t+u2SSY6 T/6ewO1cggdlFBVP/SqXSTduUkXx0b+SUHPOuGTpAZLDLpd2Xp5hLJw79twsU8dpXBLS KOmg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc; bh=nySt5r8RBUWJyAwoMP25rpQPbX0MGFg7D6eUR2CrCKw=; b=mtcHv017K/KaS9S+KIBKfROHq/oxaerDlXU5fnRr/Tii0T0JmMYWCLfBciNWunLlxs 4gQLov+kSotydugC6Yz4lVoQlpKYO28e33ZCAtVjq1Jft4wkIb4BBIdbJhygUeazP9xH MmTlUs49ScMvB5/rqvLuMHlG4S3fJz44H1Ey2vjZyt5rU2JvIrib3/lpZm5Am/h634hi hHn2ZXF9FMOKCIVQrF95cXQ9JWw7xGdfh5EdoW2FtkU61Z7QE6mmfgf29IWloxEvJzoX U1rlwhJg03pi/3Y7EfeeBUbJhg79yxOEQikoE84QAjpbsokqy7sESAmwf1XrIlQTOQGh 0AlA== X-Gm-Message-State: ACgBeo2q4/XZmhWUGrNevjKhjPw+VEV8tj4nbHsZef9JPQMQaLTu2Inx hM8sLf6gLjBoiYpSJlxGFFI= X-Google-Smtp-Source: AA6agR5TlGwUkFeWcmfXW+Z0bpGE/SZFTFMRDHtL5B8jkPsv8+3870hOMLqtc/XRmYHp3OtdHr62iA== X-Received: by 2002:a19:4918:0:b0:48c:e6a0:c8d8 with SMTP id w24-20020a194918000000b0048ce6a0c8d8mr5077135lfa.679.1660543914126; Sun, 14 Aug 2022 23:11:54 -0700 (PDT) Received: from localhost.localdomain (82-209-154-112.cust.bredband2.com. [82.209.154.112]) by smtp.gmail.com with ESMTPSA id g17-20020a2eb5d1000000b0025d70efeaaasm1296464ljn.75.2022.08.14.23.11.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 14 Aug 2022 23:11:53 -0700 (PDT) From: Marcus Folkesson To: Marcus Folkesson , Kent Gustavsson , Jonathan Cameron , Lars-Peter Clausen , Rob Herring , Krzysztof Kozlowski , Andy Shevchenko Cc: linux-iio@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v6 5/9] iio: adc: mcp3911: add support for buffers Date: Mon, 15 Aug 2022 08:16:21 +0200 Message-Id: <20220815061625.35568-6-marcus.folkesson@gmail.com> X-Mailer: git-send-email 2.37.1 In-Reply-To: <20220815061625.35568-1-marcus.folkesson@gmail.com> References: <20220815061625.35568-1-marcus.folkesson@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-iio@vger.kernel.org Add support for buffers to make the driver fit for more use cases. Signed-off-by: Marcus Folkesson Reviewed-by: Andy Shevchenko --- drivers/iio/adc/Kconfig | 2 + drivers/iio/adc/mcp3911.c | 103 +++++++++++++++++++++++++++++++++++--- 2 files changed, 97 insertions(+), 8 deletions(-) diff --git a/drivers/iio/adc/Kconfig b/drivers/iio/adc/Kconfig index 7fe5930891e0..3b5db59f3931 100644 --- a/drivers/iio/adc/Kconfig +++ b/drivers/iio/adc/Kconfig @@ -718,6 +718,8 @@ config MCP3422 config MCP3911 tristate "Microchip Technology MCP3911 driver" depends on SPI + select IIO_BUFFER + select IIO_TRIGGERED_BUFFER help Say yes here to build support for Microchip Technology's MCP3911 analog to digital converter. diff --git a/drivers/iio/adc/mcp3911.c b/drivers/iio/adc/mcp3911.c index 7e2efe702e57..4452b01c76f3 100644 --- a/drivers/iio/adc/mcp3911.c +++ b/drivers/iio/adc/mcp3911.c @@ -5,16 +5,25 @@ * Copyright (C) 2018 Marcus Folkesson * Copyright (C) 2018 Kent Gustavsson */ +#include +#include #include #include #include -#include #include #include #include #include #include +#include +#include +#include +#include +#include + +#include + #define MCP3911_REG_CHANNEL0 0x00 #define MCP3911_REG_CHANNEL1 0x03 #define MCP3911_REG_MOD 0x06 @@ -22,6 +31,7 @@ #define MCP3911_REG_GAIN 0x09 #define MCP3911_REG_STATUSCOM 0x0a +#define MCP3911_STATUSCOM_READ GENMASK(7, 6) #define MCP3911_STATUSCOM_CH1_24WIDTH BIT(4) #define MCP3911_STATUSCOM_CH0_24WIDTH BIT(3) #define MCP3911_STATUSCOM_EN_OFFCAL BIT(2) @@ -54,6 +64,13 @@ struct mcp3911 { struct regulator *vref; struct clk *clki; u32 dev_addr; + struct { + u32 channels[MCP3911_NUM_CHANNELS]; + s64 ts __aligned(8); + } scan; + + u8 tx_buf __aligned(IIO_DMA_MINALIGN); + u8 rx_buf[MCP3911_NUM_CHANNELS * 3]; }; static int mcp3911_read(struct mcp3911 *adc, u8 reg, u32 *val, u8 len) @@ -196,16 +213,66 @@ static int mcp3911_write_raw(struct iio_dev *indio_dev, .type = IIO_VOLTAGE, \ .indexed = 1, \ .channel = idx, \ + .scan_index = idx, \ .info_mask_separate = BIT(IIO_CHAN_INFO_RAW) | \ BIT(IIO_CHAN_INFO_OFFSET) | \ BIT(IIO_CHAN_INFO_SCALE), \ + .scan_type = { \ + .sign = 's', \ + .realbits = 24, \ + .storagebits = 32, \ + .endianness = IIO_BE, \ + }, \ } static const struct iio_chan_spec mcp3911_channels[] = { MCP3911_CHAN(0), MCP3911_CHAN(1), + IIO_CHAN_SOFT_TIMESTAMP(2), }; +static irqreturn_t mcp3911_trigger_handler(int irq, void *p) +{ + struct iio_poll_func *pf = p; + struct iio_dev *indio_dev = pf->indio_dev; + struct mcp3911 *adc = iio_priv(indio_dev); + struct spi_transfer xfer[] = { + { + .tx_buf = &adc->tx_buf, + .len = 1, + }, { + .rx_buf = adc->rx_buf, + .len = sizeof(adc->rx_buf), + }, + }; + int scan_index; + int i = 0; + int ret; + + mutex_lock(&adc->lock); + adc->tx_buf = MCP3911_REG_READ(MCP3911_CHANNEL(0), adc->dev_addr); + ret = spi_sync_transfer(adc->spi, xfer, ARRAY_SIZE(xfer)); + if (ret < 0) { + dev_warn(&adc->spi->dev, + "failed to get conversion data\n"); + goto out; + } + + for_each_set_bit(scan_index, indio_dev->active_scan_mask, indio_dev->masklength) { + const struct iio_chan_spec *scan_chan = &indio_dev->channels[scan_index]; + + adc->scan.channels[i] = get_unaligned_be24(&adc->rx_buf[scan_chan->channel * 3]); + i++; + } + iio_push_to_buffers_with_timestamp(indio_dev, &adc->scan, + iio_get_time_ns(indio_dev)); +out: + mutex_unlock(&adc->lock); + iio_trigger_notify_done(indio_dev->trig); + + return IRQ_HANDLED; +} + static const struct iio_info mcp3911_info = { .read_raw = mcp3911_read_raw, .write_raw = mcp3911_write_raw, @@ -214,7 +281,7 @@ static const struct iio_info mcp3911_info = { static int mcp3911_config(struct mcp3911 *adc) { struct device *dev = &adc->spi->dev; - u32 configreg; + u32 regval; int ret; ret = device_property_read_u32(dev, "microchip,device-addr", &adc->dev_addr); @@ -233,29 +300,43 @@ static int mcp3911_config(struct mcp3911 *adc) } dev_dbg(&adc->spi->dev, "use device address %i\n", adc->dev_addr); - ret = mcp3911_read(adc, MCP3911_REG_CONFIG, &configreg, 2); + ret = mcp3911_read(adc, MCP3911_REG_CONFIG, ®val, 2); if (ret) return ret; + regval &= ~MCP3911_CONFIG_VREFEXT; if (adc->vref) { dev_dbg(&adc->spi->dev, "use external voltage reference\n"); - configreg |= MCP3911_CONFIG_VREFEXT; + regval |= FIELD_PREP(MCP3911_CONFIG_VREFEXT, 1); } else { dev_dbg(&adc->spi->dev, "use internal voltage reference (1.2V)\n"); - configreg &= ~MCP3911_CONFIG_VREFEXT; + regval |= FIELD_PREP(MCP3911_CONFIG_VREFEXT, 0); } + regval &= ~MCP3911_CONFIG_CLKEXT; if (adc->clki) { dev_dbg(&adc->spi->dev, "use external clock as clocksource\n"); - configreg |= MCP3911_CONFIG_CLKEXT; + regval |= FIELD_PREP(MCP3911_CONFIG_CLKEXT, 1); } else { dev_dbg(&adc->spi->dev, "use crystal oscillator as clocksource\n"); - configreg &= ~MCP3911_CONFIG_CLKEXT; + regval |= FIELD_PREP(MCP3911_CONFIG_CLKEXT, 0); } - return mcp3911_write(adc, MCP3911_REG_CONFIG, configreg, 2); + ret = mcp3911_write(adc, MCP3911_REG_CONFIG, regval, 2); + if (ret) + return ret; + + ret = mcp3911_read(adc, MCP3911_REG_STATUSCOM, ®val, 2); + if (ret) + return ret; + + /* Address counter incremented, cycle through register types */ + regval &= ~MCP3911_STATUSCOM_READ; + regval |= FIELD_PREP(MCP3911_STATUSCOM_READ, 0x02); + + return mcp3911_write(adc, MCP3911_REG_STATUSCOM, regval, 2); } static void mcp3911_cleanup_regulator(void *_adc) @@ -326,6 +407,12 @@ static int mcp3911_probe(struct spi_device *spi) mutex_init(&adc->lock); + ret = devm_iio_triggered_buffer_setup(&spi->dev, indio_dev, + NULL, + mcp3911_trigger_handler, NULL); + if (ret) + return ret; + return devm_iio_device_register(&adc->spi->dev, indio_dev); } From patchwork Mon Aug 15 06:16:22 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcus Folkesson X-Patchwork-Id: 12943141 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 29F78C32762 for ; Mon, 15 Aug 2022 06:13:13 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240792AbiHOGMn (ORCPT ); Mon, 15 Aug 2022 02:12:43 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42330 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240393AbiHOGMD (ORCPT ); Mon, 15 Aug 2022 02:12:03 -0400 Received: from mail-lf1-x129.google.com (mail-lf1-x129.google.com [IPv6:2a00:1450:4864:20::129]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B80B218E32; Sun, 14 Aug 2022 23:11:55 -0700 (PDT) Received: by mail-lf1-x129.google.com with SMTP id f20so9382042lfc.10; Sun, 14 Aug 2022 23:11:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc; bh=iIcIavqTO/tEpGq8tOTkcwU3uozrM4gh/PI3QeIE7M4=; b=WKBryUPY4zZpTDp2XOi4j1+yz0GZPzKRQlAdI0J2LEVGAeHWh2yEu31CM5faYTI6WM oYOYEBZu7lB2kK+nzE2F5igu4hgQmeyizz1zAYTxLaBOZm+DWgdLhJIPk6MZ6c05cPmx Aoi/SAQme6P+NjRXHwBhCKx7CdP7ZFQ7WbGyEcfBNHETUCeIEZb7S1AjrpAf1RCyulMT 26pdXknz50PnfOIqFxHhEUNnchnyxP288yIx+RXa3dO3avILsGCWYMqkdvaXLW/8fsgg wR3QGLrtFClQTATgeQln5oX5wH9pSqWBPZFsFC7rHat5nrKKnYBlfeSKiDw0KUjfEhBU vqyw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc; bh=iIcIavqTO/tEpGq8tOTkcwU3uozrM4gh/PI3QeIE7M4=; b=FgkhPOqmpmZVWNRAcZZRV7FuIvcCaRO4BmlNBVds5jJew56Lbd+UaSBM1oqljk35Fh f01dCP6/MXWPSZgUtNrZtaMfYJ280/9mxd9kptpQy+FpzKUtrXn3mNLCKRLhlsAFVDsP Th+TqOEzNoI3bdj1ZUpOHqKWgEbZU12NE6v/NbT3IhAIhR/QdlUJlwrsiaYyMhF9srkB Dsi+5XHV802xDPFtXe4YpPOG5NdRT8Ccc1UumL0vu8sNwRFIIdg/iK7mC8CXEPE8hmgN X0vWWiNRFgOXT0OQjVT+SK0IH4iiAeyzraJ/hFovZ3SP1E3P9UxgiUBP3tqm8fL7IUfu GPZg== X-Gm-Message-State: ACgBeo0XKHCTJkmJ76VUSBVFyoUFhK8wXZITRNQHjtE2OjSQ9gHxNb4R oNEsTZKdLHyAK0UFxl8Pk/k= X-Google-Smtp-Source: AA6agR5WYctmeitAw9QBqDWwrGf620Hd0YhqTDf3pRevaiz3iUur7daIvMHrJ7oyDJvVtfa1oHeksg== X-Received: by 2002:a05:6512:3286:b0:48a:f483:8713 with SMTP id p6-20020a056512328600b0048af4838713mr5282570lfe.194.1660543915321; Sun, 14 Aug 2022 23:11:55 -0700 (PDT) Received: from localhost.localdomain (82-209-154-112.cust.bredband2.com. [82.209.154.112]) by smtp.gmail.com with ESMTPSA id g17-20020a2eb5d1000000b0025d70efeaaasm1296464ljn.75.2022.08.14.23.11.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 14 Aug 2022 23:11:54 -0700 (PDT) From: Marcus Folkesson To: Marcus Folkesson , Kent Gustavsson , Jonathan Cameron , Lars-Peter Clausen , Rob Herring , Krzysztof Kozlowski , Andy Shevchenko Cc: linux-iio@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v6 6/9] iio: adc: mcp3911: add support for interrupts Date: Mon, 15 Aug 2022 08:16:22 +0200 Message-Id: <20220815061625.35568-7-marcus.folkesson@gmail.com> X-Mailer: git-send-email 2.37.1 In-Reply-To: <20220815061625.35568-1-marcus.folkesson@gmail.com> References: <20220815061625.35568-1-marcus.folkesson@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-iio@vger.kernel.org Make it possible to read values upon interrupts. Configure Data Ready Signal Output Pin to either HiZ or push-pull and use it as interrupt source. Signed-off-by: Marcus Folkesson Reviewed-by: Andy Shevchenko --- drivers/iio/adc/mcp3911.c | 53 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 53 insertions(+) diff --git a/drivers/iio/adc/mcp3911.c b/drivers/iio/adc/mcp3911.c index 4452b01c76f3..b76d825c984d 100644 --- a/drivers/iio/adc/mcp3911.c +++ b/drivers/iio/adc/mcp3911.c @@ -31,6 +31,7 @@ #define MCP3911_REG_GAIN 0x09 #define MCP3911_REG_STATUSCOM 0x0a +#define MCP3911_STATUSCOM_DRHIZ BIT(12) #define MCP3911_STATUSCOM_READ GENMASK(7, 6) #define MCP3911_STATUSCOM_CH1_24WIDTH BIT(4) #define MCP3911_STATUSCOM_CH0_24WIDTH BIT(3) @@ -64,6 +65,7 @@ struct mcp3911 { struct regulator *vref; struct clk *clki; u32 dev_addr; + struct iio_trigger *trig; struct { u32 channels[MCP3911_NUM_CHANNELS]; s64 ts __aligned(8); @@ -346,6 +348,23 @@ static void mcp3911_cleanup_regulator(void *_adc) regulator_disable(adc->vref); } +static int mcp3911_set_trigger_state(struct iio_trigger *trig, bool enable) +{ + struct mcp3911 *adc = iio_trigger_get_drvdata(trig); + + if (enable) + enable_irq(adc->spi->irq); + else + disable_irq(adc->spi->irq); + + return 0; +} + +static const struct iio_trigger_ops mcp3911_trigger_ops = { + .validate_device = iio_trigger_validate_own_device, + .set_trigger_state = mcp3911_set_trigger_state, +}; + static int mcp3911_probe(struct spi_device *spi) { struct iio_dev *indio_dev; @@ -397,6 +416,15 @@ static int mcp3911_probe(struct spi_device *spi) if (ret) return ret; + if (device_property_read_bool(&adc->spi->dev, "microchip,data-ready-hiz")) + ret = mcp3911_update(adc, MCP3911_REG_STATUSCOM, MCP3911_STATUSCOM_DRHIZ, + 0, 2); + else + ret = mcp3911_update(adc, MCP3911_REG_STATUSCOM, MCP3911_STATUSCOM_DRHIZ, + MCP3911_STATUSCOM_DRHIZ, 2); + if (ret) + return ret; + indio_dev->name = spi_get_device_id(spi)->name; indio_dev->modes = INDIO_DIRECT_MODE; indio_dev->info = &mcp3911_info; @@ -407,6 +435,31 @@ static int mcp3911_probe(struct spi_device *spi) mutex_init(&adc->lock); + if (spi->irq > 0) { + adc->trig = devm_iio_trigger_alloc(&spi->dev, "%s-dev%d", + indio_dev->name, + iio_device_id(indio_dev)); + if (!adc->trig) + return PTR_ERR(adc->trig); + + adc->trig->ops = &mcp3911_trigger_ops; + iio_trigger_set_drvdata(adc->trig, adc); + ret = devm_iio_trigger_register(&spi->dev, adc->trig); + if (ret) + return ret; + + /* + * The device generates interrupts as long as it is powered up. + * Some platforms might not allow the option to power it down so + * don't enable the interrupt to avoid extra load on the system. + */ + ret = devm_request_irq(&spi->dev, spi->irq, + &iio_trigger_generic_data_rdy_poll, IRQF_NO_AUTOEN | IRQF_ONESHOT, + indio_dev->name, adc->trig); + if (ret) + return ret; + } + ret = devm_iio_triggered_buffer_setup(&spi->dev, indio_dev, NULL, mcp3911_trigger_handler, NULL); From patchwork Mon Aug 15 06:16:23 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcus Folkesson X-Patchwork-Id: 12943143 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 52737C32765 for ; Mon, 15 Aug 2022 06:13:13 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240434AbiHOGMl (ORCPT ); Mon, 15 Aug 2022 02:12:41 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42352 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240631AbiHOGMD (ORCPT ); Mon, 15 Aug 2022 02:12:03 -0400 Received: from mail-lf1-x12e.google.com (mail-lf1-x12e.google.com [IPv6:2a00:1450:4864:20::12e]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5A1CF18E0D; Sun, 14 Aug 2022 23:11:58 -0700 (PDT) Received: by mail-lf1-x12e.google.com with SMTP id z6so9383724lfu.9; Sun, 14 Aug 2022 23:11:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc; bh=OrecjO5UyPq+rEVbOsT6C3SV/fMBa8jiavf5wPC9ui4=; b=CN4NG/ff0yiwTJ85OtHtFFTyUnvAlIDlQry/CRIfAEgzlHLdL8jX08NQZcLcgAf8+p s0VqvJ5NxK+CfkaeCa0zMnpRRiY31T5AmgkXYOXkEVtw6oHOzCfio2JO5u85ND9NuA3V kLcMJqv7w3jAhtO5Kn0vd0H3xw4ESiWA4DLJhTP6leBKz4C1ACUVr/tt+xB2God4Tnli PbRqnhSlT1y0ecWf/fcMOZeQg5A39a8+RrP+W1nOzm1bgMUELNXSkKDZUwWF9CoDylEj Qcinwooy3ByY2NGxtOnWlN5tbCJFPmu15dm4AUWczjLrGaGfMROFwFkVd/sOqQtuTGoN bxDg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc; bh=OrecjO5UyPq+rEVbOsT6C3SV/fMBa8jiavf5wPC9ui4=; b=1C3NFks5UFKxymzuYucc2hs2rH82awvwnY3arqDUqM2vz/q9mOMRniv+wMUO/KR4L5 al6wtvyfq8wzqcm62sKHtLU4f2ZSc2HOSUEYeTBF10fbgonP3oQff3fXLXaxGt9MsMFI /Bew7l7nmPXIbpz9cwFiQQ10FMc4wOQC1xHlYolLOr4PdqTyV/9XBpHvAm7ACjwcFiEj aUc91T3Yet9kAMLA4N6aeZwJQ9qp4el6S4Qe/gQHw/3pR5ciT+ftIKDOkRgPH5ZuzSkT 0V/cexhdln8fY8Gv8vQiLmoVxv24EsNG3bgSeMmgPoPU7ehxW8r6mKw8i1Nf3smWmXKy FsGQ== X-Gm-Message-State: ACgBeo3aUeIAZRUGYuHzZ8gC9oHitsvs969yY8xxHEfFCy9jRyng3TD+ lhBSXK69AvvcR+/UcOGFJ00= X-Google-Smtp-Source: AA6agR7cPahCSnRXvY4Fgk+s1QGUrqAi981KdUyrh5ZjjmhHYTYqvLxGUSHdE2WMg2YL5panMvPVCQ== X-Received: by 2002:a19:7102:0:b0:48b:a287:2d6f with SMTP id m2-20020a197102000000b0048ba2872d6fmr5467138lfc.515.1660543916627; Sun, 14 Aug 2022 23:11:56 -0700 (PDT) Received: from localhost.localdomain (82-209-154-112.cust.bredband2.com. [82.209.154.112]) by smtp.gmail.com with ESMTPSA id g17-20020a2eb5d1000000b0025d70efeaaasm1296464ljn.75.2022.08.14.23.11.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 14 Aug 2022 23:11:55 -0700 (PDT) From: Marcus Folkesson To: Marcus Folkesson , Kent Gustavsson , Jonathan Cameron , Lars-Peter Clausen , Rob Herring , Krzysztof Kozlowski , Andy Shevchenko Cc: linux-iio@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Krzysztof Kozlowski Subject: [PATCH v6 7/9] dt-bindings: iio: adc: mcp3911: add microchip,data-ready-hiz entry Date: Mon, 15 Aug 2022 08:16:23 +0200 Message-Id: <20220815061625.35568-8-marcus.folkesson@gmail.com> X-Mailer: git-send-email 2.37.1 In-Reply-To: <20220815061625.35568-1-marcus.folkesson@gmail.com> References: <20220815061625.35568-1-marcus.folkesson@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-iio@vger.kernel.org The Data Ready Output Pin is either hard wired to work as high impedance or push-pull. Make it configurable. Signed-off-by: Marcus Folkesson Acked-by: Krzysztof Kozlowski --- .../devicetree/bindings/iio/adc/microchip,mcp3911.yaml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/Documentation/devicetree/bindings/iio/adc/microchip,mcp3911.yaml b/Documentation/devicetree/bindings/iio/adc/microchip,mcp3911.yaml index 95ab285f4eba..6bee332ed58f 100644 --- a/Documentation/devicetree/bindings/iio/adc/microchip,mcp3911.yaml +++ b/Documentation/devicetree/bindings/iio/adc/microchip,mcp3911.yaml @@ -36,6 +36,13 @@ properties: description: IRQ line of the ADC maxItems: 1 + microchip,data-ready-hiz: + description: + Data Ready Pin Inactive State Control + true = The DR pin state is high-impedance + false = The DR pin state is logic high + type: boolean + microchip,device-addr: description: Device address when multiple MCP3911 chips are present on the same SPI bus. $ref: /schemas/types.yaml#/definitions/uint32 From patchwork Mon Aug 15 06:16:24 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcus Folkesson X-Patchwork-Id: 12943142 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 39C60C00140 for ; Mon, 15 Aug 2022 06:13:13 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240689AbiHOGMm (ORCPT ); Mon, 15 Aug 2022 02:12:42 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42354 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240643AbiHOGMD (ORCPT ); Mon, 15 Aug 2022 02:12:03 -0400 Received: from mail-lf1-x12d.google.com (mail-lf1-x12d.google.com [IPv6:2a00:1450:4864:20::12d]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8080119002; Sun, 14 Aug 2022 23:11:59 -0700 (PDT) Received: by mail-lf1-x12d.google.com with SMTP id u3so9380371lfk.8; Sun, 14 Aug 2022 23:11:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc; bh=9vLo5VCBrLN9JauNmLfJu8z7xDOsGmoQq1BFjC9IoVE=; b=DbgWAT6m6vUcM1CWVcOkJqaoK+Vs9e/rg6a/NNYrdcVq1UKVWV+qtUQABJqVFvnISD 59K2ojwgVMJVrp3lJsfripz1orYD3Yf68LYx/TphuKdJlXPM3y9jLuy1o7BCfAETrBHP bnP4Ld+R+PJBaSZ7F1TJOaO+wFW6WKwcZO9urGx9Yv7tXMgVO7NVxdozttiiYyjXl2P4 ljYQtvGzl36toLw7gAG87gaPtvmKLlG6FnZ4rS/DDtQpKqFsd4yqObjHCOi4kZn+Xj3e G0OvbcpfUx/NE3CGOh0LIb9evnqq2umnDgx6AUjkUCseIej7g/L9wyK+K6t4K8zlH8Sb AUKw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc; bh=9vLo5VCBrLN9JauNmLfJu8z7xDOsGmoQq1BFjC9IoVE=; b=71Q53NgiqTIxsNLp9biaPaJifWAe4uhYWRBZIQSXyRGgrI/9/5bUP1RbdCzvwrp24y 1aa6Dd0FmAVceUGs8H/uMM2cUPmJYdSgVsRyU0Ht3Bxr2YMt1a5ZxjDPyueuyo+EYnhX N+mGJMs4+Un0sXn3Y84PQ6L6hXSipXI2xg3Xssmh81Ah21uAv0NRKP3FY6IKzGUQJHZs mAmfx5l6Ujti4RrS8Td5MyfqduFtbyOcgyWXR343rPZudqZ5S4OZCG95tzLS0FnllJy6 +qM7CirN9Ld6XebLSngFkXQZ4Bv5qA4Tg9aSEmykvLUBkWfkS7G3xZ1p+HTQ4H2Kw4yh rcSg== X-Gm-Message-State: ACgBeo3H7qG65unrYm671GpoURJ8q7MmOpQbifSNvI23BcDZMO7CEXOD g4oXbcSra39z4nuj3LhZHsI= X-Google-Smtp-Source: AA6agR4DwQWYjGhaIOs+PM97rH3f8bIXhmMizRmoUZrcDjAJlvaZcRcD4azIW5gYtuVrK67LueR+Uw== X-Received: by 2002:a05:6512:31d0:b0:48d:81b:7054 with SMTP id j16-20020a05651231d000b0048d081b7054mr5511875lfe.116.1660543917864; Sun, 14 Aug 2022 23:11:57 -0700 (PDT) Received: from localhost.localdomain (82-209-154-112.cust.bredband2.com. [82.209.154.112]) by smtp.gmail.com with ESMTPSA id g17-20020a2eb5d1000000b0025d70efeaaasm1296464ljn.75.2022.08.14.23.11.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 14 Aug 2022 23:11:57 -0700 (PDT) From: Marcus Folkesson To: Marcus Folkesson , Kent Gustavsson , Jonathan Cameron , Lars-Peter Clausen , Rob Herring , Krzysztof Kozlowski , Andy Shevchenko Cc: linux-iio@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v6 8/9] iio: adc: mcp3911: add support for oversampling ratio Date: Mon, 15 Aug 2022 08:16:24 +0200 Message-Id: <20220815061625.35568-9-marcus.folkesson@gmail.com> X-Mailer: git-send-email 2.37.1 In-Reply-To: <20220815061625.35568-1-marcus.folkesson@gmail.com> References: <20220815061625.35568-1-marcus.folkesson@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-iio@vger.kernel.org The chip supports oversampling ratio, so expose it to userspace. Signed-off-by: Marcus Folkesson Reviewed-by: Andy Shevchenko --- drivers/iio/adc/mcp3911.c | 58 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 58 insertions(+) diff --git a/drivers/iio/adc/mcp3911.c b/drivers/iio/adc/mcp3911.c index b76d825c984d..0151258b456c 100644 --- a/drivers/iio/adc/mcp3911.c +++ b/drivers/iio/adc/mcp3911.c @@ -41,6 +41,7 @@ #define MCP3911_REG_CONFIG 0x0c #define MCP3911_CONFIG_CLKEXT BIT(1) #define MCP3911_CONFIG_VREFEXT BIT(2) +#define MCP3911_CONFIG_OSR GENMASK(13, 11) #define MCP3911_REG_OFFCAL_CH0 0x0e #define MCP3911_REG_GAINCAL_CH0 0x11 @@ -59,6 +60,8 @@ #define MCP3911_NUM_CHANNELS 2 +static const int mcp3911_osr_table[] = { 32, 64, 128, 256, 512, 1024, 2048, 4096 }; + struct mcp3911 { struct spi_device *spi; struct mutex lock; @@ -117,6 +120,36 @@ static int mcp3911_update(struct mcp3911 *adc, u8 reg, u32 mask, return mcp3911_write(adc, reg, val, len); } +static int mcp3911_write_raw_get_fmt(struct iio_dev *indio_dev, + struct iio_chan_spec const *chan, + long mask) +{ + switch (mask) { + case IIO_CHAN_INFO_SCALE: + return IIO_VAL_INT_PLUS_NANO; + case IIO_CHAN_INFO_OVERSAMPLING_RATIO: + return IIO_VAL_INT; + default: + return IIO_VAL_INT_PLUS_NANO; + } +} + +static int mcp3911_read_avail(struct iio_dev *indio_dev, + struct iio_chan_spec const *chan, + const int **vals, int *type, int *length, + long info) +{ + switch (info) { + case IIO_CHAN_INFO_OVERSAMPLING_RATIO: + *type = IIO_VAL_INT; + *vals = mcp3911_osr_table; + *length = ARRAY_SIZE(mcp3911_osr_table); + return IIO_AVAIL_LIST; + default: + return -EINVAL; + } +} + static int mcp3911_read_raw(struct iio_dev *indio_dev, struct iio_chan_spec const *channel, int *val, int *val2, long mask) @@ -145,6 +178,15 @@ static int mcp3911_read_raw(struct iio_dev *indio_dev, ret = IIO_VAL_INT; break; + case IIO_CHAN_INFO_OVERSAMPLING_RATIO: + ret = mcp3911_read(adc, MCP3911_REG_CONFIG, val, 2); + if (ret) + goto out; + + *val = FIELD_GET(MCP3911_CONFIG_OSR, *val); + *val = 32 << *val; + ret = IIO_VAL_INT; + break; case IIO_CHAN_INFO_SCALE: if (adc->vref) { @@ -204,6 +246,17 @@ static int mcp3911_write_raw(struct iio_dev *indio_dev, MCP3911_STATUSCOM_EN_OFFCAL, MCP3911_STATUSCOM_EN_OFFCAL, 2); break; + + case IIO_CHAN_INFO_OVERSAMPLING_RATIO: + for (int i = 0; i < sizeof(mcp3911_osr_table); i++) { + if (val == mcp3911_osr_table[i]) { + val = FIELD_PREP(MCP3911_CONFIG_OSR, i); + ret = mcp3911_update(adc, MCP3911_REG_CONFIG, MCP3911_CONFIG_OSR, + val, 2); + break; + } + } + break; } out: @@ -216,9 +269,12 @@ static int mcp3911_write_raw(struct iio_dev *indio_dev, .indexed = 1, \ .channel = idx, \ .scan_index = idx, \ + .info_mask_shared_by_type = BIT(IIO_CHAN_INFO_OVERSAMPLING_RATIO), \ .info_mask_separate = BIT(IIO_CHAN_INFO_RAW) | \ BIT(IIO_CHAN_INFO_OFFSET) | \ BIT(IIO_CHAN_INFO_SCALE), \ + .info_mask_shared_by_type_available = \ + BIT(IIO_CHAN_INFO_OVERSAMPLING_RATIO), \ .scan_type = { \ .sign = 's', \ .realbits = 24, \ @@ -278,6 +334,8 @@ static irqreturn_t mcp3911_trigger_handler(int irq, void *p) static const struct iio_info mcp3911_info = { .read_raw = mcp3911_read_raw, .write_raw = mcp3911_write_raw, + .read_avail = mcp3911_read_avail, + .write_raw_get_fmt = mcp3911_write_raw_get_fmt, }; static int mcp3911_config(struct mcp3911 *adc) From patchwork Mon Aug 15 06:16:25 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcus Folkesson X-Patchwork-Id: 12943139 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 44766C00140 for ; Mon, 15 Aug 2022 06:12:42 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230025AbiHOGMk (ORCPT ); Mon, 15 Aug 2022 02:12:40 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42396 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240679AbiHOGMF (ORCPT ); Mon, 15 Aug 2022 02:12:05 -0400 Received: from mail-lf1-x136.google.com (mail-lf1-x136.google.com [IPv6:2a00:1450:4864:20::136]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id EF0A51900A; Sun, 14 Aug 2022 23:12:00 -0700 (PDT) Received: by mail-lf1-x136.google.com with SMTP id x19so9387699lfq.7; Sun, 14 Aug 2022 23:12:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc; bh=lQGu1TRp7KdFDwYlUVBw3FAbt2P+S+5rDnsKB5wE5ZI=; b=QmKtsPec/VFwlUtPAZFszC1JlbtLGUBFHLLt1lQ6nG5/B6+zZt+abbYI4vzC5KxNJC wsrjGBBcsmWOuT54y6lNCOlMqwixFCYiY9Ip4zZQzvzsFYmpDj7Y0qjxFJPoq2KkOIcM xToYn6d/h2Adl8+recIjHiFdCSCMPVEsmEsZ3oCg9Ox9KZ5IKKfDYhqGCQGNuJaCcsdW 6iwqfOIX06SFkr5Daz1RYqzy6Xe5RpzXIz7IjtIJjkqrFccMsxac9OdMxhKKMD4RunGS 1gTTjL6Pq84ddsl8dyq1bme57v3lqhgtCnUZkIj974sFXsmCJYMCntEWX2d6K1NEI8Z8 z73g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc; bh=lQGu1TRp7KdFDwYlUVBw3FAbt2P+S+5rDnsKB5wE5ZI=; b=d5m7zAZExM4aSzAZEOiOk1nxOK/Fb6fIVL3ZaAcEUccQ1It/i/KKBZZMwlE7480H2V 3rbtKDjVAlrGbgVJHZXrXqh3eH2X14W9cJgLiQ5gByCoG9wSgusIVCKM8w5YHP6ARDBC /5nZcoFkPFU98YigtiS778pP16c8bDgYN+wUzB8IFVEISnyiNC7SlF+k/uSaernbeRMy aPalRAsBMYrKdx+TSMRxZF0usxmQIFfe+hh/t0pByn9xRotR3xukTTxmIB/fV6Ly2X9p NwrojpZrgkc57Qr/IW5irlYluORD5XXxF+evzQ4DkP3VLH+FT7Gnf/nFUyNpx8AILS8e WCXQ== X-Gm-Message-State: ACgBeo0hhd7EilFmg/zEeWuTnJceumAcNgDBqZl9VH6iTToWbWKcgoVa ibYMM0bYdIY6IdIeG5gdQyA= X-Google-Smtp-Source: AA6agR5JU7hAMkKIxf0DPYA5hobegWMGGaWb/H+E18vbJPLpkU/pAG5yLyoQ97PcARiapfqmreGc3w== X-Received: by 2002:a05:6512:2354:b0:48a:e29b:2bb4 with SMTP id p20-20020a056512235400b0048ae29b2bb4mr5361953lfu.435.1660543919115; Sun, 14 Aug 2022 23:11:59 -0700 (PDT) Received: from localhost.localdomain (82-209-154-112.cust.bredband2.com. [82.209.154.112]) by smtp.gmail.com with ESMTPSA id g17-20020a2eb5d1000000b0025d70efeaaasm1296464ljn.75.2022.08.14.23.11.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 14 Aug 2022 23:11:58 -0700 (PDT) From: Marcus Folkesson To: Marcus Folkesson , Kent Gustavsson , Jonathan Cameron , Lars-Peter Clausen , Rob Herring , Krzysztof Kozlowski , Andy Shevchenko Cc: linux-iio@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v6 9/9] iio: adc: mcp3911: add support to set PGA Date: Mon, 15 Aug 2022 08:16:25 +0200 Message-Id: <20220815061625.35568-10-marcus.folkesson@gmail.com> X-Mailer: git-send-email 2.37.1 In-Reply-To: <20220815061625.35568-1-marcus.folkesson@gmail.com> References: <20220815061625.35568-1-marcus.folkesson@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-iio@vger.kernel.org Add support for setting the Programmable Gain Amplifiers by adjust the scale value. Signed-off-by: Marcus Folkesson Reviewed-by: Andy Shevchenko --- drivers/iio/adc/mcp3911.c | 107 +++++++++++++++++++++++++++++--------- 1 file changed, 83 insertions(+), 24 deletions(-) diff --git a/drivers/iio/adc/mcp3911.c b/drivers/iio/adc/mcp3911.c index 0151258b456c..de85a87b9287 100644 --- a/drivers/iio/adc/mcp3911.c +++ b/drivers/iio/adc/mcp3911.c @@ -29,6 +29,8 @@ #define MCP3911_REG_MOD 0x06 #define MCP3911_REG_PHASE 0x07 #define MCP3911_REG_GAIN 0x09 +#define MCP3911_GAIN_MASK(ch) (GENMASK(2, 0) << 3 * ch) +#define MCP3911_GAIN_VAL(ch, val) ((val << 3 * ch) & MCP3911_GAIN_MASK(ch)) #define MCP3911_REG_STATUSCOM 0x0a #define MCP3911_STATUSCOM_DRHIZ BIT(12) @@ -59,8 +61,10 @@ #define MCP3911_REG_WRITE(reg, id) ((((reg) << 1) | ((id) << 5) | (0 << 0)) & 0xff) #define MCP3911_NUM_CHANNELS 2 +#define MCP3911_NUM_SCALES 6 static const int mcp3911_osr_table[] = { 32, 64, 128, 256, 512, 1024, 2048, 4096 }; +static u32 mcp3911_scale_table[MCP3911_NUM_SCALES][2]; struct mcp3911 { struct spi_device *spi; @@ -69,6 +73,7 @@ struct mcp3911 { struct clk *clki; u32 dev_addr; struct iio_trigger *trig; + u32 gain[MCP3911_NUM_CHANNELS]; struct { u32 channels[MCP3911_NUM_CHANNELS]; s64 ts __aligned(8); @@ -145,6 +150,11 @@ static int mcp3911_read_avail(struct iio_dev *indio_dev, *vals = mcp3911_osr_table; *length = ARRAY_SIZE(mcp3911_osr_table); return IIO_AVAIL_LIST; + case IIO_CHAN_INFO_SCALE: + *type = IIO_VAL_INT_PLUS_NANO; + *vals = (int *)mcp3911_scale_table; + *length = ARRAY_SIZE(mcp3911_scale_table) * 2; + return IIO_AVAIL_LIST; default: return -EINVAL; } @@ -189,29 +199,9 @@ static int mcp3911_read_raw(struct iio_dev *indio_dev, break; case IIO_CHAN_INFO_SCALE: - if (adc->vref) { - ret = regulator_get_voltage(adc->vref); - if (ret < 0) { - dev_err(indio_dev->dev.parent, - "failed to get vref voltage: %d\n", - ret); - goto out; - } - - *val = ret / 1000; - } else { - *val = MCP3911_INT_VREF_MV; - } - - /* - * For 24bit Conversion - * Raw = ((Voltage)/(Vref) * 2^23 * Gain * 1.5 - * Voltage = Raw * (Vref)/(2^23 * Gain * 1.5) - */ - - /* val2 = (2^23 * 1.5) */ - *val2 = 12582912; - ret = IIO_VAL_FRACTIONAL; + *val = mcp3911_scale_table[ilog2(adc->gain[channel->channel])][0]; + *val2 = mcp3911_scale_table[ilog2(adc->gain[channel->channel])][1]; + ret = IIO_VAL_INT_PLUS_NANO; break; } @@ -229,6 +219,18 @@ static int mcp3911_write_raw(struct iio_dev *indio_dev, mutex_lock(&adc->lock); switch (mask) { + case IIO_CHAN_INFO_SCALE: + for (int i = 0; i < MCP3911_NUM_SCALES; i++) { + if (val == mcp3911_scale_table[i][0] && + val2 == mcp3911_scale_table[i][1]) { + + adc->gain[channel->channel] = BIT(i); + ret = mcp3911_update(adc, MCP3911_REG_GAIN, + MCP3911_GAIN_MASK(channel->channel), + MCP3911_GAIN_VAL(channel->channel, i), 1); + } + } + break; case IIO_CHAN_INFO_OFFSET: if (val2 != 0) { ret = -EINVAL; @@ -264,6 +266,47 @@ static int mcp3911_write_raw(struct iio_dev *indio_dev, return ret; } +static int mcp3911_calc_scale_table(struct mcp3911 *adc) +{ + u32 ref = MCP3911_INT_VREF_MV; + u32 div; + int ret; + int tmp0, tmp1; + s64 tmp2; + + if (adc->vref) { + ret = regulator_get_voltage(adc->vref); + if (ret < 0) { + dev_err(&adc->spi->dev, + "failed to get vref voltage: %d\n", + ret); + return ret; + } + + ref = ret / 1000; + } + + /* + * For 24-bit Conversion + * Raw = ((Voltage)/(Vref) * 2^23 * Gain * 1.5 + * Voltage = Raw * (Vref)/(2^23 * Gain * 1.5) + * + * ref = Reference voltage + * div = (2^23 * 1.5 * gain) = 12582912 * gain + */ + for (int i = 0; i < MCP3911_NUM_SCALES; i++) { + div = 12582912 * BIT(i); + tmp2 = div_s64((s64)ref * 1000000000LL, div); + tmp1 = div; + tmp0 = (int)div_s64_rem(tmp2, 1000000000, &tmp1); + + mcp3911_scale_table[i][0] = 0; + mcp3911_scale_table[i][1] = tmp1; + } + + return 0; +} + #define MCP3911_CHAN(idx) { \ .type = IIO_VOLTAGE, \ .indexed = 1, \ @@ -273,8 +316,10 @@ static int mcp3911_write_raw(struct iio_dev *indio_dev, .info_mask_separate = BIT(IIO_CHAN_INFO_RAW) | \ BIT(IIO_CHAN_INFO_OFFSET) | \ BIT(IIO_CHAN_INFO_SCALE), \ - .info_mask_shared_by_type_available = \ + .info_mask_shared_by_type_available = \ BIT(IIO_CHAN_INFO_OVERSAMPLING_RATIO), \ + .info_mask_separate_available = \ + BIT(IIO_CHAN_INFO_SCALE), \ .scan_type = { \ .sign = 's', \ .realbits = 24, \ @@ -483,6 +528,20 @@ static int mcp3911_probe(struct spi_device *spi) if (ret) return ret; + ret = mcp3911_calc_scale_table(adc); + if (ret) + return ret; + + /* Set gain to 1 for all channels */ + for (int i = 0; i < MCP3911_NUM_CHANNELS; i++) { + adc->gain[i] = 1; + ret = mcp3911_update(adc, MCP3911_REG_GAIN, + MCP3911_GAIN_MASK(i), + MCP3911_GAIN_VAL(i, 0), 1); + if (ret) + return ret; + } + indio_dev->name = spi_get_device_id(spi)->name; indio_dev->modes = INDIO_DIRECT_MODE; indio_dev->info = &mcp3911_info;