thermal: tango: add resume support

Commit Message

Mason June 20, 2016, 4:02 p.m. UTC

From: Marc Gonzalez <[e-mail]>

Signed-off-by: Marc Gonzalez <[e-mail]>
---
 drivers/thermal/tango_thermal.c | 27 +++++++++++++++++++++++++--
 1 file changed, 25 insertions(+), 2 deletions(-)

Comments

Kevin Hilman June 20, 2016, 6:17 p.m. UTC | #1

Mason <[e-mail]> writes:

> From: Marc Gonzalez <[e-mail]>
>
> Signed-off-by: Marc Gonzalez <[e-mail]>

Overall looks good, but as I mentioned in the RFC, since you don't have
a ->suspend() method it looks suspicious, so at least the changelog
should describe why you think that doesn't exist.  For that matter, the
changelog needs some more description of the patch well. :)

Kevin
--
To unsubscribe from this list: send the line "unsubscribe linux-pm" in
the body of a message to [e-mail]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Mason June 21, 2016, 9:01 a.m. UTC | #2

On 20/06/2016 20:17, Kevin Hilman wrote:

> Overall looks good, but as I mentioned in the RFC, since you don't have
> a ->suspend() method it looks suspicious, so at least the changelog
> should describe why you think that doesn't exist.  For that matter, the
> changelog needs some more description of the patch well. :)

Patch with improved commit message incoming.

Regards.

--
To unsubscribe from this list: send the line "unsubscribe linux-pm" in
the body of a message to [e-mail]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch

diff --git a/drivers/thermal/tango_thermal.c b/drivers/thermal/tango_thermal.c
index 70e0d9f406e9..d571ce2f546d 100644
--- a/drivers/thermal/tango_thermal.c
+++ b/drivers/thermal/tango_thermal.c
@@ -64,6 +64,12 @@  static const struct thermal_zone_of_device_ops ops = {
 	.get_temp	= tango_get_temp,
 };
 
+static void tango_thermal_init(struct tango_thermal_priv *priv)
+{
+	writel(0, priv->base + TEMPSI_CFG);
+	writel(CMD_ON, priv->base + TEMPSI_CMD);
+}
+
 static int tango_thermal_probe(struct platform_device *pdev)
 {
 	struct resource *res;
@@ -79,14 +85,30 @@  static int tango_thermal_probe(struct platform_device *pdev)
 	if (IS_ERR(priv->base))
 		return PTR_ERR(priv->base);
 
+	platform_set_drvdata(pdev, priv);
 	priv->thresh_idx = IDX_MIN;
-	writel(0, priv->base + TEMPSI_CFG);
-	writel(CMD_ON, priv->base + TEMPSI_CMD);
+	tango_thermal_init(priv);
 
 	tzdev = devm_thermal_zone_of_sensor_register(&pdev->dev, 0, priv, &ops);
 	return PTR_ERR_OR_ZERO(tzdev);
 }
 
+#ifdef CONFIG_PM_SLEEP
+static int tango_thermal_resume(struct device *dev)
+{
+	struct tango_thermal_priv *priv = dev_get_drvdata(dev);
+	tango_thermal_init(priv);
+
+	return 0;
+}
+
+static SIMPLE_DEV_PM_OPS(tango_thermal_pm, NULL, tango_thermal_resume);
+
+#define DEV_PM_OPS	&tango_thermal_pm
+#else
+#define DEV_PM_OPS	NULL
+#endif
+
 static const struct of_device_id tango_sensor_ids[] = {
 	{
 		.compatible = "sigma,smp8758-thermal",
@@ -99,6 +121,7 @@  static struct platform_driver tango_thermal_driver = {
 	.driver	= {
 		.name		= "tango-thermal",
 		.of_match_table	= tango_sensor_ids,
+		.pm		= DEV_PM_OPS,
 	},
 };