diff options
| author | Marek Vasut <marek.vasut+renesas@gmail.com> | 2018-12-28 11:26:03 +0100 |
|---|---|---|
| committer | Marek Vasut <marek.vasut+renesas@gmail.com> | 2019-01-08 14:08:44 +0100 |
| commit | bd57db531665f701cdf4705449205d6399fdb759 (patch) | |
| tree | 61b379671c5a7ddea63ffd57b287d3885a13ab5a | |
| parent | 8cbc4178363926999cfbc7f4e2f46bbdf8fa78ee (diff) | |
rcar_gen3: drivers: cpld: Move rcar_cpld_reset_cpu() into header
Move the rcar_cpld_reset_cpu() function into header file and zap the externs.
Signed-off-by: Marek Vasut <marek.vasut+renesas@gmail.com>
| -rw-r--r-- | drivers/renesas/rcar/cpld/ulcb_cpld.c | 1 | ||||
| -rw-r--r-- | drivers/renesas/rcar/cpld/ulcb_cpld.h | 12 | ||||
| -rw-r--r-- | plat/renesas/rcar/plat_pm.c | 5 | ||||
| -rw-r--r-- | plat/renesas/rcar/platform.mk | 1 |
4 files changed, 15 insertions, 4 deletions
diff --git a/drivers/renesas/rcar/cpld/ulcb_cpld.c b/drivers/renesas/rcar/cpld/ulcb_cpld.c index d7192f48..6b036149 100644 --- a/drivers/renesas/rcar/cpld/ulcb_cpld.c +++ b/drivers/renesas/rcar/cpld/ulcb_cpld.c @@ -5,6 +5,7 @@ */ #include <lib/mmio.h> +#include "ulcb_cpld.h" #define SCLK 8 /* GP_6_8 */ #define SSTBZ 3 /* GP_2_3 */ diff --git a/drivers/renesas/rcar/cpld/ulcb_cpld.h b/drivers/renesas/rcar/cpld/ulcb_cpld.h new file mode 100644 index 00000000..1616d711 --- /dev/null +++ b/drivers/renesas/rcar/cpld/ulcb_cpld.h @@ -0,0 +1,12 @@ +/* + * Copyright (c) 2018, Renesas Electronics Corporation. All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#ifndef RCAR_ULCB_CPLD_H__ +#define RCAR_ULCB_CPLD_H__ + +extern void rcar_cpld_reset_cpu(void); + +#endif /* RCAR_ULCB_CPLD_H__ */ diff --git a/plat/renesas/rcar/plat_pm.c b/plat/renesas/rcar/plat_pm.c index dbf3ac54..245a45a3 100644 --- a/plat/renesas/rcar/plat_pm.c +++ b/plat/renesas/rcar/plat_pm.c @@ -22,6 +22,7 @@ #include "pwrc.h" #include "rcar_def.h" #include "rcar_private.h" +#include "ulcb_cpld.h" #define DVFS_SET_VID_0V (0x00) #define P_ALL_OFF (0x80) @@ -41,10 +42,6 @@ extern void plat_rcar_gic_driver_init(void); extern void plat_rcar_gic_init(void); extern u_register_t rcar_boot_mpidr; -#if (RCAR_GEN3_ULCB == 1) -extern void rcar_cpld_reset_cpu(void); -#endif - static uintptr_t rcar_sec_entrypoint; static void rcar_program_mailbox(uint64_t mpidr, uint64_t address) diff --git a/plat/renesas/rcar/platform.mk b/plat/renesas/rcar/platform.mk index b897601e..5d1f5f60 100644 --- a/plat/renesas/rcar/platform.mk +++ b/plat/renesas/rcar/platform.mk @@ -311,6 +311,7 @@ PLAT_INCLUDES := -Iinclude/common/tbbr \ -Idrivers/staging/renesas/rcar/qos \ -Idrivers/renesas/rcar/iic_dvfs \ -Idrivers/renesas/rcar/board \ + -Idrivers/renesas/rcar/cpld/ \ -Idrivers/renesas/rcar/avs \ -Idrivers/renesas/rcar/delay \ -Idrivers/renesas/rcar/rom \ |