From 3333d2caf4756447779cd0994a1411745f20fdc3 Mon Sep 17 00:00:00 2001 From: Marek Vasut Date: Tue, 15 Oct 2019 22:47:57 +0200 Subject: [PATCH] rcar_gen3: drivers: ddr: Move DDR drivers out of staging Now that DDR drivers are mostly cleaned up , move them out of staging. Signed-off-by: Marek Vasut Change-Id: I9de63f847a0ef9ac27a79fb0f848c351fd7f4da6 --- .../renesas/rcar/ddr/boot_init_dram.h | 0 drivers/renesas/rcar/ddr/ddr.mk | 17 +++++++++++++++++ .../rcar/ddr/ddr_a/boot_init_dram_regdef.h | 0 drivers/renesas/rcar/ddr/ddr_a/ddr_a.mk | 13 +++++++++++++ .../renesas/rcar/ddr/ddr_a/ddr_init_d3.c | 0 .../renesas/rcar/ddr/ddr_a/ddr_init_e3.c | 0 .../renesas/rcar/ddr/ddr_a/ddr_init_v3m.c | 0 .../renesas/rcar/ddr/ddr_b/boot_init_dram.c | 0 .../rcar/ddr/ddr_b/boot_init_dram_config.c | 0 .../rcar/ddr/ddr_b/boot_init_dram_regdef.h | 0 .../renesas/rcar/ddr/ddr_b/ddr_b.mk | 2 +- .../renesas/rcar/ddr/ddr_b/ddr_regdef.h | 0 .../renesas/rcar/ddr/ddr_b/init_dram_tbl_h3.h | 0 .../rcar/ddr/ddr_b/init_dram_tbl_h3ver2.h | 0 .../renesas/rcar/ddr/ddr_b/init_dram_tbl_m3.h | 0 .../renesas/rcar/ddr/ddr_b/init_dram_tbl_m3n.h | 0 .../{staging => }/renesas/rcar/ddr/ddr_regs.h | 0 .../renesas/rcar/ddr/dram_sub_func.c | 0 .../renesas/rcar/ddr/dram_sub_func.h | 0 drivers/staging/renesas/rcar/ddr/ddr.mk | 17 ----------------- drivers/staging/renesas/rcar/ddr/ddr_a/ddr_a.mk | 13 ------------- plat/renesas/rcar/platform.mk | 4 ++-- 22 files changed, 33 insertions(+), 33 deletions(-) rename drivers/{staging => }/renesas/rcar/ddr/boot_init_dram.h (100%) create mode 100644 drivers/renesas/rcar/ddr/ddr.mk rename drivers/{staging => }/renesas/rcar/ddr/ddr_a/boot_init_dram_regdef.h (100%) create mode 100644 drivers/renesas/rcar/ddr/ddr_a/ddr_a.mk rename drivers/{staging => }/renesas/rcar/ddr/ddr_a/ddr_init_d3.c (100%) rename drivers/{staging => }/renesas/rcar/ddr/ddr_a/ddr_init_e3.c (100%) rename drivers/{staging => }/renesas/rcar/ddr/ddr_a/ddr_init_v3m.c (100%) rename drivers/{staging => }/renesas/rcar/ddr/ddr_b/boot_init_dram.c (100%) rename drivers/{staging => }/renesas/rcar/ddr/ddr_b/boot_init_dram_config.c (100%) rename drivers/{staging => }/renesas/rcar/ddr/ddr_b/boot_init_dram_regdef.h (100%) rename drivers/{staging => }/renesas/rcar/ddr/ddr_b/ddr_b.mk (64%) rename drivers/{staging => }/renesas/rcar/ddr/ddr_b/ddr_regdef.h (100%) rename drivers/{staging => }/renesas/rcar/ddr/ddr_b/init_dram_tbl_h3.h (100%) rename drivers/{staging => }/renesas/rcar/ddr/ddr_b/init_dram_tbl_h3ver2.h (100%) rename drivers/{staging => }/renesas/rcar/ddr/ddr_b/init_dram_tbl_m3.h (100%) rename drivers/{staging => }/renesas/rcar/ddr/ddr_b/init_dram_tbl_m3n.h (100%) rename drivers/{staging => }/renesas/rcar/ddr/ddr_regs.h (100%) rename drivers/{staging => }/renesas/rcar/ddr/dram_sub_func.c (100%) rename drivers/{staging => }/renesas/rcar/ddr/dram_sub_func.h (100%) delete mode 100644 drivers/staging/renesas/rcar/ddr/ddr.mk delete mode 100644 drivers/staging/renesas/rcar/ddr/ddr_a/ddr_a.mk diff --git a/drivers/staging/renesas/rcar/ddr/boot_init_dram.h b/drivers/renesas/rcar/ddr/boot_init_dram.h similarity index 100% rename from drivers/staging/renesas/rcar/ddr/boot_init_dram.h rename to drivers/renesas/rcar/ddr/boot_init_dram.h diff --git a/drivers/renesas/rcar/ddr/ddr.mk b/drivers/renesas/rcar/ddr/ddr.mk new file mode 100644 index 000000000..c26993d00 --- /dev/null +++ b/drivers/renesas/rcar/ddr/ddr.mk @@ -0,0 +1,17 @@ +# +# Copyright (c) 2015-2018, Renesas Electronics Corporation. All rights reserved. +# +# SPDX-License-Identifier: BSD-3-Clause +# + +ifeq (${RCAR_LSI},${RCAR_E3}) + include drivers/renesas/rcar/ddr/ddr_a/ddr_a.mk + BL2_SOURCES += drivers/renesas/rcar/ddr/dram_sub_func.c +else ifeq (${RCAR_LSI},${RCAR_D3}) + include drivers/renesas/rcar/ddr/ddr_a/ddr_a.mk +else ifeq (${RCAR_LSI},${RCAR_V3M}) + include drivers/renesas/rcar/ddr/ddr_a/ddr_a.mk +else + include drivers/renesas/rcar/ddr/ddr_b/ddr_b.mk + BL2_SOURCES += drivers/renesas/rcar/ddr/dram_sub_func.c +endif diff --git a/drivers/staging/renesas/rcar/ddr/ddr_a/boot_init_dram_regdef.h b/drivers/renesas/rcar/ddr/ddr_a/boot_init_dram_regdef.h similarity index 100% rename from drivers/staging/renesas/rcar/ddr/ddr_a/boot_init_dram_regdef.h rename to drivers/renesas/rcar/ddr/ddr_a/boot_init_dram_regdef.h diff --git a/drivers/renesas/rcar/ddr/ddr_a/ddr_a.mk b/drivers/renesas/rcar/ddr/ddr_a/ddr_a.mk new file mode 100644 index 000000000..7882558d0 --- /dev/null +++ b/drivers/renesas/rcar/ddr/ddr_a/ddr_a.mk @@ -0,0 +1,13 @@ +# +# Copyright (c) 2015-2018, Renesas Electronics Corporation. All rights reserved. +# +# SPDX-License-Identifier: BSD-3-Clause +# + +ifeq (${RCAR_LSI},${RCAR_E3}) +BL2_SOURCES += drivers/renesas/rcar/ddr/ddr_a/ddr_init_e3.c +else ifeq (${RCAR_LSI},${RCAR_D3}) +BL2_SOURCES += drivers/renesas/rcar/ddr/ddr_a/ddr_init_d3.c +else +BL2_SOURCES += drivers/renesas/rcar/ddr/ddr_a/ddr_init_v3m.c +endif diff --git a/drivers/staging/renesas/rcar/ddr/ddr_a/ddr_init_d3.c b/drivers/renesas/rcar/ddr/ddr_a/ddr_init_d3.c similarity index 100% rename from drivers/staging/renesas/rcar/ddr/ddr_a/ddr_init_d3.c rename to drivers/renesas/rcar/ddr/ddr_a/ddr_init_d3.c diff --git a/drivers/staging/renesas/rcar/ddr/ddr_a/ddr_init_e3.c b/drivers/renesas/rcar/ddr/ddr_a/ddr_init_e3.c similarity index 100% rename from drivers/staging/renesas/rcar/ddr/ddr_a/ddr_init_e3.c rename to drivers/renesas/rcar/ddr/ddr_a/ddr_init_e3.c diff --git a/drivers/staging/renesas/rcar/ddr/ddr_a/ddr_init_v3m.c b/drivers/renesas/rcar/ddr/ddr_a/ddr_init_v3m.c similarity index 100% rename from drivers/staging/renesas/rcar/ddr/ddr_a/ddr_init_v3m.c rename to drivers/renesas/rcar/ddr/ddr_a/ddr_init_v3m.c diff --git a/drivers/staging/renesas/rcar/ddr/ddr_b/boot_init_dram.c b/drivers/renesas/rcar/ddr/ddr_b/boot_init_dram.c similarity index 100% rename from drivers/staging/renesas/rcar/ddr/ddr_b/boot_init_dram.c rename to drivers/renesas/rcar/ddr/ddr_b/boot_init_dram.c diff --git a/drivers/staging/renesas/rcar/ddr/ddr_b/boot_init_dram_config.c b/drivers/renesas/rcar/ddr/ddr_b/boot_init_dram_config.c similarity index 100% rename from drivers/staging/renesas/rcar/ddr/ddr_b/boot_init_dram_config.c rename to drivers/renesas/rcar/ddr/ddr_b/boot_init_dram_config.c diff --git a/drivers/staging/renesas/rcar/ddr/ddr_b/boot_init_dram_regdef.h b/drivers/renesas/rcar/ddr/ddr_b/boot_init_dram_regdef.h similarity index 100% rename from drivers/staging/renesas/rcar/ddr/ddr_b/boot_init_dram_regdef.h rename to drivers/renesas/rcar/ddr/ddr_b/boot_init_dram_regdef.h diff --git a/drivers/staging/renesas/rcar/ddr/ddr_b/ddr_b.mk b/drivers/renesas/rcar/ddr/ddr_b/ddr_b.mk similarity index 64% rename from drivers/staging/renesas/rcar/ddr/ddr_b/ddr_b.mk rename to drivers/renesas/rcar/ddr/ddr_b/ddr_b.mk index 875f95339..2bcc2922d 100644 --- a/drivers/staging/renesas/rcar/ddr/ddr_b/ddr_b.mk +++ b/drivers/renesas/rcar/ddr/ddr_b/ddr_b.mk @@ -4,4 +4,4 @@ # SPDX-License-Identifier: BSD-3-Clause # -BL2_SOURCES += drivers/staging/renesas/rcar/ddr/ddr_b/boot_init_dram.c +BL2_SOURCES += drivers/renesas/rcar/ddr/ddr_b/boot_init_dram.c diff --git a/drivers/staging/renesas/rcar/ddr/ddr_b/ddr_regdef.h b/drivers/renesas/rcar/ddr/ddr_b/ddr_regdef.h similarity index 100% rename from drivers/staging/renesas/rcar/ddr/ddr_b/ddr_regdef.h rename to drivers/renesas/rcar/ddr/ddr_b/ddr_regdef.h diff --git a/drivers/staging/renesas/rcar/ddr/ddr_b/init_dram_tbl_h3.h b/drivers/renesas/rcar/ddr/ddr_b/init_dram_tbl_h3.h similarity index 100% rename from drivers/staging/renesas/rcar/ddr/ddr_b/init_dram_tbl_h3.h rename to drivers/renesas/rcar/ddr/ddr_b/init_dram_tbl_h3.h diff --git a/drivers/staging/renesas/rcar/ddr/ddr_b/init_dram_tbl_h3ver2.h b/drivers/renesas/rcar/ddr/ddr_b/init_dram_tbl_h3ver2.h similarity index 100% rename from drivers/staging/renesas/rcar/ddr/ddr_b/init_dram_tbl_h3ver2.h rename to drivers/renesas/rcar/ddr/ddr_b/init_dram_tbl_h3ver2.h diff --git a/drivers/staging/renesas/rcar/ddr/ddr_b/init_dram_tbl_m3.h b/drivers/renesas/rcar/ddr/ddr_b/init_dram_tbl_m3.h similarity index 100% rename from drivers/staging/renesas/rcar/ddr/ddr_b/init_dram_tbl_m3.h rename to drivers/renesas/rcar/ddr/ddr_b/init_dram_tbl_m3.h diff --git a/drivers/staging/renesas/rcar/ddr/ddr_b/init_dram_tbl_m3n.h b/drivers/renesas/rcar/ddr/ddr_b/init_dram_tbl_m3n.h similarity index 100% rename from drivers/staging/renesas/rcar/ddr/ddr_b/init_dram_tbl_m3n.h rename to drivers/renesas/rcar/ddr/ddr_b/init_dram_tbl_m3n.h diff --git a/drivers/staging/renesas/rcar/ddr/ddr_regs.h b/drivers/renesas/rcar/ddr/ddr_regs.h similarity index 100% rename from drivers/staging/renesas/rcar/ddr/ddr_regs.h rename to drivers/renesas/rcar/ddr/ddr_regs.h diff --git a/drivers/staging/renesas/rcar/ddr/dram_sub_func.c b/drivers/renesas/rcar/ddr/dram_sub_func.c similarity index 100% rename from drivers/staging/renesas/rcar/ddr/dram_sub_func.c rename to drivers/renesas/rcar/ddr/dram_sub_func.c diff --git a/drivers/staging/renesas/rcar/ddr/dram_sub_func.h b/drivers/renesas/rcar/ddr/dram_sub_func.h similarity index 100% rename from drivers/staging/renesas/rcar/ddr/dram_sub_func.h rename to drivers/renesas/rcar/ddr/dram_sub_func.h diff --git a/drivers/staging/renesas/rcar/ddr/ddr.mk b/drivers/staging/renesas/rcar/ddr/ddr.mk deleted file mode 100644 index ed7adc339..000000000 --- a/drivers/staging/renesas/rcar/ddr/ddr.mk +++ /dev/null @@ -1,17 +0,0 @@ -# -# Copyright (c) 2015-2018, Renesas Electronics Corporation. All rights reserved. -# -# SPDX-License-Identifier: BSD-3-Clause -# - -ifeq (${RCAR_LSI},${RCAR_E3}) - include drivers/staging/renesas/rcar/ddr/ddr_a/ddr_a.mk - BL2_SOURCES += drivers/staging/renesas/rcar/ddr/dram_sub_func.c -else ifeq (${RCAR_LSI},${RCAR_D3}) - include drivers/staging/renesas/rcar/ddr/ddr_a/ddr_a.mk -else ifeq (${RCAR_LSI},${RCAR_V3M}) - include drivers/staging/renesas/rcar/ddr/ddr_a/ddr_a.mk -else - include drivers/staging/renesas/rcar/ddr/ddr_b/ddr_b.mk - BL2_SOURCES += drivers/staging/renesas/rcar/ddr/dram_sub_func.c -endif diff --git a/drivers/staging/renesas/rcar/ddr/ddr_a/ddr_a.mk b/drivers/staging/renesas/rcar/ddr/ddr_a/ddr_a.mk deleted file mode 100644 index aee27a59a..000000000 --- a/drivers/staging/renesas/rcar/ddr/ddr_a/ddr_a.mk +++ /dev/null @@ -1,13 +0,0 @@ -# -# Copyright (c) 2015-2018, Renesas Electronics Corporation. All rights reserved. -# -# SPDX-License-Identifier: BSD-3-Clause -# - -ifeq (${RCAR_LSI},${RCAR_E3}) -BL2_SOURCES += drivers/staging/renesas/rcar/ddr/ddr_a/ddr_init_e3.c -else ifeq (${RCAR_LSI},${RCAR_D3}) -BL2_SOURCES += drivers/staging/renesas/rcar/ddr/ddr_a/ddr_init_d3.c -else -BL2_SOURCES += drivers/staging/renesas/rcar/ddr/ddr_a/ddr_init_v3m.c -endif diff --git a/plat/renesas/rcar/platform.mk b/plat/renesas/rcar/platform.mk index dc58e191d..4c41dd341 100644 --- a/plat/renesas/rcar/platform.mk +++ b/plat/renesas/rcar/platform.mk @@ -348,12 +348,12 @@ ERRATA_A53_855873 := 1 ERRATA_A57_859972 := 1 ERRATA_A57_813419 := 1 -include drivers/staging/renesas/rcar/ddr/ddr.mk +include drivers/renesas/rcar/ddr/ddr.mk include drivers/renesas/rcar/qos/qos.mk include drivers/renesas/rcar/pfc/pfc.mk include lib/libfdt/libfdt.mk -PLAT_INCLUDES := -Idrivers/staging/renesas/rcar/ddr \ +PLAT_INCLUDES := -Idrivers/renesas/rcar/ddr \ -Idrivers/renesas/rcar/qos \ -Idrivers/renesas/rcar/iic_dvfs \ -Idrivers/renesas/rcar/board \ -- GitLab