From: Jonathan Cameron <jic23@kernel.org>
To: Himanshu Jha <himanshujha199640@gmail.com>
Cc: lars@metafoo.de, Michael.Hennerich@analog.com, knaack.h@gmx.de,
pmeerw@pmeerw.net, gregkh@linuxfoundation.org,
linux-iio@vger.kernel.org, devel@driverdev.osuosl.org,
linux-kernel@vger.kernel.org, daniel.baluta@gmail.com
Subject: Re: [PATCH 05/11] Staging: iio: accel: Add _REG suffix to registers
Date: Wed, 7 Mar 2018 20:44:50 +0000 [thread overview]
Message-ID: <20180307204450.2cc869e6@archlinux> (raw)
In-Reply-To: <1520236170-14668-6-git-send-email-himanshujha199640@gmail.com>
On Mon, 5 Mar 2018 13:19:24 +0530
Himanshu Jha <himanshujha199640@gmail.com> wrote:
> Addition of _REG suffix to the register definitions allows a distinction
> between registers and register fields. The various registers and its field
> bits are grouped together to improve readability and easy indentification.
>
> Signed-off-by: Himanshu Jha <himanshujha199640@gmail.com>
This one looks good. I will pick it up once you've tweaked the
predecessor patches.
Thanks,
Jonathan
> ---
> drivers/staging/iio/accel/adis16201.c | 133 ++++++++++++++++------------------
> 1 file changed, 61 insertions(+), 72 deletions(-)
>
> diff --git a/drivers/staging/iio/accel/adis16201.c b/drivers/staging/iio/accel/adis16201.c
> index 445cb56..476b1c3 100644
> --- a/drivers/staging/iio/accel/adis16201.c
> +++ b/drivers/staging/iio/accel/adis16201.c
> @@ -20,75 +20,64 @@
> #include <linux/iio/buffer.h>
> #include <linux/iio/imu/adis.h>
>
> -#define ADIS16201_STARTUP_DELAY_MS 220
> -#define ADIS16201_FLASH_CNT 0x00
> +#define ADIS16201_STARTUP_DELAY_MS 220
> +#define ADIS16201_FLASH_CNT 0x00
>
> /* Data Output Register Information */
> -#define ADIS16201_SUPPLY_OUT 0x02
> -#define ADIS16201_XACCL_OUT 0x04
> -#define ADIS16201_YACCL_OUT 0x06
> -#define ADIS16201_AUX_ADC 0x08
> -#define ADIS16201_TEMP_OUT 0x0A
> -#define ADIS16201_XINCL_OUT 0x0C
> -#define ADIS16201_YINCL_OUT 0x0E
> +#define ADIS16201_SUPPLY_OUT_REG 0x02
> +#define ADIS16201_XACCL_OUT_REG 0x04
> +#define ADIS16201_YACCL_OUT_REG 0x06
> +#define ADIS16201_AUX_ADC_REG 0x08
> +#define ADIS16201_TEMP_OUT_REG 0x0A
> +#define ADIS16201_XINCL_OUT_REG 0x0C
> +#define ADIS16201_YINCL_OUT_REG 0x0E
>
> /* Calibration Register Definition */
> -#define ADIS16201_XACCL_OFFS 0x10
> -#define ADIS16201_YACCL_OFFS 0x12
> -#define ADIS16201_XACCL_SCALE 0x14
> -#define ADIS16201_YACCL_SCALE 0x16
> -#define ADIS16201_XINCL_OFFS 0x18
> -#define ADIS16201_YINCL_OFFS 0x1A
> -#define ADIS16201_XINCL_SCALE 0x1C
> -#define ADIS16201_YINCL_SCALE 0x1E
> +#define ADIS16201_XACCL_OFFS_REG 0x10
> +#define ADIS16201_YACCL_OFFS_REG 0x12
> +#define ADIS16201_XACCL_SCALE_REG 0x14
> +#define ADIS16201_YACCL_SCALE_REG 0x16
> +#define ADIS16201_XINCL_OFFS_REG 0x18
> +#define ADIS16201_YINCL_OFFS_REG 0x1A
> +#define ADIS16201_XINCL_SCALE_REG 0x1C
> +#define ADIS16201_YINCL_SCALE_REG 0x1E
>
> /* Alarm Register Definition */
> -#define ADIS16201_ALM_MAG1 0x20
> -#define ADIS16201_ALM_MAG2 0x22
> -#define ADIS16201_ALM_SMPL1 0x24
> -#define ADIS16201_ALM_SMPL2 0x26
> -#define ADIS16201_ALM_CTRL 0x28
> -
> -#define ADIS16201_AUX_DAC 0x30
> -#define ADIS16201_GPIO_CTRL 0x32
> -#define ADIS16201_MSC_CTRL 0x34
> -
> -#define ADIS16201_SMPL_PRD 0x36
> -#define ADIS16201_AVG_CNT 0x38
> -#define ADIS16201_SLP_CNT 0x3A
> +#define ADIS16201_ALM_MAG1_REG 0x20
> +#define ADIS16201_ALM_MAG2_REG 0x22
> +#define ADIS16201_ALM_SMPL1_REG 0x24
> +#define ADIS16201_ALM_SMPL2_REG 0x26
> +#define ADIS16201_ALM_CTRL_REG 0x28
> +
> +#define ADIS16201_AUX_DAC_REG 0x30
> +#define ADIS16201_GPIO_CTRL_REG 0x32
> +#define ADIS16201_MSC_CTRL_REG 0x34
> +#define ADIS16201_SMPL_PRD_REG 0x36
> +#define ADIS16201_AVG_CNT_REG 0x38
> +#define ADIS16201_SLP_CNT_REG 0x3A
> +
> +/* Miscellaneous Control Register Definition */
> +#define ADIS16201_MSC_CTRL_REG 0x34
> +#define ADIS16201_MSC_CTRL_SELF_TEST_EN BIT(8)
> +#define ADIS16201_MSC_CTRL_DATA_RDY_EN BIT(2)
> +#define ADIS16201_MSC_CTRL_ACTIVE_DATA_RDY_HIGH BIT(1)
> +#define ADIS16201_MSC_CTRL_DATA_RDY_DIO1 BIT(0)
>
> /* Diagnostics, system status register */
> -#define ADIS16201_DIAG_STAT 0x3C
> +#define ADIS16201_DIAG_STAT_REG 0x3C
> +#define ADIS16201_DIAG_STAT_ALARM2 BIT(9)
> +#define ADIS16201_DIAG_STAT_ALARM1 BIT(8)
> +#define ADIS16201_DIAG_STAT_SPI_FAIL_BIT 3
> +#define ADIS16201_DIAG_STAT_FLASH_UPT_FAIL_BIT 2
> +#define ADIS16201_DIAG_STAT_POWER_HIGH_BIT 1
> +#define ADIS16201_DIAG_STAT_POWER_LOW_BIT 0
>
> /* Operation, system command register */
> -#define ADIS16201_GLOB_CMD 0x3E
> -
> -
> -#define ADIS16201_MSC_CTRL_SELF_TEST_EN BIT(8)
> -
> -#define ADIS16201_MSC_CTRL_DATA_RDY_EN BIT(2)
> -
> -#define ADIS16201_MSC_CTRL_ACTIVE_DATA_RDY_HIGH BIT(1)
> -
> -#define ADIS16201_MSC_CTRL_DATA_RDY_DIO1 BIT(0)
> -
> -
> -#define ADIS16201_DIAG_STAT_ALARM2 BIT(9)
> -
> -#define ADIS16201_DIAG_STAT_ALARM1 BIT(8)
> -
> -#define ADIS16201_DIAG_STAT_SPI_FAIL_BIT 3
> -
> -#define ADIS16201_DIAG_STAT_FLASH_UPT_FAIL_BIT 2
> -
> -#define ADIS16201_DIAG_STAT_POWER_HIGH_BIT 1
> -
> -#define ADIS16201_DIAG_STAT_POWER_LOW_BIT 0
> -
> -#define ADIS16201_GLOB_CMD_SW_RESET BIT(7)
> -#define ADIS16201_GLOB_CMD_FACTORY BIT(1)
> +#define ADIS16201_GLOB_CMD_REG 0x3E
> +#define ADIS16201_GLOB_CMD_SW_RESET BIT(7)
> +#define ADIS16201_GLOB_CMD_FACTORY BIT(1)
>
> -#define ADIS16201_ERROR_ACTIVE BIT(14)
> +#define ADIS16201_ERROR_ACTIVE BIT(14)
>
> enum adis16201_scan {
> ADIS16201_SCAN_ACC_X,
> @@ -101,10 +90,10 @@ enum adis16201_scan {
> };
>
> static const u8 adis16201_addresses[] = {
> - [ADIS16201_SCAN_ACC_X] = ADIS16201_XACCL_OFFS,
> - [ADIS16201_SCAN_ACC_Y] = ADIS16201_YACCL_OFFS,
> - [ADIS16201_SCAN_INCLI_X] = ADIS16201_XINCL_OFFS,
> - [ADIS16201_SCAN_INCLI_Y] = ADIS16201_YINCL_OFFS,
> + [ADIS16201_SCAN_ACC_X] = ADIS16201_XACCL_OFFS_REG,
> + [ADIS16201_SCAN_ACC_Y] = ADIS16201_YACCL_OFFS_REG,
> + [ADIS16201_SCAN_INCLI_X] = ADIS16201_XINCL_OFFS_REG,
> + [ADIS16201_SCAN_INCLI_Y] = ADIS16201_YINCL_OFFS_REG,
> };
>
> static int adis16201_read_raw(struct iio_dev *indio_dev,
> @@ -208,16 +197,16 @@ static int adis16201_write_raw(struct iio_dev *indio_dev,
> }
>
> static const struct iio_chan_spec adis16201_channels[] = {
> - ADIS_SUPPLY_CHAN(ADIS16201_SUPPLY_OUT, ADIS16201_SCAN_SUPPLY, 0, 12),
> - ADIS_TEMP_CHAN(ADIS16201_TEMP_OUT, ADIS16201_SCAN_TEMP, 0, 12),
> - ADIS_ACCEL_CHAN(X, ADIS16201_XACCL_OUT, ADIS16201_SCAN_ACC_X,
> + ADIS_SUPPLY_CHAN(ADIS16201_SUPPLY_OUT_REG, ADIS16201_SCAN_SUPPLY, 0, 12),
> + ADIS_TEMP_CHAN(ADIS16201_TEMP_OUT_REG, ADIS16201_SCAN_TEMP, 0, 12),
> + ADIS_ACCEL_CHAN(X, ADIS16201_XACCL_OUT_REG, ADIS16201_SCAN_ACC_X,
> BIT(IIO_CHAN_INFO_CALIBBIAS), 0, 14),
> - ADIS_ACCEL_CHAN(Y, ADIS16201_YACCL_OUT, ADIS16201_SCAN_ACC_Y,
> + ADIS_ACCEL_CHAN(Y, ADIS16201_YACCL_OUT_REG, ADIS16201_SCAN_ACC_Y,
> BIT(IIO_CHAN_INFO_CALIBBIAS), 0, 14),
> - ADIS_AUX_ADC_CHAN(ADIS16201_AUX_ADC, ADIS16201_SCAN_AUX_ADC, 0, 12),
> - ADIS_INCLI_CHAN(X, ADIS16201_XINCL_OUT, ADIS16201_SCAN_INCLI_X,
> + ADIS_AUX_ADC_CHAN(ADIS16201_AUX_ADC_REG, ADIS16201_SCAN_AUX_ADC, 0, 12),
> + ADIS_INCLI_CHAN(X, ADIS16201_XINCL_OUT_REG, ADIS16201_SCAN_INCLI_X,
> BIT(IIO_CHAN_INFO_CALIBBIAS), 0, 14),
> - ADIS_INCLI_CHAN(X, ADIS16201_YINCL_OUT, ADIS16201_SCAN_INCLI_Y,
> + ADIS_INCLI_CHAN(X, ADIS16201_YINCL_OUT_REG, ADIS16201_SCAN_INCLI_Y,
> BIT(IIO_CHAN_INFO_CALIBBIAS), 0, 14),
> IIO_CHAN_SOFT_TIMESTAMP(7)
> };
> @@ -237,9 +226,9 @@ static const char * const adis16201_status_error_msgs[] = {
>
> static const struct adis_data adis16201_data = {
> .read_delay = 20,
> - .msc_ctrl_reg = ADIS16201_MSC_CTRL,
> - .glob_cmd_reg = ADIS16201_GLOB_CMD,
> - .diag_stat_reg = ADIS16201_DIAG_STAT,
> + .msc_ctrl_reg = ADIS16201_MSC_CTRL_REG,
> + .glob_cmd_reg = ADIS16201_GLOB_CMD_REG,
> + .diag_stat_reg = ADIS16201_DIAG_STAT_REG,
>
> .self_test_mask = ADIS16201_MSC_CTRL_SELF_TEST_EN,
> .self_test_no_autoclear = true,
next prev parent reply other threads:[~2018-03-07 20:44 UTC|newest]
Thread overview: 43+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-03-05 7:49 [PATCH 00/11] staging: iio: accel: adis16201 driver cleanup Himanshu Jha
2018-03-05 7:49 ` Himanshu Jha
2018-03-05 7:49 ` [PATCH 01/11] Staging: iio: accel: Prefer alphabetical sequence of header files Himanshu Jha
2018-03-07 20:29 ` Jonathan Cameron
2018-03-05 7:49 ` [PATCH 02/11] Staging: iio: accel: Add a blank space before returns Himanshu Jha
2018-03-07 20:32 ` Jonathan Cameron
2018-03-07 20:32 ` Jonathan Cameron
2018-03-05 7:49 ` [PATCH 03/11] Staging: iio: accel: Remove unnecessary comments Himanshu Jha
2018-03-05 7:49 ` Himanshu Jha
2018-03-06 21:26 ` Shreeya Patel
2018-03-06 22:25 ` Himanshu Jha
2018-03-07 20:40 ` Jonathan Cameron
2018-03-07 20:40 ` Jonathan Cameron
2018-03-05 7:49 ` [PATCH 04/11] Staging: iio: accel: Rename few macro definitions Himanshu Jha
2018-03-05 7:49 ` Himanshu Jha
2018-03-07 20:42 ` Jonathan Cameron
2018-03-07 20:42 ` Jonathan Cameron
2018-03-05 7:49 ` [PATCH 05/11] Staging: iio: accel: Add _REG suffix to registers Himanshu Jha
2018-03-05 7:49 ` Himanshu Jha
2018-03-07 20:44 ` Jonathan Cameron [this message]
2018-03-05 7:49 ` [PATCH 06/11] Staging: iio: accel: Reverse christmas tree Himanshu Jha
2018-03-05 7:49 ` Himanshu Jha
2018-03-05 7:49 ` [PATCH 07/11] Staging: iio: accel: Adjust arguments to match open parentheses Himanshu Jha
2018-03-05 7:49 ` Himanshu Jha
2018-03-05 10:16 ` Dan Carpenter
2018-03-05 10:16 ` Dan Carpenter
2018-03-05 7:49 ` [PATCH 08/11] Staging: iio: accel: Use switch statement than if-else Himanshu Jha
2018-03-05 7:49 ` Himanshu Jha
2018-03-07 20:48 ` Jonathan Cameron
2018-03-07 20:48 ` Jonathan Cameron
2018-03-05 7:49 ` [PATCH 09/11] Staging: iio: accel: Use sign_extend32 function Himanshu Jha
2018-03-05 7:49 ` Himanshu Jha
2018-03-05 7:49 ` [PATCH 10/11] Staging: iio: accel: Add comments about units in data read function Himanshu Jha
2018-03-05 7:49 ` Himanshu Jha
2018-03-07 20:50 ` Jonathan Cameron
2018-03-07 20:50 ` Jonathan Cameron
2018-03-08 7:28 ` Himanshu Jha
2018-03-10 15:05 ` Jonathan Cameron
2018-03-10 15:05 ` Jonathan Cameron
2018-03-05 7:49 ` [PATCH 11/11] Staging: iio: accel: Move adis16201 driver out of staging subsystem Himanshu Jha
2018-03-05 7:49 ` Himanshu Jha
2018-03-07 20:58 ` Jonathan Cameron
2018-03-07 20:58 ` Jonathan Cameron
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=20180307204450.2cc869e6@archlinux \
--to=jic23@kernel.org \
--cc=Michael.Hennerich@analog.com \
--cc=daniel.baluta@gmail.com \
--cc=devel@driverdev.osuosl.org \
--cc=gregkh@linuxfoundation.org \
--cc=himanshujha199640@gmail.com \
--cc=knaack.h@gmx.de \
--cc=lars@metafoo.de \
--cc=linux-iio@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=pmeerw@pmeerw.net \
/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.