driver: gpio: update gpio_mcux.c driver

GPIO interrupts do not work on MCXA, MCXA has ICR register but feature
FSL_FEATURE_GPIO_HAS_INTERRUPT_CHANNEL_SELECT value is 0, can't only use
this feature to support ICR. So adjust feature judgment.

Signed-off-by: Neil Chen <[email protected]>

Author: NeilChen93

drivers/gpio/gpio_mcux.c

@@ -23,6 +23,15 @@
 #define PORT_Type void
 #endif
 
+#if (defined(FSL_FEATURE_GPIO_HAS_INTERRUPT_CHANNEL_SELECT) && \
+		FSL_FEATURE_GPIO_HAS_INTERRUPT_CHANNEL_SELECT)
+#define GPIO_MCUX_HAS_INTERRUPT_CHANNEL_SELECT
+#endif
+
+#if (defined(FSL_FEATURE_PORT_HAS_NO_INTERRUPT) && FSL_FEATURE_PORT_HAS_NO_INTERRUPT)
+#define PORT_HAS_NO_INTERRUPT
+#endif
+
 struct gpio_mcux_config {
 	/* gpio_driver_config needs to be first */
 	struct gpio_driver_config common;
@@ -255,7 +264,7 @@ static int gpio_mcux_port_toggle_bits(const struct device *dev, uint32_t mask)
 }
 
 #if !(defined(CONFIG_PINCTRL_NXP_IOCON))
-#if !(defined(FSL_FEATURE_PORT_HAS_NO_INTERRUPT) && FSL_FEATURE_PORT_HAS_NO_INTERRUPT)
+#if !(defined(PORT_HAS_NO_INTERRUPT))
 static uint32_t get_port_pcr_irqc_value_from_flags(const struct device *dev, uint32_t pin,
 						   enum gpio_int_mode mode, enum gpio_int_trig trig)
 {
@@ -289,11 +298,10 @@ static uint32_t get_port_pcr_irqc_value_from_flags(const struct device *dev, uin
 
 	return PORT_PCR_IRQC(port_interrupt);
 }
-#endif /* !defined(FSL_FEATURE_PORT_HAS_NO_INTERRUPT) && FSL_FEATURE_PORT_HAS_NO_INTERRUPT */
+#endif /* !(defined(PORT_HAS_NO_INTERRUPT)) */
 #endif /* !(defined(CONFIG_PINCTRL_NXP_IOCON)) */
 
-#if (defined(FSL_FEATURE_GPIO_HAS_INTERRUPT_CHANNEL_SELECT) && \
-		FSL_FEATURE_GPIO_HAS_INTERRUPT_CHANNEL_SELECT)
+#if (defined(GPIO_MCUX_HAS_INTERRUPT_CHANNEL_SELECT) || defined(PORT_HAS_NO_INTERRUPT))
 
 #define GPIO_MCUX_INTERRUPT_DISABLED     0
 #define GPIO_MCUX_INTERRUPT_LOGIC_0      0x8
@@ -335,7 +343,7 @@ static uint32_t get_gpio_icr_irqc_value_from_flags(const struct device *dev, uin
 
 	return GPIO_ICR_IRQC(gpio_interrupt);
 }
-#endif /* (defined(FSL_FEATURE_GPIO_HAS_INTERRUPT_CHANNEL_SELECT) */
+#endif /* (defined(GPIO_MCUX_HAS_INTERRUPT_CHANNEL_SELECT) */
 
 static int gpio_mcux_pin_interrupt_configure(const struct device *dev, gpio_pin_t pin,
 					     enum gpio_int_mode mode, enum gpio_int_trig trig)
@@ -361,16 +369,15 @@ static int gpio_mcux_pin_interrupt_configure(const struct device *dev, gpio_pin_
 		return -ENOTSUP;
 	}
 
-#if (defined(FSL_FEATURE_GPIO_HAS_INTERRUPT_CHANNEL_SELECT) && \
-		FSL_FEATURE_GPIO_HAS_INTERRUPT_CHANNEL_SELECT)
+#if (defined(GPIO_MCUX_HAS_INTERRUPT_CHANNEL_SELECT) || defined(PORT_HAS_NO_INTERRUPT))
 	uint32_t icr = get_gpio_icr_irqc_value_from_flags(dev, pin, mode, trig);
 
 	gpio_base->ICR[pin] = (gpio_base->ICR[pin] & ~GPIO_ICR_IRQC_MASK) | icr;
-#elif !(defined(FSL_FEATURE_PORT_HAS_NO_INTERRUPT) && FSL_FEATURE_PORT_HAS_NO_INTERRUPT)
+#elif !(defined(PORT_HAS_NO_INTERRUPT))
 	uint32_t pcr = get_port_pcr_irqc_value_from_flags(dev, pin, mode, trig);
 
 	port_base->PCR[pin] = (port_base->PCR[pin] & ~PORT_PCR_IRQC_MASK) | pcr;
-#endif /* !(defined(FSL_FEATURE_PORT_HAS_NO_INTERRUPT) */
+#endif /* defined(GPIO_MCUX_HAS_INTERRUPT_CHANNEL_SELECT) || defined(PORT_HAS_NO_INTERRUPT) */
 
 	return 0;
 }
@@ -389,21 +396,20 @@ static void gpio_mcux_port_isr(const struct device *dev)
 	struct gpio_mcux_data *data = dev->data;
 	uint32_t int_status;
 
-#if (defined(FSL_FEATURE_GPIO_HAS_INTERRUPT_CHANNEL_SELECT) && \
-		FSL_FEATURE_GPIO_HAS_INTERRUPT_CHANNEL_SELECT)
+#if (defined(GPIO_MCUX_HAS_INTERRUPT_CHANNEL_SELECT) || defined(PORT_HAS_NO_INTERRUPT))
 	int_status = config->gpio_base->ISFR[0];
 
 	/* Clear the gpio interrupts */
 	config->gpio_base->ISFR[0] = int_status;
-#elif !(defined(FSL_FEATURE_PORT_HAS_NO_INTERRUPT) && FSL_FEATURE_PORT_HAS_NO_INTERRUPT)
+#elif !(defined(PORT_HAS_NO_INTERRUPT))
 	int_status = config->port_base->ISFR;
 
 	/* Clear the port interrupts */
 	config->port_base->ISFR = int_status;
 #else
 	int_status = 0U;
 	ARG_UNUSED(config);
-#endif /* !(defined(FSL_FEATURE_PORT_HAS_NO_INTERRUPT) */
+#endif /* defined(GPIO_MCUX_HAS_INTERRUPT_CHANNEL_SELECT) || defined(PORT_HAS_NO_INTERRUPT) */
 
 	gpio_fire_callbacks(&data->callbacks, dev, int_status);
 }