Kirkwood and Dove Thermal drivers
Subsystems (3)
v5 cover Kirkwood and Dove Thermal drivers
This patchset adds thermal support for Kirkwood and Dove SoCs.
Changes since v4
* Remove redundant dev_err() after devm_kzalloc() failure.
Changes since v3
* Added dependency on OF
Changes since v2
* More marvel -> marvell
* Dove driver. Debugged by Sebastian Hesselbarth
Changes since v1
* Temperature Reading in milligrad
* marvel -> marvell
* generalized to Orion
* Compatibility string marvell,kirkwood-thermal
* Arithmetic using unsigned long
Andrew Lunn (2):
Thermal: Dove: Add Themal sensor support for Dove.
Dove: Thermal: Add DT node and enable in defconfig
Nobuhiro Iwamatsu (2):
thermal: Add support for the thermal sensor on Kirkwood SoCs
ARM: Kirkwood: Add support thermal sensor for 88F6282 and 88F6283
.../devicetree/bindings/thermal/dove-thermal.txt | 18 ++ .../bindings/thermal/kirkwood-thermal.txt | 15 ++ arch/arm/boot/dts/dove.dtsi | 5 + arch/arm/boot/dts/kirkwood-6282.dtsi | 6 + arch/arm/configs/dove_defconfig | 2 + arch/arm/configs/kirkwood_defconfig | 2 + drivers/thermal/Kconfig | 16 ++ drivers/thermal/Makefile | 2 + drivers/thermal/dove_thermal.c | 209 ++++++++++++++++++++ drivers/thermal/kirkwood_thermal.c | 134 +++++++++++++ 10 files changed, 409 insertions(+) create mode 100644 Documentation/devicetree/bindings/thermal/dove-thermal.txt create mode 100644 Documentation/devicetree/bindings/thermal/kirkwood-thermal.txt create mode 100644 drivers/thermal/dove_thermal.c create mode 100644 drivers/thermal/kirkwood_thermal.c
Signature · 1 line
1.7.10.4
PATCH v5 1/4 thermal: Add support for the thermal sensor on Kirkwood SoCs
From: Nobuhiro Iwamatsu <[email protected]>
This patch adds support for Kirkwood 88F6282 and 88F6283 thermal sensor.
--- .../bindings/thermal/kirkwood-thermal.txt | 15 +++ drivers/thermal/Kconfig | 8 ++ drivers/thermal/Makefile | 1 + drivers/thermal/kirkwood_thermal.c | 134 ++++++++++++++++++++ 4 files changed, 158 insertions(+) create mode 100644 Documentation/devicetree/bindings/thermal/kirkwood-thermal.txt create mode 100644 drivers/thermal/kirkwood_thermal.c
Documentation/devicetree/bindings/thermal/kirkwood-thermal.txt new file +15 -0
@@ -0,0 +1,15 @@ +* Kirkwood Thermal + +This version is for Kirkwood 88F8262 & 88F6283 SoCs. Other kirkwoods +don't contain a thermal sensor. + +Required properties: +- compatible : "marvell,kirkwood-thermal" +- reg : Address range of the thermal registers + +Example: + + thermal at 10078 { + compatible = "marvell,kirkwood-thermal"; + reg = <0x10078 0x4>; + };
drivers/thermal/Kconfig +8 -0
@@ -93,6 +93,14 @@ config RCAR_THERMAL Enable this to plug the R-Car thermal sensor driver into the Linux thermal framework +config KIRKWOOD_THERMAL + tristate "Temperature sensor on Marvell Kirkwood SoCs" + depends on ARCH_KIRKWOOD + depends on OF + help + Support for the Kirkwood thermal sensor driver into the Linux thermal + framework. Only kirkwood 88F6282 and 88F6283 have this sensor. + config EXYNOS_THERMAL tristate "Temperature sensor on Samsung EXYNOS" depends on (ARCH_EXYNOS4 || ARCH_EXYNOS5)
drivers/thermal/Makefile +1 -0
@@ -15,6 +15,7 @@ obj-$(CONFIG_CPU_THERMAL) += cpu_cooling.o # platform thermal drivers obj-$(CONFIG_SPEAR_THERMAL) += spear_thermal.o obj-$(CONFIG_RCAR_THERMAL) += rcar_thermal.o +obj-$(CONFIG_KIRKWOOD_THERMAL) += kirkwood_thermal.o obj-$(CONFIG_EXYNOS_THERMAL) += exynos_thermal.o obj-$(CONFIG_DB8500_THERMAL) += db8500_thermal.o obj-$(CONFIG_DB8500_CPUFREQ_COOLING) += db8500_cpufreq_cooling.o
drivers/thermal/kirkwood_thermal.c new file +134 -0
134 lines not on this page · raw message
Signature · 1 line
1.7.10.4
PATCH v5 1/4 thermal: Add support for the thermal sensor on Kirkwood SoCs
Quoted 6 lines · Andrew Lunn
From: Nobuhiro Iwamatsu <[email protected]>
This patch adds support for Kirkwood 88F6282 and 88F6283 thermal sensor.
Signed-off-by Nobuhiro Iwamatsu <[email protected]>Signed-off-by Andrew Lunn <[email protected]>
applied to thermal -next.
thanks,
rui
Quoted 201 lines
--- .../bindings/thermal/kirkwood-thermal.txt | 15 +++ drivers/thermal/Kconfig | 8 ++ drivers/thermal/Makefile | 1 + drivers/thermal/kirkwood_thermal.c | 134 ++++++++++++++++++++ 4 files changed, 158 insertions(+) create mode 100644 Documentation/devicetree/bindings/thermal/kirkwood-thermal.txt create mode 100644 drivers/thermal/kirkwood_thermal.cDocumentation/devicetree/bindings/thermal/kirkwood-thermal.txt new file +15
-0@@ -0,0 +1,15 @@ +* Kirkwood Thermal + +This version is for Kirkwood 88F8262 & 88F6283 SoCs. Other kirkwoods +don't contain a thermal sensor. + +Required properties: +- compatible : "marvell,kirkwood-thermal" +- reg : Address range of the thermal registers + +Example: + + thermal at 10078 { + compatible = "marvell,kirkwood-thermal"; + reg = <0x10078 0x4>; + };drivers/thermal/Kconfig +8
-0@@ -93,6 +93,14 @@ config RCAR_THERMAL Enable this to plug the R-Car thermal sensor driver into the Linux thermal framework +config KIRKWOOD_THERMAL + tristate "Temperature sensor on Marvell Kirkwood SoCs" + depends on ARCH_KIRKWOOD + depends on OF + help + Support for the Kirkwood thermal sensor driver into the Linux thermal + framework. Only kirkwood 88F6282 and 88F6283 have this sensor. + config EXYNOS_THERMAL tristate "Temperature sensor on Samsung EXYNOS" depends on (ARCH_EXYNOS4 || ARCH_EXYNOS5)drivers/thermal/Makefile +1
-0@@ -15,6 +15,7 @@ obj-$(CONFIG_CPU_THERMAL) += cpu_cooling.o # platform thermal drivers obj-$(CONFIG_SPEAR_THERMAL) += spear_thermal.o obj-$(CONFIG_RCAR_THERMAL) += rcar_thermal.o +obj-$(CONFIG_KIRKWOOD_THERMAL) += kirkwood_thermal.o obj-$(CONFIG_EXYNOS_THERMAL) += exynos_thermal.o obj-$(CONFIG_DB8500_THERMAL) += db8500_thermal.o obj-$(CONFIG_DB8500_CPUFREQ_COOLING) += db8500_cpufreq_cooling.odrivers/thermal/kirkwood_thermal.c new file +134
-0@@ -0,0 +1,134 @@ +/* +* Kirkwood thermal sensor driver +* +* Copyright (C) 2012 Nobuhiro Iwamatsu <[email protected]> +* +* 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/platform_device.h> +#include <linux/thermal.h> + +#define KIRKWOOD_THERMAL_VALID_OFFSET 9 +#define KIRKWOOD_THERMAL_VALID_MASK 0x1 +#define KIRKWOOD_THERMAL_TEMP_OFFSET 10 +#define KIRKWOOD_THERMAL_TEMP_MASK 0x1FF + +/* Kirkwood Thermal Sensor Dev Structure */ +struct kirkwood_thermal_priv { +void __iomem *sensor; +}; + +static int kirkwood_get_temp (struct thermal_zone_device *thermal, +unsigned long *temp) +{ +unsigned long reg; +struct kirkwood_thermal_priv *priv = thermal->devdata; + + reg =readl_relaxed (priv->sensor); + +/* Valid check */ +if (!(reg >>KIRKWOOD_THERMAL_VALID_OFFSET ) & +KIRKWOOD_THERMAL_VALID_MASK ) { +dev_err (&thermal->device, +"Temperature sensor reading not valid\n" ); +return -EIO ; + } + +/* +* Calculate temperature. See Section 8.10.1 of the 88AP510, +* datasheet, which has the same sensor. +* Documentation/arm/Marvell/README +*/ + reg = (reg >>KIRKWOOD_THERMAL_TEMP_OFFSET ) & +KIRKWOOD_THERMAL_TEMP_MASK ; + *temp = ((2281638UL - (7298 *reg)) /10 ); + +return 0 ; +} + +static struct thermal_zone_device_ops ops = { + .get_temp = kirkwood_get_temp, +}; + +static const struct of_device_id kirkwood_thermal_id_table[] = { + { .compatible ="marvell,kirkwood-thermal" }, + {} +}; + +static int kirkwood_thermal_probe (struct platform_device *pdev) +{ +struct thermal_zone_device *thermal =NULL ; +struct kirkwood_thermal_priv *priv; +struct resource *res; + + res =platform_get_resource (pdev,IORESOURCE_MEM ,0 ); +if (!res) { +dev_err (&pdev->dev,"Failed to get platform resource\n" ); +return -ENODEV ; + } + + priv =devm_kzalloc (&pdev->dev,sizeof (*priv),GFP_KERNEL ); +if (!priv) +return -ENOMEM ; + + priv->sensor =devm_request_and_ioremap (&pdev->dev, res); +if (!priv->sensor) { +dev_err (&pdev->dev,"Failed to request_ioremap memory\n" ); +return -EADDRNOTAVAIL ; + } + + thermal =thermal_zone_device_register ("kirkwood_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 kirkwood_thermal_exit (struct platform_device *pdev) +{ +struct thermal_zone_device *kirkwood_thermal = +platform_get_drvdata (pdev); + +thermal_zone_device_unregister (kirkwood_thermal); +platform_set_drvdata (pdev,NULL ); + +return 0 ; +} + +MODULE_DEVICE_TABLE (of, kirkwood_thermal_id_table); + +static struct platform_driver kirkwood_thermal_driver = { + .probe = kirkwood_thermal_probe, + .remove = kirkwood_thermal_exit, + .driver = { + .name ="kirkwood_thermal" , + .owner =THIS_MODULE , + .of_match_table =of_match_ptr (kirkwood_thermal_id_table), + }, +}; + +module_platform_driver (kirkwood_thermal_driver); + +MODULE_AUTHOR ("Nobuhiro Iwamatsu <[email protected]>" ); +MODULE_DESCRIPTION ("kirkwood thermal driver" ); +MODULE_LICENSE ("GPL" );
PATCH v5 2/4 ARM: Kirkwood: Add support thermal sensor for 88F6282 and 88F6283
In reply to Andrew LunnFrom: Nobuhiro Iwamatsu <[email protected]>
Kirkwood 88F6282 and 88F6283 have a thermal sensor.
This patch adds a DT node and enables the driver in the kernel config.
--- arch/arm/boot/dts/kirkwood-6282.dtsi | 6 ++++++ arch/arm/configs/kirkwood_defconfig | 2 ++ 2 files changed, 8 insertions(+)
arch/arm/boot/dts/kirkwood-6282.dtsi +6 -0
@@ -32,6 +32,12 @@ }; }; + thermal at 10078 { + compatible = "marvell,kirkwood-thermal"; + reg = <0x10078 0x4>; + status = "okay"; + }; + i2c at 11100 { compatible = "marvell,mv64xxx-i2c"; reg = <0x11100 0x20>;
arch/arm/configs/kirkwood_defconfig +2 -0
@@ -118,6 +118,8 @@ CONFIG_SPI=y CONFIG_SPI_ORION=y CONFIG_GPIO_SYSFS=y # CONFIG_HWMON is not set +CONFIG_THERMAL=y +CONFIG_KIRKWOOD_THERMAL=y CONFIG_WATCHDOG=y CONFIG_ORION_WATCHDOG=y CONFIG_HID_DRAGONRISE=y
Signature · 1 line
1.7.10.4
PATCH v5 2/4 ARM: Kirkwood: Add support thermal sensor for 88F6282 and 88F6283
Quoted 11 lines · Andrew Lunn
From: Nobuhiro Iwamatsu <[email protected]>
Kirkwood 88F6282 and 88F6283 have a thermal sensor.
This patch adds a DT node and enables the driver in the kernel config.Signed-off-by Nobuhiro Iwamatsu <[email protected]>Signed-off-by Andrew Lunn <[email protected]>--- arch/arm/boot/dts/kirkwood-6282.dtsi | 6 ++++++ arch/arm/configs/kirkwood_defconfig | 2 ++ 2 files changed, 8 insertions(+)
Patches 2 and 4 of this series applied to mvebu/dt_deps with a dependency on thermal/next up to:
74ffa64 Thermal: Dove: Add Themal sensor support for Dove. 7060aa3 thermal: Add support for the thermal sensor on Kirkwood SoCs
thx,
Jason.
PATCH v5 3/4 Thermal: Dove: Add Themal sensor support for Dove.
In reply to Andrew LunnThe Marvell Dove SoC has a thermal sensor. Add a driver using the thermal framework.
--- .../devicetree/bindings/thermal/dove-thermal.txt | 18 ++ drivers/thermal/Kconfig | 8 + drivers/thermal/Makefile | 1 + drivers/thermal/dove_thermal.c | 209 ++++++++++++++++++++ 4 files changed, 236 insertions(+) create mode 100644 Documentation/devicetree/bindings/thermal/dove-thermal.txt create mode 100644 drivers/thermal/dove_thermal.c
Documentation/devicetree/bindings/thermal/dove-thermal.txt new file +18 -0
@@ -0,0 +1,18 @@ +* Dove Thermal + +This driver is for Dove SoCs which contain a thermal sensor. + +Required properties: +- compatible : "marvell,dove-thermal" +- reg : Address range of the thermal registers + +The reg properties should contain two ranges. The first is for the +three Thermal Manager registers, while the second range contains the +Thermal Diode Control Registers. + +Example: + + thermal at 10078 { + compatible = "marvell,dove-thermal"; + reg = <0xd001c 0x0c>, <0xd005c 0x08>; + };
drivers/thermal/Kconfig +8 -0
@@ -109,6 +109,14 @@ config EXYNOS_THERMAL If you say yes here you get support for TMU (Thermal Management Unit) on SAMSUNG EXYNOS series of SoC. +config DOVE_THERMAL + tristate "Temperature sensor on Marvell Dove SoCs" + depends on ARCH_DOVE + depends on OF + help + Support for the Dove thermal sensor driver in the Linux thermal + framework. + config DB8500_THERMAL bool "DB8500 thermal management" depends on ARCH_U8500
drivers/thermal/Makefile +1 -0
@@ -17,5 +17,6 @@ obj-$(CONFIG_SPEAR_THERMAL) += spear_thermal.o obj-$(CONFIG_RCAR_THERMAL) += rcar_thermal.o 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_DB8500_CPUFREQ_COOLING) += db8500_cpufreq_cooling.o
drivers/thermal/dove_thermal.c new file +209 -0
209 lines not on this page · raw message
Signature · 1 line
1.7.10.4
PATCH v5 3/4 Thermal: Dove: Add Themal sensor support for Dove.
Quoted 5 lines · Andrew Lunn
The Marvell Dove SoC has a thermal sensor. Add a driver using the thermal framework.
Signed-off-by Andrew Lunn <[email protected]>Signed-off-by Sebastian Hesselbarth <[email protected]>
applied to thermal -next.
thanks,
rui
Quoted 278 lines
--- .../devicetree/bindings/thermal/dove-thermal.txt | 18 ++ drivers/thermal/Kconfig | 8 + drivers/thermal/Makefile | 1 + drivers/thermal/dove_thermal.c | 209 ++++++++++++++++++++ 4 files changed, 236 insertions(+) create mode 100644 Documentation/devicetree/bindings/thermal/dove-thermal.txt create mode 100644 drivers/thermal/dove_thermal.cDocumentation/devicetree/bindings/thermal/dove-thermal.txt new file +18
-0@@ -0,0 +1,18 @@ +* Dove Thermal + +This driver is for Dove SoCs which contain a thermal sensor. + +Required properties: +- compatible : "marvell,dove-thermal" +- reg : Address range of the thermal registers + +The reg properties should contain two ranges. The first is for the +three Thermal Manager registers, while the second range contains the +Thermal Diode Control Registers. + +Example: + + thermal at 10078 { + compatible = "marvell,dove-thermal"; + reg = <0xd001c 0x0c>, <0xd005c 0x08>; + };drivers/thermal/Kconfig +8
-0@@ -109,6 +109,14 @@ config EXYNOS_THERMAL If you say yes here you get support for TMU (Thermal Management Unit) on SAMSUNG EXYNOS series of SoC. +config DOVE_THERMAL + tristate "Temperature sensor on Marvell Dove SoCs" + depends on ARCH_DOVE + depends on OF + help + Support for the Dove thermal sensor driver in the Linux thermal + framework. + config DB8500_THERMAL bool "DB8500 thermal management" depends on ARCH_U8500drivers/thermal/Makefile +1
-0@@ -17,5 +17,6 @@ obj-$(CONFIG_SPEAR_THERMAL) += spear_thermal.o obj-$(CONFIG_RCAR_THERMAL) += rcar_thermal.o 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_DB8500_CPUFREQ_COOLING) += db8500_cpufreq_cooling.odrivers/thermal/dove_thermal.c new file +209
-0@@ -0,0 +1,209 @@ +/* +* Dove thermal sensor driver +* +* Copyright (C) 2013 Andrew Lunn <[email protected]> +* +* 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/platform_device.h> +#include <linux/thermal.h> + +#define DOVE_THERMAL_TEMP_OFFSET 1 +#define DOVE_THERMAL_TEMP_MASK 0x1FF + +/* Dove Thermal Manager Control and Status Register */ +#define PMU_TM_DISABLE_OFFS 0 +#define PMU_TM_DISABLE_MASK (0x1 << PMU_TM_DISABLE_OFFS) + +/* Dove Theraml Diode Control 0 Register */ +#define PMU_TDC0_SW_RST_MASK (0x1 << 1) +#define PMU_TDC0_SEL_VCAL_OFFS 5 +#define PMU_TDC0_SEL_VCAL_MASK (0x3 << PMU_TDC0_SEL_VCAL_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_AVG_NUM_OFFS 25 +#define PMU_TDC0_AVG_NUM_MASK (0x7 << PMU_TDC0_AVG_NUM_OFFS) + +/* Dove Thermal Diode Control 1 Register */ +#define PMU_TEMP_DIOD_CTRL1_REG 0x04 +#define PMU_TDC1_TEMP_VALID_MASK (0x1 << 10) + +/* Dove Thermal Sensor Dev Structure */ +struct dove_thermal_priv { +void __iomem *sensor; +void __iomem *control; +}; + +static int dove_init_sensor (const struct dove_thermal_priv *priv) +{ +u32 reg; +u32 i; + +/* Configure the Diode Control Register #0 */ + reg =readl_relaxed (priv->control); + +/* Use average of 2 */ + reg &= ~PMU_TDC0_AVG_NUM_MASK ; + reg |= (0x1 <<PMU_TDC0_AVG_NUM_OFFS ); + +/* Reference calibration value */ + reg &= ~PMU_TDC0_REF_CAL_CNT_MASK ; + reg |= (0x0F1 <<PMU_TDC0_REF_CAL_CNT_OFFS ); + +/* Set the high level reference for calibration */ + reg &= ~PMU_TDC0_SEL_VCAL_MASK ; + reg |= (0x2 <<PMU_TDC0_SEL_VCAL_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); + +/* Poll the sensor for the first reading */ +for (i =0 ; i <1000000 ; i++) { + reg =readl_relaxed (priv->sensor); +if (reg &DOVE_THERMAL_TEMP_MASK ) +break ; + } + +if (i ==1000000 ) +return -EIO ; + +return 0 ; +} + +static int dove_get_temp (struct thermal_zone_device *thermal, +unsigned long *temp) +{ +unsigned long reg; +struct dove_thermal_priv *priv = thermal->devdata; + +/* Valid check */ + reg =readl_relaxed (priv->control +PMU_TEMP_DIOD_CTRL1_REG ); +if ((reg &PMU_TDC1_TEMP_VALID_MASK ) ==0x0 ) { +dev_err (&thermal->device, +"Temperature sensor reading not valid\n" ); +return -EIO ; + } + +/* +* Calculate temperature. See Section 8.10.1 of 88AP510, +* Documentation/arm/Marvell/README +*/ + reg =readl_relaxed (priv->sensor); + reg = (reg >>DOVE_THERMAL_TEMP_OFFSET ) &DOVE_THERMAL_TEMP_MASK ; + *temp = ((2281638UL - (7298 *reg)) /10 ); + +return 0 ; +} + +static struct thermal_zone_device_ops ops = { + .get_temp = dove_get_temp, +}; + +static const struct of_device_id dove_thermal_id_table[] = { + { .compatible ="marvell,dove-thermal" }, + {} +}; + +static int dove_thermal_probe (struct platform_device *pdev) +{ +struct thermal_zone_device *thermal =NULL ; +struct dove_thermal_priv *priv; +struct resource *res; +int ret; + + res =platform_get_resource (pdev,IORESOURCE_MEM ,0 ); +if (!res) { +dev_err (&pdev->dev,"Failed to get platform resource\n" ); +return -ENODEV ; + } + + priv =devm_kzalloc (&pdev->dev,sizeof (*priv),GFP_KERNEL ); +if (!priv) +return -ENOMEM ; + + priv->sensor =devm_request_and_ioremap (&pdev->dev, res); +if (!priv->sensor) { +dev_err (&pdev->dev,"Failed to request_ioremap memory\n" ); +return -EADDRNOTAVAIL ; + } + + 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_request_and_ioremap (&pdev->dev, res); +if (!priv->control) { +dev_err (&pdev->dev,"Failed to request_ioremap memory\n" ); +return -EADDRNOTAVAIL ; + } + + ret =dove_init_sensor (priv); +if (ret) { +dev_err (&pdev->dev,"Failed to initialize sensor\n" ); +return ret; + } + + thermal =thermal_zone_device_register ("dove_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 dove_thermal_exit (struct platform_device *pdev) +{ +struct thermal_zone_device *dove_thermal = +platform_get_drvdata (pdev); + +thermal_zone_device_unregister (dove_thermal); +platform_set_drvdata (pdev,NULL ); + +return 0 ; +} + +MODULE_DEVICE_TABLE (of, dove_thermal_id_table); + +static struct platform_driver dove_thermal_driver = { + .probe = dove_thermal_probe, + .remove = dove_thermal_exit, + .driver = { + .name ="dove_thermal" , + .owner =THIS_MODULE , + .of_match_table =of_match_ptr (dove_thermal_id_table), + }, +}; + +module_platform_driver (dove_thermal_driver); + +MODULE_AUTHOR ("Andrew Lunn <[email protected]>" ); +MODULE_DESCRIPTION ("Dove thermal driver" ); +MODULE_LICENSE ("GPL" );
PATCH v5 4/4 Dove: Thermal: Add DT node and enable in defconfig
In reply to Andrew LunnAdd a device tree node to instantiate the dove thermal driver. Enable the driver and the thermal framework in dove_defconfig.
--- arch/arm/boot/dts/dove.dtsi | 5 +++++ arch/arm/configs/dove_defconfig | 2 ++ 2 files changed, 7 insertions(+)
arch/arm/boot/dts/dove.dtsi +5 -0
@@ -50,6 +50,11 @@ #clock-cells = <1>; }; + thermal: thermal at d001c { + compatible = "marvell,dove-thermal"; + reg = <0xd001c 0x0c>, <0xd005c 0x08>; + }; + uart0: serial at 12000 { compatible = "ns16550a"; reg = <0x12000 0x100>;
arch/arm/configs/dove_defconfig +2 -0
@@ -80,6 +80,8 @@ CONFIG_I2C_MV64XXX=y CONFIG_SPI=y CONFIG_SPI_ORION=y # CONFIG_HWMON is not set +CONFIG_THERMAL=y +CONFIG_DOVE_THERMAL=y CONFIG_USB=y CONFIG_USB_DEVICEFS=y CONFIG_USB_EHCI_HCD=y
Signature · 1 line
1.7.10.4