diff mbox series

[v4,08/10] iio: imu: adis16475: Re-define ADIS16475_DATA

Message ID 20240524090030.336427-9-ramona.bolboaca13@gmail.com (mailing list archive)
State Changes Requested
Headers show
Series adis16501 and adis1657x support | expand

Commit Message

Ramona Gradinariu May 24, 2024, 9 a.m. UTC 
Re-define ADIS16475_DATA such that it takes _has_fifo as parameter.

Signed-off-by: Ramona Gradinariu <ramona.bolboaca13@gmail.com>
---
 drivers/iio/imu/adis16475.c | 95 +++++++++++++++++++------------------
 1 file changed, 48 insertions(+), 47 deletions(-)

Comments

Nuno Sá May 24, 2024, 10:47 a.m. UTC | #1 
On Fri, 2024-05-24 at 12:00 +0300, Ramona Gradinariu wrote:
> Re-define ADIS16475_DATA such that it takes _has_fifo as parameter.
> 
> Signed-off-by: Ramona Gradinariu <ramona.bolboaca13@gmail.com>
> ---

I may be missing something but do we actually need to patches redefining the macro?
If I'm not missing nothing the first patch is only relevant for the new ADIS devices
which are added in patch 10. So maybe squash both patches changing the macro.

- Nuno Sá
Jonathan Cameron May 26, 2024, 12:43 p.m. UTC | #2 
On Fri, 24 May 2024 12:47:38 +0200
Nuno Sá <noname.nuno@gmail.com> wrote:

> On Fri, 2024-05-24 at 12:00 +0300, Ramona Gradinariu wrote:
> > Re-define ADIS16475_DATA such that it takes _has_fifo as parameter.
> > 
> > Signed-off-by: Ramona Gradinariu <ramona.bolboaca13@gmail.com>
> > ---  
> 
> I may be missing something but do we actually need to patches redefining the macro?
> If I'm not missing nothing the first patch is only relevant for the new ADIS devices
> which are added in patch 10. So maybe squash both patches changing the macro.
> 
> - Nuno Sá
> 
If that's not possible for some reason, give them both slightly more detailed
patch titles. It's confusing to have them identical!
 
I'd prefer them squashed as Nuno suggested.
diff mbox series

Patch

diff --git a/drivers/iio/imu/adis16475.c b/drivers/iio/imu/adis16475.c
index c589f214259b..3bbf3e181e1a 100644
--- a/drivers/iio/imu/adis16475.c
+++ b/drivers/iio/imu/adis16475.c
@@ -695,32 +695,33 @@  static const char * const adis16475_status_error_msgs[] = {
 	[ADIS16475_DIAG_STAT_CLK] = "Clock error",
 };
 
-#define ADIS16475_DATA(_prod_id, _timeouts, _burst_max_len, _burst_max_speed_hz)	\
-{											\
-	.msc_ctrl_reg = ADIS16475_REG_MSG_CTRL,						\
-	.glob_cmd_reg = ADIS16475_REG_GLOB_CMD,						\
-	.diag_stat_reg = ADIS16475_REG_DIAG_STAT,					\
-	.prod_id_reg = ADIS16475_REG_PROD_ID,						\
-	.prod_id = (_prod_id),								\
-	.self_test_mask = BIT(2),							\
-	.self_test_reg = ADIS16475_REG_GLOB_CMD,					\
-	.cs_change_delay = 16,								\
-	.read_delay = 5,								\
-	.write_delay = 5,								\
-	.status_error_msgs = adis16475_status_error_msgs,				\
-	.status_error_mask = BIT(ADIS16475_DIAG_STAT_DATA_PATH) |			\
-		BIT(ADIS16475_DIAG_STAT_FLASH_MEM) |					\
-		BIT(ADIS16475_DIAG_STAT_SPI) |						\
-		BIT(ADIS16475_DIAG_STAT_STANDBY) |					\
-		BIT(ADIS16475_DIAG_STAT_SENSOR) |					\
-		BIT(ADIS16475_DIAG_STAT_MEMORY) |					\
-		BIT(ADIS16475_DIAG_STAT_CLK),						\
-	.unmasked_drdy = true,								\
-	.timeouts = (_timeouts),							\
-	.burst_reg_cmd = ADIS16475_REG_GLOB_CMD,					\
-	.burst_len = ADIS16475_BURST_MAX_DATA,						\
-	.burst_max_len = _burst_max_len,						\
-	.burst_max_speed_hz = _burst_max_speed_hz					\
+#define ADIS16475_DATA(_prod_id, _timeouts, _burst_max_len, _burst_max_speed_hz, _has_fifo)	\
+{												\
+	.msc_ctrl_reg = ADIS16475_REG_MSG_CTRL,							\
+	.glob_cmd_reg = ADIS16475_REG_GLOB_CMD,							\
+	.diag_stat_reg = ADIS16475_REG_DIAG_STAT,						\
+	.prod_id_reg = ADIS16475_REG_PROD_ID,							\
+	.prod_id = (_prod_id),									\
+	.self_test_mask = BIT(2),								\
+	.self_test_reg = ADIS16475_REG_GLOB_CMD,						\
+	.cs_change_delay = 16,									\
+	.read_delay = 5,									\
+	.write_delay = 5,									\
+	.status_error_msgs = adis16475_status_error_msgs,					\
+	.status_error_mask = BIT(ADIS16475_DIAG_STAT_DATA_PATH) |				\
+		BIT(ADIS16475_DIAG_STAT_FLASH_MEM) |						\
+		BIT(ADIS16475_DIAG_STAT_SPI) |							\
+		BIT(ADIS16475_DIAG_STAT_STANDBY) |						\
+		BIT(ADIS16475_DIAG_STAT_SENSOR) |						\
+		BIT(ADIS16475_DIAG_STAT_MEMORY) |						\
+		BIT(ADIS16475_DIAG_STAT_CLK),							\
+	.unmasked_drdy = true,									\
+	.has_fifo = _has_fifo,									\
+	.timeouts = (_timeouts),								\
+	.burst_reg_cmd = ADIS16475_REG_GLOB_CMD,						\
+	.burst_len = ADIS16475_BURST_MAX_DATA,							\
+	.burst_max_len = _burst_max_len,							\
+	.burst_max_speed_hz = _burst_max_speed_hz						\
 }
 
 static const struct adis16475_sync adis16475_sync_mode[] = {
@@ -760,7 +761,7 @@  static const struct adis16475_chip_info adis16475_chip_info[] = {
 		.num_sync = ARRAY_SIZE(adis16475_sync_mode),
 		.adis_data = ADIS16475_DATA(16470, &adis16475_timeouts,
 					    ADIS16475_BURST32_MAX_DATA,
-					    ADIS16475_BURST_MAX_SPEED),
+					    ADIS16475_BURST_MAX_SPEED, false),
 	},
 	[ADIS16475_1] = {
 		.name = "adis16475-1",
@@ -779,7 +780,7 @@  static const struct adis16475_chip_info adis16475_chip_info[] = {
 		.num_sync = ARRAY_SIZE(adis16475_sync_mode),
 		.adis_data = ADIS16475_DATA(16475, &adis16475_timeouts,
 					    ADIS16475_BURST32_MAX_DATA,
-					    ADIS16475_BURST_MAX_SPEED),
+					    ADIS16475_BURST_MAX_SPEED, false),
 	},
 	[ADIS16475_2] = {
 		.name = "adis16475-2",
@@ -798,7 +799,7 @@  static const struct adis16475_chip_info adis16475_chip_info[] = {
 		.num_sync = ARRAY_SIZE(adis16475_sync_mode),
 		.adis_data = ADIS16475_DATA(16475, &adis16475_timeouts,
 					    ADIS16475_BURST32_MAX_DATA,
-					    ADIS16475_BURST_MAX_SPEED),
+					    ADIS16475_BURST_MAX_SPEED, false),
 	},
 	[ADIS16475_3] = {
 		.name = "adis16475-3",
@@ -817,7 +818,7 @@  static const struct adis16475_chip_info adis16475_chip_info[] = {
 		.num_sync = ARRAY_SIZE(adis16475_sync_mode),
 		.adis_data = ADIS16475_DATA(16475, &adis16475_timeouts,
 					    ADIS16475_BURST32_MAX_DATA,
-					    ADIS16475_BURST_MAX_SPEED),
+					    ADIS16475_BURST_MAX_SPEED, false),
 	},
 	[ADIS16477_1] = {
 		.name = "adis16477-1",
@@ -837,7 +838,7 @@  static const struct adis16475_chip_info adis16475_chip_info[] = {
 		.flags = ADIS16475_HAS_BURST32 | ADIS16475_HAS_BURST_DELTA_DATA,
 		.adis_data = ADIS16475_DATA(16477, &adis16475_timeouts,
 					    ADIS16475_BURST32_MAX_DATA,
-					    ADIS16475_BURST_MAX_SPEED),
+					    ADIS16475_BURST_MAX_SPEED, false),
 	},
 	[ADIS16477_2] = {
 		.name = "adis16477-2",
@@ -857,7 +858,7 @@  static const struct adis16475_chip_info adis16475_chip_info[] = {
 		.flags = ADIS16475_HAS_BURST32 | ADIS16475_HAS_BURST_DELTA_DATA,
 		.adis_data = ADIS16475_DATA(16477, &adis16475_timeouts,
 					    ADIS16475_BURST32_MAX_DATA,
-					    ADIS16475_BURST_MAX_SPEED),
+					    ADIS16475_BURST_MAX_SPEED, false),
 	},
 	[ADIS16477_3] = {
 		.name = "adis16477-3",
@@ -877,7 +878,7 @@  static const struct adis16475_chip_info adis16475_chip_info[] = {
 		.flags = ADIS16475_HAS_BURST32 | ADIS16475_HAS_BURST_DELTA_DATA,
 		.adis_data = ADIS16475_DATA(16477, &adis16475_timeouts,
 					    ADIS16475_BURST32_MAX_DATA,
-					    ADIS16475_BURST_MAX_SPEED),
+					    ADIS16475_BURST_MAX_SPEED, false),
 	},
 	[ADIS16465_1] = {
 		.name = "adis16465-1",
@@ -896,7 +897,7 @@  static const struct adis16475_chip_info adis16475_chip_info[] = {
 		.num_sync = ARRAY_SIZE(adis16475_sync_mode),
 		.adis_data = ADIS16475_DATA(16465, &adis16475_timeouts,
 					    ADIS16475_BURST32_MAX_DATA,
-					    ADIS16475_BURST_MAX_SPEED),
+					    ADIS16475_BURST_MAX_SPEED, false),
 	},
 	[ADIS16465_2] = {
 		.name = "adis16465-2",
@@ -915,7 +916,7 @@  static const struct adis16475_chip_info adis16475_chip_info[] = {
 		.num_sync = ARRAY_SIZE(adis16475_sync_mode),
 		.adis_data = ADIS16475_DATA(16465, &adis16475_timeouts,
 					    ADIS16475_BURST32_MAX_DATA,
-					    ADIS16475_BURST_MAX_SPEED),
+					    ADIS16475_BURST_MAX_SPEED, false),
 	},
 	[ADIS16465_3] = {
 		.name = "adis16465-3",
@@ -934,7 +935,7 @@  static const struct adis16475_chip_info adis16475_chip_info[] = {
 		.num_sync = ARRAY_SIZE(adis16475_sync_mode),
 		.adis_data = ADIS16475_DATA(16465, &adis16475_timeouts,
 					    ADIS16475_BURST32_MAX_DATA,
-					    ADIS16475_BURST_MAX_SPEED),
+					    ADIS16475_BURST_MAX_SPEED, false),
 	},
 	[ADIS16467_1] = {
 		.name = "adis16467-1",
@@ -953,7 +954,7 @@  static const struct adis16475_chip_info adis16475_chip_info[] = {
 		.num_sync = ARRAY_SIZE(adis16475_sync_mode),
 		.adis_data = ADIS16475_DATA(16467, &adis16475_timeouts,
 					    ADIS16475_BURST32_MAX_DATA,
-					    ADIS16475_BURST_MAX_SPEED),
+					    ADIS16475_BURST_MAX_SPEED, false),
 	},
 	[ADIS16467_2] = {
 		.name = "adis16467-2",
@@ -972,7 +973,7 @@  static const struct adis16475_chip_info adis16475_chip_info[] = {
 		.num_sync = ARRAY_SIZE(adis16475_sync_mode),
 		.adis_data = ADIS16475_DATA(16467, &adis16475_timeouts,
 					    ADIS16475_BURST32_MAX_DATA,
-					    ADIS16475_BURST_MAX_SPEED),
+					    ADIS16475_BURST_MAX_SPEED, false),
 	},
 	[ADIS16467_3] = {
 		.name = "adis16467-3",
@@ -991,7 +992,7 @@  static const struct adis16475_chip_info adis16475_chip_info[] = {
 		.num_sync = ARRAY_SIZE(adis16475_sync_mode),
 		.adis_data = ADIS16475_DATA(16467, &adis16475_timeouts,
 					    ADIS16475_BURST32_MAX_DATA,
-					    ADIS16475_BURST_MAX_SPEED),
+					    ADIS16475_BURST_MAX_SPEED, false),
 	},
 	[ADIS16500] = {
 		.name = "adis16500",
@@ -1012,7 +1013,7 @@  static const struct adis16475_chip_info adis16475_chip_info[] = {
 		.flags = ADIS16475_HAS_BURST32 | ADIS16475_HAS_BURST_DELTA_DATA,
 		.adis_data = ADIS16475_DATA(16500, &adis1650x_timeouts,
 					    ADIS16475_BURST32_MAX_DATA,
-					    ADIS16475_BURST_MAX_SPEED),
+					    ADIS16475_BURST_MAX_SPEED, false),
 	},
 	[ADIS16501] = {
 		.name = "adis16501",
@@ -1033,7 +1034,7 @@  static const struct adis16475_chip_info adis16475_chip_info[] = {
 		.flags = ADIS16475_HAS_BURST32 | ADIS16475_HAS_BURST_DELTA_DATA,
 		.adis_data = ADIS16475_DATA(16501, &adis1650x_timeouts,
 					    ADIS16475_BURST32_MAX_DATA,
-					    ADIS16475_BURST_MAX_SPEED),
+					    ADIS16475_BURST_MAX_SPEED, false),
 	},
 	[ADIS16505_1] = {
 		.name = "adis16505-1",
@@ -1054,7 +1055,7 @@  static const struct adis16475_chip_info adis16475_chip_info[] = {
 		.flags = ADIS16475_HAS_BURST32 | ADIS16475_HAS_BURST_DELTA_DATA,
 		.adis_data = ADIS16475_DATA(16505, &adis1650x_timeouts,
 					    ADIS16475_BURST32_MAX_DATA,
-					    ADIS16475_BURST_MAX_SPEED),
+					    ADIS16475_BURST_MAX_SPEED, false),
 	},
 	[ADIS16505_2] = {
 		.name = "adis16505-2",
@@ -1075,7 +1076,7 @@  static const struct adis16475_chip_info adis16475_chip_info[] = {
 		.flags = ADIS16475_HAS_BURST32 | ADIS16475_HAS_BURST_DELTA_DATA,
 		.adis_data = ADIS16475_DATA(16505, &adis1650x_timeouts,
 					    ADIS16475_BURST32_MAX_DATA,
-					    ADIS16475_BURST_MAX_SPEED),
+					    ADIS16475_BURST_MAX_SPEED, false),
 	},
 	[ADIS16505_3] = {
 		.name = "adis16505-3",
@@ -1096,7 +1097,7 @@  static const struct adis16475_chip_info adis16475_chip_info[] = {
 		.flags = ADIS16475_HAS_BURST32 | ADIS16475_HAS_BURST_DELTA_DATA,
 		.adis_data = ADIS16475_DATA(16505, &adis1650x_timeouts,
 					    ADIS16475_BURST32_MAX_DATA,
-					    ADIS16475_BURST_MAX_SPEED),
+					    ADIS16475_BURST_MAX_SPEED, false),
 	},
 	[ADIS16507_1] = {
 		.name = "adis16507-1",
@@ -1117,7 +1118,7 @@  static const struct adis16475_chip_info adis16475_chip_info[] = {
 		.flags = ADIS16475_HAS_BURST32 | ADIS16475_HAS_BURST_DELTA_DATA,
 		.adis_data = ADIS16475_DATA(16507, &adis1650x_timeouts,
 					    ADIS16475_BURST32_MAX_DATA,
-					    ADIS16475_BURST_MAX_SPEED),
+					    ADIS16475_BURST_MAX_SPEED, false),
 	},
 	[ADIS16507_2] = {
 		.name = "adis16507-2",
@@ -1138,7 +1139,7 @@  static const struct adis16475_chip_info adis16475_chip_info[] = {
 		.flags = ADIS16475_HAS_BURST32 | ADIS16475_HAS_BURST_DELTA_DATA,
 		.adis_data = ADIS16475_DATA(16507, &adis1650x_timeouts,
 					    ADIS16475_BURST32_MAX_DATA,
-					    ADIS16475_BURST_MAX_SPEED),
+					    ADIS16475_BURST_MAX_SPEED, false),
 	},
 	[ADIS16507_3] = {
 		.name = "adis16507-3",
@@ -1159,7 +1160,7 @@  static const struct adis16475_chip_info adis16475_chip_info[] = {
 		.flags = ADIS16475_HAS_BURST32 | ADIS16475_HAS_BURST_DELTA_DATA,
 		.adis_data = ADIS16475_DATA(16507, &adis1650x_timeouts,
 					    ADIS16475_BURST32_MAX_DATA,
-					    ADIS16475_BURST_MAX_SPEED),
+					    ADIS16475_BURST_MAX_SPEED, false),
 	},
 };