Skip to content

GitLab

Commit b26461e8 authored by Paul Beesley's avatar Paul Beesley Committed by TrustedFirmware Code Review
Browse files

Merge changes Ie594b535,Ifa444dd5,Ie93e7fcc,I302cff20,I0f6c1cad, ... into integration 

* changes:
  rcar_gen3: drivers: pfc: Move PFC drivers out of staging
  rcar_gen3: drivers: pfc: Checkpatch cleanup
  rcar_gen3: drivers: pfc: V3M: Fix camel case
  rcar_gen3: drivers: pfc: V3M: Drop forward declarations
  rcar_gen3: drivers: pfc: V3M: Switch to BIT() macro
  rcar_gen3: drivers: pfc: V3M: Checkpatch cleanup
  rcar_gen3: drivers: pfc: V3M: Switch to common register header file
  rcar_gen3: drivers: pfc: E3: Drop pfc_reg_write() forward declaration
  rcar_gen3: drivers: pfc: E3: Switch to BIT() macro
  rcar_gen3: drivers: pfc: E3: Checkpatch cleanup
  rcar_gen3: drivers: pfc: E3: Switch to common register header file
  rcar_gen3: drivers: pfc: D3: Switch to BIT() macro
  rcar_gen3: drivers: pfc: D3: Drop unused macros
  rcar_gen3: drivers: pfc: D3: Checkpatch cleanup
  rcar_gen3: drivers: pfc: D3: Switch to common register header file
  rcar_gen3: drivers: pfc: M3N: Drop forward declarations
  rcar_gen3: drivers: pfc: M3N: Switch to BIT() macro
  rcar_gen3: drivers: pfc: M3N: Checkpatch cleanup
  rcar_gen3: drivers: pfc: M3N: Switch to common register header file
  rcar_gen3: drivers: pfc: M3W: Fix camel case
  rcar_gen3: drivers: pfc: M3W: Drop forward declarations
  rcar_gen3: drivers: pfc: M3W: Switch to BIT() macro
  rcar_gen3: drivers: pfc: M3W: Checkpatch cleanup
  rcar_gen3: drivers: pfc: M3W: Switch to common register header file
  rcar_gen3: drivers: pfc: H3: Drop pfc_reg_write() forward declaration
  rcar_gen3: drivers: pfc: H3: Switch to BIT() macro
  rcar_gen3: drivers: pfc: H3: Drop unused macros
  rcar_gen3: drivers: pfc: H3: Checkpatch cleanup
  rcar_gen3: drivers: pfc: H3: Switch to common register header file
  rcar_gen3: drivers: pfc: Introduce common register header file
  rcar_gen3: drivers: pfc: D3: Drop unused M3W check
parents 1b779c8c 2a690b6d
Expand all Show whitespace changes
Inline Side-by-side
drivers/renesas/rcar/pfc/D3/pfc_init_d3.c 0 → 100644
View file @ b26461e8
This diff is collapsed.
drivers/staging/renesas/rcar/pfc/D3/pfc_init_d3.h → drivers/renesas/rcar/pfc/D3/pfc_init_d3.h
View file @ b26461e8
......@@ -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 */
drivers/staging/renesas/rcar/pfc/V3M/pfc_init_v3m.h → drivers/renesas/rcar/pfc/V3M/pfc_init_v3m.h
View file @ b26461e8
......@@ -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 */
drivers/staging/renesas/rcar/pfc/pfc.mk → drivers/renesas/rcar/pfc/pfc.mk
View file @ b26461e8
......@@ -5,65 +5,65 @@
#
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
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/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/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/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/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/staging/renesas/rcar/pfc/M3/pfc_init_m3.c
BL2_SOURCES += drivers/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
BL2_SOURCES += drivers/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
BL2_SOURCES += drivers/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
BL2_SOURCES += drivers/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
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/staging/renesas/rcar/pfc/H3/pfc_init_h3_v1.c
BL2_SOURCES += drivers/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
BL2_SOURCES += drivers/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
BL2_SOURCES += drivers/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
BL2_SOURCES += drivers/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
BL2_SOURCES += drivers/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
BL2_SOURCES += drivers/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
BL2_SOURCES += drivers/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
BL2_SOURCES += drivers/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
BL2_SOURCES += drivers/renesas/rcar/pfc/D3/pfc_init_d3.c
endif
endif
BL2_SOURCES += drivers/staging/renesas/rcar/pfc/pfc_init.c
BL2_SOURCES += drivers/renesas/rcar/pfc/pfc_init.c
drivers/renesas/rcar/pfc/pfc_regs.h 0 → 100644
View file @ b26461e8
This diff is collapsed.
drivers/staging/renesas/rcar/pfc/D3/pfc_init_d3.c deleted 100644 → 0
View file @ 1b779c8c
This diff is collapsed.
plat/renesas/rcar/platform.mk
View file @ b26461e8
......@@ -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 \
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment