From 2ddb55752b9da7ebf6c725d2e1e2bb04c82c76b9 Mon Sep 17 00:00:00 2001 From: Biju Das Date: Wed, 16 Dec 2020 10:05:41 +0000 Subject: [PATCH] drivers: renesas: io: Move to common Move io driver code to common directory, so that the same code can be re-used by both R-Car Gen3 and RZ/G2 platforms. Signed-off-by: Biju Das Reviewed-by: Lad Prabhakar Change-Id: Ic661e415c91a1fbfd5eee3bba86466037e51574b --- drivers/renesas/{rcar => common}/io/io_common.h | 0 drivers/renesas/{rcar => common}/io/io_emmcdrv.c | 0 drivers/renesas/{rcar => common}/io/io_emmcdrv.h | 0 drivers/renesas/{rcar => common}/io/io_memdrv.c | 0 drivers/renesas/{rcar => common}/io/io_memdrv.h | 0 drivers/renesas/{rcar => common}/io/io_private.h | 0 drivers/renesas/{rcar => common}/io/io_rcar.c | 0 drivers/renesas/{rcar => common}/io/io_rcar.h | 0 plat/renesas/common/common.mk | 3 +++ plat/renesas/rcar/platform.mk | 5 +---- 10 files changed, 4 insertions(+), 4 deletions(-) rename drivers/renesas/{rcar => common}/io/io_common.h (100%) rename drivers/renesas/{rcar => common}/io/io_emmcdrv.c (100%) rename drivers/renesas/{rcar => common}/io/io_emmcdrv.h (100%) rename drivers/renesas/{rcar => common}/io/io_memdrv.c (100%) rename drivers/renesas/{rcar => common}/io/io_memdrv.h (100%) rename drivers/renesas/{rcar => common}/io/io_private.h (100%) rename drivers/renesas/{rcar => common}/io/io_rcar.c (100%) rename drivers/renesas/{rcar => common}/io/io_rcar.h (100%) diff --git a/drivers/renesas/rcar/io/io_common.h b/drivers/renesas/common/io/io_common.h similarity index 100% rename from drivers/renesas/rcar/io/io_common.h rename to drivers/renesas/common/io/io_common.h diff --git a/drivers/renesas/rcar/io/io_emmcdrv.c b/drivers/renesas/common/io/io_emmcdrv.c similarity index 100% rename from drivers/renesas/rcar/io/io_emmcdrv.c rename to drivers/renesas/common/io/io_emmcdrv.c diff --git a/drivers/renesas/rcar/io/io_emmcdrv.h b/drivers/renesas/common/io/io_emmcdrv.h similarity index 100% rename from drivers/renesas/rcar/io/io_emmcdrv.h rename to drivers/renesas/common/io/io_emmcdrv.h diff --git a/drivers/renesas/rcar/io/io_memdrv.c b/drivers/renesas/common/io/io_memdrv.c similarity index 100% rename from drivers/renesas/rcar/io/io_memdrv.c rename to drivers/renesas/common/io/io_memdrv.c diff --git a/drivers/renesas/rcar/io/io_memdrv.h b/drivers/renesas/common/io/io_memdrv.h similarity index 100% rename from drivers/renesas/rcar/io/io_memdrv.h rename to drivers/renesas/common/io/io_memdrv.h diff --git a/drivers/renesas/rcar/io/io_private.h b/drivers/renesas/common/io/io_private.h similarity index 100% rename from drivers/renesas/rcar/io/io_private.h rename to drivers/renesas/common/io/io_private.h diff --git a/drivers/renesas/rcar/io/io_rcar.c b/drivers/renesas/common/io/io_rcar.c similarity index 100% rename from drivers/renesas/rcar/io/io_rcar.c rename to drivers/renesas/common/io/io_rcar.c diff --git a/drivers/renesas/rcar/io/io_rcar.h b/drivers/renesas/common/io/io_rcar.h similarity index 100% rename from drivers/renesas/rcar/io/io_rcar.h rename to drivers/renesas/common/io/io_rcar.h diff --git a/plat/renesas/common/common.mk b/plat/renesas/common/common.mk index 9b1466349..82f4d7d7e 100644 --- a/plat/renesas/common/common.mk +++ b/plat/renesas/common/common.mk @@ -79,6 +79,9 @@ BL2_SOURCES += ${RCAR_GIC_SOURCES} \ ${LIBFDT_SRCS} \ common/desc_image_load.c \ drivers/renesas/common/common.c \ + drivers/renesas/common/io/io_emmcdrv.c \ + drivers/renesas/common/io/io_memdrv.c \ + drivers/renesas/common/io/io_rcar.c \ drivers/renesas/common/emmc/emmc_interrupt.c \ drivers/renesas/common/emmc/emmc_utility.c \ drivers/renesas/common/emmc/emmc_mount.c \ diff --git a/plat/renesas/rcar/platform.mk b/plat/renesas/rcar/platform.mk index 02be49a2e..1f0c8abc4 100644 --- a/plat/renesas/rcar/platform.mk +++ b/plat/renesas/rcar/platform.mk @@ -309,7 +309,7 @@ PLAT_INCLUDES += -Idrivers/renesas/rcar/ddr \ -Idrivers/renesas/rcar/scif \ -Idrivers/renesas/common/emmc \ -Idrivers/renesas/rcar/pwrc \ - -Idrivers/renesas/rcar/io + -Idrivers/renesas/common/io BL2_SOURCES += plat/renesas/rcar/aarch64/platform_common.c \ plat/renesas/rcar/aarch64/plat_helpers.S \ @@ -322,9 +322,6 @@ BL2_SOURCES += plat/renesas/rcar/aarch64/platform_common.c \ plat/renesas/rcar/bl2_cpg_init.c \ drivers/renesas/rcar/console/rcar_printf.c \ drivers/renesas/rcar/scif/scif.S \ - drivers/renesas/rcar/io/io_emmcdrv.c \ - drivers/renesas/rcar/io/io_memdrv.c \ - drivers/renesas/rcar/io/io_rcar.c \ drivers/renesas/rcar/auth/auth_mod.c \ drivers/renesas/rcar/rpc/rpc_driver.c \ drivers/renesas/rcar/dma/dma_driver.c \ -- 2.39.5