From: ezequiel.garcia@free-electrons.com (Ezequiel Garcia)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 10/16] thermal: mvebu: Add infrastructure to support more multiple SoC variants
Date: Wed, 20 Mar 2013 19:36:31 -0300 [thread overview]
Message-ID: <1363818997-23137-11-git-send-email-ezequiel.garcia@free-electrons.com> (raw)
In-Reply-To: <1363818997-23137-1-git-send-email-ezequiel.garcia@free-electrons.com>
This commit adds the infrastructure required for mvebu thermal driver
to support multiple SoC variants.
In particular, we add support for an optional memory resource, and a
couple of optionals function pointers:
* one to handle the case where the thermal sensor needs initialization,
* another one to support for valid sensor value checking
Signed-off-by: Ezequiel Garcia <ezequiel.garcia@free-electrons.com>
---
drivers/thermal/mvebu_thermal.c | 68 ++++++++++++++++++++++++++++++++++----
1 files changed, 60 insertions(+), 8 deletions(-)
diff --git a/drivers/thermal/mvebu_thermal.c b/drivers/thermal/mvebu_thermal.c
index 3304057..bfe4817 100644
--- a/drivers/thermal/mvebu_thermal.c
+++ b/drivers/thermal/mvebu_thermal.c
@@ -20,8 +20,11 @@
#include <linux/of.h>
#include <linux/module.h>
#include <linux/platform_device.h>
+#include <linux/of_device.h>
#include <linux/thermal.h>
+#define MVEBU_THERMAL_SOC_VARIANT_KIRKWOOD 0x1
+
#define MVEBU_THERMAL_VALID_OFFSET 9
#define MVEBU_THERMAL_VALID_MASK 0x1
#define MVEBU_THERMAL_TEMP_OFFSET 10
@@ -30,28 +33,48 @@
/* Marvell EBU Thermal Sensor Dev Structure */
struct mvebu_thermal_priv {
void __iomem *sensor;
+ void __iomem *control;
+ int soc_variant;
+
+ /* Initialize the sensor (optional) */
+ void (*init_sensor)(struct mvebu_thermal_priv *);
+
+ /* Test for a valid sensor value (optional) */
+ bool (*is_valid)(struct mvebu_thermal_priv *);
};
+static bool mvebu_is_valid(struct mvebu_thermal_priv *priv)
+{
+ unsigned long reg = readl_relaxed(priv->sensor);
+
+ return (reg >> MVEBU_THERMAL_VALID_OFFSET) &
+ MVEBU_THERMAL_VALID_MASK;
+}
+
static int mvebu_get_temp(struct thermal_zone_device *thermal,
unsigned long *temp)
{
unsigned long reg;
struct mvebu_thermal_priv *priv = thermal->devdata;
- reg = readl_relaxed(priv->sensor);
-
/* Valid check */
- if (!((reg >> MVEBU_THERMAL_VALID_OFFSET) &
- MVEBU_THERMAL_VALID_MASK)) {
+ if (priv->is_valid && !priv->is_valid(priv)) {
dev_err(&thermal->device,
"Temperature sensor reading not valid\n");
return -EIO;
}
- reg = (reg >> MVEBU_THERMAL_TEMP_OFFSET) &
+ reg = (readl_relaxed(priv->sensor) >> MVEBU_THERMAL_TEMP_OFFSET) &
MVEBU_THERMAL_TEMP_MASK;
- *temp = ((2363302UL - (7339*reg)) / 10);
+ switch (priv->soc_variant) {
+ case MVEBU_THERMAL_SOC_VARIANT_KIRKWOOD:
+ *temp = ((2363302UL - (7339*reg)) / 10);
+ break;
+ default:
+ *temp = 0;
+ break;
+ }
return 0;
}
@@ -60,17 +83,27 @@ static struct thermal_zone_device_ops ops = {
};
static const struct of_device_id mvebu_thermal_id_table[] = {
- { .compatible = "marvell,kirkwood-thermal" },
- {}
+ {
+ .compatible = "marvell,kirkwood-thermal",
+ .data = (void *) MVEBU_THERMAL_SOC_VARIANT_KIRKWOOD,
+ },
+ {
+ /* sentinel */
+ },
};
MODULE_DEVICE_TABLE(of, mvebu_thermal_id_table);
static int mvebu_thermal_probe(struct platform_device *pdev)
{
struct thermal_zone_device *thermal;
+ const struct of_device_id *match;
struct mvebu_thermal_priv *priv;
struct resource *res;
+ match = of_match_device(mvebu_thermal_id_table, &pdev->dev);
+ if (!match)
+ return -ENODEV;
+
res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
if (!res) {
dev_err(&pdev->dev, "Failed to get platform resource\n");
@@ -85,6 +118,25 @@ static int mvebu_thermal_probe(struct platform_device *pdev)
if (!priv->sensor)
return -EADDRNOTAVAIL;
+ res = platform_get_resource(pdev, IORESOURCE_MEM, 1);
+ if (res) {
+ priv->control = devm_ioremap_resource(&pdev->dev, res);
+ if (!priv->control)
+ return -EADDRNOTAVAIL;
+ }
+
+ priv->soc_variant = (int)match->data;
+ switch (priv->soc_variant) {
+ case MVEBU_THERMAL_SOC_VARIANT_KIRKWOOD:
+ priv->is_valid = mvebu_is_valid;
+ break;
+ default:
+ break;
+ }
+
+ if (priv->init_sensor)
+ priv->init_sensor(priv);
+
thermal = thermal_zone_device_register("mvebu_thermal", 0, 0,
priv, &ops, NULL, 0, 0);
if (IS_ERR(thermal)) {
--
1.7.8.6
next prev parent reply other threads:[~2013-03-20 22:36 UTC|newest]
Thread overview: 43+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-03-20 22:36 [PATCH 00/16] Marvell EBU thermal sensor consolidation Ezequiel Garcia
2013-03-20 22:36 ` [PATCH 01/16] thermal: Rename driver 'kirkwood' -> 'mvebu' Ezequiel Garcia
2013-03-20 22:36 ` [PATCH 02/16] thermal: mvebu: Rename symbols " Ezequiel Garcia
2013-03-20 22:36 ` [PATCH 03/16] thermal: mvebu: Move MODULE_DEVICE_TABLE upwards Ezequiel Garcia
2013-03-20 22:36 ` [PATCH 04/16] thermal: mvebu: Remove unneeded variable initialization Ezequiel Garcia
2013-03-20 22:36 ` [PATCH 05/16] thermal: mvebu: Fix valid check for thermal register Ezequiel Garcia
2013-03-21 14:35 ` Jason Cooper
2013-03-21 15:16 ` Ezequiel Garcia
2013-03-21 15:24 ` Jason Cooper
2013-03-21 19:57 ` Ezequiel Garcia
2013-03-21 20:06 ` Jason Cooper
2013-03-20 22:36 ` [PATCH 06/16] thermal: mvebu: Convert to devm_ioremap_resource() Ezequiel Garcia
2013-03-21 6:10 ` Andrew Lunn
2013-03-21 9:43 ` Ezequiel Garcia
2013-03-21 10:08 ` Andrew Lunn
2013-03-21 14:04 ` Sergei Shtylyov
2013-03-21 15:17 ` Ezequiel Garcia
2013-03-21 19:17 ` Russell King - ARM Linux
2013-03-21 20:21 ` Ezequiel Garcia
2013-03-20 22:36 ` [PATCH 07/16] thermal: mvebu: Fix license declaration Ezequiel Garcia
2013-03-20 22:36 ` [PATCH 08/16] thermal: mvebu: Fix temperature output formula for kirkwood Ezequiel Garcia
2013-03-21 14:41 ` Jason Cooper
2013-03-21 19:20 ` Russell King - ARM Linux
2013-03-21 20:38 ` Ezequiel Garcia
2013-03-20 22:36 ` [PATCH 09/16] thermal: mvebu: Rename kirkwood definitions to mvebu Ezequiel Garcia
2013-03-20 22:36 ` Ezequiel Garcia [this message]
2013-03-20 22:36 ` [PATCH 11/16] thermal: mvebu: Add support for Armada XP thermal sensor Ezequiel Garcia
2013-03-20 22:36 ` [PATCH 12/16] thermal: mvebu: Add support for Armada 370 " Ezequiel Garcia
2013-03-20 22:36 ` [PATCH 13/16] thermal: mvebu: Add support for Marvell Dove SoC family Ezequiel Garcia
2013-03-21 6:23 ` Andrew Lunn
2013-03-21 6:26 ` Andrew Lunn
2013-03-20 22:36 ` [PATCH 14/16] ARM: mvebu: Add thermal support to Armada XP device tree Ezequiel Garcia
2013-03-20 22:36 ` [PATCH 15/16] ARM: mvebu: Add thermal support to Armada 370 " Ezequiel Garcia
2013-03-21 14:03 ` Sergei Shtylyov
2013-03-21 15:18 ` Ezequiel Garcia
2013-03-20 22:36 ` [PATCH 16/16] ARM: configs: Update mvebu, dove and kirkwood defconfigs for thermal Ezequiel Garcia
2013-03-21 6:45 ` [PATCH 00/16] Marvell EBU thermal sensor consolidation Andrew Lunn
2013-03-21 9:42 ` Ezequiel Garcia
2013-03-21 12:35 ` Ezequiel Garcia
2013-03-21 13:36 ` Andrew Lunn
2013-03-21 17:32 ` Jason Gunthorpe
2013-03-22 14:23 ` Ezequiel Garcia
2013-03-21 12:26 ` Ezequiel Garcia
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1363818997-23137-11-git-send-email-ezequiel.garcia@free-electrons.com \
--to=ezequiel.garcia@free-electrons.com \
--cc=linux-arm-kernel@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).