diff --git a/include/zephyr/dt-bindings/pinctrl/renesas/pinctrl-ra-common.h b/include/zephyr/dt-bindings/pinctrl/renesas/pinctrl-ra-common.h
index 88ea7ece75d..a7969523a93 100644
--- a/include/zephyr/dt-bindings/pinctrl/renesas/pinctrl-ra-common.h
+++ b/include/zephyr/dt-bindings/pinctrl/renesas/pinctrl-ra-common.h
@@ -12,7 +12,7 @@
 #define PSEL_POS   24
 #define PSEL_MASK  0x5
 #define PORT_POS   21
-#define PORT_MASK  0x3
+#define PORT_MASK  0x7
 #define PIN_POS    17
 #define PIN_MASK   0xF
 #define OPT_POS    0
diff --git a/soc/arm/renesas_ra/common/pinctrl_ra.h b/soc/arm/renesas_ra/common/pinctrl_ra.h
index d61f1e418d5..ed80b3fda18 100644
--- a/soc/arm/renesas_ra/common/pinctrl_ra.h
+++ b/soc/arm/renesas_ra/common/pinctrl_ra.h
@@ -56,7 +56,8 @@ struct pinctrl_ra_pin {
 			uint8_t pin: 4;
 			uint8_t port: 3;
 			uint32_t UNUSED24: 5;
-			uint8_t port4: 3;
+			uint8_t port4: 1;
+			uint32_t UNUSED30: 2;
 		};
 	};
 };
@@ -90,4 +91,4 @@ extern int pinctrl_ra_query_config(uint32_t port, uint32_t pin,
 				       Z_PINCTRL_STATE_PIN_INIT)                                   \
 	}
 
-#endif /* ZEPHYR_SOC_ARM_RENESAS_RA_RA6E1_PINCTRL_SOC_H_ */
+#endif /* ZEPHYR_SOC_ARM_RENESAS_RA_COMMON_RA_PINCTRL_SOC_H_ */