Most of the lines in cru.h are needed only by cpu-info.c source file, therefore there is no reason to keep them in the header file and share. Among them are the include statements of SoC-specific CRU header files that caused SoC-specific dependencies to be spread around.
Signed-off-by: Massimo Pegorer <[email protected]> --- arch/arm/include/asm/arch-rockchip/cru.h | 27 --------------------------- arch/arm/mach-rockchip/cpu-info.c | 21 +++++++++++++++++++++ 2 files changed, 21 insertions(+), 27 deletions(-) diff --git a/arch/arm/include/asm/arch-rockchip/cru.h b/arch/arm/include/asm/arch-rockchip/cru.h index c3259b8e7cc..cffbc18691e 100644 --- a/arch/arm/include/asm/arch-rockchip/cru.h +++ b/arch/arm/include/asm/arch-rockchip/cru.h @@ -7,33 +7,6 @@ #ifndef _ROCKCHIP_CLOCK_H #define _ROCKCHIP_CLOCK_H -#ifndef __ASSEMBLY__ -#include <linux/bitops.h> -#endif - -#if defined(CONFIG_ROCKCHIP_RK3288) -# include <asm/arch-rockchip/cru_rk3288.h> -#elif defined(CONFIG_ROCKCHIP_RK3399) -# include <asm/arch-rockchip/cru_rk3399.h> -#elif defined(CONFIG_ROCKCHIP_RK3568) -#include <asm/arch-rockchip/cru_rk3568.h> -#elif defined(CONFIG_ROCKCHIP_RK3588) -#include <asm/arch-rockchip/cru_rk3588.h> -#endif - -/* CRU_GLB_RST_ST */ -enum { - GLB_POR_RST, - FST_GLB_RST_ST = BIT(0), - SND_GLB_RST_ST = BIT(1), - FST_GLB_TSADC_RST_ST = BIT(2), - SND_GLB_TSADC_RST_ST = BIT(3), - FST_GLB_WDT_RST_ST = BIT(4), - SND_GLB_WDT_RST_ST = BIT(5), -}; - -#define MHz 1000000 - 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 14c7331e1ab..4a23fdd70ba 100644 --- a/arch/arm/mach-rockchip/cpu-info.c +++ b/arch/arm/mach-rockchip/cpu-info.c @@ -11,6 +11,27 @@ #include <asm/arch-rockchip/hardware.h> #include <linux/err.h> +#if defined(CONFIG_ROCKCHIP_RK3288) +# include <asm/arch-rockchip/cru_rk3288.h> +#elif defined(CONFIG_ROCKCHIP_RK3399) +# include <asm/arch-rockchip/cru_rk3399.h> +#elif defined(CONFIG_ROCKCHIP_RK3568) +#include <asm/arch-rockchip/cru_rk3568.h> +#elif defined(CONFIG_ROCKCHIP_RK3588) +#include <asm/arch-rockchip/cru_rk3588.h> +#endif + +/* CRU_GLB_RST_ST */ +enum { + GLB_POR_RST, + FST_GLB_RST_ST = BIT(0), + SND_GLB_RST_ST = BIT(1), + FST_GLB_TSADC_RST_ST = BIT(2), + SND_GLB_TSADC_RST_ST = BIT(3), + FST_GLB_WDT_RST_ST = BIT(4), + SND_GLB_WDT_RST_ST = BIT(5), +}; + char *get_reset_cause(void) { struct rockchip_cru *cru = rockchip_get_cru(); -- 2.34.1
