diff --git a/drivers/gpio/gpio_rcar.c b/drivers/gpio/gpio_rcar.c
index 820db5fc76c..f60112427bc 100644
--- a/drivers/gpio/gpio_rcar.c
+++ b/drivers/gpio/gpio_rcar.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 IoT.bzh
+ * Copyright (c) 2020-2023 IoT.bzh
  *
  * SPDX-License-Identifier: Apache-2.0
  */
@@ -52,6 +52,7 @@ struct gpio_rcar_data {
 #define FILONOFF 0x28   /* Chattering Prevention On/Off Register */
 #define OUTDTSEL 0x40   /* Output Data Select Register */
 #define BOTHEDGE 0x4c   /* One Edge/Both Edge Select Register */
+#define INEN     0x50	/* General Input Enable Register */
 
 static inline uint32_t gpio_rcar_read(const struct device *dev, uint32_t offs)
 {
@@ -106,6 +107,11 @@ static void gpio_rcar_config_general_input_output_mode(
 	/* Configure positive logic in POSNEG */
 	gpio_rcar_modify_bit(dev, POSNEG, gpio, false);
 
+	/* Select "Input Enable/Disable" in INEN for Gen4 SoCs */
+#ifdef CONFIG_SOC_SERIES_RCAR_GEN4
+	gpio_rcar_modify_bit(dev, INEN, gpio, !output);
+#endif
+
 	/* Select "General Input/Output Mode" in IOINTSEL */
 	gpio_rcar_modify_bit(dev, IOINTSEL, gpio, false);
 
@@ -223,6 +229,11 @@ static int gpio_rcar_pin_interrupt_configure(const struct device *dev,
 		gpio_rcar_modify_bit(dev, BOTHEDGE, pin, true);
 	}
 
+	/* Select "Input Enable" in INEN for Gen4 SoCs */
+#ifdef CONFIG_SOC_SERIES_RCAR_GEN4
+	gpio_rcar_modify_bit(dev, INEN, pin, true);
+#endif
+
 	gpio_rcar_modify_bit(dev, IOINTSEL, pin, true);
 
 	if (mode == GPIO_INT_MODE_EDGE) {