diff --git a/drivers/renesas/rcar/avs/avs_driver.c b/drivers/renesas/common/avs/avs_driver.c
similarity index 100%
rename from drivers/renesas/rcar/avs/avs_driver.c
rename to drivers/renesas/common/avs/avs_driver.c
diff --git a/drivers/renesas/rcar/avs/avs_driver.h b/drivers/renesas/common/avs/avs_driver.h
similarity index 100%
rename from drivers/renesas/rcar/avs/avs_driver.h
rename to drivers/renesas/common/avs/avs_driver.h
diff --git a/plat/renesas/common/common.mk b/plat/renesas/common/common.mk
index 61e86fe..4603571 100644
--- a/plat/renesas/common/common.mk
+++ b/plat/renesas/common/common.mk
@@ -86,6 +86,7 @@
 			drivers/renesas/common/io/io_rcar.c		\
 			drivers/renesas/common/auth/auth_mod.c		\
 			drivers/renesas/common/dma/dma_driver.c		\
+			drivers/renesas/common/avs/avs_driver.c		\
 			drivers/renesas/common/delay/micro_delay.c	\
 			drivers/renesas/common/emmc/emmc_interrupt.c	\
 			drivers/renesas/common/emmc/emmc_utility.c	\
diff --git a/plat/renesas/rcar/platform.mk b/plat/renesas/rcar/platform.mk
index fc83cc5..35dd0ef 100644
--- a/plat/renesas/rcar/platform.mk
+++ b/plat/renesas/rcar/platform.mk
@@ -303,7 +303,7 @@
 			-Idrivers/renesas/rcar/board		\
 			-Idrivers/renesas/rcar/cpld/		\
 			-Idrivers/renesas/common/iic_dvfs	\
-			-Idrivers/renesas/rcar/avs		\
+			-Idrivers/renesas/common/avs		\
 			-Idrivers/renesas/common/delay		\
 			-Idrivers/renesas/common/rom		\
 			-Idrivers/renesas/common/scif		\
@@ -321,7 +321,6 @@
 			plat/renesas/rcar/plat_image_load.c		\
 			plat/renesas/rcar/bl2_cpg_init.c		\
 			drivers/renesas/rcar/rpc/rpc_driver.c		\
-			drivers/renesas/rcar/avs/avs_driver.c		\
 			drivers/renesas/rcar/board/board.c
 
 BL31_SOURCES	+=	plat/renesas/rcar/plat_topology.c		\