leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

thermal: armada: remove sensors validity from the IP initialization

Browse Source 
When using new bindings with multiple sensors, sensor validity is
checked twice because sensor selection also checks for the validity.

Remove the redundant call from the IP initialization helper and move it
to the legacy probe section where it is still needed.

Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com>
Signed-off-by: Eduardo Valentin <edubezval@gmail.com>
This commit is contained in:
Miquel Raynal 2018-07-16 16:41:53 +02:00 committed by Eduardo Valentin
parent f7c2068a17
commit 00707e4c96
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
drivers/thermal/armada_thermal.c
View File

@ -222,9 +222,6 @@ static void armada380_init(struct platform_device *pdev,
reg &= ~CONTROL0_TSEN_TC_TRIM_MASK; reg &= ~CONTROL0_TSEN_TC_TRIM_MASK;
reg |= CONTROL0_TSEN_TC_TRIM_VAL; reg |= CONTROL0_TSEN_TC_TRIM_VAL;
regmap_write(priv->syscon, data->syscon_control0_off, reg); regmap_write(priv->syscon, data->syscon_control0_off, reg);
/* Wait the sensors to be valid or the core will warn the user */
armada_wait_sensor_validity(priv);
} }
static void armada_ap806_init(struct platform_device *pdev, static void armada_ap806_init(struct platform_device *pdev,
@ -244,9 +241,6 @@ static void armada_ap806_init(struct platform_device *pdev,
reg &= ~CONTROL0_TSEN_AVG_BYPASS; reg &= ~CONTROL0_TSEN_AVG_BYPASS;
regmap_write(priv->syscon, data->syscon_control0_off, reg); regmap_write(priv->syscon, data->syscon_control0_off, reg);
/* Wait the sensors to be valid or the core will warn the user */
armada_wait_sensor_validity(priv);
} }
static void armada_cp110_init(struct platform_device *pdev, static void armada_cp110_init(struct platform_device *pdev,
@ -652,6 +646,9 @@ static int armada_thermal_probe(struct platform_device *pdev)
priv->data->init(pdev, priv); priv->data->init(pdev, priv);
/* Wait the sensors to be valid */
armada_wait_sensor_validity(priv);
tz = thermal_zone_device_register(priv->zone_name, 0, 0, priv, tz = thermal_zone_device_register(priv->zone_name, 0, 0, priv,
&legacy_ops, NULL, 0, 0); &legacy_ops, NULL, 0, 0);
if (IS_ERR(tz)) { if (IS_ERR(tz)) {