diff options
| author | Christoph Muellner <christoph.muellner@theobroma-systems.com> | 2019-08-08 16:29:22 +0200 |
|---|---|---|
| committer | Christoph Muellner <christoph.muellner@theobroma-systems.com> | 2019-09-27 20:57:24 +0200 |
| commit | eba9aec92c46380e03bbe6c69dce74480e02bca8 (patch) | |
| tree | f484fd52b1d549f64234162cc558a02912f4ec88 | |
| parent | a1a5511b287099c75e2118912ff087b88e9762b6 (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.c | 11 |
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; |