From b28c29d0084e1380333881d718ebeb0ef65b10a5 Mon Sep 17 00:00:00 2001 From: Biju Das Date: Wed, 16 Dec 2020 09:53:19 +0000 Subject: [PATCH] drivers: renesas: eMMC: Move to common Move eMMC 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: I7f3055709337327d1a1c9f563c14ad1626adb355 --- drivers/renesas/{rcar => common}/emmc/emmc_cmd.c | 0 drivers/renesas/{rcar => common}/emmc/emmc_config.h | 0 drivers/renesas/{rcar => common}/emmc/emmc_def.h | 0 drivers/renesas/{rcar => common}/emmc/emmc_hal.h | 0 drivers/renesas/{rcar => common}/emmc/emmc_init.c | 0 drivers/renesas/{rcar => common}/emmc/emmc_interrupt.c | 0 drivers/renesas/{rcar => common}/emmc/emmc_mount.c | 0 drivers/renesas/{rcar => common}/emmc/emmc_read.c | 0 drivers/renesas/{rcar => common}/emmc/emmc_registers.h | 0 drivers/renesas/{rcar => common}/emmc/emmc_std.h | 0 drivers/renesas/{rcar => common}/emmc/emmc_utility.c | 0 plat/renesas/common/common.mk | 6 ++++++ plat/renesas/rcar/platform.mk | 8 +------- 13 files changed, 7 insertions(+), 7 deletions(-) rename drivers/renesas/{rcar => common}/emmc/emmc_cmd.c (100%) rename drivers/renesas/{rcar => common}/emmc/emmc_config.h (100%) rename drivers/renesas/{rcar => common}/emmc/emmc_def.h (100%) rename drivers/renesas/{rcar => common}/emmc/emmc_hal.h (100%) rename drivers/renesas/{rcar => common}/emmc/emmc_init.c (100%) rename drivers/renesas/{rcar => common}/emmc/emmc_interrupt.c (100%) rename drivers/renesas/{rcar => common}/emmc/emmc_mount.c (100%) rename drivers/renesas/{rcar => common}/emmc/emmc_read.c (100%) rename drivers/renesas/{rcar => common}/emmc/emmc_registers.h (100%) rename drivers/renesas/{rcar => common}/emmc/emmc_std.h (100%) rename drivers/renesas/{rcar => common}/emmc/emmc_utility.c (100%) diff --git a/drivers/renesas/rcar/emmc/emmc_cmd.c b/drivers/renesas/common/emmc/emmc_cmd.c similarity index 100% rename from drivers/renesas/rcar/emmc/emmc_cmd.c rename to drivers/renesas/common/emmc/emmc_cmd.c diff --git a/drivers/renesas/rcar/emmc/emmc_config.h b/drivers/renesas/common/emmc/emmc_config.h similarity index 100% rename from drivers/renesas/rcar/emmc/emmc_config.h rename to drivers/renesas/common/emmc/emmc_config.h diff --git a/drivers/renesas/rcar/emmc/emmc_def.h b/drivers/renesas/common/emmc/emmc_def.h similarity index 100% rename from drivers/renesas/rcar/emmc/emmc_def.h rename to drivers/renesas/common/emmc/emmc_def.h diff --git a/drivers/renesas/rcar/emmc/emmc_hal.h b/drivers/renesas/common/emmc/emmc_hal.h similarity index 100% rename from drivers/renesas/rcar/emmc/emmc_hal.h rename to drivers/renesas/common/emmc/emmc_hal.h diff --git a/drivers/renesas/rcar/emmc/emmc_init.c b/drivers/renesas/common/emmc/emmc_init.c similarity index 100% rename from drivers/renesas/rcar/emmc/emmc_init.c rename to drivers/renesas/common/emmc/emmc_init.c diff --git a/drivers/renesas/rcar/emmc/emmc_interrupt.c b/drivers/renesas/common/emmc/emmc_interrupt.c similarity index 100% rename from drivers/renesas/rcar/emmc/emmc_interrupt.c rename to drivers/renesas/common/emmc/emmc_interrupt.c diff --git a/drivers/renesas/rcar/emmc/emmc_mount.c b/drivers/renesas/common/emmc/emmc_mount.c similarity index 100% rename from drivers/renesas/rcar/emmc/emmc_mount.c rename to drivers/renesas/common/emmc/emmc_mount.c diff --git a/drivers/renesas/rcar/emmc/emmc_read.c b/drivers/renesas/common/emmc/emmc_read.c similarity index 100% rename from drivers/renesas/rcar/emmc/emmc_read.c rename to drivers/renesas/common/emmc/emmc_read.c diff --git a/drivers/renesas/rcar/emmc/emmc_registers.h b/drivers/renesas/common/emmc/emmc_registers.h similarity index 100% rename from drivers/renesas/rcar/emmc/emmc_registers.h rename to drivers/renesas/common/emmc/emmc_registers.h diff --git a/drivers/renesas/rcar/emmc/emmc_std.h b/drivers/renesas/common/emmc/emmc_std.h similarity index 100% rename from drivers/renesas/rcar/emmc/emmc_std.h rename to drivers/renesas/common/emmc/emmc_std.h diff --git a/drivers/renesas/rcar/emmc/emmc_utility.c b/drivers/renesas/common/emmc/emmc_utility.c similarity index 100% rename from drivers/renesas/rcar/emmc/emmc_utility.c rename to drivers/renesas/common/emmc/emmc_utility.c diff --git a/plat/renesas/common/common.mk b/plat/renesas/common/common.mk index ab9cded70..9b1466349 100644 --- a/plat/renesas/common/common.mk +++ b/plat/renesas/common/common.mk @@ -79,6 +79,12 @@ BL2_SOURCES += ${RCAR_GIC_SOURCES} \ ${LIBFDT_SRCS} \ common/desc_image_load.c \ drivers/renesas/common/common.c \ + drivers/renesas/common/emmc/emmc_interrupt.c \ + drivers/renesas/common/emmc/emmc_utility.c \ + drivers/renesas/common/emmc/emmc_mount.c \ + drivers/renesas/common/emmc/emmc_init.c \ + drivers/renesas/common/emmc/emmc_read.c \ + drivers/renesas/common/emmc/emmc_cmd.c \ drivers/io/io_storage.c BL31_SOURCES += ${RCAR_GIC_SOURCES} \ diff --git a/plat/renesas/rcar/platform.mk b/plat/renesas/rcar/platform.mk index 8613f5ea2..02be49a2e 100644 --- a/plat/renesas/rcar/platform.mk +++ b/plat/renesas/rcar/platform.mk @@ -307,7 +307,7 @@ PLAT_INCLUDES += -Idrivers/renesas/rcar/ddr \ -Idrivers/renesas/rcar/delay \ -Idrivers/renesas/rcar/rom \ -Idrivers/renesas/rcar/scif \ - -Idrivers/renesas/rcar/emmc \ + -Idrivers/renesas/common/emmc \ -Idrivers/renesas/rcar/pwrc \ -Idrivers/renesas/rcar/io @@ -330,12 +330,6 @@ BL2_SOURCES += plat/renesas/rcar/aarch64/platform_common.c \ drivers/renesas/rcar/dma/dma_driver.c \ drivers/renesas/rcar/avs/avs_driver.c \ drivers/renesas/rcar/delay/micro_delay.c \ - drivers/renesas/rcar/emmc/emmc_interrupt.c \ - drivers/renesas/rcar/emmc/emmc_utility.c \ - drivers/renesas/rcar/emmc/emmc_mount.c \ - drivers/renesas/rcar/emmc/emmc_init.c \ - drivers/renesas/rcar/emmc/emmc_read.c \ - drivers/renesas/rcar/emmc/emmc_cmd.c \ drivers/renesas/rcar/watchdog/swdt.c \ drivers/renesas/rcar/rom/rom_api.c \ drivers/renesas/rcar/board/board.c -- 2.39.5