From: Ezequiel Garcia <ezequiel.garcia@free-electrons.com> To: linux-pm@vger.kernel.org, linux-arm-kernel@lists.infradead.org Cc: Jason Cooper <jason@lakedaemon.net>, Lior Amsalem <alior@marvell.com>, Zhang Rui <rui.zhang@intel.com>, Nobuhiro Iwamatsu <iwamatsu@nigauri.org>, Thomas Petazzoni <thomas.petazzoni@free-electrons.com>, Gregory Clement <gregory.clement@free-electrons.com>, Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>, Andrew Lunn <andrew@lunn.ch>, Ezequiel Garcia <ezequiel.garcia@free-electrons.com> Subject: [PATCH v2 08/14] thermal: mvebu: Add infrastructure to support more multiple SoC variants Date: Fri, 22 Mar 2013 19:25:08 -0300 [thread overview] Message-ID: <1363991114-4225-9-git-send-email-ezequiel.garcia@free-electrons.com> (raw) In-Reply-To: <1363991114-4225-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 new struct to contain the operation for each SoC variant. Signed-off-by: Ezequiel Garcia <ezequiel.garcia@free-electrons.com> --- drivers/thermal/mvebu_thermal.c | 80 +++++++++++++++++++++++++++++++-------- 1 files changed, 64 insertions(+), 16 deletions(-) diff --git a/drivers/thermal/mvebu_thermal.c b/drivers/thermal/mvebu_thermal.c index 39ddded..a7c9b34 100644 --- a/drivers/thermal/mvebu_thermal.c +++ b/drivers/thermal/mvebu_thermal.c @@ -20,6 +20,7 @@ #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_VALID_OFFSET 9 @@ -27,36 +28,56 @@ #define MVEBU_THERMAL_TEMP_OFFSET 10 #define MVEBU_THERMAL_TEMP_MASK 0x1FF +struct mvebu_thermal_ops; + /* Marvell EBU Thermal Sensor Dev Structure */ struct mvebu_thermal_priv { void __iomem *sensor; + void __iomem *control; + struct mvebu_thermal_ops *ops; +}; + +struct mvebu_thermal_ops { + /* Converts the sensor register to ajunction temperature */ + unsigned long (*sensor_temp)(struct mvebu_thermal_priv *); + + /* 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 unsigned long orion_sensor_temp(struct mvebu_thermal_priv *priv) +{ + unsigned long reg = readl_relaxed(priv->sensor); + + reg = (reg >> MVEBU_THERMAL_TEMP_OFFSET) & + MVEBU_THERMAL_TEMP_MASK; + return (3220000000UL - (10000000UL * reg)) / 13625; +} + 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->ops->is_valid && !priv->ops->is_valid(priv)) { dev_err(&thermal->device, "Temperature sensor reading not valid\n"); return -EIO; } - /* - * Calculate temperature. According to Marvell internal - * documentation the formula for this is: - * Celsius = (322-reg)/1.3625 - */ - reg = (reg >> MVEBU_THERMAL_TEMP_OFFSET) & - MVEBU_THERMAL_TEMP_MASK; - *temp = ((3220000000UL - (10000000UL * reg)) / 13625); - + *temp = priv->ops->sensor_temp(priv); return 0; } @@ -64,18 +85,33 @@ static struct thermal_zone_device_ops ops = { .get_temp = mvebu_get_temp, }; +static const struct mvebu_thermal_ops kirkwood_ops = { + .sensor_temp = orion_sensor_temp, + .is_valid = mvebu_is_valid, +}; + static const struct of_device_id mvebu_thermal_id_table[] = { - { .compatible = "marvell,kirkwood-thermal" }, - {} + { + .compatible = "marvell,kirkwood-thermal", + .data = &kirkwood_ops, + }, + { + /* 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"); @@ -90,6 +126,18 @@ static int mvebu_thermal_probe(struct platform_device *pdev) if (IS_ERR(priv->sensor)) return PTR_ERR(priv->sensor); + res = platform_get_resource(pdev, IORESOURCE_MEM, 1); + if (res) { + priv->control = devm_ioremap_resource(&pdev->dev, res); + if (IS_ERR(priv->control)) + return PTR_ERR(priv->control); + } + + priv->ops = (struct mvebu_thermal_ops *)match->data; + + if (priv->ops->init_sensor) + priv->ops->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
WARNING: multiple messages have this Message-ID (diff)
From: ezequiel.garcia@free-electrons.com (Ezequiel Garcia) To: linux-arm-kernel@lists.infradead.org Subject: [PATCH v2 08/14] thermal: mvebu: Add infrastructure to support more multiple SoC variants Date: Fri, 22 Mar 2013 19:25:08 -0300 [thread overview] Message-ID: <1363991114-4225-9-git-send-email-ezequiel.garcia@free-electrons.com> (raw) In-Reply-To: <1363991114-4225-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 new struct to contain the operation for each SoC variant. Signed-off-by: Ezequiel Garcia <ezequiel.garcia@free-electrons.com> --- drivers/thermal/mvebu_thermal.c | 80 +++++++++++++++++++++++++++++++-------- 1 files changed, 64 insertions(+), 16 deletions(-) diff --git a/drivers/thermal/mvebu_thermal.c b/drivers/thermal/mvebu_thermal.c index 39ddded..a7c9b34 100644 --- a/drivers/thermal/mvebu_thermal.c +++ b/drivers/thermal/mvebu_thermal.c @@ -20,6 +20,7 @@ #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_VALID_OFFSET 9 @@ -27,36 +28,56 @@ #define MVEBU_THERMAL_TEMP_OFFSET 10 #define MVEBU_THERMAL_TEMP_MASK 0x1FF +struct mvebu_thermal_ops; + /* Marvell EBU Thermal Sensor Dev Structure */ struct mvebu_thermal_priv { void __iomem *sensor; + void __iomem *control; + struct mvebu_thermal_ops *ops; +}; + +struct mvebu_thermal_ops { + /* Converts the sensor register to ajunction temperature */ + unsigned long (*sensor_temp)(struct mvebu_thermal_priv *); + + /* 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 unsigned long orion_sensor_temp(struct mvebu_thermal_priv *priv) +{ + unsigned long reg = readl_relaxed(priv->sensor); + + reg = (reg >> MVEBU_THERMAL_TEMP_OFFSET) & + MVEBU_THERMAL_TEMP_MASK; + return (3220000000UL - (10000000UL * reg)) / 13625; +} + 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->ops->is_valid && !priv->ops->is_valid(priv)) { dev_err(&thermal->device, "Temperature sensor reading not valid\n"); return -EIO; } - /* - * Calculate temperature. According to Marvell internal - * documentation the formula for this is: - * Celsius = (322-reg)/1.3625 - */ - reg = (reg >> MVEBU_THERMAL_TEMP_OFFSET) & - MVEBU_THERMAL_TEMP_MASK; - *temp = ((3220000000UL - (10000000UL * reg)) / 13625); - + *temp = priv->ops->sensor_temp(priv); return 0; } @@ -64,18 +85,33 @@ static struct thermal_zone_device_ops ops = { .get_temp = mvebu_get_temp, }; +static const struct mvebu_thermal_ops kirkwood_ops = { + .sensor_temp = orion_sensor_temp, + .is_valid = mvebu_is_valid, +}; + static const struct of_device_id mvebu_thermal_id_table[] = { - { .compatible = "marvell,kirkwood-thermal" }, - {} + { + .compatible = "marvell,kirkwood-thermal", + .data = &kirkwood_ops, + }, + { + /* 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"); @@ -90,6 +126,18 @@ static int mvebu_thermal_probe(struct platform_device *pdev) if (IS_ERR(priv->sensor)) return PTR_ERR(priv->sensor); + res = platform_get_resource(pdev, IORESOURCE_MEM, 1); + if (res) { + priv->control = devm_ioremap_resource(&pdev->dev, res); + if (IS_ERR(priv->control)) + return PTR_ERR(priv->control); + } + + priv->ops = (struct mvebu_thermal_ops *)match->data; + + if (priv->ops->init_sensor) + priv->ops->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-22 22:25 UTC|newest] Thread overview: 94+ messages / expand[flat|nested] mbox.gz Atom feed top 2013-03-22 22:25 [PATCH v2 00/14] Marvell EBU thermal sensor consolidation Ezequiel Garcia 2013-03-22 22:25 ` Ezequiel Garcia 2013-03-22 22:25 ` [PATCH v2 01/14] thermal: Rename driver 'kirkwood' -> 'mvebu' Ezequiel Garcia 2013-03-22 22:25 ` Ezequiel Garcia 2013-04-11 16:00 ` [v2,01/14] " Eduardo Valentin 2013-04-11 16:00 ` Eduardo Valentin 2013-04-11 16:31 ` Ezequiel Garcia 2013-04-11 16:31 ` Ezequiel Garcia 2013-04-11 18:47 ` Eduardo Valentin 2013-04-11 18:47 ` Eduardo Valentin 2013-04-11 18:57 ` Eduardo Valentin 2013-04-11 18:57 ` Eduardo Valentin 2013-04-11 19:09 ` Ezequiel Garcia 2013-04-11 19:09 ` Ezequiel Garcia 2013-04-11 16:21 ` Eduardo Valentin 2013-04-11 16:21 ` Eduardo Valentin 2013-03-22 22:25 ` [PATCH v2 02/14] thermal: mvebu: Rename symbols " Ezequiel Garcia 2013-03-22 22:25 ` Ezequiel Garcia 2013-04-11 16:18 ` [v2,02/14] " Eduardo Valentin 2013-04-11 16:18 ` Eduardo Valentin 2013-03-22 22:25 ` [PATCH v2 03/14] thermal: mvebu: Move MODULE_DEVICE_TABLE upwards Ezequiel Garcia 2013-03-22 22:25 ` Ezequiel Garcia 2013-04-11 16:25 ` [v2,03/14] " Eduardo Valentin 2013-04-11 16:25 ` Eduardo Valentin 2013-03-22 22:25 ` [PATCH v2 04/14] thermal: mvebu: Remove unneeded variable initialization Ezequiel Garcia 2013-03-22 22:25 ` Ezequiel Garcia 2013-04-11 16:29 ` [v2,04/14] " Eduardo Valentin 2013-04-11 16:29 ` [v2, 04/14] " Eduardo Valentin 2013-04-11 18:54 ` [v2,04/14] " Eduardo Valentin 2013-04-11 18:54 ` [v2, 04/14] " Eduardo Valentin 2013-03-22 22:25 ` [PATCH v2 05/14] thermal: mvebu: Convert to devm_ioremap_resource() Ezequiel Garcia 2013-03-22 22:25 ` Ezequiel Garcia 2013-04-11 16:35 ` [v2,05/14] " Eduardo Valentin 2013-04-11 16:35 ` Eduardo Valentin 2013-04-11 18:55 ` Eduardo Valentin 2013-04-11 18:55 ` Eduardo Valentin 2013-03-22 22:25 ` [PATCH v2 06/14] thermal: mvebu: Fix license declaration Ezequiel Garcia 2013-03-22 22:25 ` Ezequiel Garcia 2013-04-11 16:40 ` [v2,06/14] " Eduardo Valentin 2013-04-11 16:40 ` Eduardo Valentin 2013-04-11 18:55 ` Eduardo Valentin 2013-04-11 18:55 ` Eduardo Valentin 2013-03-22 22:25 ` [PATCH v2 07/14] thermal: mvebu: Rename kirkwood definitions to mvebu Ezequiel Garcia 2013-03-22 22:25 ` Ezequiel Garcia 2013-04-11 16:43 ` [v2,07/14] " Eduardo Valentin 2013-04-11 16:43 ` Eduardo Valentin 2013-03-22 22:25 ` Ezequiel Garcia [this message] 2013-03-22 22:25 ` [PATCH v2 08/14] thermal: mvebu: Add infrastructure to support more multiple SoC variants Ezequiel Garcia 2013-03-22 22:25 ` [PATCH v2 09/14] thermal: mvebu: Add support for Armada XP thermal sensor Ezequiel Garcia 2013-03-22 22:25 ` Ezequiel Garcia 2013-03-22 22:25 ` [PATCH v2 10/14] thermal: mvebu: Add support for Armada 370 " Ezequiel Garcia 2013-03-22 22:25 ` Ezequiel Garcia 2013-03-22 22:25 ` [PATCH v2 11/14] thermal: mvebu: Add support for Marvell Dove SoC family Ezequiel Garcia 2013-03-22 22:25 ` Ezequiel Garcia 2013-03-23 11:26 ` Sebastian Hesselbarth 2013-03-23 11:26 ` Sebastian Hesselbarth 2013-03-24 0:16 ` Ezequiel Garcia 2013-03-24 0:16 ` Ezequiel Garcia 2013-03-25 9:34 ` Ezequiel Garcia 2013-03-25 9:34 ` Ezequiel Garcia 2013-03-22 22:25 ` [PATCH v2 12/14] ARM: mvebu: Add thermal support to Armada XP device tree Ezequiel Garcia 2013-03-22 22:25 ` Ezequiel Garcia 2013-03-22 22:25 ` [PATCH v2 13/14] ARM: mvebu: Add thermal support to Armada 370 " Ezequiel Garcia 2013-03-22 22:25 ` Ezequiel Garcia 2013-03-23 14:18 ` Sergei Shtylyov 2013-03-23 14:18 ` Sergei Shtylyov 2013-03-23 14:20 ` Sergei Shtylyov 2013-03-23 14:20 ` Sergei Shtylyov 2013-03-23 14:25 ` Sergei Shtylyov 2013-03-23 14:25 ` Sergei Shtylyov 2013-03-24 0:22 ` Ezequiel Garcia 2013-03-24 0:22 ` Ezequiel Garcia 2013-03-22 22:25 ` [PATCH v2 14/14] ARM: configs: Update mvebu, dove and kirkwood defconfigs for thermal Ezequiel Garcia 2013-03-22 22:25 ` Ezequiel Garcia 2013-03-23 18:16 ` [PATCH v2 00/14] Marvell EBU thermal sensor consolidation Jason Cooper 2013-03-23 18:16 ` Jason Cooper 2013-03-23 18:28 ` Sebastian Hesselbarth 2013-03-23 18:28 ` Sebastian Hesselbarth 2013-03-23 18:31 ` Jason Cooper 2013-03-23 18:31 ` Jason Cooper 2013-03-23 18:38 ` Sebastian Hesselbarth 2013-03-23 18:38 ` Sebastian Hesselbarth 2013-03-25 9:30 ` Andrew Lunn 2013-03-25 9:30 ` Andrew Lunn 2013-03-25 10:45 ` Ezequiel Garcia 2013-03-25 10:45 ` Ezequiel Garcia 2013-03-25 12:23 ` Sebastian Hesselbarth 2013-03-25 12:23 ` Sebastian Hesselbarth 2013-03-25 12:39 ` Ezequiel Garcia 2013-03-25 12:39 ` Ezequiel Garcia 2013-03-25 13:58 ` Sebastian Hesselbarth 2013-03-25 13:58 ` Sebastian Hesselbarth 2013-03-25 16:29 ` Jason Gunthorpe 2013-03-25 16:29 ` Jason Gunthorpe
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=1363991114-4225-9-git-send-email-ezequiel.garcia@free-electrons.com \ --to=ezequiel.garcia@free-electrons.com \ --cc=alior@marvell.com \ --cc=andrew@lunn.ch \ --cc=gregory.clement@free-electrons.com \ --cc=iwamatsu@nigauri.org \ --cc=jason@lakedaemon.net \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-pm@vger.kernel.org \ --cc=rui.zhang@intel.com \ --cc=sebastian.hesselbarth@gmail.com \ --cc=thomas.petazzoni@free-electrons.com \ /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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.