Commit fdcf6bbb authored by Nuno Sá's avatar Nuno Sá Committed by Jonathan Cameron

iio: imu: adis: Add self_test_reg variable

This patch adds a dedicated self_test_reg variable. This is also a step
to let new drivers make use of `adis_initial_startup()`. Some devices
use MSG_CTRL reg to request a self_test command while others use the
GLOB_CMD register.
Signed-off-by: default avatarNuno Sá <nuno.sa@analog.com>
Signed-off-by: default avatarAlexandru Ardelean <alexandru.ardelean@analog.com>
Signed-off-by: default avatarJonathan Cameron <Jonathan.Cameron@huawei.com>
parent 3f17ada8
...@@ -246,6 +246,7 @@ static const struct adis_data adis16201_data = { ...@@ -246,6 +246,7 @@ static const struct adis_data adis16201_data = {
.diag_stat_reg = ADIS16201_DIAG_STAT_REG, .diag_stat_reg = ADIS16201_DIAG_STAT_REG,
.self_test_mask = ADIS16201_MSC_CTRL_SELF_TEST_EN, .self_test_mask = ADIS16201_MSC_CTRL_SELF_TEST_EN,
.self_test_reg = ADIS16201_MSC_CTRL_REG,
.self_test_no_autoclear = true, .self_test_no_autoclear = true,
.timeouts = &adis16201_timeouts, .timeouts = &adis16201_timeouts,
......
...@@ -256,6 +256,7 @@ static const struct adis_data adis16209_data = { ...@@ -256,6 +256,7 @@ static const struct adis_data adis16209_data = {
.diag_stat_reg = ADIS16209_STAT_REG, .diag_stat_reg = ADIS16209_STAT_REG,
.self_test_mask = ADIS16209_MSC_CTRL_SELF_TEST_EN, .self_test_mask = ADIS16209_MSC_CTRL_SELF_TEST_EN,
.self_test_reg = ADIS16209_MSC_CTRL_REG,
.self_test_no_autoclear = true, .self_test_no_autoclear = true,
.timeouts = &adis16209_timeouts, .timeouts = &adis16209_timeouts,
......
...@@ -471,6 +471,7 @@ static const char * const adis16136_status_error_msgs[] = { ...@@ -471,6 +471,7 @@ static const char * const adis16136_status_error_msgs[] = {
.diag_stat_reg = ADIS16136_REG_DIAG_STAT, \ .diag_stat_reg = ADIS16136_REG_DIAG_STAT, \
.glob_cmd_reg = ADIS16136_REG_GLOB_CMD, \ .glob_cmd_reg = ADIS16136_REG_GLOB_CMD, \
.msc_ctrl_reg = ADIS16136_REG_MSC_CTRL, \ .msc_ctrl_reg = ADIS16136_REG_MSC_CTRL, \
.self_test_reg = ADIS16136_REG_MSC_CTRL, \
.self_test_mask = ADIS16136_MSC_CTRL_SELF_TEST, \ .self_test_mask = ADIS16136_MSC_CTRL_SELF_TEST, \
.read_delay = 10, \ .read_delay = 10, \
.write_delay = 10, \ .write_delay = 10, \
......
...@@ -346,6 +346,7 @@ static const struct adis_data adis16260_data = { ...@@ -346,6 +346,7 @@ static const struct adis_data adis16260_data = {
.diag_stat_reg = ADIS16260_DIAG_STAT, .diag_stat_reg = ADIS16260_DIAG_STAT,
.self_test_mask = ADIS16260_MSC_CTRL_MEM_TEST, .self_test_mask = ADIS16260_MSC_CTRL_MEM_TEST,
.self_test_reg = ADIS16260_MSC_CTRL,
.timeouts = &adis16260_timeouts, .timeouts = &adis16260_timeouts,
.status_error_msgs = adis1620_status_error_msgs, .status_error_msgs = adis1620_status_error_msgs,
......
...@@ -346,8 +346,8 @@ static int adis_self_test(struct adis *adis) ...@@ -346,8 +346,8 @@ static int adis_self_test(struct adis *adis)
int ret; int ret;
const struct adis_timeout *timeouts = adis->data->timeouts; const struct adis_timeout *timeouts = adis->data->timeouts;
ret = __adis_write_reg_16(adis, adis->data->msc_ctrl_reg, ret = __adis_write_reg_16(adis, adis->data->self_test_reg,
adis->data->self_test_mask); adis->data->self_test_mask);
if (ret) { if (ret) {
dev_err(&adis->spi->dev, "Failed to initiate self test: %d\n", dev_err(&adis->spi->dev, "Failed to initiate self test: %d\n",
ret); ret);
...@@ -359,7 +359,7 @@ static int adis_self_test(struct adis *adis) ...@@ -359,7 +359,7 @@ static int adis_self_test(struct adis *adis)
ret = __adis_check_status(adis); ret = __adis_check_status(adis);
if (adis->data->self_test_no_autoclear) if (adis->data->self_test_no_autoclear)
__adis_write_reg_16(adis, adis->data->msc_ctrl_reg, 0x00); __adis_write_reg_16(adis, adis->data->self_test_reg, 0x00);
return ret; return ret;
} }
......
...@@ -956,6 +956,7 @@ static const char * const adis16400_status_error_msgs[] = { ...@@ -956,6 +956,7 @@ static const char * const adis16400_status_error_msgs[] = {
.read_delay = 50, \ .read_delay = 50, \
.write_delay = 50, \ .write_delay = 50, \
.self_test_mask = ADIS16400_MSC_CTRL_MEM_TEST, \ .self_test_mask = ADIS16400_MSC_CTRL_MEM_TEST, \
.self_test_reg = ADIS16400_MSC_CTRL, \
.status_error_msgs = adis16400_status_error_msgs, \ .status_error_msgs = adis16400_status_error_msgs, \
.status_error_mask = BIT(ADIS16400_DIAG_STAT_ZACCL_FAIL) | \ .status_error_mask = BIT(ADIS16400_DIAG_STAT_ZACCL_FAIL) | \
BIT(ADIS16400_DIAG_STAT_YACCL_FAIL) | \ BIT(ADIS16400_DIAG_STAT_YACCL_FAIL) | \
......
...@@ -392,6 +392,8 @@ static const struct adis_timeout adis16460_timeouts = { ...@@ -392,6 +392,8 @@ static const struct adis_timeout adis16460_timeouts = {
static const struct adis_data adis16460_data = { static const struct adis_data adis16460_data = {
.diag_stat_reg = ADIS16460_REG_DIAG_STAT, .diag_stat_reg = ADIS16460_REG_DIAG_STAT,
.glob_cmd_reg = ADIS16460_REG_GLOB_CMD, .glob_cmd_reg = ADIS16460_REG_GLOB_CMD,
.self_test_mask = BIT(2),
.self_test_reg = ADIS16460_REG_GLOB_CMD,
.has_paging = false, .has_paging = false,
.read_delay = 5, .read_delay = 5,
.write_delay = 5, .write_delay = 5,
......
...@@ -830,6 +830,7 @@ static int adis16480_enable_irq(struct adis *adis, bool enable); ...@@ -830,6 +830,7 @@ static int adis16480_enable_irq(struct adis *adis, bool enable);
.read_delay = 5, \ .read_delay = 5, \
.write_delay = 5, \ .write_delay = 5, \
.self_test_mask = BIT(1), \ .self_test_mask = BIT(1), \
.self_test_reg = ADIS16480_REG_GLOB_CMD, \
.status_error_msgs = adis16480_status_error_msgs, \ .status_error_msgs = adis16480_status_error_msgs, \
.status_error_mask = BIT(ADIS16480_DIAG_STAT_XGYRO_FAIL) | \ .status_error_mask = BIT(ADIS16480_DIAG_STAT_XGYRO_FAIL) | \
BIT(ADIS16480_DIAG_STAT_YGYRO_FAIL) | \ BIT(ADIS16480_DIAG_STAT_YGYRO_FAIL) | \
......
...@@ -250,6 +250,7 @@ static const struct adis_data adis16203_data = { ...@@ -250,6 +250,7 @@ static const struct adis_data adis16203_data = {
.diag_stat_reg = ADIS16203_DIAG_STAT, .diag_stat_reg = ADIS16203_DIAG_STAT,
.self_test_mask = ADIS16203_MSC_CTRL_SELF_TEST_EN, .self_test_mask = ADIS16203_MSC_CTRL_SELF_TEST_EN,
.self_test_reg = ADIS16203_MSC_CTRL,
.self_test_no_autoclear = true, .self_test_no_autoclear = true,
.timeouts = &adis16203_timeouts, .timeouts = &adis16203_timeouts,
......
...@@ -373,6 +373,7 @@ static const struct adis_data adis16240_data = { ...@@ -373,6 +373,7 @@ static const struct adis_data adis16240_data = {
.diag_stat_reg = ADIS16240_DIAG_STAT, .diag_stat_reg = ADIS16240_DIAG_STAT,
.self_test_mask = ADIS16240_MSC_CTRL_SELF_TEST_EN, .self_test_mask = ADIS16240_MSC_CTRL_SELF_TEST_EN,
.self_test_reg = ADIS16240_MSC_CTRL,
.self_test_no_autoclear = true, .self_test_no_autoclear = true,
.timeouts = &adis16240_timeouts, .timeouts = &adis16240_timeouts,
......
...@@ -41,6 +41,7 @@ struct adis_timeout { ...@@ -41,6 +41,7 @@ struct adis_timeout {
* @glob_cmd_reg: Register address of the GLOB_CMD register * @glob_cmd_reg: Register address of the GLOB_CMD register
* @msc_ctrl_reg: Register address of the MSC_CTRL register * @msc_ctrl_reg: Register address of the MSC_CTRL register
* @diag_stat_reg: Register address of the DIAG_STAT register * @diag_stat_reg: Register address of the DIAG_STAT register
* @self_test_reg: Register address to request self test command
* @status_error_msgs: Array of error messgaes * @status_error_msgs: Array of error messgaes
* @status_error_mask: * @status_error_mask:
* @timeouts: Chip specific delays * @timeouts: Chip specific delays
...@@ -55,6 +56,7 @@ struct adis_data { ...@@ -55,6 +56,7 @@ struct adis_data {
unsigned int diag_stat_reg; unsigned int diag_stat_reg;
unsigned int self_test_mask; unsigned int self_test_mask;
unsigned int self_test_reg;
bool self_test_no_autoclear; bool self_test_no_autoclear;
const struct adis_timeout *timeouts; const struct adis_timeout *timeouts;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment