Received: by 2002:a05:7412:37c9:b0:e2:908c:2ebd with SMTP id jz9csp2364350rdb; Thu, 21 Sep 2023 17:09:48 -0700 (PDT) X-Google-Smtp-Source: AGHT+IH8/IbuemPv5HUGRq2G6oSNf6hHL7bIcACyghWJ+8y302oQYk00OBnp6aLnx/HgQbkl0zK9 X-Received: by 2002:a17:903:32c1:b0:1c0:e87e:52ba with SMTP id i1-20020a17090332c100b001c0e87e52bamr1796832plr.2.1695341387803; Thu, 21 Sep 2023 17:09:47 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1695341387; cv=none; d=google.com; s=arc-20160816; b=eEmMsfQwV/2mpWen4s8yfH4dtxLfYk8k/LfrM2TRClOz7/bwGofgGOMK230c/yCcXn 55fDCbNXHTlDgy18wQV0LgVDUAafwq3N/J1rSwje/30Y/sizha2jRrzHJ9+eQNLcSInk c4EPh5QDgl5QsSSJpsnB7eHwaYgrcb7iH3uWWDkHPNLpvv9M2XSs52zjfxlDtQ7dJuv5 G4dguqzOQhQnoNY7YdAPU4OcrLO9z4ZSAV0g31RbtlZCi+XoplmmhbG/TEOvoofF3KdH jlyx8hiFurvVPaciplsypVZroTaAmk5M6SZ2g7sjrw3HHDmkYwEVQ+njcpKZ9hJgwKPl UKnQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=8xPn0fJb1G79vmQneRtFHd9riwOuPrJO1tNQT+KG0zw=; fh=rOC7q8UJisRayejF6PsoKdRfRTtXVZOwgDCXOG0B/ws=; b=FpwBn20y49bYCieA5AiF5Agm1VytgyDuZyMl0FitnP1GIbcTllt8988Ah2ZwTWVjJ2 ZVFPc/2qMqVe8o11GqV/7XfY+0FfvvDksPABQCTTFFLIeUqJLIx9p/5idW6cJezzIrMR XLy/TKpcmIS5L8YjK1cvjbncHKmFCOwwLP5Oyo3ZiebhhoSWLO+J0Npqw4d+GDTWMhV9 8Tum2DX7AICyWg/aNV+e+Kx404qRy2tyGHTg6bTwhkzrHuOVj+A5wrpVlDS5hqqwvFSi /m2kb5olYVEsTq7LA+Cue670JOdhEQttdU00+ysTYeuod0c0LBNWIXe66HuTn7f3y+oP rSsg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@baylibre-com.20230601.gappssmtp.com header.s=20230601 header.b=vGywFzIy; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.31 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from morse.vger.email (morse.vger.email. [23.128.96.31]) by mx.google.com with ESMTPS id n18-20020a170902e55200b001b82da85c5asi2708646plf.336.2023.09.21.17.09.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 21 Sep 2023 17:09:47 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.31 as permitted sender) client-ip=23.128.96.31; Authentication-Results: mx.google.com; dkim=pass header.i=@baylibre-com.20230601.gappssmtp.com header.s=20230601 header.b=vGywFzIy; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.31 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by morse.vger.email (Postfix) with ESMTP id 2734280FE967; Thu, 21 Sep 2023 13:22:41 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at morse.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231626AbjIUUWa (ORCPT + 99 others); Thu, 21 Sep 2023 16:22:30 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52066 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231425AbjIUUWC (ORCPT ); Thu, 21 Sep 2023 16:22:02 -0400 Received: from mail-ej1-x629.google.com (mail-ej1-x629.google.com [IPv6:2a00:1450:4864:20::629]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D853C10182 for ; Thu, 21 Sep 2023 10:29:57 -0700 (PDT) Received: by mail-ej1-x629.google.com with SMTP id a640c23a62f3a-9ad8bba8125so159472066b.3 for ; Thu, 21 Sep 2023 10:29:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=baylibre-com.20230601.gappssmtp.com; s=20230601; t=1695317389; x=1695922189; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=8xPn0fJb1G79vmQneRtFHd9riwOuPrJO1tNQT+KG0zw=; b=vGywFzIyVlqaDtmzt/UED2fs7D4gyvtpUpoVEYskX/NnqTJWi+d2dOREdB9MHu3jhF iXa6d8zI2/l5YlGsHsS18qdy0IifUAfL7m5Eb883TRSFtDTrDNVXb7+t79iTsZoOgAjp bfwEH0mn6xsosTGSXQjuyDGGUG1kIxjqowW727EzLI5pzYmhUWbjRwFzQ/DVCOha2D44 G0gA7K11g+N/iHfbjiMg03LHJCeCiKJ4JHRhDhP62sw04qX2+6gHH8Q+MBq1UoM5Ysdl l5Fbm9uz3Zi/lS7srCfesrx4C7uA7H4Yn9eFrOS7kXYhAgogiQ5Rm8aCdvcoPnRYnxUV 5aAQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1695317389; x=1695922189; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=8xPn0fJb1G79vmQneRtFHd9riwOuPrJO1tNQT+KG0zw=; b=RreOZaiTLF7pvd8XYXR0Xd661UKZKBuM1hJMhPdXvicijBLMs7E6XXUl/GtwXhBx83 3y2ExcN1Xedw7J6WjdXHJ2KLL7kk8phNHflqjzaPygoJh0INfZn902OODse3uaiJOWMh j+0RvwqcDPKDXXE0n89R6FjodAysV9Lqjef8byxNAMK5McI75pQlc4qJFNL5qKjoUCpW +jgEM1sq2baKr7Wnr4zSLV41EOhotcJm4useYxy4yYzhUBbfazXStFOP4mY5LWJgfLXv RQ5AjNZhjMQR1fEt8vONwlpgL26eXLj7Fw+A/rJ9tMZJYZ9qrVVMArdh71blG1Y+C5Bp 416A== X-Gm-Message-State: AOJu0YzopoRev/spIpX7HwQvMFovmBfMRasYi478tEB1SDTKugjHdn08 q7N0Jlk2k5ziEyzF9pdxWiQQBJz3iRwoR6ggWIzojkeH X-Received: by 2002:a7b:c859:0:b0:402:95a0:b2ae with SMTP id c25-20020a7bc859000000b0040295a0b2aemr4971411wml.32.1695307458717; Thu, 21 Sep 2023 07:44:18 -0700 (PDT) Received: from localhost.localdomain (abordeaux-655-1-129-86.w90-5.abo.wanadoo.fr. [90.5.10.86]) by smtp.gmail.com with ESMTPSA id s17-20020a1cf211000000b003fe2a40d287sm2125515wmc.1.2023.09.21.07.44.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 21 Sep 2023 07:44:18 -0700 (PDT) From: David Lechner To: linux-iio@vger.kernel.org, devicetree@vger.kernel.org, linux-staging@lists.linux.dev Cc: linux-kernel@vger.kernel.org, Jonathan Cameron , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Michael Hennerich , =?UTF-8?q?Nuno=20S=C3=A1?= , Axel Haslam , Philip Molloy , David Lechner Subject: [PATCH v2 07/19] staging: iio: resolver: ad2s1210: implement IIO_CHAN_INFO_SCALE Date: Thu, 21 Sep 2023 09:43:48 -0500 Message-Id: <20230921144400.62380-8-dlechner@baylibre.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230921144400.62380-1-dlechner@baylibre.com> References: <20230921144400.62380-1-dlechner@baylibre.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-0.8 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SPF_HELO_NONE, SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on morse.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (morse.vger.email [0.0.0.0]); Thu, 21 Sep 2023 13:22:41 -0700 (PDT) This adds an implementation of IIO_CHAN_INFO_SCALE to the ad2s1210 resolver driver. This allows userspace to get the scale factor for the raw values. Signed-off-by: David Lechner --- drivers/staging/iio/resolver/ad2s1210.c | 107 ++++++++++++++++-------- 1 file changed, 72 insertions(+), 35 deletions(-) diff --git a/drivers/staging/iio/resolver/ad2s1210.c b/drivers/staging/iio/resolver/ad2s1210.c index 985b8fecd65a..95d43b241a75 100644 --- a/drivers/staging/iio/resolver/ad2s1210.c +++ b/drivers/staging/iio/resolver/ad2s1210.c @@ -458,56 +458,91 @@ static ssize_t ad2s1210_store_reg(struct device *dev, return ret < 0 ? ret : len; } +static const int ad2s1210_velocity_scale[] = { + 17089132, /* 8.192MHz / (2*pi * 2500 / 2^15) */ + 42722830, /* 8.192MHz / (2*pi * 1000 / 2^15) */ + 85445659, /* 8.192MHz / (2*pi * 500 / 2^15) */ + 341782638, /* 8.192MHz / (2*pi * 125 / 2^15) */ +}; + static int ad2s1210_read_raw(struct iio_dev *indio_dev, struct iio_chan_spec const *chan, int *val, int *val2, - long m) + long mask) { struct ad2s1210_state *st = iio_priv(indio_dev); int ret = 0; - mutex_lock(&st->lock); - gpiod_set_value(st->gpios[AD2S1210_SAMPLE], 0); - /* delay (6 * tck + 20) nano seconds */ - udelay(1); + switch (mask) { + case IIO_CHAN_INFO_RAW: + mutex_lock(&st->lock); + gpiod_set_value(st->gpios[AD2S1210_SAMPLE], 0); + /* delay (6 * tck + 20) nano seconds */ + udelay(1); + + switch (chan->type) { + case IIO_ANGL: + ad2s1210_set_mode(MOD_POS, st); + break; + case IIO_ANGL_VEL: + ad2s1210_set_mode(MOD_VEL, st); + break; + default: + ret = -EINVAL; + break; + } + if (ret < 0) + goto error_info_raw; + ret = spi_read(st->sdev, st->rx, 2); + if (ret < 0) + goto error_info_raw; + + switch (chan->type) { + case IIO_ANGL: + *val = be16_to_cpup((__be16 *)st->rx); + ret = IIO_VAL_INT; + break; + case IIO_ANGL_VEL: + *val = (s16)be16_to_cpup((__be16 *)st->rx); + ret = IIO_VAL_INT; + break; + default: + ret = -EINVAL; + break; + } - switch (chan->type) { - case IIO_ANGL: - ad2s1210_set_mode(MOD_POS, st); - break; - case IIO_ANGL_VEL: - ad2s1210_set_mode(MOD_VEL, st); - break; - default: - ret = -EINVAL; +error_info_raw: + gpiod_set_value(st->gpios[AD2S1210_SAMPLE], 1); + /* delay (2 * tck + 20) nano seconds */ + udelay(1); + mutex_unlock(&st->lock); break; - } - if (ret < 0) - goto error_ret; - ret = spi_read(st->sdev, st->rx, 2); - if (ret < 0) - goto error_ret; - switch (chan->type) { - case IIO_ANGL: - *val = be16_to_cpup((__be16 *)st->rx); - ret = IIO_VAL_INT; - break; - case IIO_ANGL_VEL: - *val = (s16)be16_to_cpup((__be16 *)st->rx); - ret = IIO_VAL_INT; + case IIO_CHAN_INFO_SCALE: + switch (chan->type) { + case IIO_ANGL: + /* approx 0.3 arc min converted to radians */ + *val = 0; + *val2 = 95874; + ret = IIO_VAL_INT_PLUS_NANO; + break; + case IIO_ANGL_VEL: + *val = st->fclkin; + *val2 = ad2s1210_velocity_scale[st->resolution]; + ret = IIO_VAL_FRACTIONAL; + break; + default: + ret = -EINVAL; + break; + } break; + default: ret = -EINVAL; break; } -error_ret: - gpiod_set_value(st->gpios[AD2S1210_SAMPLE], 1); - /* delay (2 * tck + 20) nano seconds */ - udelay(1); - mutex_unlock(&st->lock); return ret; } @@ -549,12 +584,14 @@ static const struct iio_chan_spec ad2s1210_channels[] = { .type = IIO_ANGL, .indexed = 1, .channel = 0, - .info_mask_separate = BIT(IIO_CHAN_INFO_RAW), + .info_mask_separate = BIT(IIO_CHAN_INFO_RAW) | + BIT(IIO_CHAN_INFO_SCALE), }, { .type = IIO_ANGL_VEL, .indexed = 1, .channel = 0, - .info_mask_separate = BIT(IIO_CHAN_INFO_RAW), + .info_mask_separate = BIT(IIO_CHAN_INFO_RAW) | + BIT(IIO_CHAN_INFO_SCALE), } }; -- 2.34.1