| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Date: Thu, 17 Feb 2022 06:27:05 +0000
From: LI Qingwu <Qing-wu.Li@...ca-geosystems.com.cn>
To: jic23@...nel.org, lars@...afoo.de, robh+dt@...nel.org,
tomas.melin@...sala.com, andy.shevchenko@...il.com,
devicetree@...r.kernel.org, linux-kernel@...r.kernel.org,
Qing-wu.Li@...ca-geosystems.com.cn
Cc: linux-iio@...r.kernel.org, bsp-development.geo@...ca-geosystems.com
Subject: [PATCH V2 5/5] iio: accel: sca3300: Add inclination channels.
Different with SCA3300, SCL3300 can output inclination angles.
Angles are formed from acceleration with following equations:
ANG_X = atan2(accx / √(accy^2 + accz^2)),
ANG_Y = atan2(accy / √(accx^2 + accz^2)),
ANG_Z = atan2(accz / √(accx^2 + accy^2)),
The commit add output of the raw value,scale
and scale_available of angles.
New interfaces:
in_incli_scale
in_incli_scale_available
in_incli_x_raw
in_incli_y_raw
in_incli_z_raw
Signed-off-by: LI Qingwu <Qing-wu.Li@...ca-geosystems.com.cn>
---
drivers/iio/accel/sca3300.c | 48 +++++++++++++++++++++++++++++++++++++
1 file changed, 48 insertions(+)
diff --git a/drivers/iio/accel/sca3300.c b/drivers/iio/accel/sca3300.c
index 123ab9a784d2..5c86b143d17a 100644
--- a/drivers/iio/accel/sca3300.c
+++ b/drivers/iio/accel/sca3300.c
@@ -64,6 +64,9 @@ enum sca3300_scan_indexes {
SCA3300_ACC_Y,
SCA3300_ACC_Z,
SCA3300_TEMP,
+ SCA3300_INCLI_X,
+ SCA3300_INCLI_Y,
+ SCA3300_INCLI_Z,
SCA3300_TIMESTAMP,
};
@@ -88,6 +91,24 @@ enum sca3300_scan_indexes {
}, \
}
+#define SCA3300_INCLI_CHANNEL(index, reg, axis) { \
+ .type = IIO_INCLI, \
+ .address = reg, \
+ .modified = 1, \
+ .channel2 = IIO_MOD_##axis, \
+ .info_mask_shared_by_type = BIT(IIO_CHAN_INFO_SCALE), \
+ .info_mask_separate = BIT(IIO_CHAN_INFO_RAW), \
+ .info_mask_shared_by_type_available = \
+ BIT(IIO_CHAN_INFO_SCALE), \
+ .scan_index = index, \
+ .scan_type = { \
+ .sign = 's', \
+ .realbits = 16, \
+ .storagebits = 16, \
+ .endianness = IIO_CPU, \
+ }, \
+}
+
#define SCA3300_TEMP_CHANNEL(index, reg) { \
.type = IIO_TEMP, \
.address = reg, \
@@ -115,6 +136,9 @@ static const struct iio_chan_spec scl3300_channels[] = {
SCA3300_ACCEL_CHANNEL(SCA3300_ACC_Y, 0x2, Y),
SCA3300_ACCEL_CHANNEL(SCA3300_ACC_Z, 0x3, Z),
SCA3300_TEMP_CHANNEL(SCA3300_TEMP, 0x05),
+ SCA3300_INCLI_CHANNEL(SCA3300_INCLI_X, 0x09, X),
+ SCA3300_INCLI_CHANNEL(SCA3300_INCLI_Y, 0x0A, Y),
+ SCA3300_INCLI_CHANNEL(SCA3300_INCLI_Z, 0x0B, Z),
IIO_CHAN_SOFT_TIMESTAMP(SCA3300_TIMESTAMP),
};
@@ -124,17 +148,28 @@ static const int scl3300_lp_freq_table[] = {40, 70, 10, 10};
static const int sca3300_accel_scale_table[][2] = {{0, 370}, {0, 741}, {0, 185}, {0, 185}};
static const int scl3300_accel_scale_table[][2] = {{0, 167}, {0, 333}, {0, 83}, {0, 83}};
+static const int scl3300_incli_scale_table[][2] = {{0, 5495}, {0, 5495}, {0, 5495}, {0, 5495}};
+
static const unsigned long sca3300_scan_masks[] = {
BIT(SCA3300_ACC_X) | BIT(SCA3300_ACC_Y) | BIT(SCA3300_ACC_Z) |
BIT(SCA3300_TEMP),
0,
};
+static const unsigned long scl3300_scan_masks[] = {
+ BIT(SCA3300_ACC_X) | BIT(SCA3300_ACC_Y) | BIT(SCA3300_ACC_Z) |
+ BIT(SCA3300_TEMP) |
+ BIT(SCA3300_INCLI_X) | BIT(SCA3300_INCLI_Y) | BIT(SCA3300_INCLI_Z),
+ 0,
+};
+
struct sca3300_chip_info {
const struct iio_chan_spec *channels;
enum sca3300_chip_type chip_type;
const int (*accel_scale_table)[2];
+ const int (*incli_scale_table)[2];
unsigned int num_accel_scales;
+ unsigned int num_incli_scales;
unsigned long scan_masks;
unsigned int num_freqs;
const int *freq_table;
@@ -172,14 +207,18 @@ static const struct sca3300_chip_info sca3300_chip_info_tbl[] = {
.scan_masks = sca3300_scan_masks,
.channels = sca3300_channels,
.chip_type = CHIP_SCA3300,
+ .incli_scale_table = NULL,
+ .num_incli_scales = 0,
.name = "sca3300",
.chip_id = 0x51,
.num_freqs = 2,
},
[CHIP_SCL3300] = {
.num_accel_scales = ARRAY_SIZE(scl3300_accel_scale_table)*2-1,
+ .num_incli_scales = ARRAY_SIZE(scl3300_lp_freq_table)-1,
.num_channels = ARRAY_SIZE(scl3300_channels),
.accel_scale_table = scl3300_accel_scale_table,
+ .incli_scale_table = scl3300_incli_scale_table,
.freq_table = scl3300_lp_freq_table,
.scan_masks = sca3300_scan_masks,
.channels = scl3300_channels,
@@ -378,6 +417,10 @@ static int sca3300_read_raw(struct iio_dev *indio_dev,
if (ret)
return ret;
switch (chan->type) {
+ case IIO_INCLI:
+ *val = data->chip_info->incli_scale_table[reg_val][0];
+ *val2 = data->chip_info->incli_scale_table[reg_val][1];
+ return IIO_VAL_INT_PLUS_MICRO;
case IIO_ACCEL:
*val = data->chip_info->accel_scale_table[reg_val][0];
*val2 = data->chip_info->accel_scale_table[reg_val][1];
@@ -507,6 +550,11 @@ static int sca3300_read_avail(struct iio_dev *indio_dev,
switch (mask) {
case IIO_CHAN_INFO_SCALE:
switch (chan->type) {
+ case IIO_INCLI:
+ *vals = (const int *)data->chip_info->incli_scale_table;
+ *length = data->chip_info->num_incli_scales;
+ *type = IIO_VAL_INT_PLUS_MICRO;
+ return IIO_AVAIL_LIST;
case IIO_ACCEL:
*vals = (const int *)data->chip_info->accel_scale_table;
*length = data->chip_info->num_accel_scales;
--
2.25.1
Powered by blists - more mailing lists