diff --git a/drivers/pinctrl/CMakeLists.txt b/drivers/pinctrl/CMakeLists.txt
index 9f104c6e323..88c4750a735 100644
--- a/drivers/pinctrl/CMakeLists.txt
+++ b/drivers/pinctrl/CMakeLists.txt
@@ -11,6 +11,7 @@ zephyr_library_sources_ifdef(CONFIG_PINCTRL_ITE_IT8XXX2 pinctrl_ite_it8xxx2.c)
 zephyr_library_sources_ifdef(CONFIG_PINCTRL_NPCX pinctrl_npcx.c)
 zephyr_library_sources_ifdef(CONFIG_PINCTRL_NUMICRO pinctrl_numicro.c)
 zephyr_library_sources_ifdef(CONFIG_PINCTRL_NRF pinctrl_nrf.c)
+zephyr_library_sources_ifdef(CONFIG_SOC_R8A779F0 pfc_r8a779f0.c)
 zephyr_library_sources_ifdef(CONFIG_PINCTRL_RCAR_PFC pfc_rcar.c)
 zephyr_library_sources_ifdef(CONFIG_PINCTRL_RPI_PICO pinctrl_rpi_pico.c)
 zephyr_library_sources_ifdef(CONFIG_PINCTRL_SAM pinctrl_sam.c)
diff --git a/soc/renesas/rcar/rcar_gen4/pfc_r8a779f0.c b/drivers/pinctrl/pfc_r8a779f0.c
similarity index 99%
rename from soc/renesas/rcar/rcar_gen4/pfc_r8a779f0.c
rename to drivers/pinctrl/pfc_r8a779f0.c
index 25eba334d77..b72d0ee2b1c 100644
--- a/soc/renesas/rcar/rcar_gen4/pfc_r8a779f0.c
+++ b/drivers/pinctrl/pfc_r8a779f0.c
@@ -6,7 +6,7 @@
  */
 
 #include <errno.h>
-#include "pinctrl_soc.h"
+#include <pinctrl_soc.h>
 #include <zephyr/dt-bindings/pinctrl/renesas/pinctrl-r8a779f0.h>
 
 const struct pfc_drive_reg pfc_drive_regs[] = {
diff --git a/soc/renesas/rcar/rcar_gen4/CMakeLists.txt b/soc/renesas/rcar/rcar_gen4/CMakeLists.txt
index 79be28ffe55..691c155c6e3 100644
--- a/soc/renesas/rcar/rcar_gen4/CMakeLists.txt
+++ b/soc/renesas/rcar/rcar_gen4/CMakeLists.txt
@@ -2,5 +2,4 @@
 # SPDX-License-Identifier: Apache-2.0
 
 zephyr_include_directories(.)
-zephyr_library_sources_ifdef(CONFIG_SOC_R8A779F0 pfc_r8a779f0.c)
 set(SOC_LINKER_SCRIPT ${ZEPHYR_BASE}/include/zephyr/arch/arm/cortex_a_r/scripts/linker.ld CACHE INTERNAL "")