diff options
author | Marek Vasut <marek.vasut+renesas@gmail.com> | 2019-06-17 19:29:03 +0200 |
---|---|---|
committer | Marek Vasut <marek.vasut+renesas@gmail.com> | 2019-06-22 17:33:10 +0200 |
commit | 2a690b6dbd3982104eabfb9639567bdf3bacc7bb (patch) | |
tree | 321c14a5133e45b0bc79dd978bda884d0a281e64 | |
parent | 278998257409ab0708917f53cd53cd9030016887 (diff) | |
download | trusted-firmware-a-2a690b6dbd3982104eabfb9639567bdf3bacc7bb.tar.gz |
rcar_gen3: drivers: pfc: Move PFC drivers out of staging
Now that PFC drivers are cleaned up , move them out of staging.
Signed-off-by: Marek Vasut <marek.vasut+renesas@gmail.com>
Change-Id: Ie594b53558c2bfb8e5d88e5b0354752c17a2487e
-rw-r--r-- | drivers/renesas/rcar/pfc/D3/pfc_init_d3.c (renamed from drivers/staging/renesas/rcar/pfc/D3/pfc_init_d3.c) | 0 | ||||
-rw-r--r-- | drivers/renesas/rcar/pfc/D3/pfc_init_d3.h (renamed from drivers/staging/renesas/rcar/pfc/D3/pfc_init_d3.h) | 6 | ||||
-rw-r--r-- | drivers/renesas/rcar/pfc/E3/pfc_init_e3.c (renamed from drivers/staging/renesas/rcar/pfc/E3/pfc_init_e3.c) | 0 | ||||
-rw-r--r-- | drivers/renesas/rcar/pfc/E3/pfc_init_e3.h (renamed from drivers/staging/renesas/rcar/pfc/E3/pfc_init_e3.h) | 0 | ||||
-rw-r--r-- | drivers/renesas/rcar/pfc/H3/pfc_init_h3_v1.c (renamed from drivers/staging/renesas/rcar/pfc/H3/pfc_init_h3_v1.c) | 0 | ||||
-rw-r--r-- | drivers/renesas/rcar/pfc/H3/pfc_init_h3_v1.h (renamed from drivers/staging/renesas/rcar/pfc/H3/pfc_init_h3_v1.h) | 0 | ||||
-rw-r--r-- | drivers/renesas/rcar/pfc/H3/pfc_init_h3_v2.c (renamed from drivers/staging/renesas/rcar/pfc/H3/pfc_init_h3_v2.c) | 0 | ||||
-rw-r--r-- | drivers/renesas/rcar/pfc/H3/pfc_init_h3_v2.h (renamed from drivers/staging/renesas/rcar/pfc/H3/pfc_init_h3_v2.h) | 0 | ||||
-rw-r--r-- | drivers/renesas/rcar/pfc/M3/pfc_init_m3.c (renamed from drivers/staging/renesas/rcar/pfc/M3/pfc_init_m3.c) | 0 | ||||
-rw-r--r-- | drivers/renesas/rcar/pfc/M3/pfc_init_m3.h (renamed from drivers/staging/renesas/rcar/pfc/M3/pfc_init_m3.h) | 0 | ||||
-rw-r--r-- | drivers/renesas/rcar/pfc/M3N/pfc_init_m3n.c (renamed from drivers/staging/renesas/rcar/pfc/M3N/pfc_init_m3n.c) | 0 | ||||
-rw-r--r-- | drivers/renesas/rcar/pfc/M3N/pfc_init_m3n.h (renamed from drivers/staging/renesas/rcar/pfc/M3N/pfc_init_m3n.h) | 0 | ||||
-rw-r--r-- | drivers/renesas/rcar/pfc/V3M/pfc_init_v3m.c (renamed from drivers/staging/renesas/rcar/pfc/V3M/pfc_init_v3m.c) | 0 | ||||
-rw-r--r-- | drivers/renesas/rcar/pfc/V3M/pfc_init_v3m.h (renamed from drivers/staging/renesas/rcar/pfc/V3M/pfc_init_v3m.h) | 6 | ||||
-rw-r--r-- | drivers/renesas/rcar/pfc/pfc.mk | 69 | ||||
-rw-r--r-- | drivers/renesas/rcar/pfc/pfc_init.c (renamed from drivers/staging/renesas/rcar/pfc/pfc_init.c) | 0 | ||||
-rw-r--r-- | drivers/renesas/rcar/pfc/pfc_regs.h (renamed from drivers/staging/renesas/rcar/pfc/pfc_regs.h) | 0 | ||||
-rw-r--r-- | drivers/staging/renesas/rcar/pfc/pfc.mk | 69 | ||||
-rw-r--r-- | plat/renesas/rcar/platform.mk | 2 |
19 files changed, 76 insertions, 76 deletions
diff --git a/drivers/staging/renesas/rcar/pfc/D3/pfc_init_d3.c b/drivers/renesas/rcar/pfc/D3/pfc_init_d3.c index 7e9bde9d47..7e9bde9d47 100644 --- a/drivers/staging/renesas/rcar/pfc/D3/pfc_init_d3.c +++ b/drivers/renesas/rcar/pfc/D3/pfc_init_d3.c diff --git a/drivers/staging/renesas/rcar/pfc/D3/pfc_init_d3.h b/drivers/renesas/rcar/pfc/D3/pfc_init_d3.h index ee1fada3b9..b7b1754374 100644 --- a/drivers/staging/renesas/rcar/pfc/D3/pfc_init_d3.h +++ b/drivers/renesas/rcar/pfc/D3/pfc_init_d3.h @@ -4,9 +4,9 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#ifndef PFC_INIT_D3_H__ -#define PFC_INIT_D3_H__ +#ifndef PFC_INIT_D3_H +#define PFC_INIT_D3_H void pfc_init_d3(void); -#endif /* PFC_INIT_D3_H__ */ +#endif /* PFC_INIT_D3_H */ diff --git a/drivers/staging/renesas/rcar/pfc/E3/pfc_init_e3.c b/drivers/renesas/rcar/pfc/E3/pfc_init_e3.c index b63d6bb9eb..b63d6bb9eb 100644 --- a/drivers/staging/renesas/rcar/pfc/E3/pfc_init_e3.c +++ b/drivers/renesas/rcar/pfc/E3/pfc_init_e3.c diff --git a/drivers/staging/renesas/rcar/pfc/E3/pfc_init_e3.h b/drivers/renesas/rcar/pfc/E3/pfc_init_e3.h index 647a937d14..647a937d14 100644 --- a/drivers/staging/renesas/rcar/pfc/E3/pfc_init_e3.h +++ b/drivers/renesas/rcar/pfc/E3/pfc_init_e3.h diff --git a/drivers/staging/renesas/rcar/pfc/H3/pfc_init_h3_v1.c b/drivers/renesas/rcar/pfc/H3/pfc_init_h3_v1.c index 7287c83391..7287c83391 100644 --- a/drivers/staging/renesas/rcar/pfc/H3/pfc_init_h3_v1.c +++ b/drivers/renesas/rcar/pfc/H3/pfc_init_h3_v1.c diff --git a/drivers/staging/renesas/rcar/pfc/H3/pfc_init_h3_v1.h b/drivers/renesas/rcar/pfc/H3/pfc_init_h3_v1.h index 2478e1c08b..2478e1c08b 100644 --- a/drivers/staging/renesas/rcar/pfc/H3/pfc_init_h3_v1.h +++ b/drivers/renesas/rcar/pfc/H3/pfc_init_h3_v1.h diff --git a/drivers/staging/renesas/rcar/pfc/H3/pfc_init_h3_v2.c b/drivers/renesas/rcar/pfc/H3/pfc_init_h3_v2.c index 8bba3c1506..8bba3c1506 100644 --- a/drivers/staging/renesas/rcar/pfc/H3/pfc_init_h3_v2.c +++ b/drivers/renesas/rcar/pfc/H3/pfc_init_h3_v2.c diff --git a/drivers/staging/renesas/rcar/pfc/H3/pfc_init_h3_v2.h b/drivers/renesas/rcar/pfc/H3/pfc_init_h3_v2.h index b02f93eb28..b02f93eb28 100644 --- a/drivers/staging/renesas/rcar/pfc/H3/pfc_init_h3_v2.h +++ b/drivers/renesas/rcar/pfc/H3/pfc_init_h3_v2.h diff --git a/drivers/staging/renesas/rcar/pfc/M3/pfc_init_m3.c b/drivers/renesas/rcar/pfc/M3/pfc_init_m3.c index 380899d3ae..380899d3ae 100644 --- a/drivers/staging/renesas/rcar/pfc/M3/pfc_init_m3.c +++ b/drivers/renesas/rcar/pfc/M3/pfc_init_m3.c diff --git a/drivers/staging/renesas/rcar/pfc/M3/pfc_init_m3.h b/drivers/renesas/rcar/pfc/M3/pfc_init_m3.h index 70885de79d..70885de79d 100644 --- a/drivers/staging/renesas/rcar/pfc/M3/pfc_init_m3.h +++ b/drivers/renesas/rcar/pfc/M3/pfc_init_m3.h diff --git a/drivers/staging/renesas/rcar/pfc/M3N/pfc_init_m3n.c b/drivers/renesas/rcar/pfc/M3N/pfc_init_m3n.c index 3fac3758e9..3fac3758e9 100644 --- a/drivers/staging/renesas/rcar/pfc/M3N/pfc_init_m3n.c +++ b/drivers/renesas/rcar/pfc/M3N/pfc_init_m3n.c diff --git a/drivers/staging/renesas/rcar/pfc/M3N/pfc_init_m3n.h b/drivers/renesas/rcar/pfc/M3N/pfc_init_m3n.h index 3e6f879448..3e6f879448 100644 --- a/drivers/staging/renesas/rcar/pfc/M3N/pfc_init_m3n.h +++ b/drivers/renesas/rcar/pfc/M3N/pfc_init_m3n.h diff --git a/drivers/staging/renesas/rcar/pfc/V3M/pfc_init_v3m.c b/drivers/renesas/rcar/pfc/V3M/pfc_init_v3m.c index 51d6f427cc..51d6f427cc 100644 --- a/drivers/staging/renesas/rcar/pfc/V3M/pfc_init_v3m.c +++ b/drivers/renesas/rcar/pfc/V3M/pfc_init_v3m.c diff --git a/drivers/staging/renesas/rcar/pfc/V3M/pfc_init_v3m.h b/drivers/renesas/rcar/pfc/V3M/pfc_init_v3m.h index eded87ca98..7bab92fdbb 100644 --- a/drivers/staging/renesas/rcar/pfc/V3M/pfc_init_v3m.h +++ b/drivers/renesas/rcar/pfc/V3M/pfc_init_v3m.h @@ -5,9 +5,9 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#ifndef PFC_INIT_V3M_H__ -#define PFC_INIT_V3M_H__ +#ifndef PFC_INIT_V3M_H +#define PFC_INIT_V3M_H void pfc_init_v3m(void); -#endif /* PFC_INIT_V3M_H__ */ +#endif /* PFC_INIT_V3M_H */ diff --git a/drivers/renesas/rcar/pfc/pfc.mk b/drivers/renesas/rcar/pfc/pfc.mk new file mode 100644 index 0000000000..f1dd92c066 --- /dev/null +++ b/drivers/renesas/rcar/pfc/pfc.mk @@ -0,0 +1,69 @@ +# +# Copyright (c) 2015-2018, Renesas Electronics Corporation. All rights reserved. +# +# SPDX-License-Identifier: BSD-3-Clause +# + +ifeq (${RCAR_LSI},${RCAR_AUTO}) + BL2_SOURCES += drivers/renesas/rcar/pfc/H3/pfc_init_h3_v1.c + BL2_SOURCES += drivers/renesas/rcar/pfc/H3/pfc_init_h3_v2.c + BL2_SOURCES += drivers/renesas/rcar/pfc/M3/pfc_init_m3.c + BL2_SOURCES += drivers/renesas/rcar/pfc/M3N/pfc_init_m3n.c + BL2_SOURCES += drivers/renesas/rcar/pfc/V3M/pfc_init_v3m.c + +else ifdef RCAR_LSI_CUT_COMPAT + ifeq (${RCAR_LSI},${RCAR_H3}) + BL2_SOURCES += drivers/renesas/rcar/pfc/H3/pfc_init_h3_v1.c + BL2_SOURCES += drivers/renesas/rcar/pfc/H3/pfc_init_h3_v2.c + endif + ifeq (${RCAR_LSI},${RCAR_H3N}) + BL2_SOURCES += drivers/renesas/rcar/pfc/H3/pfc_init_h3_v1.c + BL2_SOURCES += drivers/renesas/rcar/pfc/H3/pfc_init_h3_v2.c + endif + ifeq (${RCAR_LSI},${RCAR_M3}) + BL2_SOURCES += drivers/renesas/rcar/pfc/M3/pfc_init_m3.c + endif + ifeq (${RCAR_LSI},${RCAR_M3N}) + BL2_SOURCES += drivers/renesas/rcar/pfc/M3N/pfc_init_m3n.c + endif + ifeq (${RCAR_LSI},${RCAR_V3M}) + BL2_SOURCES += drivers/renesas/rcar/pfc/V3M/pfc_init_v3m.c + endif + ifeq (${RCAR_LSI},${RCAR_E3}) + BL2_SOURCES += drivers/renesas/rcar/pfc/E3/pfc_init_e3.c + endif + ifeq (${RCAR_LSI},${RCAR_D3}) + BL2_SOURCES += drivers/renesas/rcar/pfc/D3/pfc_init_d3.c + endif +else + ifeq (${RCAR_LSI},${RCAR_H3}) + ifeq (${LSI_CUT},10) + BL2_SOURCES += drivers/renesas/rcar/pfc/H3/pfc_init_h3_v1.c + else ifeq (${LSI_CUT},11) + BL2_SOURCES += drivers/renesas/rcar/pfc/H3/pfc_init_h3_v1.c + else +# LSI_CUT 20 or later + BL2_SOURCES += drivers/renesas/rcar/pfc/H3/pfc_init_h3_v2.c + endif + endif + ifeq (${RCAR_LSI},${RCAR_H3N}) + BL2_SOURCES += drivers/renesas/rcar/pfc/H3/pfc_init_h3_v2.c + endif + ifeq (${RCAR_LSI},${RCAR_M3}) + BL2_SOURCES += drivers/renesas/rcar/pfc/M3/pfc_init_m3.c + endif + ifeq (${RCAR_LSI},${RCAR_M3N}) + BL2_SOURCES += drivers/renesas/rcar/pfc/M3N/pfc_init_m3n.c + endif + ifeq (${RCAR_LSI},${RCAR_V3M}) + BL2_SOURCES += drivers/renesas/rcar/pfc/V3M/pfc_init_v3m.c + endif + ifeq (${RCAR_LSI},${RCAR_E3}) + BL2_SOURCES += drivers/renesas/rcar/pfc/E3/pfc_init_e3.c + endif + ifeq (${RCAR_LSI},${RCAR_D3}) + BL2_SOURCES += drivers/renesas/rcar/pfc/D3/pfc_init_d3.c + endif +endif + +BL2_SOURCES += drivers/renesas/rcar/pfc/pfc_init.c diff --git a/drivers/staging/renesas/rcar/pfc/pfc_init.c b/drivers/renesas/rcar/pfc/pfc_init.c index e9455af51c..e9455af51c 100644 --- a/drivers/staging/renesas/rcar/pfc/pfc_init.c +++ b/drivers/renesas/rcar/pfc/pfc_init.c diff --git a/drivers/staging/renesas/rcar/pfc/pfc_regs.h b/drivers/renesas/rcar/pfc/pfc_regs.h index b0b4e6fd99..b0b4e6fd99 100644 --- a/drivers/staging/renesas/rcar/pfc/pfc_regs.h +++ b/drivers/renesas/rcar/pfc/pfc_regs.h diff --git a/drivers/staging/renesas/rcar/pfc/pfc.mk b/drivers/staging/renesas/rcar/pfc/pfc.mk deleted file mode 100644 index 2c55cb06d3..0000000000 --- a/drivers/staging/renesas/rcar/pfc/pfc.mk +++ /dev/null @@ -1,69 +0,0 @@ -# -# Copyright (c) 2015-2018, Renesas Electronics Corporation. All rights reserved. -# -# SPDX-License-Identifier: BSD-3-Clause -# - -ifeq (${RCAR_LSI},${RCAR_AUTO}) - BL2_SOURCES += drivers/staging/renesas/rcar/pfc/H3/pfc_init_h3_v1.c - BL2_SOURCES += drivers/staging/renesas/rcar/pfc/H3/pfc_init_h3_v2.c - BL2_SOURCES += drivers/staging/renesas/rcar/pfc/M3/pfc_init_m3.c - BL2_SOURCES += drivers/staging/renesas/rcar/pfc/M3N/pfc_init_m3n.c - BL2_SOURCES += drivers/staging/renesas/rcar/pfc/V3M/pfc_init_v3m.c - -else ifdef RCAR_LSI_CUT_COMPAT - ifeq (${RCAR_LSI},${RCAR_H3}) - BL2_SOURCES += drivers/staging/renesas/rcar/pfc/H3/pfc_init_h3_v1.c - BL2_SOURCES += drivers/staging/renesas/rcar/pfc/H3/pfc_init_h3_v2.c - endif - ifeq (${RCAR_LSI},${RCAR_H3N}) - BL2_SOURCES += drivers/staging/renesas/rcar/pfc/H3/pfc_init_h3_v1.c - BL2_SOURCES += drivers/staging/renesas/rcar/pfc/H3/pfc_init_h3_v2.c - endif - ifeq (${RCAR_LSI},${RCAR_M3}) - BL2_SOURCES += drivers/staging/renesas/rcar/pfc/M3/pfc_init_m3.c - endif - ifeq (${RCAR_LSI},${RCAR_M3N}) - BL2_SOURCES += drivers/staging/renesas/rcar/pfc/M3N/pfc_init_m3n.c - endif - ifeq (${RCAR_LSI},${RCAR_V3M}) - BL2_SOURCES += drivers/staging/renesas/rcar/pfc/V3M/pfc_init_v3m.c - endif - ifeq (${RCAR_LSI},${RCAR_E3}) - BL2_SOURCES += drivers/staging/renesas/rcar/pfc/E3/pfc_init_e3.c - endif - ifeq (${RCAR_LSI},${RCAR_D3}) - BL2_SOURCES += drivers/staging/renesas/rcar/pfc/D3/pfc_init_d3.c - endif -else - ifeq (${RCAR_LSI},${RCAR_H3}) - ifeq (${LSI_CUT},10) - BL2_SOURCES += drivers/staging/renesas/rcar/pfc/H3/pfc_init_h3_v1.c - else ifeq (${LSI_CUT},11) - BL2_SOURCES += drivers/staging/renesas/rcar/pfc/H3/pfc_init_h3_v1.c - else -# LSI_CUT 20 or later - BL2_SOURCES += drivers/staging/renesas/rcar/pfc/H3/pfc_init_h3_v2.c - endif - endif - ifeq (${RCAR_LSI},${RCAR_H3N}) - BL2_SOURCES += drivers/staging/renesas/rcar/pfc/H3/pfc_init_h3_v2.c - endif - ifeq (${RCAR_LSI},${RCAR_M3}) - BL2_SOURCES += drivers/staging/renesas/rcar/pfc/M3/pfc_init_m3.c - endif - ifeq (${RCAR_LSI},${RCAR_M3N}) - BL2_SOURCES += drivers/staging/renesas/rcar/pfc/M3N/pfc_init_m3n.c - endif - ifeq (${RCAR_LSI},${RCAR_V3M}) - BL2_SOURCES += drivers/staging/renesas/rcar/pfc/V3M/pfc_init_v3m.c - endif - ifeq (${RCAR_LSI},${RCAR_E3}) - BL2_SOURCES += drivers/staging/renesas/rcar/pfc/E3/pfc_init_e3.c - endif - ifeq (${RCAR_LSI},${RCAR_D3}) - BL2_SOURCES += drivers/staging/renesas/rcar/pfc/D3/pfc_init_d3.c - endif -endif - -BL2_SOURCES += drivers/staging/renesas/rcar/pfc/pfc_init.c diff --git a/plat/renesas/rcar/platform.mk b/plat/renesas/rcar/platform.mk index 17fdc0d6a4..dc58e191d9 100644 --- a/plat/renesas/rcar/platform.mk +++ b/plat/renesas/rcar/platform.mk @@ -350,7 +350,7 @@ ERRATA_A57_813419 := 1 include drivers/staging/renesas/rcar/ddr/ddr.mk include drivers/renesas/rcar/qos/qos.mk -include drivers/staging/renesas/rcar/pfc/pfc.mk +include drivers/renesas/rcar/pfc/pfc.mk include lib/libfdt/libfdt.mk PLAT_INCLUDES := -Idrivers/staging/renesas/rcar/ddr \ |