From patchwork Sun Oct 27 19:21:23 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lorenzo Bianconi X-Patchwork-Id: 11214295 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 3C315112C for ; Sun, 27 Oct 2019 19:21:42 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 0F61B20717 for ; Sun, 27 Oct 2019 19:21:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1572204102; bh=01fpVACNnPSHlfFrq2Ce2QeapSgaDQ8QpuD1mdnTv3o=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=V/ONkB91OUQ3T3ShaKLuPwRdm+OACk4VQgEkQkMNYJ8Ps2yasArF/RlEX48VHFmTB ERgqmvt8YFyUENQH/QHi6U7+Ld6w55K3dItBA9kn7ydmEta4mAx5Kk9sb/IiAS3E0q tbdEc/SAVdrtGLYhJpWUXzX1UA/9Q8XzCfZLo+EI= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727070AbfJ0TVl (ORCPT ); Sun, 27 Oct 2019 15:21:41 -0400 Received: from mail.kernel.org ([198.145.29.99]:39174 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726985AbfJ0TVl (ORCPT ); Sun, 27 Oct 2019 15:21:41 -0400 Received: from localhost.localdomain (unknown [151.66.57.46]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 662FF20717; Sun, 27 Oct 2019 19:21:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1572204100; bh=01fpVACNnPSHlfFrq2Ce2QeapSgaDQ8QpuD1mdnTv3o=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=j2UTiywrfy5pehPI6iabSL8AyTv4mi3IQEzDDZ/h3Wot+XczWTiSzNgV00l414maX AzevTUh282houEIva2CEI72MG0RVfMq5G6uGOfOGK/j4yTRKritjyu3LVhefEKpauw bWuVuXuRAAquAAfEiD3KUU6r90waMks7JT9r+r6g= From: Lorenzo Bianconi To: jic23@kernel.org Cc: lorenzo.bianconi@redhat.com, linux-iio@vger.kernel.org Subject: [PATCH 1/2] iio: imu: st_lsm6dsx: explicitly define odr table size Date: Sun, 27 Oct 2019 20:21:23 +0100 Message-Id: <2ef6b3a3268bddb1294f646f02545d46a7f7fc1e.1572203759.git.lorenzo@kernel.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: References: MIME-Version: 1.0 Sender: linux-iio-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-iio@vger.kernel.org Introduce odr_len in st_lsm6dsx_odr_table_entry data structure in order to explicitly define odr table size and support devices with different odr table map Signed-off-by: Lorenzo Bianconi --- drivers/iio/imu/st_lsm6dsx/st_lsm6dsx.h | 2 ++ drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c | 27 +++++++++++++++----- drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_shub.c | 12 ++++----- 3 files changed, 29 insertions(+), 12 deletions(-) diff --git a/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx.h b/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx.h index 37e499fe6bcf..9ffc8e06f73d 100644 --- a/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx.h +++ b/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx.h @@ -113,7 +113,9 @@ struct st_lsm6dsx_odr { #define ST_LSM6DSX_ODR_LIST_SIZE 6 struct st_lsm6dsx_odr_table_entry { struct st_lsm6dsx_reg reg; + struct st_lsm6dsx_odr odr_avl[ST_LSM6DSX_ODR_LIST_SIZE]; + int odr_len; }; struct st_lsm6dsx_fs { diff --git a/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c b/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c index c53c03ec2423..2f9396745bc8 100644 --- a/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c +++ b/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c @@ -133,6 +133,7 @@ static const struct st_lsm6dsx_settings st_lsm6dsx_sensor_settings[] = { .odr_avl[3] = { 238, 0x04 }, .odr_avl[4] = { 476, 0x05 }, .odr_avl[5] = { 952, 0x06 }, + .odr_len = 6, }, [ST_LSM6DSX_ID_GYRO] = { .reg = { @@ -145,6 +146,7 @@ static const struct st_lsm6dsx_settings st_lsm6dsx_sensor_settings[] = { .odr_avl[3] = { 238, 0x04 }, .odr_avl[4] = { 476, 0x05 }, .odr_avl[5] = { 952, 0x06 }, + .odr_len = 6, }, }, .fs_table = { @@ -233,6 +235,7 @@ static const struct st_lsm6dsx_settings st_lsm6dsx_sensor_settings[] = { .odr_avl[3] = { 104, 0x04 }, .odr_avl[4] = { 208, 0x05 }, .odr_avl[5] = { 416, 0x06 }, + .odr_len = 6, }, [ST_LSM6DSX_ID_GYRO] = { .reg = { @@ -245,6 +248,7 @@ static const struct st_lsm6dsx_settings st_lsm6dsx_sensor_settings[] = { .odr_avl[3] = { 104, 0x04 }, .odr_avl[4] = { 208, 0x05 }, .odr_avl[5] = { 416, 0x06 }, + .odr_len = 6, }, }, .fs_table = { @@ -397,6 +401,7 @@ static const struct st_lsm6dsx_settings st_lsm6dsx_sensor_settings[] = { .odr_avl[3] = { 104, 0x04 }, .odr_avl[4] = { 208, 0x05 }, .odr_avl[5] = { 416, 0x06 }, + .odr_len = 6, }, [ST_LSM6DSX_ID_GYRO] = { .reg = { @@ -409,6 +414,7 @@ static const struct st_lsm6dsx_settings st_lsm6dsx_sensor_settings[] = { .odr_avl[3] = { 104, 0x04 }, .odr_avl[4] = { 208, 0x05 }, .odr_avl[5] = { 416, 0x06 }, + .odr_len = 6, }, }, .fs_table = { @@ -570,6 +576,7 @@ static const struct st_lsm6dsx_settings st_lsm6dsx_sensor_settings[] = { .odr_avl[3] = { 104, 0x04 }, .odr_avl[4] = { 208, 0x05 }, .odr_avl[5] = { 416, 0x06 }, + .odr_len = 6, }, [ST_LSM6DSX_ID_GYRO] = { .reg = { @@ -582,6 +589,7 @@ static const struct st_lsm6dsx_settings st_lsm6dsx_sensor_settings[] = { .odr_avl[3] = { 104, 0x04 }, .odr_avl[4] = { 208, 0x05 }, .odr_avl[5] = { 416, 0x06 }, + .odr_len = 6, }, }, .fs_table = { @@ -745,6 +753,7 @@ static const struct st_lsm6dsx_settings st_lsm6dsx_sensor_settings[] = { .odr_avl[3] = { 104, 0x04 }, .odr_avl[4] = { 208, 0x05 }, .odr_avl[5] = { 416, 0x06 }, + .odr_len = 6, }, [ST_LSM6DSX_ID_GYRO] = { .reg = { @@ -757,6 +766,7 @@ static const struct st_lsm6dsx_settings st_lsm6dsx_sensor_settings[] = { .odr_avl[3] = { 104, 0x04 }, .odr_avl[4] = { 208, 0x05 }, .odr_avl[5] = { 416, 0x06 }, + .odr_len = 6, }, }, .fs_table = { @@ -940,6 +950,7 @@ static const struct st_lsm6dsx_settings st_lsm6dsx_sensor_settings[] = { .odr_avl[3] = { 104, 0x04 }, .odr_avl[4] = { 208, 0x05 }, .odr_avl[5] = { 416, 0x06 }, + .odr_len = 6, }, [ST_LSM6DSX_ID_GYRO] = { .reg = { @@ -952,6 +963,7 @@ static const struct st_lsm6dsx_settings st_lsm6dsx_sensor_settings[] = { .odr_avl[3] = { 104, 0x04 }, .odr_avl[4] = { 208, 0x05 }, .odr_avl[5] = { 416, 0x06 }, + .odr_len = 6, }, }, .fs_table = { @@ -1115,6 +1127,7 @@ static const struct st_lsm6dsx_settings st_lsm6dsx_sensor_settings[] = { .odr_avl[3] = { 104, 0x04 }, .odr_avl[4] = { 208, 0x05 }, .odr_avl[5] = { 416, 0x06 }, + .odr_len = 6, }, [ST_LSM6DSX_ID_GYRO] = { .reg = { @@ -1127,6 +1140,7 @@ static const struct st_lsm6dsx_settings st_lsm6dsx_sensor_settings[] = { .odr_avl[3] = { 104, 0x04 }, .odr_avl[4] = { 208, 0x05 }, .odr_avl[5] = { 416, 0x06 }, + .odr_len = 6, }, }, .fs_table = { @@ -1350,15 +1364,16 @@ int st_lsm6dsx_check_odr(struct st_lsm6dsx_sensor *sensor, u16 odr, u8 *val) int i; odr_table = &sensor->hw->settings->odr_table[sensor->id]; - for (i = 0; i < ST_LSM6DSX_ODR_LIST_SIZE; i++) + for (i = 0; i < odr_table->odr_len; i++) { /* * ext devices can run at different odr respect to * accel sensor */ if (odr_table->odr_avl[i].hz >= odr) break; + } - if (i == ST_LSM6DSX_ODR_LIST_SIZE) + if (i == odr_table->odr_len) return -EINVAL; *val = odr_table->odr_avl[i].val; @@ -1710,13 +1725,13 @@ st_lsm6dsx_sysfs_sampling_frequency_avail(struct device *dev, char *buf) { struct st_lsm6dsx_sensor *sensor = iio_priv(dev_get_drvdata(dev)); - enum st_lsm6dsx_sensor_id id = sensor->id; - struct st_lsm6dsx_hw *hw = sensor->hw; + const struct st_lsm6dsx_odr_table_entry *odr_table; int i, len = 0; - for (i = 0; i < ST_LSM6DSX_ODR_LIST_SIZE; i++) + odr_table = &sensor->hw->settings->odr_table[sensor->id]; + for (i = 0; i < odr_table->odr_len; i++) len += scnprintf(buf + len, PAGE_SIZE - len, "%d ", - hw->settings->odr_table[id].odr_avl[i].hz); + odr_table->odr_avl[i].hz); buf[len - 1] = '\n'; return len; diff --git a/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_shub.c b/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_shub.c index ea472cf6db7b..e029cc05a17f 100644 --- a/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_shub.c +++ b/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_shub.c @@ -55,6 +55,7 @@ static const struct st_lsm6dsx_ext_dev_settings st_lsm6dsx_ext_dev_table[] = { .odr_avl[1] = { 20, 0x1 }, .odr_avl[2] = { 50, 0x2 }, .odr_avl[3] = { 100, 0x3 }, + .odr_len = 4, }, .fs_table = { .fs_avl[0] = { @@ -323,11 +324,12 @@ st_lsm6dsx_shub_get_odr_val(struct st_lsm6dsx_sensor *sensor, int i; settings = sensor->ext_info.settings; - for (i = 0; i < ST_LSM6DSX_ODR_LIST_SIZE; i++) + for (i = 0; i < settings->odr_table.odr_len; i++) { if (settings->odr_table.odr_avl[i].hz == odr) break; + } - if (i == ST_LSM6DSX_ODR_LIST_SIZE) + if (i == settings->odr_table.odr_len) return -EINVAL; *val = settings->odr_table.odr_avl[i].val; @@ -537,12 +539,10 @@ st_lsm6dsx_shub_sampling_freq_avail(struct device *dev, int i, len = 0; settings = sensor->ext_info.settings; - for (i = 0; i < ST_LSM6DSX_ODR_LIST_SIZE; i++) { + for (i = 0; i < settings->odr_table.odr_len; i++) { u16 val = settings->odr_table.odr_avl[i].hz; - if (val > 0) - len += scnprintf(buf + len, PAGE_SIZE - len, "%d ", - val); + len += scnprintf(buf + len, PAGE_SIZE - len, "%d ", val); } buf[len - 1] = '\n'; From patchwork Sun Oct 27 19:21:24 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lorenzo Bianconi X-Patchwork-Id: 11214297 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 25E3A112C for ; Sun, 27 Oct 2019 19:21:44 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id E130E20659 for ; Sun, 27 Oct 2019 19:21:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1572204104; bh=7JzrIUbEfDfJG8tuOVH8l2+DQLipNF/G/v9V4fflR2E=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=D2XZnCC6FV+hrmt+yp9//VpVYWEqLdRSMQ2vvJpMuMWDI8iXG0PogiU/CNvz3vdLX 6ZyExXRRlKZYbnHKEjF/dBsbBO0plKpIe/ae1fHJw5gjpNvp+7tv6O85BbK4iPlLDZ T0WZPtFCGOdhEangIoUbQHVGlRclcifVYDTcDakU= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727085AbfJ0TVn (ORCPT ); Sun, 27 Oct 2019 15:21:43 -0400 Received: from mail.kernel.org ([198.145.29.99]:39186 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726985AbfJ0TVn (ORCPT ); Sun, 27 Oct 2019 15:21:43 -0400 Received: from localhost.localdomain (unknown [151.66.57.46]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 5D60120B7C; Sun, 27 Oct 2019 19:21:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1572204102; bh=7JzrIUbEfDfJG8tuOVH8l2+DQLipNF/G/v9V4fflR2E=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=BM/Im19+aTjx3N+jre+gatUEEeQ+8dyA8kg6cBIBf8PPMe6a1Afa6C9dHzqqmXvAC ON5xJq02KrEhZ42/zzTNnGE9j610FiOtkawWv4/kQ9yc2jhJ66owu74he2UDfWCVFC Vos2kXcRqCkvhAvRZGcC1K8/dbCCUFzkGApkwBeA= From: Lorenzo Bianconi To: jic23@kernel.org Cc: lorenzo.bianconi@redhat.com, linux-iio@vger.kernel.org Subject: [PATCH 2/2] iio: imu: st_lsm6dsx: express odr in HZ / 10 Date: Sun, 27 Oct 2019 20:21:24 +0100 Message-Id: <3d1ffc5fd083dcbd007872e5e8f5261faac69503.1572203759.git.lorenzo@kernel.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: References: MIME-Version: 1.0 Sender: linux-iio-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-iio@vger.kernel.org Express available frequencies in HZ / 10 in order to support even rational ODRs. This patch is need to fix an Android CTS failure Signed-off-by: Lorenzo Bianconi --- drivers/iio/imu/st_lsm6dsx/st_lsm6dsx.h | 2 +- drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c | 181 ++++++++++--------- drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_shub.c | 23 ++- 3 files changed, 106 insertions(+), 100 deletions(-) diff --git a/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx.h b/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx.h index 9ffc8e06f73d..b32c6389f47b 100644 --- a/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx.h +++ b/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx.h @@ -106,7 +106,7 @@ struct st_lsm6dsx_sensor; struct st_lsm6dsx_hw; struct st_lsm6dsx_odr { - u16 hz; + u16 hz; /* expressed in HZ / 10 */ u8 val; }; diff --git a/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c b/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c index 2f9396745bc8..63e113725499 100644 --- a/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c +++ b/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c @@ -127,12 +127,12 @@ static const struct st_lsm6dsx_settings st_lsm6dsx_sensor_settings[] = { .addr = 0x20, .mask = GENMASK(7, 5), }, - .odr_avl[0] = { 10, 0x01 }, - .odr_avl[1] = { 50, 0x02 }, - .odr_avl[2] = { 119, 0x03 }, - .odr_avl[3] = { 238, 0x04 }, - .odr_avl[4] = { 476, 0x05 }, - .odr_avl[5] = { 952, 0x06 }, + .odr_avl[0] = { 100, 0x01 }, + .odr_avl[1] = { 500, 0x02 }, + .odr_avl[2] = { 1190, 0x03 }, + .odr_avl[3] = { 2380, 0x04 }, + .odr_avl[4] = { 4760, 0x05 }, + .odr_avl[5] = { 9520, 0x06 }, .odr_len = 6, }, [ST_LSM6DSX_ID_GYRO] = { @@ -140,12 +140,12 @@ static const struct st_lsm6dsx_settings st_lsm6dsx_sensor_settings[] = { .addr = 0x10, .mask = GENMASK(7, 5), }, - .odr_avl[0] = { 15, 0x01 }, - .odr_avl[1] = { 60, 0x02 }, - .odr_avl[2] = { 119, 0x03 }, - .odr_avl[3] = { 238, 0x04 }, - .odr_avl[4] = { 476, 0x05 }, - .odr_avl[5] = { 952, 0x06 }, + .odr_avl[0] = { 149, 0x01 }, + .odr_avl[1] = { 595, 0x02 }, + .odr_avl[2] = { 1190, 0x03 }, + .odr_avl[3] = { 2380, 0x04 }, + .odr_avl[4] = { 4760, 0x05 }, + .odr_avl[5] = { 9520, 0x06 }, .odr_len = 6, }, }, @@ -229,12 +229,12 @@ static const struct st_lsm6dsx_settings st_lsm6dsx_sensor_settings[] = { .addr = 0x10, .mask = GENMASK(7, 4), }, - .odr_avl[0] = { 13, 0x01 }, - .odr_avl[1] = { 26, 0x02 }, - .odr_avl[2] = { 52, 0x03 }, - .odr_avl[3] = { 104, 0x04 }, - .odr_avl[4] = { 208, 0x05 }, - .odr_avl[5] = { 416, 0x06 }, + .odr_avl[0] = { 125, 0x01 }, + .odr_avl[1] = { 260, 0x02 }, + .odr_avl[2] = { 520, 0x03 }, + .odr_avl[3] = { 1040, 0x04 }, + .odr_avl[4] = { 2080, 0x05 }, + .odr_avl[5] = { 4160, 0x06 }, .odr_len = 6, }, [ST_LSM6DSX_ID_GYRO] = { @@ -242,12 +242,12 @@ static const struct st_lsm6dsx_settings st_lsm6dsx_sensor_settings[] = { .addr = 0x11, .mask = GENMASK(7, 4), }, - .odr_avl[0] = { 13, 0x01 }, - .odr_avl[1] = { 26, 0x02 }, - .odr_avl[2] = { 52, 0x03 }, - .odr_avl[3] = { 104, 0x04 }, - .odr_avl[4] = { 208, 0x05 }, - .odr_avl[5] = { 416, 0x06 }, + .odr_avl[0] = { 125, 0x01 }, + .odr_avl[1] = { 260, 0x02 }, + .odr_avl[2] = { 520, 0x03 }, + .odr_avl[3] = { 1040, 0x04 }, + .odr_avl[4] = { 2080, 0x05 }, + .odr_avl[5] = { 4160, 0x06 }, .odr_len = 6, }, }, @@ -395,12 +395,12 @@ static const struct st_lsm6dsx_settings st_lsm6dsx_sensor_settings[] = { .addr = 0x10, .mask = GENMASK(7, 4), }, - .odr_avl[0] = { 13, 0x01 }, - .odr_avl[1] = { 26, 0x02 }, - .odr_avl[2] = { 52, 0x03 }, - .odr_avl[3] = { 104, 0x04 }, - .odr_avl[4] = { 208, 0x05 }, - .odr_avl[5] = { 416, 0x06 }, + .odr_avl[0] = { 125, 0x01 }, + .odr_avl[1] = { 260, 0x02 }, + .odr_avl[2] = { 520, 0x03 }, + .odr_avl[3] = { 1040, 0x04 }, + .odr_avl[4] = { 2080, 0x05 }, + .odr_avl[5] = { 4160, 0x06 }, .odr_len = 6, }, [ST_LSM6DSX_ID_GYRO] = { @@ -408,12 +408,12 @@ static const struct st_lsm6dsx_settings st_lsm6dsx_sensor_settings[] = { .addr = 0x11, .mask = GENMASK(7, 4), }, - .odr_avl[0] = { 13, 0x01 }, - .odr_avl[1] = { 26, 0x02 }, - .odr_avl[2] = { 52, 0x03 }, - .odr_avl[3] = { 104, 0x04 }, - .odr_avl[4] = { 208, 0x05 }, - .odr_avl[5] = { 416, 0x06 }, + .odr_avl[0] = { 125, 0x01 }, + .odr_avl[1] = { 260, 0x02 }, + .odr_avl[2] = { 520, 0x03 }, + .odr_avl[3] = { 1040, 0x04 }, + .odr_avl[4] = { 2080, 0x05 }, + .odr_avl[5] = { 4160, 0x06 }, .odr_len = 6, }, }, @@ -570,12 +570,12 @@ static const struct st_lsm6dsx_settings st_lsm6dsx_sensor_settings[] = { .addr = 0x10, .mask = GENMASK(7, 4), }, - .odr_avl[0] = { 13, 0x01 }, - .odr_avl[1] = { 26, 0x02 }, - .odr_avl[2] = { 52, 0x03 }, - .odr_avl[3] = { 104, 0x04 }, - .odr_avl[4] = { 208, 0x05 }, - .odr_avl[5] = { 416, 0x06 }, + .odr_avl[0] = { 125, 0x01 }, + .odr_avl[1] = { 260, 0x02 }, + .odr_avl[2] = { 520, 0x03 }, + .odr_avl[3] = { 1040, 0x04 }, + .odr_avl[4] = { 2080, 0x05 }, + .odr_avl[5] = { 4160, 0x06 }, .odr_len = 6, }, [ST_LSM6DSX_ID_GYRO] = { @@ -583,12 +583,12 @@ static const struct st_lsm6dsx_settings st_lsm6dsx_sensor_settings[] = { .addr = 0x11, .mask = GENMASK(7, 4), }, - .odr_avl[0] = { 13, 0x01 }, - .odr_avl[1] = { 26, 0x02 }, - .odr_avl[2] = { 52, 0x03 }, - .odr_avl[3] = { 104, 0x04 }, - .odr_avl[4] = { 208, 0x05 }, - .odr_avl[5] = { 416, 0x06 }, + .odr_avl[0] = { 125, 0x01 }, + .odr_avl[1] = { 260, 0x02 }, + .odr_avl[2] = { 520, 0x03 }, + .odr_avl[3] = { 1040, 0x04 }, + .odr_avl[4] = { 2080, 0x05 }, + .odr_avl[5] = { 4160, 0x06 }, .odr_len = 6, }, }, @@ -747,12 +747,12 @@ static const struct st_lsm6dsx_settings st_lsm6dsx_sensor_settings[] = { .addr = 0x10, .mask = GENMASK(7, 4), }, - .odr_avl[0] = { 13, 0x01 }, - .odr_avl[1] = { 26, 0x02 }, - .odr_avl[2] = { 52, 0x03 }, - .odr_avl[3] = { 104, 0x04 }, - .odr_avl[4] = { 208, 0x05 }, - .odr_avl[5] = { 416, 0x06 }, + .odr_avl[0] = { 125, 0x01 }, + .odr_avl[1] = { 260, 0x02 }, + .odr_avl[2] = { 520, 0x03 }, + .odr_avl[3] = { 1040, 0x04 }, + .odr_avl[4] = { 2080, 0x05 }, + .odr_avl[5] = { 4160, 0x06 }, .odr_len = 6, }, [ST_LSM6DSX_ID_GYRO] = { @@ -760,12 +760,12 @@ static const struct st_lsm6dsx_settings st_lsm6dsx_sensor_settings[] = { .addr = 0x11, .mask = GENMASK(7, 4), }, - .odr_avl[0] = { 13, 0x01 }, - .odr_avl[1] = { 26, 0x02 }, - .odr_avl[2] = { 52, 0x03 }, - .odr_avl[3] = { 104, 0x04 }, - .odr_avl[4] = { 208, 0x05 }, - .odr_avl[5] = { 416, 0x06 }, + .odr_avl[0] = { 125, 0x01 }, + .odr_avl[1] = { 260, 0x02 }, + .odr_avl[2] = { 520, 0x03 }, + .odr_avl[3] = { 1040, 0x04 }, + .odr_avl[4] = { 2080, 0x05 }, + .odr_avl[5] = { 4160, 0x06 }, .odr_len = 6, }, }, @@ -944,12 +944,12 @@ static const struct st_lsm6dsx_settings st_lsm6dsx_sensor_settings[] = { .addr = 0x10, .mask = GENMASK(7, 4), }, - .odr_avl[0] = { 13, 0x01 }, - .odr_avl[1] = { 26, 0x02 }, - .odr_avl[2] = { 52, 0x03 }, - .odr_avl[3] = { 104, 0x04 }, - .odr_avl[4] = { 208, 0x05 }, - .odr_avl[5] = { 416, 0x06 }, + .odr_avl[0] = { 125, 0x01 }, + .odr_avl[1] = { 260, 0x02 }, + .odr_avl[2] = { 520, 0x03 }, + .odr_avl[3] = { 1040, 0x04 }, + .odr_avl[4] = { 2080, 0x05 }, + .odr_avl[5] = { 4160, 0x06 }, .odr_len = 6, }, [ST_LSM6DSX_ID_GYRO] = { @@ -957,12 +957,12 @@ static const struct st_lsm6dsx_settings st_lsm6dsx_sensor_settings[] = { .addr = 0x11, .mask = GENMASK(7, 4), }, - .odr_avl[0] = { 13, 0x01 }, - .odr_avl[1] = { 26, 0x02 }, - .odr_avl[2] = { 52, 0x03 }, - .odr_avl[3] = { 104, 0x04 }, - .odr_avl[4] = { 208, 0x05 }, - .odr_avl[5] = { 416, 0x06 }, + .odr_avl[0] = { 125, 0x01 }, + .odr_avl[1] = { 260, 0x02 }, + .odr_avl[2] = { 520, 0x03 }, + .odr_avl[3] = { 1040, 0x04 }, + .odr_avl[4] = { 2080, 0x05 }, + .odr_avl[5] = { 4160, 0x06 }, .odr_len = 6, }, }, @@ -1121,12 +1121,12 @@ static const struct st_lsm6dsx_settings st_lsm6dsx_sensor_settings[] = { .addr = 0x10, .mask = GENMASK(7, 4), }, - .odr_avl[0] = { 13, 0x01 }, - .odr_avl[1] = { 26, 0x02 }, - .odr_avl[2] = { 52, 0x03 }, - .odr_avl[3] = { 104, 0x04 }, - .odr_avl[4] = { 208, 0x05 }, - .odr_avl[5] = { 416, 0x06 }, + .odr_avl[0] = { 125, 0x01 }, + .odr_avl[1] = { 260, 0x02 }, + .odr_avl[2] = { 520, 0x03 }, + .odr_avl[3] = { 1040, 0x04 }, + .odr_avl[4] = { 2080, 0x05 }, + .odr_avl[5] = { 4160, 0x06 }, .odr_len = 6, }, [ST_LSM6DSX_ID_GYRO] = { @@ -1134,12 +1134,12 @@ static const struct st_lsm6dsx_settings st_lsm6dsx_sensor_settings[] = { .addr = 0x11, .mask = GENMASK(7, 4), }, - .odr_avl[0] = { 13, 0x01 }, - .odr_avl[1] = { 26, 0x02 }, - .odr_avl[2] = { 52, 0x03 }, - .odr_avl[3] = { 104, 0x04 }, - .odr_avl[4] = { 208, 0x05 }, - .odr_avl[5] = { 416, 0x06 }, + .odr_avl[0] = { 125, 0x01 }, + .odr_avl[1] = { 260, 0x02 }, + .odr_avl[2] = { 520, 0x03 }, + .odr_avl[3] = { 1040, 0x04 }, + .odr_avl[4] = { 2080, 0x05 }, + .odr_avl[5] = { 4160, 0x06 }, .odr_len = 6, }, }, @@ -1475,7 +1475,7 @@ static int st_lsm6dsx_read_oneshot(struct st_lsm6dsx_sensor *sensor, if (err < 0) return err; - delay = 1000000 / sensor->odr; + delay = 10000000 / sensor->odr; usleep_range(delay, 2 * delay); err = st_lsm6dsx_read_locked(hw, addr, &data, sizeof(data)); @@ -1507,8 +1507,9 @@ static int st_lsm6dsx_read_raw(struct iio_dev *iio_dev, iio_device_release_direct_mode(iio_dev); break; case IIO_CHAN_INFO_SAMP_FREQ: - *val = sensor->odr; - ret = IIO_VAL_INT; + *val = sensor->odr / 10; + *val2 = (sensor->odr % 10) * 100000; + ret = IIO_VAL_INT_PLUS_MICRO; break; case IIO_CHAN_INFO_SCALE: *val = 0; @@ -1541,6 +1542,7 @@ static int st_lsm6dsx_write_raw(struct iio_dev *iio_dev, case IIO_CHAN_INFO_SAMP_FREQ: { u8 data; + val = val * 10 + val2 / 100000; val = st_lsm6dsx_check_odr(sensor, val, &data); if (val < 0) err = val; @@ -1730,8 +1732,9 @@ st_lsm6dsx_sysfs_sampling_frequency_avail(struct device *dev, odr_table = &sensor->hw->settings->odr_table[sensor->id]; for (i = 0; i < odr_table->odr_len; i++) - len += scnprintf(buf + len, PAGE_SIZE - len, "%d ", - odr_table->odr_avl[i].hz); + len += scnprintf(buf + len, PAGE_SIZE - len, "%d.%d ", + odr_table->odr_avl[i].hz / 10, + odr_table->odr_avl[i].hz % 10); buf[len - 1] = '\n'; return len; diff --git a/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_shub.c b/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_shub.c index e029cc05a17f..c3b124a73815 100644 --- a/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_shub.c +++ b/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_shub.c @@ -51,10 +51,10 @@ static const struct st_lsm6dsx_ext_dev_settings st_lsm6dsx_ext_dev_table[] = { .addr = 0x60, .mask = GENMASK(3, 2), }, - .odr_avl[0] = { 10, 0x0 }, - .odr_avl[1] = { 20, 0x1 }, - .odr_avl[2] = { 50, 0x2 }, - .odr_avl[3] = { 100, 0x3 }, + .odr_avl[0] = { 100, 0x0 }, + .odr_avl[1] = { 200, 0x1 }, + .odr_avl[2] = { 500, 0x2 }, + .odr_avl[3] = { 1000, 0x3 }, .odr_len = 4, }, .fs_table = { @@ -97,8 +97,8 @@ static void st_lsm6dsx_shub_wait_complete(struct st_lsm6dsx_hw *hw) u16 odr; sensor = iio_priv(hw->iio_devs[ST_LSM6DSX_ID_ACC]); - odr = (hw->enable_mask & BIT(ST_LSM6DSX_ID_ACC)) ? sensor->odr : 13; - msleep((2000U / odr) + 1); + odr = (hw->enable_mask & BIT(ST_LSM6DSX_ID_ACC)) ? sensor->odr : 125; + msleep((20000U / odr) + 1); } /** @@ -442,7 +442,7 @@ st_lsm6dsx_shub_read_oneshot(struct st_lsm6dsx_sensor *sensor, if (err < 0) return err; - delay = 1000000 / sensor->odr; + delay = 10000000 / sensor->odr; usleep_range(delay, 2 * delay); len = min_t(int, sizeof(data), ch->scan_type.realbits >> 3); @@ -482,8 +482,9 @@ st_lsm6dsx_shub_read_raw(struct iio_dev *iio_dev, iio_device_release_direct_mode(iio_dev); break; case IIO_CHAN_INFO_SAMP_FREQ: - *val = sensor->odr; - ret = IIO_VAL_INT; + *val = sensor->odr / 10; + *val2 = (sensor->odr % 10) * 100000; + ret = IIO_VAL_INT_PLUS_MICRO; break; case IIO_CHAN_INFO_SCALE: *val = 0; @@ -514,6 +515,7 @@ st_lsm6dsx_shub_write_raw(struct iio_dev *iio_dev, case IIO_CHAN_INFO_SAMP_FREQ: { u16 data; + val = val * 10 + val2 / 100000; err = st_lsm6dsx_shub_get_odr_val(sensor, val, &data); if (!err) sensor->odr = val; @@ -542,7 +544,8 @@ st_lsm6dsx_shub_sampling_freq_avail(struct device *dev, for (i = 0; i < settings->odr_table.odr_len; i++) { u16 val = settings->odr_table.odr_avl[i].hz; - len += scnprintf(buf + len, PAGE_SIZE - len, "%d ", val); + len += scnprintf(buf + len, PAGE_SIZE - len, "%d.%d ", + val / 10, val % 10); } buf[len - 1] = '\n';