Move the only remaining function get_reset_cause() from cru.h header file to clock.h which already provides the whole common interface to Rockchip SoC CRU (Clock and Reset Unit). And remove cru.h file.
Signed-off-by: Massimo Pegorer <[email protected]> --- arch/arm/include/asm/arch-rockchip/clock.h | 2 ++ arch/arm/include/asm/arch-rockchip/cru.h | 12 ------------ arch/arm/mach-rockchip/cpu-info.c | 1 - board/firefly/roc-pc-rk3399/roc-pc-rk3399.c | 2 +- 4 files changed, 3 insertions(+), 14 deletions(-) diff --git a/arch/arm/include/asm/arch-rockchip/clock.h b/arch/arm/include/asm/arch-rockchip/clock.h index 8d3819778eb..4bedf1a0294 100644 --- a/arch/arm/include/asm/arch-rockchip/clock.h +++ b/arch/arm/include/asm/arch-rockchip/clock.h @@ -194,6 +194,8 @@ void rk3288_clk_configure_cpu(struct rockchip_cru *cru, struct rk3288_grf *grf); int rockchip_get_clk(struct udevice **devp); +char *get_reset_cause(void); + /* * rockchip_reset_bind() - Bind soft reset device as child of clock device * diff --git a/arch/arm/include/asm/arch-rockchip/cru.h b/arch/arm/include/asm/arch-rockchip/cru.h deleted file mode 100644 index cffbc18691e..00000000000 --- a/arch/arm/include/asm/arch-rockchip/cru.h +++ /dev/null @@ -1,12 +0,0 @@ -/* SPDX-License-Identifier: (GPL-2.0+ OR MIT) */ -/* - * (C) Copyright 2019 Amarula Solutions. - * Author: Jagan Teki <[email protected]> - */ - -#ifndef _ROCKCHIP_CLOCK_H -#define _ROCKCHIP_CLOCK_H - -char *get_reset_cause(void); - -#endif /* _ROCKCHIP_CLOCK_H */ diff --git a/arch/arm/mach-rockchip/cpu-info.c b/arch/arm/mach-rockchip/cpu-info.c index 4a23fdd70ba..7f20f7aa667 100644 --- a/arch/arm/mach-rockchip/cpu-info.c +++ b/arch/arm/mach-rockchip/cpu-info.c @@ -7,7 +7,6 @@ #include <env.h> #include <init.h> #include <asm/arch-rockchip/clock.h> -#include <asm/arch-rockchip/cru.h> #include <asm/arch-rockchip/hardware.h> #include <linux/err.h> diff --git a/board/firefly/roc-pc-rk3399/roc-pc-rk3399.c b/board/firefly/roc-pc-rk3399/roc-pc-rk3399.c index 5a71e94ae1e..713d3eb2eb9 100644 --- a/board/firefly/roc-pc-rk3399/roc-pc-rk3399.c +++ b/board/firefly/roc-pc-rk3399/roc-pc-rk3399.c @@ -13,7 +13,7 @@ #include <asm/global_data.h> #include <asm/io.h> -#include <asm/arch-rockchip/cru.h> +#include <asm/arch-rockchip/clock.h> #include <asm/arch-rockchip/gpio.h> #include <asm/arch-rockchip/grf_rk3399.h> -- 2.34.1
