thermal: Add Armada 370/XP support
Subsystems (4)
v2 cover thermal: Add Armada 370/XP support
After Andrew Lunn objected the single driver approach [1] that merged all the Marvell EBU SoC thermal drivers, we have agreed to proceed step by step. For the time being we are adding support for Armada 370/XP only. Given both Armada 370 and Armada XP have a similar feature set, it makes sense to provide a single driver for them.
In the future we can unify this with the other drivers, if this proves to be worthwhile.
This driver has been influenced by the existing Kirkwood driver, also taking account of suggestions made by Jason Gunthorpe.
Testing has been done on the following boards:
For Armada 370: Globalscale Mirabox and Marvell Armada 370 RD For Armada XP: Plat'home Openblocks AX3 and Marvell Armada XP DB-MV784MP-GP
This series is based in v3.9-rc2. To make testing easier this patchset can be found on a github branch [2].
Changes from v1:
* Reorder Kconfig and Makefiles entries as requested by Andrew Lunn.
* Make armada_get_temp() more readable, as requested by Durgadoss R.
Any feedback or comments are welcome!
[1] http://permalink.gmane.org/gmane.linux.power-management.general/32123
[2] https://github.com/MISL-EBU-System-SW/mainline-public/tree/armada-thermal-v2
Ezequiel Garcia (4):
thermal: Add driver for Armada 370/XP SoC thermal management
ARM: mvebu: Add thermal support to Armada XP device tree
ARM: mvebu: Add thermal support to Armada 370 device tree
ARM: configs: Update mvebu defconfig for thermal
.../devicetree/bindings/thermal/armada-thermal.txt | 22 ++ arch/arm/boot/dts/armada-370.dtsi | 6 + arch/arm/boot/dts/armada-xp.dtsi | 6 + arch/arm/configs/mvebu_defconfig | 2 + drivers/thermal/Kconfig | 8 + drivers/thermal/Makefile | 1 + drivers/thermal/armada_thermal.c | 236 ++++++++++++++++++++ 7 files changed, 281 insertions(+), 0 deletions(-) create mode 100644 Documentation/devicetree/bindings/thermal/armada-thermal.txt create mode 100644 drivers/thermal/armada_thermal.c
Signature · 1 line
1.7.8.6
PATCH v2 1/4 thermal: Add driver for Armada 370/XP SoC thermal management
This driver supports both Armada 370 and Armada XP SoC thermal management controllers.
Armada 370 has a register to check a valid temperature, whereas Armada XP does not. Each has a different initialization (i.e. calibration) function. The temperature conversion formula is the same for both.
The controller present in each SoC have a very similar feature set, so it corresponds to have one driver to support both of them.
Although this driver may present similarities to Dove and Kirkwood thermal driver, the exact differences and coincidences are not fully known. For this reason, support is given through a separate driver.
---
Changes from v1:
* Make armada_get_temp() more readable by reading the register on a separate line, as requested by Durgadoss R.
* Reorder Kconfig and Makefile entries, as requested by Andrew Lunn.
.../devicetree/bindings/thermal/armada-thermal.txt | 22 ++ drivers/thermal/Kconfig | 8 + drivers/thermal/Makefile | 1 + drivers/thermal/armada_thermal.c | 236 ++++++++++++++++++++ 4 files changed, 267 insertions(+), 0 deletions(-) create mode 100644 Documentation/devicetree/bindings/thermal/armada-thermal.txt create mode 100644 drivers/thermal/armada_thermal.c
Documentation/devicetree/bindings/thermal/armada-thermal.txt new file +22 -0
@@ -0,0 +1,22 @@ +* Marvell Armada 370/XP thermal management + +Required properties: + +- compatible: Should be set to one of the following: + marvell,armada370-thermal + marvell,armadaxp-thermal + +- reg: Device's register space. + Two entries are expected, see the examples below. + The first one is required for the sensor register; + the second one is required for the control register + to be used for sensor initialization (a.k.a. calibration). + +Example: + + thermal at d0018300 { + compatible = "marvell,armada370-thermal"; + reg = <0xd0018300 0x4 + 0xd0018304 0x4>; + status = "okay"; + };
drivers/thermal/Kconfig +8 -0
@@ -144,6 +144,14 @@ config DB8500_THERMAL created. Cooling devices can be bound to the trip points to cool this thermal zone if trip points reached. +config ARMADA_THERMAL + tristate "Armada 370/XP thermal management" + depends on ARCH_MVEBU + depends on OF + help + Enable this option if you want to have support for thermal management + controller present in Armada 370 and Armada XP SoC. + config DB8500_CPUFREQ_COOLING tristate "DB8500 cpufreq cooling" depends on ARCH_U8500
drivers/thermal/Makefile +1 -0
@@ -19,6 +19,7 @@ obj-$(CONFIG_KIRKWOOD_THERMAL) += kirkwood_thermal.o obj-$(CONFIG_EXYNOS_THERMAL) += exynos_thermal.o obj-$(CONFIG_DOVE_THERMAL) += dove_thermal.o obj-$(CONFIG_DB8500_THERMAL) += db8500_thermal.o +obj-$(CONFIG_ARMADA_THERMAL) += armada_thermal.o obj-$(CONFIG_DB8500_CPUFREQ_COOLING) += db8500_cpufreq_cooling.o obj-$(CONFIG_INTEL_POWERCLAMP) += intel_powerclamp.o
drivers/thermal/armada_thermal.c new file +236 -0
236 lines not on this page · raw message
Signature · 1 line
1.7.8.6
Zhang Rui
reviewerPATCH v2 1/4 thermal: Add driver for Armada 370/XP SoC thermal management
Quoted 147 lines · Ezequiel Garcia
This driver supports both Armada 370 and Armada XP SoC thermal management controllers.
Armada 370 has a register to check a valid temperature, whereas Armada XP does not. Each has a different initialization (i.e. calibration) function. The temperature conversion formula is the same for both.
The controller present in each SoC have a very similar feature set, so it corresponds to have one driver to support both of them.
Although this driver may present similarities to Dove and Kirkwood thermal driver, the exact differences and coincidences are not fully known. For this reason, support is given through a separate driver.
Signed-off-by Ezequiel Garcia <[email protected]>---
Changes from v1:
* Makearmada_get_temp()more readable by reading the register on a separate line, as requested by Durgadoss R.* Reorder
KconfigandMakefileentries, as requested by Andrew Lunn..../devicetree/bindings/thermal/armada-thermal.txt | 22 ++ drivers/thermal/Kconfig | 8 + drivers/thermal/Makefile | 1 + drivers/thermal/armada_thermal.c | 236 ++++++++++++++++++++ 4 files changed, 267 insertions(+), 0 deletions(-) create mode 100644 Documentation/devicetree/bindings/thermal/armada-thermal.txt create mode 100644 drivers/thermal/armada_thermal.cDocumentation/devicetree/bindings/thermal/armada-thermal.txt new file +22
-0@@ -0,0 +1,22 @@ +* Marvell Armada 370/XP thermal management + +Required properties: + +- compatible: Should be set to one of the following: + marvell,armada370-thermal + marvell,armadaxp-thermal + +- reg: Device's register space. + Two entries are expected, see the examples below. + The first one is required for the sensor register; + the second one is required for the control register + to be used for sensor initialization (a.k.a. calibration). + +Example: + + thermal at d0018300 { + compatible = "marvell,armada370-thermal"; + reg = <0xd0018300 0x4 + 0xd0018304 0x4>; + status = "okay"; + };drivers/thermal/Kconfig +8
-0@@ -144,6 +144,14 @@ config DB8500_THERMAL created. Cooling devices can be bound to the trip points to cool this thermal zone if trip points reached. +config ARMADA_THERMAL + tristate "Armada 370/XP thermal management" + depends on ARCH_MVEBU + depends on OF + help + Enable this option if you want to have support for thermal management + controller present in Armada 370 and Armada XP SoC. + config DB8500_CPUFREQ_COOLING tristate "DB8500 cpufreq cooling" depends on ARCH_U8500drivers/thermal/Makefile +1
-0@@ -19,6 +19,7 @@ obj-$(CONFIG_KIRKWOOD_THERMAL) += kirkwood_thermal.o obj-$(CONFIG_EXYNOS_THERMAL) += exynos_thermal.o obj-$(CONFIG_DOVE_THERMAL) += dove_thermal.o obj-$(CONFIG_DB8500_THERMAL) += db8500_thermal.o +obj-$(CONFIG_ARMADA_THERMAL) += armada_thermal.o obj-$(CONFIG_DB8500_CPUFREQ_COOLING) += db8500_cpufreq_cooling.o obj-$(CONFIG_INTEL_POWERCLAMP) += intel_powerclamp.odrivers/thermal/armada_thermal.c new file +52
-0@@ -0,0 +1,236 @@ +/* +* Marvell Armada 370/XP thermal sensor driver +* +* Copyright (C) 2013 Marvell +* +* This software is licensed under the terms of the GNU General Public +* License version 2, as published by the Free Software Foundation, and +* may be copied, distributed, and modified under those terms. +* +* This program is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* +*/ +#include <linux/device.h> +#include <linux/err.h> +#include <linux/io.h> +#include <linux/kernel.h> +#include <linux/of.h> +#include <linux/module.h> +#include <linux/delay.h> +#include <linux/platform_device.h> +#include <linux/of_device.h> +#include <linux/thermal.h> + +#define THERMAL_VALID_OFFSET 9 +#define THERMAL_VALID_MASK 0x1 +#define THERMAL_TEMP_OFFSET 10 +#define THERMAL_TEMP_MASK 0x1ff + +/* Thermal Manager Control and Status Register */ +#define PMU_TDC0_SW_RST_MASK (0x1 << 1) +#define PMU_TM_DISABLE_OFFS 0 +#define PMU_TM_DISABLE_MASK (0x1 << PMU_TM_DISABLE_OFFS) +#define PMU_TDC0_REF_CAL_CNT_OFFS 11 +#define PMU_TDC0_REF_CAL_CNT_MASK (0x1ff << PMU_TDC0_REF_CAL_CNT_OFFS) +#define PMU_TDC0_OTF_CAL_MASK (0x1 << 30) +#define PMU_TDC0_START_CAL_MASK (0x1 << 25) + +struct armada_thermal_ops ; + +/* Marvell EBU Thermal Sensor Dev Structure */ +struct armada_thermal_priv { +void __iomem *sensor; +void __iomem *control; +struct armada_thermal_ops *ops; +}; + +struct armada_thermal_ops { +/* Initialize the sensor */ +void (*init_sensor)(struct armada_thermal_priv *);
drivers/thermal/armada_thermal.c line 62
Quoted 10 lines
drivers/thermal/armada_thermal.c new file +10
-0+ +/* Test for a valid sensor value (optional) */ +bool (*is_valid)(struct armada_thermal_priv *); +}; + +static void armadaxp_init_sensor (struct armada_thermal_priv *priv) +{ +unsigned long reg; + +/* ??? */
what does this comment mean?
Quoted 16 lines
drivers/thermal/armada_thermal.c new file +16
-0+ reg =readl_relaxed (priv->control); + reg |=PMU_TDC0_OTF_CAL_MASK ; +writel (reg, priv->control); + +/* Reference calibration value */ + reg &= ~PMU_TDC0_REF_CAL_CNT_MASK ; + reg |= (0xf1 <<PMU_TDC0_REF_CAL_CNT_OFFS ); +writel (reg, priv->control); + +/* Reset the sensor */ + reg =readl_relaxed (priv->control); +writel ((reg |PMU_TDC0_SW_RST_MASK ), priv->control); + +writel (reg, priv->control); + +/* Enable the sensor */
drivers/thermal/armada_thermal.c line 88
Quoted 10 lines
drivers/thermal/armada_thermal.c new file +10
-0+ reg =readl_relaxed (priv->sensor); + reg &= ~PMU_TM_DISABLE_MASK ; +writel (reg, priv->sensor); +} + +static void armada370_init_sensor (struct armada_thermal_priv *priv) +{ +unsigned long reg; + +/* ??? */
ditto.
thanks,
rui
Quoted 148 lines
drivers/thermal/armada_thermal.c new file +148
-0+ reg =readl_relaxed (priv->control); + reg |=PMU_TDC0_OTF_CAL_MASK ; +writel (reg, priv->control); + +/* Reference calibration value */ + reg &= ~PMU_TDC0_REF_CAL_CNT_MASK ; + reg |= (0xf1 <<PMU_TDC0_REF_CAL_CNT_OFFS ); +writel (reg, priv->control); + +/* ??? */ + reg &= ~PMU_TDC0_START_CAL_MASK ; +writel (reg, priv->control); + +/* FIXME: Why do we need this delay? */ +mdelay (10 ); +} + +static bool armada_is_valid (struct armada_thermal_priv *priv) +{ +unsigned long reg =readl_relaxed (priv->sensor); + +return (reg >>THERMAL_VALID_OFFSET ) &THERMAL_VALID_MASK ; +} + +static int armada_get_temp (struct thermal_zone_device *thermal, +unsigned long *temp) +{ +struct armada_thermal_priv *priv = thermal->devdata; +unsigned long reg; + +/* Valid check */ +if (priv->ops->is_valid && !priv->ops->is_valid (priv)) { +dev_err (&thermal->device, +"Temperature sensor reading not valid\n" ); +return -EIO ; + } + + reg =readl_relaxed (priv->sensor); + reg = (reg >>THERMAL_TEMP_OFFSET ) &THERMAL_TEMP_MASK ; + *temp = (3153000000UL - (10000000UL *reg)) /13825 ; +return 0 ; +} + +static struct thermal_zone_device_ops ops = { + .get_temp = armada_get_temp, +}; + +static const struct armada_thermal_ops armadaxp_ops = { + .init_sensor = armadaxp_init_sensor, +}; + +static const struct armada_thermal_ops armada370_ops = { + .is_valid = armada_is_valid, + .init_sensor = armada370_init_sensor, +}; + +static const struct of_device_id armada_thermal_id_table[] = { + { + .compatible ="marvell,armadaxp-thermal" , + .data = &armadaxp_ops, + }, + { + .compatible ="marvell,armada370-thermal" , + .data = &armada370_ops, + }, + { +/* sentinel */ + }, +}; +MODULE_DEVICE_TABLE (of, armada_thermal_id_table); + +static int armada_thermal_probe (struct platform_device *pdev) +{ +struct thermal_zone_device *thermal; +const struct of_device_id *match; +struct armada_thermal_priv *priv; +struct resource *res; + + match =of_match_device (armada_thermal_id_table, &pdev->dev); +if (!match) +return -ENODEV ; + + priv =devm_kzalloc (&pdev->dev,sizeof (*priv),GFP_KERNEL ); +if (!priv) +return -ENOMEM ; + + res =platform_get_resource (pdev,IORESOURCE_MEM ,0 ); +if (!res) { +dev_err (&pdev->dev,"Failed to get platform resource\n" ); +return -ENODEV ; + } + + priv->sensor =devm_ioremap_resource (&pdev->dev, res); +if (IS_ERR (priv->sensor)) +return PTR_ERR (priv->sensor); + + res =platform_get_resource (pdev,IORESOURCE_MEM ,1 ); +if (!res) { +dev_err (&pdev->dev,"Failed to get platform resource\n" ); +return -ENODEV ; + } + + priv->control =devm_ioremap_resource (&pdev->dev, res); +if (IS_ERR (priv->control)) +return PTR_ERR (priv->control); + + priv->ops = (struct armada_thermal_ops *)match->data; + priv->ops->init_sensor (priv); + + thermal =thermal_zone_device_register ("armada_thermal" ,0 ,0 , + priv, &ops,NULL ,0 ,0 ); +if (IS_ERR (thermal)) { +dev_err (&pdev->dev, +"Failed to register thermal zone device\n" ); +return PTR_ERR (thermal); + } + +platform_set_drvdata (pdev, thermal); + +return 0 ; +} + +static int armada_thermal_exit (struct platform_device *pdev) +{ +struct thermal_zone_device *armada_thermal = +platform_get_drvdata (pdev); + +thermal_zone_device_unregister (armada_thermal); +platform_set_drvdata (pdev,NULL ); + +return 0 ; +} + +static struct platform_driver armada_thermal_driver = { + .probe = armada_thermal_probe, + .remove = armada_thermal_exit, + .driver = { + .name ="armada_thermal" , + .owner =THIS_MODULE , + .of_match_table =of_match_ptr (armada_thermal_id_table), + }, +}; + +module_platform_driver (armada_thermal_driver); + +MODULE_AUTHOR ("Ezequiel Garcia <[email protected]>" ); +MODULE_DESCRIPTION ("Armada 370/XP thermal driver" ); +MODULE_LICENSE ("GPL v2" );
PATCH v2 1/4 thermal: Add driver for Armada 370/XP SoC thermal management
Quoted 152 lines · Zhang Rui
Quoted 151 lines · Ezequiel Garcia
This driver supports both Armada 370 and Armada XP SoC thermal management controllers.
Armada 370 has a register to check a valid temperature, whereas Armada XP does not. Each has a different initialization (i.e. calibration) function. The temperature conversion formula is the same for both.
The controller present in each SoC have a very similar feature set, so it corresponds to have one driver to support both of them.
Although this driver may present similarities to Dove and Kirkwood thermal driver, the exact differences and coincidences are not fully known. For this reason, support is given through a separate driver.
Signed-off-by Ezequiel Garcia <[email protected]>---
Changes from v1:
* Makearmada_get_temp()more readable by reading the register on a separate line, as requested by Durgadoss R.* Reorder
KconfigandMakefileentries, as requested by Andrew Lunn..../devicetree/bindings/thermal/armada-thermal.txt | 22 ++ drivers/thermal/Kconfig | 8 + drivers/thermal/Makefile | 1 + drivers/thermal/armada_thermal.c | 236 ++++++++++++++++++++ 4 files changed, 267 insertions(+), 0 deletions(-) create mode 100644 Documentation/devicetree/bindings/thermal/armada-thermal.txt create mode 100644 drivers/thermal/armada_thermal.cDocumentation/devicetree/bindings/thermal/armada-thermal.txt new file +22
-0@@ -0,0 +1,22 @@ +* Marvell Armada 370/XP thermal management + +Required properties: + +- compatible: Should be set to one of the following: + marvell,armada370-thermal + marvell,armadaxp-thermal + +- reg: Device's register space. + Two entries are expected, see the examples below. + The first one is required for the sensor register; + the second one is required for the control register + to be used for sensor initialization (a.k.a. calibration). + +Example: + + thermal at d0018300 { + compatible = "marvell,armada370-thermal"; + reg = <0xd0018300 0x4 + 0xd0018304 0x4>; + status = "okay"; + };drivers/thermal/Kconfig +8
-0@@ -144,6 +144,14 @@ config DB8500_THERMAL created. Cooling devices can be bound to the trip points to cool this thermal zone if trip points reached. +config ARMADA_THERMAL + tristate "Armada 370/XP thermal management" + depends on ARCH_MVEBU + depends on OF + help + Enable this option if you want to have support for thermal management + controller present in Armada 370 and Armada XP SoC. + config DB8500_CPUFREQ_COOLING tristate "DB8500 cpufreq cooling" depends on ARCH_U8500drivers/thermal/Makefile +1
-0@@ -19,6 +19,7 @@ obj-$(CONFIG_KIRKWOOD_THERMAL) += kirkwood_thermal.o obj-$(CONFIG_EXYNOS_THERMAL) += exynos_thermal.o obj-$(CONFIG_DOVE_THERMAL) += dove_thermal.o obj-$(CONFIG_DB8500_THERMAL) += db8500_thermal.o +obj-$(CONFIG_ARMADA_THERMAL) += armada_thermal.o obj-$(CONFIG_DB8500_CPUFREQ_COOLING) += db8500_cpufreq_cooling.o obj-$(CONFIG_INTEL_POWERCLAMP) += intel_powerclamp.odrivers/thermal/armada_thermal.c new file +56
-0@@ -0,0 +1,236 @@ +/* +* Marvell Armada 370/XP thermal sensor driver +* +* Copyright (C) 2013 Marvell +* +* This software is licensed under the terms of the GNU General Public +* License version 2, as published by the Free Software Foundation, and +* may be copied, distributed, and modified under those terms. +* +* This program is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* +*/ +#include <linux/device.h> +#include <linux/err.h> +#include <linux/io.h> +#include <linux/kernel.h> +#include <linux/of.h> +#include <linux/module.h> +#include <linux/delay.h> +#include <linux/platform_device.h> +#include <linux/of_device.h> +#include <linux/thermal.h> + +#define THERMAL_VALID_OFFSET 9 +#define THERMAL_VALID_MASK 0x1 +#define THERMAL_TEMP_OFFSET 10 +#define THERMAL_TEMP_MASK 0x1ff + +/* Thermal Manager Control and Status Register */ +#define PMU_TDC0_SW_RST_MASK (0x1 << 1) +#define PMU_TM_DISABLE_OFFS 0 +#define PMU_TM_DISABLE_MASK (0x1 << PMU_TM_DISABLE_OFFS) +#define PMU_TDC0_REF_CAL_CNT_OFFS 11 +#define PMU_TDC0_REF_CAL_CNT_MASK (0x1ff << PMU_TDC0_REF_CAL_CNT_OFFS) +#define PMU_TDC0_OTF_CAL_MASK (0x1 << 30) +#define PMU_TDC0_START_CAL_MASK (0x1 << 25) + +struct armada_thermal_ops ; + +/* Marvell EBU Thermal Sensor Dev Structure */ +struct armada_thermal_priv { +void __iomem *sensor; +void __iomem *control; +struct armada_thermal_ops *ops; +}; + +struct armada_thermal_ops { +/* Initialize the sensor */ +void (*init_sensor)(struct armada_thermal_priv *); + +/* Test for a valid sensor value (optional) */ +bool (*is_valid)(struct armada_thermal_priv *); +};
Quoted 9 lines
drivers/thermal/armada_thermal.c line 62
Quoted 6 lines
drivers/thermal/armada_thermal.c new file +6
-0+ +static void armadaxp_init_sensor (struct armada_thermal_priv *priv) +{ +unsigned long reg; + +/* ??? */ what does this comment mean?
It means I'm not sure entirely sure what the below code does. Maybe I should remove it?
Quoted 4 lines
drivers/thermal/armada_thermal.c line 66
Quoted 4 lines
drivers/thermal/armada_thermal.c new file +4
-0+ reg =readl_relaxed (priv->control); + reg |=PMU_TDC0_OTF_CAL_MASK ; +writel (reg, priv->control); +
Thanks for the review,
Signature · 3 lines
Ezequiel Garc?a, Free Electrons Embedded Linux, Kernel and Android Engineering http://free-electrons.com
PATCH v2 1/4 thermal: Add driver for Armada 370/XP SoC thermal management
In reply to Zhang RuiHi Zhang,
Quoted 17 lines · Zhang Rui
Quoted 16 lines · Ezequiel Garcia
This driver supports both Armada 370 and Armada XP SoC thermal management controllers.
Armada 370 has a register to check a valid temperature, whereas Armada XP does not. Each has a different initialization (i.e. calibration) function. The temperature conversion formula is the same for both.
The controller present in each SoC have a very similar feature set, so it corresponds to have one driver to support both of them.
Although this driver may present similarities to Dove and Kirkwood thermal driver, the exact differences and coincidences are not fully known. For this reason, support is given through a separate driver.
Signed-off-by Ezequiel Garcia <[email protected]>---
[...]
Quoted 8 lines
Review
Quoted 5 lines
(quoted diff) +5
-0+static void armadaxp_init_sensor(struct armada_thermal_priv *priv) +{ + unsigned long reg; + + /* ??? */what does this comment mean?
In the case you'd prefer those comments to be removed, here's a patch that does just that.
Is it possible for you to take it instead of the previous one, in this form?
------------------------------------8<----------------------------------------
Documentation/devicetree/bindings/thermal/armada-thermal.txt new file +22 -0
@@ -0,0 +1,22 @@ +* Marvell Armada 370/XP thermal management + +Required properties: + +- compatible: Should be set to one of the following: + marvell,armada370-thermal + marvell,armadaxp-thermal + +- reg: Device's register space. + Two entries are expected, see the examples below. + The first one is required for the sensor register; + the second one is required for the control register + to be used for sensor initialization (a.k.a. calibration). + +Example: + + thermal@d0018300 { + compatible = "marvell,armada370-thermal"; + reg = <0xd0018300 0x4 + 0xd0018304 0x4>; + status = "okay"; + };
drivers/thermal/Kconfig +8 -0
@@ -144,6 +144,14 @@ config DB8500_THERMAL created. Cooling devices can be bound to the trip points to cool this thermal zone if trip points reached. +config ARMADA_THERMAL + tristate "Armada 370/XP thermal management" + depends on ARCH_MVEBU + depends on OF + help + Enable this option if you want to have support for thermal management + controller present in Armada 370 and Armada XP SoC. + config DB8500_CPUFREQ_COOLING tristate "DB8500 cpufreq cooling" depends on ARCH_U8500
drivers/thermal/Makefile +1 -0
@@ -19,6 +19,7 @@ obj-$(CONFIG_KIRKWOOD_THERMAL) += kirkwood_thermal.o obj-$(CONFIG_EXYNOS_THERMAL) += exynos_thermal.o obj-$(CONFIG_DOVE_THERMAL) += dove_thermal.o obj-$(CONFIG_DB8500_THERMAL) += db8500_thermal.o +obj-$(CONFIG_ARMADA_THERMAL) += armada_thermal.o obj-$(CONFIG_DB8500_CPUFREQ_COOLING) += db8500_cpufreq_cooling.o obj-$(CONFIG_INTEL_POWERCLAMP) += intel_powerclamp.o
drivers/thermal/armada_thermal.c new file +232 -0
232 lines not on this page · raw message
------------------------------------>8----------------------------------------
Signature · 3 lines
Ezequiel García, Free Electrons Embedded Linux, Kernel and Android Engineering http://free-electrons.com
Zhang Rui
reviewerPATCH v2 1/4 thermal: Add driver for Armada 370/XP SoC thermal management
Quoted 19 lines · Ezequiel Garcia
Hi Zhang,
Quoted 16 lines · Zhang Rui
Quoted 15 lines · Ezequiel Garcia
This driver supports both Armada 370 and Armada XP SoC thermal management controllers.
Armada 370 has a register to check a valid temperature, whereas Armada XP does not. Each has a different initialization (i.e. calibration) function. The temperature conversion formula is the same for both.
The controller present in each SoC have a very similar feature set, so it corresponds to have one driver to support both of them.
Although this driver may present similarities to Dove and Kirkwood thermal driver, the exact differences and coincidences are not fully known. For this reason, support is given through a separate driver.
Signed-off-by Ezequiel Garcia <[email protected]>
patch applied.
thanks,
rui
Quoted 319 lines
Quoted 1 line
Quoted 1 line
---
[...]
Quoted 8 lines
drivers/thermal/armada_thermal.c
Quoted 5 lines
drivers/thermal/armada_thermal.c new file +5
-0+static void armadaxp_init_sensor (struct armada_thermal_priv *priv) +{ +unsigned long reg; + +/* ??? */ what does this comment mean?
In the case you'd prefer those comments to be removed, here's a patch that does just that.
Is it possible for you to take it instead of the previous one, in this form?
------------------------------------8<----------------------------------------
Documentation/devicetree/bindings/thermal/armada-thermal.txt new file +22
-0@@ -0,0 +1,22 @@ +* Marvell Armada 370/XP thermal management + +Required properties: + +- compatible: Should be set to one of the following: + marvell,armada370-thermal + marvell,armadaxp-thermal + +- reg: Device's register space. + Two entries are expected, see the examples below. + The first one is required for the sensor register; + the second one is required for the control register + to be used for sensor initialization (a.k.a. calibration). + +Example: + + thermal at d0018300 { + compatible = "marvell,armada370-thermal"; + reg = <0xd0018300 0x4 + 0xd0018304 0x4>; + status = "okay"; + };drivers/thermal/Kconfig +8
-0@@ -144,6 +144,14 @@ config DB8500_THERMAL created. Cooling devices can be bound to the trip points to cool this thermal zone if trip points reached. +config ARMADA_THERMAL + tristate "Armada 370/XP thermal management" + depends on ARCH_MVEBU + depends on OF + help + Enable this option if you want to have support for thermal management + controller present in Armada 370 and Armada XP SoC. + config DB8500_CPUFREQ_COOLING tristate "DB8500 cpufreq cooling" depends on ARCH_U8500drivers/thermal/Makefile +1
-0@@ -19,6 +19,7 @@ obj-$(CONFIG_KIRKWOOD_THERMAL) += kirkwood_thermal.o obj-$(CONFIG_EXYNOS_THERMAL) += exynos_thermal.o obj-$(CONFIG_DOVE_THERMAL) += dove_thermal.o obj-$(CONFIG_DB8500_THERMAL) += db8500_thermal.o +obj-$(CONFIG_ARMADA_THERMAL) += armada_thermal.o obj-$(CONFIG_DB8500_CPUFREQ_COOLING) += db8500_cpufreq_cooling.o obj-$(CONFIG_INTEL_POWERCLAMP) += intel_powerclamp.odrivers/thermal/armada_thermal.c new file +232
-1@@ -0,0 +1,232 @@ +/* +* Marvell Armada 370/XP thermal sensor driver +* +* Copyright (C) 2013 Marvell +* +* This software is licensed under the terms of the GNU General Public +* License version 2, as published by the Free Software Foundation, and +* may be copied, distributed, and modified under those terms. +* +* This program is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* +*/ +#include <linux/device.h> +#include <linux/err.h> +#include <linux/io.h> +#include <linux/kernel.h> +#include <linux/of.h> +#include <linux/module.h> +#include <linux/delay.h> +#include <linux/platform_device.h> +#include <linux/of_device.h> +#include <linux/thermal.h> + +#define THERMAL_VALID_OFFSET 9 +#define THERMAL_VALID_MASK 0x1 +#define THERMAL_TEMP_OFFSET 10 +#define THERMAL_TEMP_MASK 0x1ff + +/* Thermal Manager Control and Status Register */ +#define PMU_TDC0_SW_RST_MASK (0x1 << 1) +#define PMU_TM_DISABLE_OFFS 0 +#define PMU_TM_DISABLE_MASK (0x1 << PMU_TM_DISABLE_OFFS) +#define PMU_TDC0_REF_CAL_CNT_OFFS 11 +#define PMU_TDC0_REF_CAL_CNT_MASK (0x1ff << PMU_TDC0_REF_CAL_CNT_OFFS) +#define PMU_TDC0_OTF_CAL_MASK (0x1 << 30) +#define PMU_TDC0_START_CAL_MASK (0x1 << 25) + +struct armada_thermal_ops ; + +/* Marvell EBU Thermal Sensor Dev Structure */ +struct armada_thermal_priv { +void __iomem *sensor; +void __iomem *control; +struct armada_thermal_ops *ops; +}; + +struct armada_thermal_ops { +/* Initialize the sensor */ +void (*init_sensor)(struct armada_thermal_priv *); + +/* Test for a valid sensor value (optional) */ +bool (*is_valid)(struct armada_thermal_priv *); +}; + +static void armadaxp_init_sensor (struct armada_thermal_priv *priv) +{ +unsigned long reg; + + reg =readl_relaxed (priv->control); + reg |=PMU_TDC0_OTF_CAL_MASK ; +writel (reg, priv->control); + +/* Reference calibration value */ + reg &= ~PMU_TDC0_REF_CAL_CNT_MASK ; + reg |= (0xf1 <<PMU_TDC0_REF_CAL_CNT_OFFS ); +writel (reg, priv->control); + +/* Reset the sensor */ + reg =readl_relaxed (priv->control); +writel ((reg |PMU_TDC0_SW_RST_MASK ), priv->control); + +writel (reg, priv->control); + +/* Enable the sensor */ + reg =readl_relaxed (priv->sensor); + reg &= ~PMU_TM_DISABLE_MASK ; +writel (reg, priv->sensor); +} + +static void armada370_init_sensor (struct armada_thermal_priv *priv) +{ +unsigned long reg; + + reg =readl_relaxed (priv->control); + reg |=PMU_TDC0_OTF_CAL_MASK ; +writel (reg, priv->control); + +/* Reference calibration value */ + reg &= ~PMU_TDC0_REF_CAL_CNT_MASK ; + reg |= (0xf1 <<PMU_TDC0_REF_CAL_CNT_OFFS ); +writel (reg, priv->control); + + reg &= ~PMU_TDC0_START_CAL_MASK ; +writel (reg, priv->control); + +mdelay (10 ); +} + +static bool armada_is_valid (struct armada_thermal_priv *priv) +{ +unsigned long reg =readl_relaxed (priv->sensor); + +return (reg >>THERMAL_VALID_OFFSET ) &THERMAL_VALID_MASK ; +} + +static int armada_get_temp (struct thermal_zone_device *thermal, +unsigned long *temp) +{ +struct armada_thermal_priv *priv = thermal->devdata; +unsigned long reg; + +/* Valid check */ +if (priv->ops->is_valid && !priv->ops->is_valid (priv)) { +dev_err (&thermal->device, +"Temperature sensor reading not valid\n" ); +return -EIO ; + } + + reg =readl_relaxed (priv->sensor); + reg = (reg >>THERMAL_TEMP_OFFSET ) &THERMAL_TEMP_MASK ; + *temp = (3153000000UL - (10000000UL *reg)) /13825 ; +return 0 ; +} + +static struct thermal_zone_device_ops ops = { + .get_temp = armada_get_temp, +}; + +static const struct armada_thermal_ops armadaxp_ops = { + .init_sensor = armadaxp_init_sensor, +}; + +static const struct armada_thermal_ops armada370_ops = { + .is_valid = armada_is_valid, + .init_sensor = armada370_init_sensor, +}; + +static const struct of_device_id armada_thermal_id_table[] = { + { + .compatible ="marvell,armadaxp-thermal" , + .data = &armadaxp_ops, + }, + { + .compatible ="marvell,armada370-thermal" , + .data = &armada370_ops, + }, + { +/* sentinel */ + }, +}; +MODULE_DEVICE_TABLE (of, armada_thermal_id_table); + +static int armada_thermal_probe (struct platform_device *pdev) +{ +struct thermal_zone_device *thermal; +const struct of_device_id *match; +struct armada_thermal_priv *priv; +struct resource *res; + + match =of_match_device (armada_thermal_id_table, &pdev->dev); +if (!match) +return -ENODEV ; + + priv =devm_kzalloc (&pdev->dev,sizeof (*priv),GFP_KERNEL ); +if (!priv) +return -ENOMEM ; + + res =platform_get_resource (pdev,IORESOURCE_MEM ,0 ); +if (!res) { +dev_err (&pdev->dev,"Failed to get platform resource\n" ); +return -ENODEV ; + } + + priv->sensor =devm_ioremap_resource (&pdev->dev, res); +if (IS_ERR (priv->sensor)) +return PTR_ERR (priv->sensor); + + res =platform_get_resource (pdev,IORESOURCE_MEM ,1 ); +if (!res) { +dev_err (&pdev->dev,"Failed to get platform resource\n" ); +return -ENODEV ; + } + + priv->control =devm_ioremap_resource (&pdev->dev, res); +if (IS_ERR (priv->control)) +return PTR_ERR (priv->control); + + priv->ops = (struct armada_thermal_ops *)match->data; + priv->ops->init_sensor (priv); + + thermal =thermal_zone_device_register ("armada_thermal" ,0 ,0 , + priv, &ops,NULL ,0 ,0 ); +if (IS_ERR (thermal)) { +dev_err (&pdev->dev, +"Failed to register thermal zone device\n" ); +return PTR_ERR (thermal); + } + +platform_set_drvdata (pdev, thermal); + +return 0 ; +} + +static int armada_thermal_exit (struct platform_device *pdev) +{ +struct thermal_zone_device *armada_thermal = +platform_get_drvdata (pdev); + +thermal_zone_device_unregister (armada_thermal); +platform_set_drvdata (pdev,NULL ); + +return 0 ; +} + +static struct platform_driver armada_thermal_driver = { + .probe = armada_thermal_probe, + .remove = armada_thermal_exit, + .driver = { + .name ="armada_thermal" , + .owner =THIS_MODULE , + .of_match_table =of_match_ptr (armada_thermal_id_table), + }, +}; + +module_platform_driver (armada_thermal_driver); + +MODULE_AUTHOR ("Ezequiel Garcia <[email protected]>" ); +MODULE_DESCRIPTION ("Armada 370/XP thermal driver" ); +MODULE_LICENSE ("GPL v2" ); ------------------------------------>8----------------------------------------
PATCH v2 1/4 thermal: Add driver for Armada 370/XP SoC thermal management
Quoted 15 lines · Zhang Rui
Quoted 14 lines · Ezequiel Garcia
Hi Zhang,
Quoted 11 lines · Zhang Rui
Quoted 10 lines · Ezequiel Garcia
This driver supports both Armada 370 and Armada XP SoC thermal management controllers.
Armada 370 has a register to check a valid temperature, whereas Armada XP does not. Each has a different initialization (i.e. calibration) function. The temperature conversion formula is the same for both.
The controller present in each SoC have a very similar feature set, so it corresponds to have one driver to support both of them.
Quoted 8 lines
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
Although this driver may present similarities to Dove and Kirkwood thermal driver, the exact differences and coincidences are not fully known. For this reason, support is given through a separate driver.
Signed-off-by Ezequiel Garcia <[email protected]>patch applied.
Great, thank you! Which branch have you applied this?
Signature · 3 lines
Ezequiel Garc?a, Free Electrons Embedded Linux, Kernel and Android Engineering http://free-electrons.com
PATCH v2 1/4 thermal: Add driver for Armada 370/XP SoC thermal management
In reply to Zhang RuiHi Zhang,
Quoted 13 lines · Zhang Rui
Quoted 12 lines · Ezequiel Garcia
Quoted 11 lines · Zhang Rui
Quoted 10 lines · Ezequiel Garcia
This driver supports both Armada 370 and Armada XP SoC thermal management controllers.
Armada 370 has a register to check a valid temperature, whereas Armada XP does not. Each has a different initialization (i.e. calibration) function. The temperature conversion formula is the same for both.
The controller present in each SoC have a very similar feature set, so it corresponds to have one driver to support both of them.
Quoted 8 lines
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
Although this driver may present similarities to Dove and Kirkwood thermal driver, the exact differences and coincidences are not fully known. For this reason, support is given through a separate driver.
Signed-off-by Ezequiel Garcia <[email protected]>patch applied.
I'm not seeing this patch applied on any branch.
Where have you applied this? Or perhaps there's anything left to fix?
Signature · 3 lines
Ezequiel Garc?a, Free Electrons Embedded Linux, Kernel and Android Engineering http://free-electrons.com
PATCH v2 2/4 ARM: mvebu: Add thermal support to Armada XP device tree
In reply to Ezequiel GarciaThis patch adds support for the thermal controller available in all Armada XP boards. This controller has two 4-byte registers:
one to read the thermal sensor, the other for sensor initialization.
---
This patch depends on the patch to support Armada XP thermal driver:
'thermal: Add driver for Armada 370/XP SoC thermal management'
arch/arm/boot/dts/armada-xp.dtsi | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-)
arch/arm/boot/dts/armada-xp.dtsi +6 -0
@@ -151,5 +151,11 @@ status = "disabled"; }; + thermal at d00182b0 { + compatible = "marvell,armadaxp-thermal"; + reg = <0xd00182b0 0x4 + 0xd00184d0 0x4>; + status = "okay"; + }; }; };
Signature · 1 line
1.7.8.6
PATCH v2 3/4 ARM: mvebu: Add thermal support to Armada 370 device tree
In reply to Ezequiel GarciaThis patch adds support for the thermal controller available in all Armada 370 boards. This controller has two 4-byte registers:
one to read the thermal sensor, the other for sensor initialization.
---
This patch depends on the patch to support Armada 370 thermal driver:
'thermal: Add driver for Armada 370/XP SoC thermal management'
arch/arm/boot/dts/armada-370.dtsi | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-)
arch/arm/boot/dts/armada-370.dtsi +6 -0
@@ -153,5 +153,11 @@ clocks = <&coreclk 0>; }; + thermal at d0018300 { + compatible = "marvell,armada370-thermal"; + reg = <0xd0018300 0x4 + 0xd0018304 0x4>; + status = "okay"; + }; }; };
Signature · 1 line
1.7.8.6
PATCH v2 4/4 ARM: configs: Update mvebu defconfig for thermal
In reply to Ezequiel GarciaThe thermal management driver for Armada XP/370 has been added so we update the defconfig to reflect this.
--- arch/arm/configs/mvebu_defconfig | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-)
arch/arm/configs/mvebu_defconfig +2 -0
@@ -49,6 +49,8 @@ CONFIG_MTD_M25P80=y CONFIG_SERIAL_8250_DW=y CONFIG_GPIOLIB=y CONFIG_GPIO_SYSFS=y +CONFIG_THERMAL=y +CONFIG_ARMADA_THERMAL=y CONFIG_USB_SUPPORT=y CONFIG_USB=y CONFIG_USB_EHCI_HCD=y
Signature · 1 line
1.7.8.6
v2 cover thermal: Add Armada 370/XP support
In reply to Ezequiel GarciaQuoted 17 lines · Ezequiel Garcia
After Andrew Lunn objected the single driver approach [1] that merged all the Marvell EBU SoC thermal drivers, we have agreed to proceed step by step. For the time being we are adding support for Armada 370/XP only. Given both Armada 370 and Armada XP have a similar feature set, it makes sense to provide a single driver for them.
In the future we can unify this with the other drivers, if this proves to be worthwhile.
This driver has been influenced by the existing Kirkwood driver, also taking account of suggestions made by Jason Gunthorpe.
Testing has been done on the following boards:
For Armada 370: Globalscale Mirabox and Marvell Armada 370 RD For Armada XP: Plat'home Openblocks AX3 and Marvell Armada XP DB-MV784MP-GP
Quoted 8 lines
This series is based in v3.9-rc2. To make testing easier this patchset can be found on a github branch [2].
Changes from v1:
* ReorderKconfigand Makefiles entries as requested by Andrew Lunn.
* Makearmada_get_temp()more readable, as requested by Durgadoss R.Any feedback or comments are welcome!
Quoted 24 lines
[1] http://permalink.gmane.org/gmane.linux.power-management.general/32123
[2] https://github.com/MISL-EBU-System-SW/mainline-public/tree/armada-thermal-v2Ezequiel Garcia (4):
thermal: Add driver for Armada 370/XP SoC thermal management
ARM: mvebu: Add thermal support to Armada XP device tree
ARM: mvebu: Add thermal support to Armada 370 device tree
ARM: configs: Update mvebu defconfig for thermal.../devicetree/bindings/thermal/armada-thermal.txt | 22 ++ arch/arm/boot/dts/armada-370.dtsi | 6 + arch/arm/boot/dts/armada-xp.dtsi | 6 + arch/arm/configs/mvebu_defconfig | 2 + drivers/thermal/Kconfig | 8 + drivers/thermal/Makefile | 1 + drivers/thermal/armada_thermal.c | 236 ++++++++++++++++++++ 7 files changed, 281 insertions(+), 0 deletions(-) create mode 100644 Documentation/devicetree/bindings/thermal/armada-thermal.txt create mode 100644 drivers/thermal/armada_thermal.cSignature · 1 line
1.7.8.6
v2 cover thermal: Add Armada 370/XP support
In reply to Ezequiel GarciaQuoted 30 lines · Ezequiel Garcia
After Andrew Lunn objected the single driver approach [1] that merged all the Marvell EBU SoC thermal drivers, we have agreed to proceed step by step. For the time being we are adding support for Armada 370/XP only. Given both Armada 370 and Armada XP have a similar feature set, it makes sense to provide a single driver for them.
In the future we can unify this with the other drivers, if this proves to be worthwhile.
This driver has been influenced by the existing Kirkwood driver, also taking account of suggestions made by Jason Gunthorpe.
Testing has been done on the following boards:
For Armada 370: Globalscale Mirabox and Marvell Armada 370 RD For Armada XP: Plat'home Openblocks AX3 and Marvell Armada XP DB-MV784MP-GPThis series is based in v3.9-rc2. To make testing easier this patchset can be found on a github branch [2].
Changes from v1:
* ReorderKconfigand Makefiles entries as requested by Andrew Lunn.
* Makearmada_get_temp()more readable, as requested by Durgadoss R.Any feedback or comments are welcome!
[1] http://permalink.gmane.org/gmane.linux.power-management.general/32123
[2] https://github.com/MISL-EBU-System-SW/mainline-public/tree/armada-thermal-v2Ezequiel Garcia (4):
...
Quoted 3 lines
ARM: mvebu: Add thermal support to Armada XP device tree
ARM: mvebu: Add thermal support to Armada 370 device tree
ARM: configs: Update mvebu defconfig for thermal
...
Quoted 3 lines
arch/arm/boot/dts/armada-370.dtsi | 6 + arch/arm/boot/dts/armada-xp.dtsi | 6 + arch/arm/configs/mvebu_defconfig | 2 +
Patches 2 through 4 applied to mvebu/dt
thx,
Jason.