From: Jonathan Cameron <jic23@kernel.org>
To: Denis CIOCCA <denis.ciocca@st.com>
Cc: linux-iio@vger.kernel.org, lars@metafoo.de, j.anaszewski@samsung.com
Subject: Re: [PATCH 1/3] iio:common: ST_SENSORS_LSM_CHANNELS macro changed
Date: Sat, 18 May 2013 21:23:49 +0100 [thread overview]
Message-ID: <5197E355.1010207@kernel.org> (raw)
In-Reply-To: <1368607493-4843-2-git-send-email-denis.ciocca@st.com>
On 05/15/2013 09:44 AM, Denis CIOCCA wrote:
> Signed-off-by: Denis Ciocca <denis.ciocca@st.com>
one nitpick. Otherwise looks fine to me.
> ---
> drivers/iio/accel/st_accel_core.c | 36 ++++++++++++++++++++-----------
> drivers/iio/gyro/st_gyro_core.c | 21 ++++++++++--------
> drivers/iio/magnetometer/st_magn_core.c | 36 ++++++++++++++++++++-----------
> include/linux/iio/common/st_sensors.h | 20 ++++++++---------
> 4 files changed, 69 insertions(+), 44 deletions(-)
>
> diff --git a/drivers/iio/accel/st_accel_core.c b/drivers/iio/accel/st_accel_core.c
> index e0f5a3c..40236d5 100644
> --- a/drivers/iio/accel/st_accel_core.c
> +++ b/drivers/iio/accel/st_accel_core.c
> @@ -125,22 +125,34 @@
> #define ST_ACCEL_3_MULTIREAD_BIT false
>
> static const struct iio_chan_spec st_accel_12bit_channels[] = {
> - ST_SENSORS_LSM_CHANNELS(IIO_ACCEL, ST_SENSORS_SCAN_X, IIO_MOD_X, IIO_LE,
> - ST_SENSORS_DEFAULT_12_REALBITS, ST_ACCEL_DEFAULT_OUT_X_L_ADDR),
> - ST_SENSORS_LSM_CHANNELS(IIO_ACCEL, ST_SENSORS_SCAN_Y, IIO_MOD_Y, IIO_LE,
> - ST_SENSORS_DEFAULT_12_REALBITS, ST_ACCEL_DEFAULT_OUT_Y_L_ADDR),
> - ST_SENSORS_LSM_CHANNELS(IIO_ACCEL, ST_SENSORS_SCAN_Z, IIO_MOD_Z, IIO_LE,
> - ST_SENSORS_DEFAULT_12_REALBITS, ST_ACCEL_DEFAULT_OUT_Z_L_ADDR),
> + ST_SENSORS_LSM_CHANNELS(IIO_ACCEL,
> + BIT(IIO_CHAN_INFO_RAW) | BIT(IIO_CHAN_INFO_SCALE),
> + ST_SENSORS_SCAN_X, 1, IIO_MOD_X, 's', IIO_LE, 12, 16,
> + ST_ACCEL_DEFAULT_OUT_X_L_ADDR),
> + ST_SENSORS_LSM_CHANNELS(IIO_ACCEL,
> + BIT(IIO_CHAN_INFO_RAW) | BIT(IIO_CHAN_INFO_SCALE),
> + ST_SENSORS_SCAN_Y, 1, IIO_MOD_Y, 's', IIO_LE, 12, 16,
> + ST_ACCEL_DEFAULT_OUT_Y_L_ADDR),
> + ST_SENSORS_LSM_CHANNELS(IIO_ACCEL,
> + BIT(IIO_CHAN_INFO_RAW) | BIT(IIO_CHAN_INFO_SCALE),
> + ST_SENSORS_SCAN_Z, 1, IIO_MOD_Z, 's', IIO_LE, 12, 16,
> + ST_ACCEL_DEFAULT_OUT_Z_L_ADDR),
> IIO_CHAN_SOFT_TIMESTAMP(3)
> };
>
> static const struct iio_chan_spec st_accel_16bit_channels[] = {
> - ST_SENSORS_LSM_CHANNELS(IIO_ACCEL, ST_SENSORS_SCAN_X, IIO_MOD_X, IIO_LE,
> - ST_SENSORS_DEFAULT_16_REALBITS, ST_ACCEL_DEFAULT_OUT_X_L_ADDR),
> - ST_SENSORS_LSM_CHANNELS(IIO_ACCEL, ST_SENSORS_SCAN_Y, IIO_MOD_Y, IIO_LE,
> - ST_SENSORS_DEFAULT_16_REALBITS, ST_ACCEL_DEFAULT_OUT_Y_L_ADDR),
> - ST_SENSORS_LSM_CHANNELS(IIO_ACCEL, ST_SENSORS_SCAN_Z, IIO_MOD_Z, IIO_LE,
> - ST_SENSORS_DEFAULT_16_REALBITS, ST_ACCEL_DEFAULT_OUT_Z_L_ADDR),
> + ST_SENSORS_LSM_CHANNELS(IIO_ACCEL,
> + BIT(IIO_CHAN_INFO_RAW) | BIT(IIO_CHAN_INFO_SCALE),
> + ST_SENSORS_SCAN_X, 1, IIO_MOD_X, 's', IIO_LE, 16, 16,
> + ST_ACCEL_DEFAULT_OUT_X_L_ADDR),
> + ST_SENSORS_LSM_CHANNELS(IIO_ACCEL,
> + BIT(IIO_CHAN_INFO_RAW) | BIT(IIO_CHAN_INFO_SCALE),
> + ST_SENSORS_SCAN_Y, 1, IIO_MOD_Y, 's', IIO_LE, 16, 16,
> + ST_ACCEL_DEFAULT_OUT_Y_L_ADDR),
> + ST_SENSORS_LSM_CHANNELS(IIO_ACCEL,
> + BIT(IIO_CHAN_INFO_RAW) | BIT(IIO_CHAN_INFO_SCALE),
> + ST_SENSORS_SCAN_Z, 1, IIO_MOD_Z, 's', IIO_LE, 16, 16,
> + ST_ACCEL_DEFAULT_OUT_Z_L_ADDR),
> IIO_CHAN_SOFT_TIMESTAMP(3)
> };
>
> diff --git a/drivers/iio/gyro/st_gyro_core.c b/drivers/iio/gyro/st_gyro_core.c
> index fa9b242..9bae46b 100644
> --- a/drivers/iio/gyro/st_gyro_core.c
> +++ b/drivers/iio/gyro/st_gyro_core.c
> @@ -86,15 +86,18 @@
> #define ST_GYRO_2_MULTIREAD_BIT true
>
> static const struct iio_chan_spec st_gyro_16bit_channels[] = {
> - ST_SENSORS_LSM_CHANNELS(IIO_ANGL_VEL, ST_SENSORS_SCAN_X,
> - IIO_MOD_X, IIO_LE, ST_SENSORS_DEFAULT_16_REALBITS,
> - ST_GYRO_DEFAULT_OUT_X_L_ADDR),
> - ST_SENSORS_LSM_CHANNELS(IIO_ANGL_VEL, ST_SENSORS_SCAN_Y,
> - IIO_MOD_Y, IIO_LE, ST_SENSORS_DEFAULT_16_REALBITS,
> - ST_GYRO_DEFAULT_OUT_Y_L_ADDR),
> - ST_SENSORS_LSM_CHANNELS(IIO_ANGL_VEL, ST_SENSORS_SCAN_Z,
> - IIO_MOD_Z, IIO_LE, ST_SENSORS_DEFAULT_16_REALBITS,
> - ST_GYRO_DEFAULT_OUT_Z_L_ADDR),
> + ST_SENSORS_LSM_CHANNELS(IIO_ANGL_VEL,
> + BIT(IIO_CHAN_INFO_RAW) | BIT(IIO_CHAN_INFO_SCALE),
> + ST_SENSORS_SCAN_X, 1, IIO_MOD_X, 's', IIO_LE, 16, 16,
> + ST_GYRO_DEFAULT_OUT_X_L_ADDR),
> + ST_SENSORS_LSM_CHANNELS(IIO_ANGL_VEL,
> + BIT(IIO_CHAN_INFO_RAW) | BIT(IIO_CHAN_INFO_SCALE),
> + ST_SENSORS_SCAN_Y, 1, IIO_MOD_Y, 's', IIO_LE, 16, 16,
> + ST_GYRO_DEFAULT_OUT_Y_L_ADDR),
> + ST_SENSORS_LSM_CHANNELS(IIO_ANGL_VEL,
> + BIT(IIO_CHAN_INFO_RAW) | BIT(IIO_CHAN_INFO_SCALE),
> + ST_SENSORS_SCAN_Z, 1, IIO_MOD_Z, 's', IIO_LE, 16, 16,
> + ST_GYRO_DEFAULT_OUT_Z_L_ADDR),
> IIO_CHAN_SOFT_TIMESTAMP(3)
> };
>
> diff --git a/drivers/iio/magnetometer/st_magn_core.c b/drivers/iio/magnetometer/st_magn_core.c
> index 16f0d6d..715d616 100644
> --- a/drivers/iio/magnetometer/st_magn_core.c
> +++ b/drivers/iio/magnetometer/st_magn_core.c
> @@ -113,22 +113,34 @@
> #define ST_MAGN_2_OUT_Z_L_ADDR 0x2c
>
> static const struct iio_chan_spec st_magn_16bit_channels[] = {
> - ST_SENSORS_LSM_CHANNELS(IIO_MAGN, ST_SENSORS_SCAN_X, IIO_MOD_X, IIO_LE,
> - ST_SENSORS_DEFAULT_16_REALBITS, ST_MAGN_DEFAULT_OUT_X_L_ADDR),
> - ST_SENSORS_LSM_CHANNELS(IIO_MAGN, ST_SENSORS_SCAN_Y, IIO_MOD_Y, IIO_LE,
> - ST_SENSORS_DEFAULT_16_REALBITS, ST_MAGN_DEFAULT_OUT_Y_L_ADDR),
> - ST_SENSORS_LSM_CHANNELS(IIO_MAGN, ST_SENSORS_SCAN_Z, IIO_MOD_Z, IIO_LE,
> - ST_SENSORS_DEFAULT_16_REALBITS, ST_MAGN_DEFAULT_OUT_Z_L_ADDR),
> + ST_SENSORS_LSM_CHANNELS(IIO_MAGN,
> + BIT(IIO_CHAN_INFO_RAW) | BIT(IIO_CHAN_INFO_SCALE),
> + ST_SENSORS_SCAN_X, 1, IIO_MOD_X, 's', IIO_LE, 16, 16,
> + ST_MAGN_DEFAULT_OUT_X_L_ADDR),
> + ST_SENSORS_LSM_CHANNELS(IIO_MAGN,
> + BIT(IIO_CHAN_INFO_RAW) | BIT(IIO_CHAN_INFO_SCALE),
> + ST_SENSORS_SCAN_Y, 1, IIO_MOD_Y, 's', IIO_LE, 16, 16,
> + ST_MAGN_DEFAULT_OUT_Y_L_ADDR),
> + ST_SENSORS_LSM_CHANNELS(IIO_MAGN,
> + BIT(IIO_CHAN_INFO_RAW) | BIT(IIO_CHAN_INFO_SCALE),
> + ST_SENSORS_SCAN_Z, 1, IIO_MOD_Z, 's', IIO_LE, 16, 16,
> + ST_MAGN_DEFAULT_OUT_Z_L_ADDR),
> IIO_CHAN_SOFT_TIMESTAMP(3)
> };
>
> static const struct iio_chan_spec st_magn_2_16bit_channels[] = {
> - ST_SENSORS_LSM_CHANNELS(IIO_MAGN, ST_SENSORS_SCAN_X, IIO_MOD_X, IIO_LE,
> - ST_SENSORS_DEFAULT_16_REALBITS, ST_MAGN_2_OUT_X_L_ADDR),
> - ST_SENSORS_LSM_CHANNELS(IIO_MAGN, ST_SENSORS_SCAN_Y, IIO_MOD_Y, IIO_LE,
> - ST_SENSORS_DEFAULT_16_REALBITS, ST_MAGN_2_OUT_Y_L_ADDR),
> - ST_SENSORS_LSM_CHANNELS(IIO_MAGN, ST_SENSORS_SCAN_Z, IIO_MOD_Z, IIO_LE,
> - ST_SENSORS_DEFAULT_16_REALBITS, ST_MAGN_2_OUT_Z_L_ADDR),
> + ST_SENSORS_LSM_CHANNELS(IIO_MAGN,
> + BIT(IIO_CHAN_INFO_RAW) | BIT(IIO_CHAN_INFO_SCALE),
> + ST_SENSORS_SCAN_X, 1, IIO_MOD_X, 's', IIO_LE, 16, 16,
> + ST_MAGN_2_OUT_X_L_ADDR),
> + ST_SENSORS_LSM_CHANNELS(IIO_MAGN,
> + BIT(IIO_CHAN_INFO_RAW) | BIT(IIO_CHAN_INFO_SCALE),
> + ST_SENSORS_SCAN_Y, 1, IIO_MOD_Y, 's', IIO_LE, 16, 16,
> + ST_MAGN_2_OUT_Y_L_ADDR),
> + ST_SENSORS_LSM_CHANNELS(IIO_MAGN,
> + BIT(IIO_CHAN_INFO_RAW) | BIT(IIO_CHAN_INFO_SCALE),
> + ST_SENSORS_SCAN_Z, 1, IIO_MOD_Z, 's', IIO_LE, 16, 16,
> + ST_MAGN_2_OUT_Z_L_ADDR),
> IIO_CHAN_SOFT_TIMESTAMP(3)
> };
>
> diff --git a/include/linux/iio/common/st_sensors.h b/include/linux/iio/common/st_sensors.h
> index 172c5b2..5ffd763 100644
> --- a/include/linux/iio/common/st_sensors.h
> +++ b/include/linux/iio/common/st_sensors.h
> @@ -30,8 +30,6 @@
> #define ST_SENSORS_SCAN_X 0
> #define ST_SENSORS_SCAN_Y 1
> #define ST_SENSORS_SCAN_Z 2
> -#define ST_SENSORS_DEFAULT_12_REALBITS 12
> -#define ST_SENSORS_DEFAULT_16_REALBITS 16
> #define ST_SENSORS_DEFAULT_POWER_ON_VALUE 0x01
> #define ST_SENSORS_DEFAULT_POWER_OFF_VALUE 0x00
> #define ST_SENSORS_DEFAULT_WAI_ADDRESS 0x0f
> @@ -42,20 +40,20 @@
> #define ST_SENSORS_MAX_NAME 17
> #define ST_SENSORS_MAX_4WAI 7
>
> -#define ST_SENSORS_LSM_CHANNELS(device_type, index, mod, endian, bits, addr) \
> +#define ST_SENSORS_LSM_CHANNELS(device_type, mask, index, mod, \
> + ch2, s, endian, rbits, sbits, addr) \
> { \
> .type = device_type, \
> - .modified = 1, \
> - .info_mask_separate = BIT(IIO_CHAN_INFO_RAW) | \
> - BIT(IIO_CHAN_INFO_SCALE), \
> + .modified = mod, \
> + .info_mask_separate = mask, \
> .scan_index = index, \
> - .channel2 = mod, \
> + .channel2 = ch2, \
You never use channel2 as anything other than a modifier (or
nothing) so to my mind this renaming of the parameter does
not make sense.
> .address = addr, \
> .scan_type = { \
> - .sign = 's', \
> - .realbits = bits, \
> - .shift = 16 - bits, \
> - .storagebits = 16, \
> + .sign = s, \
> + .realbits = rbits, \
> + .shift = sbits - rbits, \
> + .storagebits = sbits, \
> .endianness = endian, \
> }, \
> }
>
next prev parent reply other threads:[~2013-05-18 20:23 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-05-15 8:44 STMicroelectronics pressure sensors driver Denis CIOCCA
2013-05-15 8:44 ` [PATCH 1/3] iio:common: ST_SENSORS_LSM_CHANNELS macro changed Denis CIOCCA
2013-05-18 20:23 ` Jonathan Cameron [this message]
2013-05-15 8:44 ` [PATCH 2/3] iio:common: Added get_buffer_element function pointer Denis CIOCCA
2013-05-18 20:33 ` Jonathan Cameron
2013-05-15 8:44 ` [PATCH 3/3] iio:pressure: Add STMicroelectronics pressures driver Denis CIOCCA
2013-05-17 15:00 ` Jacek Anaszewski
2013-05-17 16:09 ` Denis CIOCCA
2013-05-18 21:06 ` Jonathan Cameron
2013-05-20 7:51 ` Denis CIOCCA
2013-05-20 9:47 ` Jacek Anaszewski
2013-05-22 21:27 ` Jonathan Cameron
2013-05-22 21:29 ` Jonathan Cameron
-- strict thread matches above, loose matches on Subject: below --
2013-05-24 14:25 Support pressure sensors Denis CIOCCA
2013-05-24 14:25 ` [PATCH 1/3] iio:common: ST_SENSORS_LSM_CHANNELS macro changed Denis CIOCCA
2013-06-03 14:58 STMicroelectronics series of patches to support pressure sensors Denis CIOCCA
2013-06-03 14:58 ` [PATCH 1/3] iio:common: ST_SENSORS_LSM_CHANNELS macro changed Denis CIOCCA
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=5197E355.1010207@kernel.org \
--to=jic23@kernel.org \
--cc=denis.ciocca@st.com \
--cc=j.anaszewski@samsung.com \
--cc=lars@metafoo.de \
--cc=linux-iio@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.