From 01fe02229eb3155bc274c7d11de28597c87f0616 Mon Sep 17 00:00:00 2001 From: Jacob Chen Date: Tue, 12 Dec 2017 09:54:24 +0800 Subject: [PATCH] clk: rockchip: do not register ddrclk if PSCI is not enabled on arm32 ARM32 system can run without trustos, we should prevent arm_smccc_smc being called in such system. Change-Id: Ic87b78107b464e3ab8dc72a3ca1fa9a64e358580 Signed-off-by: Jacob Chen Signed-off-by: Elaine Zhang --- drivers/clk/rockchip/clk-ddr.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/drivers/clk/rockchip/clk-ddr.c b/drivers/clk/rockchip/clk-ddr.c index 15838ff49a52..7fafcdf87de9 100644 --- a/drivers/clk/rockchip/clk-ddr.c +++ b/drivers/clk/rockchip/clk-ddr.c @@ -25,6 +25,9 @@ #include #include #include +#ifdef CONFIG_ARM +#include +#endif #include "clk.h" @@ -307,6 +310,11 @@ struct clk *rockchip_clk_register_ddrclk(const char *name, int flags, struct clk_init_data init; struct clk *clk; +#ifdef CONFIG_ARM + if (!psci_smp_available()) + return NULL; +#endif + ddrclk = kzalloc(sizeof(*ddrclk), GFP_KERNEL); if (!ddrclk) return ERR_PTR(-ENOMEM);