On 23/05/2022 09:23, LI Qingwu wrote:
> Add support for Murata SCL3300, a 3-axis MEMS accelerometer.
> Same as SCA3300, it has the accelerometer and temperature output.
>
> Datasheet: www.murata.com/en-us/products/sensor/inclinometer/overview/lineup/scl3300
> Signed-off-by: LI Qingwu <Qing-wu.Li@xxxxxxxxxxxxxxxxxxxxxxx>
> ---
> drivers/iio/accel/sca3300.c | 31 +++++++++++++++++++++++++++++--
> 1 file changed, 29 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/iio/accel/sca3300.c b/drivers/iio/accel/sca3300.c
> index 6463d12a9ab9..74e780a7ffcd 100644
> --- a/drivers/iio/accel/sca3300.c
> +++ b/drivers/iio/accel/sca3300.c
> @@ -38,6 +38,7 @@
> /* Device ID */
> #define SCA3300_REG_WHOAMI 0x10
> #define SCA3300_WHOAMI_ID 0x51
> +#define SCL3300_WHOAMI_ID 0xC1
>
> /* Device return status and mask */
> #define SCA3300_VALUE_RS_ERROR 0x3
> @@ -96,10 +97,18 @@ static const struct iio_chan_spec sca3300_channels[] = {
> static const int sca3300_lp_freq[] = {70, 10};
> static const int sca3300_lp_freq_map[] = {0, 0, 0, 1};
>
> +static const int scl3300_lp_freq[] = {40, 70, 10};
> +static const int scl3300_lp_freq_map[] = {0, 1, 2};
> +
> static const int sca3300_accel_scale[][2] = {{0, 370}, {0, 741}, {0, 185}};
> static const int sca3300_accel_scale_map[] = {0, 1, 2, 2};
>
> +static const int scl3300_accel_scale[][2] = {{0, 167}, {0, 333}, {0, 83}};
> +static const int scl3300_accel_scale_map[] = {0, 1, 2};
> +
> static const int sca3300_avail_modes_map[] = {0, 1, 2, 3};
> +static const int scl3300_avail_modes_map[] = {0, 1, 3};
> +
> static const unsigned long sca3300_scan_masks[] = {
> BIT(SCA3300_ACC_X) | BIT(SCA3300_ACC_Y) | BIT(SCA3300_ACC_Z) |
> BIT(SCA3300_TEMP),
> @@ -159,6 +168,21 @@ static const struct sca3300_chip_info sca3300_chip_tbl[] = {
> .num_avail_modes = 4,
> .chip_id = SCA3300_WHOAMI_ID,
> },
> + {
> + .name = "scl3300",
> + .scan_masks = sca3300_scan_masks,
> + .channels = sca3300_channels,
> + .num_channels = ARRAY_SIZE(sca3300_channels),
> + .num_accel_scales = ARRAY_SIZE(scl3300_accel_scale)*2,
> + .accel_scale = scl3300_accel_scale,
> + .accel_scale_map = scl3300_accel_scale_map,
> + .num_freqs = ARRAY_SIZE(scl3300_lp_freq),
> + .freq_table = scl3300_lp_freq,
> + .freq_map = scl3300_lp_freq_map,
> + .avail_modes_table = scl3300_avail_modes_map,
> + .num_avail_modes = 3,
> + .chip_id = SCL3300_WHOAMI_ID,
> + },
> };
>
> DECLARE_CRC8_TABLE(sca3300_crc_table);
> @@ -443,9 +467,11 @@ static int sca3300_init(struct sca3300_data *sca_data,
>
> /*
> * Wait 1ms after SW-reset command.
> - * Wait 15ms for settling of signal paths.
> + * Wait for the settling of signal paths,
> + * 15ms for SCA3300 and 25ms for SCL3300,
> + * take the max of the then.
There is now a typo here, but I think this line could be left out
altogether. i.e.
> + * Wait for the settling of signal paths,
> + * 15ms for SCA3300 and 25ms for SCL3300.
Thanks,
Tomas
> */
> - usleep_range(16e3, 50e3);
> + usleep_range(26e3, 50e3);
>
> ret = sca3300_read_reg(sca_data, SCA3300_REG_WHOAMI, &value);
> if (ret)
> @@ -572,6 +598,7 @@ static int sca3300_probe(struct spi_device *spi)
>
> static const struct of_device_id sca3300_dt_ids[] = {
> { .compatible = "murata,sca3300"},
> + { .compatible = "murata,scl3300"},
> {}
> };
> MODULE_DEVICE_TABLE(of, sca3300_dt_ids);
