summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMiquel Raynal <miquel.raynal@bootlin.com>2018-07-16 17:41:48 +0300
committerEduardo Valentin <edubezval@gmail.com>2018-07-28 00:43:06 +0300
commit5b5e17a182e14316ab4369fd9e8173207cf42130 (patch)
tree8f32e0bd57208fa25e3c048450d7da68378de32b
parent8b4c2712cd7cbf9f83b8032550c7cbdfcdf970eb (diff)
downloadlinux-5b5e17a182e14316ab4369fd9e8173207cf42130.tar.xz
thermal: armada: dissociate a380 and cp110 ->init() hooks
Until now, Armada 380 and CP110 could share the same ->init() function because their use was identical. Prepare the support of multi-sensors support and overheat interrupt feature by separating the initialization paths before they actually diverge. Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com> Signed-off-by: Eduardo Valentin <edubezval@gmail.com>
-rw-r--r--drivers/thermal/armada_thermal.c8
1 files changed, 7 insertions, 1 deletions
diff --git a/drivers/thermal/armada_thermal.c b/drivers/thermal/armada_thermal.c
index 2f2150f9639f..31ff57a654ba 100644
--- a/drivers/thermal/armada_thermal.c
+++ b/drivers/thermal/armada_thermal.c
@@ -200,6 +200,12 @@ static void armada_ap806_init(struct platform_device *pdev,
armada_wait_sensor_validity(priv);
}
+static void armada_cp110_init(struct platform_device *pdev,
+ struct armada_thermal_priv *priv)
+{
+ armada380_init(pdev, priv);
+}
+
static bool armada_is_valid(struct armada_thermal_priv *priv)
{
u32 reg = readl_relaxed(priv->status);
@@ -306,7 +312,7 @@ static const struct armada_thermal_data armada_ap806_data = {
static const struct armada_thermal_data armada_cp110_data = {
.is_valid = armada_is_valid,
- .init = armada380_init,
+ .init = armada_cp110_init,
.is_valid_bit = BIT(10),
.temp_shift = 0,
.temp_mask = 0x3ff,