summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristoph Muellner <christoph.muellner@theobroma-systems.com>2019-08-08 16:29:22 +0200
committerChristoph Muellner <christoph.muellner@theobroma-systems.com>2019-10-02 00:39:48 +0200
commite149d33aecae8a842ac0fac7dda13cbe552cd12a (patch)
tree26178c89320047fb70556f74166d0a6ea2126f07
parent313cc8bf5b31a76f3a90457c7761de71659b4b6a (diff)
thermal: rk3368: Remove SCPI calls.
SCPI calls can be used if there's an backend existing backend available. However, since mainline ATF does not provide this service, we disable SCPI calls to not fail during driver probing. Signed-off-by: Christoph Muellner <christoph.muellner@theobroma-systems.com>
-rw-r--r--drivers/thermal/rk3368_thermal.c11
1 files changed, 1 insertions, 10 deletions
diff --git a/drivers/thermal/rk3368_thermal.c b/drivers/thermal/rk3368_thermal.c
index ec07b96fdb78..d9cd88c6775e 100644
--- a/drivers/thermal/rk3368_thermal.c
+++ b/drivers/thermal/rk3368_thermal.c
@@ -33,7 +33,6 @@
#include <linux/mutex.h>
#include <linux/nvmem-consumer.h>
#include <linux/pm_qos.h>
-#include <soc/rockchip/scpi.h>
/**
* If the temperature over a period of time High,
@@ -447,11 +446,6 @@ static int rk3368_configure_from_dt(struct device *dev,
cycle = DIV_ROUND_UP(1000000000, rate) / 1000;
- if (scpi_thermal_set_clk_cycle(cycle)) {
- dev_err(dev, "scpi_thermal_set_clk_cycle error.\n");
- return -EINVAL;
- }
-
if (of_property_read_u32(np, "hw-shut-temp", &shut_temp)) {
dev_warn(dev,
"Missing tshut temp property, using default %ld\n",
@@ -569,10 +563,7 @@ static int rk3368_get_raw_code(struct rk3368_thermal_data *ctx)
static int old_data = 130;
int tsadc_data = 0;
- if (ctx->latency_req > ctx->latency_bound)
- tsadc_data = scpi_thermal_get_temperature();
- else
- tsadc_data = get_raw_code_internal();
+ tsadc_data = get_raw_code_internal();
if ((tsadc_data < RAW_CODE_MIN) || (tsadc_data > RAW_CODE_MAX))
tsadc_data = old_data;