icjx: use iC-JX interrupt config instead of the general one

There might be multiple expanders, one with interrupt used and other without. This commit fixes initial incorrect interrupt design by introducing ICJX_INT_ENABLE config option. Signed-off-by: Michal Lenc <[email protected]>
michallenc · May 6, 2024 · 73ca3ab · 73ca3ab
1 parent 9d6e2b9
commit 73ca3ab
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 5 deletions.
diff --git a/drivers/ioexpander/Kconfig b/drivers/ioexpander/Kconfig
@@ -66,12 +66,19 @@ config IOEXPANDER_ICJX
 
 if IOEXPANDER_ICJX
 
-config iC-JX_MULTIPLE
+config ICJX_MULTIPLE
 	bool "Multiple iC-JX Devices"
 	default n
 	---help---
 		Can be defined to support multiple iC-JX devices on board.
 
+config ICJX_INT_ENABLE
+	bool "Enable iC-JX Interrupt Support"
+	default n
+	select IOEXPANDER_INT_ENABLE
+	---help---
+		Enable driver interrupt functionality
+
 endif # IOEXPANDER_ICJX
 
 config IOEXPANDER_ISO1H812G

diff --git a/drivers/ioexpander/icjx.c b/drivers/ioexpander/icjx.c
@@ -72,7 +72,7 @@ struct icjx_dev_s
   uint16_t irqpins;
   mutex_t lock;
 
-#ifdef CONFIG_IOEXPANDER_INT_ENABLE
+#ifdef CONFIG_ICJX_INT_ENABLE
   struct work_s work;
   struct icjx_callback_s callback;
 #endif
@@ -114,7 +114,7 @@ static int icjx_multireadpin(FAR struct ioexpander_dev_s *dev,
                              FAR const uint8_t *pins, FAR bool *values,
                              int count);
 #endif
-#ifdef CONFIG_IOEXPANDER_INT_ENABLE
+#ifdef CONFIG_ICJX_INT_ENABLE
 static FAR void *icjx_attach(FAR struct ioexpander_dev_s *dev,
                              ioe_pinset_t pinset, ioe_callback_t callback,
                              FAR void *arg);
@@ -147,7 +147,7 @@ static const struct ioexpander_ops_s g_icjx_ops =
   , icjx_multireadpin
   , icjx_multireadpin
 #endif
-#ifdef CONFIG_IOEXPANDER_INT_ENABLE
+#ifdef CONFIG_ICJX_INT_ENABLE
   , icjx_attach
   , icjx_detach
 #endif
@@ -871,7 +871,7 @@ static int icjx_multireadpin(FAR struct ioexpander_dev_s *dev,
  *
  ****************************************************************************/
 
-#ifdef CONFIG_IOEXPANDER_INT_ENABLE
+#ifdef CONFIG_ICJX_INT_ENABLE
 static FAR void *icjx_attach(FAR struct ioexpander_dev_s *dev,
                              ioe_pinset_t pinset, ioe_callback_t callback,
                              FAR void *arg)