* [PATCH v3 0/4] Kirkwood and Dove Thermal drivers
@ 2013-02-02 14:35 ` Andrew Lunn
0 siblings, 0 replies; 36+ messages in thread
From: Andrew Lunn @ 2013-02-02 14:35 UTC (permalink / raw)
To: Jason Cooper, rui.zhang; +Cc: linux ARM, linux-pm, Andrew Lunn
This patchset adds thermal support for Kirkwood and Dove SoCs.
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 | 14 ++
drivers/thermal/Makefile | 2 +
drivers/thermal/dove_thermal.c | 211 ++++++++++++++++++++
drivers/thermal/kirkwood_thermal.c | 136 +++++++++++++
10 files changed, 411 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
--
1.7.10.4
^ permalink raw reply [flat|nested] 36+ messages in thread
* [PATCH v3 0/4] Kirkwood and Dove Thermal drivers
@ 2013-02-02 14:35 ` Andrew Lunn
0 siblings, 0 replies; 36+ messages in thread
From: Andrew Lunn @ 2013-02-02 14:35 UTC (permalink / raw)
To: linux-arm-kernel
This patchset adds thermal support for Kirkwood and Dove SoCs.
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 | 14 ++
drivers/thermal/Makefile | 2 +
drivers/thermal/dove_thermal.c | 211 ++++++++++++++++++++
drivers/thermal/kirkwood_thermal.c | 136 +++++++++++++
10 files changed, 411 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
--
1.7.10.4
^ permalink raw reply [flat|nested] 36+ messages in thread
* [PATCH v3 1/4] thermal: Add support for the thermal sensor on Kirkwood SoCs
2013-02-02 14:35 ` Andrew Lunn
@ 2013-02-02 14:35 ` Andrew Lunn
-1 siblings, 0 replies; 36+ messages in thread
From: Andrew Lunn @ 2013-02-02 14:35 UTC (permalink / raw)
To: Jason Cooper, rui.zhang
Cc: linux ARM, linux-pm, Nobuhiro Iwamatsu, Andrew Lunn
From: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
This patch adds support for Kirkwood 88F6282 and 88F6283 thermal sensor.
Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
Signed-off-by: Andrew Lunn <andrew@lunn.ch>
---
.../bindings/thermal/kirkwood-thermal.txt | 15 +++
drivers/thermal/Kconfig | 7 +
drivers/thermal/Makefile | 1 +
drivers/thermal/kirkwood_thermal.c | 136 ++++++++++++++++++++
4 files changed, 159 insertions(+)
create mode 100644 Documentation/devicetree/bindings/thermal/kirkwood-thermal.txt
create mode 100644 drivers/thermal/kirkwood_thermal.c
diff --git a/Documentation/devicetree/bindings/thermal/kirkwood-thermal.txt b/Documentation/devicetree/bindings/thermal/kirkwood-thermal.txt
new file mode 100644
index 0000000..8c0f5eb
--- /dev/null
+++ b/Documentation/devicetree/bindings/thermal/kirkwood-thermal.txt
@@ -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@10078 {
+ compatible = "marvell,kirkwood-thermal";
+ reg = <0x10078 0x4>;
+ };
diff --git a/drivers/thermal/Kconfig b/drivers/thermal/Kconfig
index c2c77d1..e691500 100644
--- a/drivers/thermal/Kconfig
+++ b/drivers/thermal/Kconfig
@@ -93,6 +93,13 @@ 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
+ 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)
diff --git a/drivers/thermal/Makefile b/drivers/thermal/Makefile
index d8da683..99026b2 100644
--- a/drivers/thermal/Makefile
+++ b/drivers/thermal/Makefile
@@ -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
diff --git a/drivers/thermal/kirkwood_thermal.c b/drivers/thermal/kirkwood_thermal.c
new file mode 100644
index 0000000..000cfc9
--- /dev/null
+++ b/drivers/thermal/kirkwood_thermal.c
@@ -0,0 +1,136 @@
+/*
+ * Kirkwood thermal sensor driver
+ *
+ * Copyright (C) 2012 Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
+ *
+ * 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) {
+ dev_err(&pdev->dev, "kzalloc fail\n");
+ 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 <iwamatsu@nigauri.org>");
+MODULE_DESCRIPTION("kirkwood thermal driver");
+MODULE_LICENSE("GPL");
--
1.7.10.4
^ permalink raw reply related [flat|nested] 36+ messages in thread
* [PATCH v3 1/4] thermal: Add support for the thermal sensor on Kirkwood SoCs
@ 2013-02-02 14:35 ` Andrew Lunn
0 siblings, 0 replies; 36+ messages in thread
From: Andrew Lunn @ 2013-02-02 14:35 UTC (permalink / raw)
To: linux-arm-kernel
From: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
This patch adds support for Kirkwood 88F6282 and 88F6283 thermal sensor.
Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
Signed-off-by: Andrew Lunn <andrew@lunn.ch>
---
.../bindings/thermal/kirkwood-thermal.txt | 15 +++
drivers/thermal/Kconfig | 7 +
drivers/thermal/Makefile | 1 +
drivers/thermal/kirkwood_thermal.c | 136 ++++++++++++++++++++
4 files changed, 159 insertions(+)
create mode 100644 Documentation/devicetree/bindings/thermal/kirkwood-thermal.txt
create mode 100644 drivers/thermal/kirkwood_thermal.c
diff --git a/Documentation/devicetree/bindings/thermal/kirkwood-thermal.txt b/Documentation/devicetree/bindings/thermal/kirkwood-thermal.txt
new file mode 100644
index 0000000..8c0f5eb
--- /dev/null
+++ b/Documentation/devicetree/bindings/thermal/kirkwood-thermal.txt
@@ -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>;
+ };
diff --git a/drivers/thermal/Kconfig b/drivers/thermal/Kconfig
index c2c77d1..e691500 100644
--- a/drivers/thermal/Kconfig
+++ b/drivers/thermal/Kconfig
@@ -93,6 +93,13 @@ 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
+ 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)
diff --git a/drivers/thermal/Makefile b/drivers/thermal/Makefile
index d8da683..99026b2 100644
--- a/drivers/thermal/Makefile
+++ b/drivers/thermal/Makefile
@@ -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
diff --git a/drivers/thermal/kirkwood_thermal.c b/drivers/thermal/kirkwood_thermal.c
new file mode 100644
index 0000000..000cfc9
--- /dev/null
+++ b/drivers/thermal/kirkwood_thermal.c
@@ -0,0 +1,136 @@
+/*
+ * Kirkwood thermal sensor driver
+ *
+ * Copyright (C) 2012 Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
+ *
+ * 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) {
+ dev_err(&pdev->dev, "kzalloc fail\n");
+ 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 <iwamatsu@nigauri.org>");
+MODULE_DESCRIPTION("kirkwood thermal driver");
+MODULE_LICENSE("GPL");
--
1.7.10.4
^ permalink raw reply related [flat|nested] 36+ messages in thread
* [PATCH v3 2/4] ARM: Kirkwood: Add support thermal sensor for 88F6282 and 88F6283
2013-02-02 14:35 ` Andrew Lunn
@ 2013-02-02 14:35 ` Andrew Lunn
-1 siblings, 0 replies; 36+ messages in thread
From: Andrew Lunn @ 2013-02-02 14:35 UTC (permalink / raw)
To: Jason Cooper, rui.zhang
Cc: linux ARM, linux-pm, Nobuhiro Iwamatsu, Andrew Lunn
From: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
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 <iwamatsu@nigauri.org>
Signed-off-by: Andrew Lunn <andrew@lunn.ch>
---
arch/arm/boot/dts/kirkwood-6282.dtsi | 6 ++++++
arch/arm/configs/kirkwood_defconfig | 2 ++
2 files changed, 8 insertions(+)
diff --git a/arch/arm/boot/dts/kirkwood-6282.dtsi b/arch/arm/boot/dts/kirkwood-6282.dtsi
index 4ccea21..bd168b6 100644
--- a/arch/arm/boot/dts/kirkwood-6282.dtsi
+++ b/arch/arm/boot/dts/kirkwood-6282.dtsi
@@ -32,6 +32,12 @@
};
};
+ thermal@10078 {
+ compatible = "marvell,kirkwood-thermal";
+ reg = <0x10078 0x4>;
+ status = "okay";
+ };
+
i2c@11100 {
compatible = "marvell,mv64xxx-i2c";
reg = <0x11100 0x20>;
diff --git a/arch/arm/configs/kirkwood_defconfig b/arch/arm/configs/kirkwood_defconfig
index 93f3794..3d8667f 100644
--- a/arch/arm/configs/kirkwood_defconfig
+++ b/arch/arm/configs/kirkwood_defconfig
@@ -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
--
1.7.10.4
^ permalink raw reply related [flat|nested] 36+ messages in thread
* [PATCH v3 2/4] ARM: Kirkwood: Add support thermal sensor for 88F6282 and 88F6283
@ 2013-02-02 14:35 ` Andrew Lunn
0 siblings, 0 replies; 36+ messages in thread
From: Andrew Lunn @ 2013-02-02 14:35 UTC (permalink / raw)
To: linux-arm-kernel
From: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
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 <iwamatsu@nigauri.org>
Signed-off-by: Andrew Lunn <andrew@lunn.ch>
---
arch/arm/boot/dts/kirkwood-6282.dtsi | 6 ++++++
arch/arm/configs/kirkwood_defconfig | 2 ++
2 files changed, 8 insertions(+)
diff --git a/arch/arm/boot/dts/kirkwood-6282.dtsi b/arch/arm/boot/dts/kirkwood-6282.dtsi
index 4ccea21..bd168b6 100644
--- a/arch/arm/boot/dts/kirkwood-6282.dtsi
+++ b/arch/arm/boot/dts/kirkwood-6282.dtsi
@@ -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>;
diff --git a/arch/arm/configs/kirkwood_defconfig b/arch/arm/configs/kirkwood_defconfig
index 93f3794..3d8667f 100644
--- a/arch/arm/configs/kirkwood_defconfig
+++ b/arch/arm/configs/kirkwood_defconfig
@@ -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
--
1.7.10.4
^ permalink raw reply related [flat|nested] 36+ messages in thread
* [PATCH v3 3/4] Thermal: Dove: Add Themal sensor support for Dove.
2013-02-02 14:35 ` Andrew Lunn
@ 2013-02-02 14:35 ` Andrew Lunn
-1 siblings, 0 replies; 36+ messages in thread
From: Andrew Lunn @ 2013-02-02 14:35 UTC (permalink / raw)
To: Jason Cooper, rui.zhang
Cc: linux ARM, linux-pm, Andrew Lunn, Sebastian Hesselbarth
The Marvell Dove SoC has a thermal sensor. Add a driver using the
thermal framework.
Signed-off-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
---
.../devicetree/bindings/thermal/dove-thermal.txt | 18 ++
drivers/thermal/Kconfig | 7 +
drivers/thermal/Makefile | 1 +
drivers/thermal/dove_thermal.c | 211 ++++++++++++++++++++
4 files changed, 237 insertions(+)
create mode 100644 Documentation/devicetree/bindings/thermal/dove-thermal.txt
create mode 100644 drivers/thermal/dove_thermal.c
diff --git a/Documentation/devicetree/bindings/thermal/dove-thermal.txt b/Documentation/devicetree/bindings/thermal/dove-thermal.txt
new file mode 100644
index 0000000..6f47467
--- /dev/null
+++ b/Documentation/devicetree/bindings/thermal/dove-thermal.txt
@@ -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@10078 {
+ compatible = "marvell,dove-thermal";
+ reg = <0xd001c 0x0c>, <0xd005c 0x08>;
+ };
diff --git a/drivers/thermal/Kconfig b/drivers/thermal/Kconfig
index e691500..cdc267e 100644
--- a/drivers/thermal/Kconfig
+++ b/drivers/thermal/Kconfig
@@ -108,6 +108,13 @@ 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
+ help
+ Support for the Dove thermal sensor driver in the Linux thermal
+ framework.
+
config DB8500_THERMAL
bool "DB8500 thermal management"
depends on ARCH_U8500
diff --git a/drivers/thermal/Makefile b/drivers/thermal/Makefile
index 99026b2..5ed357e 100644
--- a/drivers/thermal/Makefile
+++ b/drivers/thermal/Makefile
@@ -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
diff --git a/drivers/thermal/dove_thermal.c b/drivers/thermal/dove_thermal.c
new file mode 100644
index 0000000..3a92b55
--- /dev/null
+++ b/drivers/thermal/dove_thermal.c
@@ -0,0 +1,211 @@
+/*
+ * Dove thermal sensor driver
+ *
+ * Copyright (C) 2013 Andrew Lunn <andrew@lunn.ch>
+ *
+ * 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) {
+ dev_err(&pdev->dev, "kzalloc fail\n");
+ 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 <andrew@lunn.ch>");
+MODULE_DESCRIPTION("Dove thermal driver");
+MODULE_LICENSE("GPL");
--
1.7.10.4
^ permalink raw reply related [flat|nested] 36+ messages in thread
* [PATCH v3 3/4] Thermal: Dove: Add Themal sensor support for Dove.
@ 2013-02-02 14:35 ` Andrew Lunn
0 siblings, 0 replies; 36+ messages in thread
From: Andrew Lunn @ 2013-02-02 14:35 UTC (permalink / raw)
To: linux-arm-kernel
The Marvell Dove SoC has a thermal sensor. Add a driver using the
thermal framework.
Signed-off-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
---
.../devicetree/bindings/thermal/dove-thermal.txt | 18 ++
drivers/thermal/Kconfig | 7 +
drivers/thermal/Makefile | 1 +
drivers/thermal/dove_thermal.c | 211 ++++++++++++++++++++
4 files changed, 237 insertions(+)
create mode 100644 Documentation/devicetree/bindings/thermal/dove-thermal.txt
create mode 100644 drivers/thermal/dove_thermal.c
diff --git a/Documentation/devicetree/bindings/thermal/dove-thermal.txt b/Documentation/devicetree/bindings/thermal/dove-thermal.txt
new file mode 100644
index 0000000..6f47467
--- /dev/null
+++ b/Documentation/devicetree/bindings/thermal/dove-thermal.txt
@@ -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>;
+ };
diff --git a/drivers/thermal/Kconfig b/drivers/thermal/Kconfig
index e691500..cdc267e 100644
--- a/drivers/thermal/Kconfig
+++ b/drivers/thermal/Kconfig
@@ -108,6 +108,13 @@ 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
+ help
+ Support for the Dove thermal sensor driver in the Linux thermal
+ framework.
+
config DB8500_THERMAL
bool "DB8500 thermal management"
depends on ARCH_U8500
diff --git a/drivers/thermal/Makefile b/drivers/thermal/Makefile
index 99026b2..5ed357e 100644
--- a/drivers/thermal/Makefile
+++ b/drivers/thermal/Makefile
@@ -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
diff --git a/drivers/thermal/dove_thermal.c b/drivers/thermal/dove_thermal.c
new file mode 100644
index 0000000..3a92b55
--- /dev/null
+++ b/drivers/thermal/dove_thermal.c
@@ -0,0 +1,211 @@
+/*
+ * Dove thermal sensor driver
+ *
+ * Copyright (C) 2013 Andrew Lunn <andrew@lunn.ch>
+ *
+ * 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) {
+ dev_err(&pdev->dev, "kzalloc fail\n");
+ 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 <andrew@lunn.ch>");
+MODULE_DESCRIPTION("Dove thermal driver");
+MODULE_LICENSE("GPL");
--
1.7.10.4
^ permalink raw reply related [flat|nested] 36+ messages in thread
* [PATCH v3 4/4] Dove: Thermal: Add DT node and enable in defconfig
2013-02-02 14:35 ` Andrew Lunn
@ 2013-02-02 14:35 ` Andrew Lunn
-1 siblings, 0 replies; 36+ messages in thread
From: Andrew Lunn @ 2013-02-02 14:35 UTC (permalink / raw)
To: Jason Cooper, rui.zhang; +Cc: linux ARM, linux-pm, Andrew Lunn
Add a device tree node to instantiate the dove thermal driver.
Enable the driver and the thermal framework in dove_defconfig.
Signed-off-by: Andrew Lunn <andrew@lunn.ch>
---
arch/arm/boot/dts/dove.dtsi | 5 +++++
arch/arm/configs/dove_defconfig | 2 ++
2 files changed, 7 insertions(+)
diff --git a/arch/arm/boot/dts/dove.dtsi b/arch/arm/boot/dts/dove.dtsi
index 42eac1f..3584a00 100644
--- a/arch/arm/boot/dts/dove.dtsi
+++ b/arch/arm/boot/dts/dove.dtsi
@@ -50,6 +50,11 @@
#clock-cells = <1>;
};
+ thermal: thermal@d001c {
+ compatible = "marvell,dove-thermal";
+ reg = <0xd001c 0x0c>, <0xd005c 0x08>;
+ };
+
uart0: serial@12000 {
compatible = "ns16550a";
reg = <0x12000 0x100>;
diff --git a/arch/arm/configs/dove_defconfig b/arch/arm/configs/dove_defconfig
index 0b7ee92..9713b5b 100644
--- a/arch/arm/configs/dove_defconfig
+++ b/arch/arm/configs/dove_defconfig
@@ -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
--
1.7.10.4
^ permalink raw reply related [flat|nested] 36+ messages in thread
* [PATCH v3 4/4] Dove: Thermal: Add DT node and enable in defconfig
@ 2013-02-02 14:35 ` Andrew Lunn
0 siblings, 0 replies; 36+ messages in thread
From: Andrew Lunn @ 2013-02-02 14:35 UTC (permalink / raw)
To: linux-arm-kernel
Add a device tree node to instantiate the dove thermal driver.
Enable the driver and the thermal framework in dove_defconfig.
Signed-off-by: Andrew Lunn <andrew@lunn.ch>
---
arch/arm/boot/dts/dove.dtsi | 5 +++++
arch/arm/configs/dove_defconfig | 2 ++
2 files changed, 7 insertions(+)
diff --git a/arch/arm/boot/dts/dove.dtsi b/arch/arm/boot/dts/dove.dtsi
index 42eac1f..3584a00 100644
--- a/arch/arm/boot/dts/dove.dtsi
+++ b/arch/arm/boot/dts/dove.dtsi
@@ -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>;
diff --git a/arch/arm/configs/dove_defconfig b/arch/arm/configs/dove_defconfig
index 0b7ee92..9713b5b 100644
--- a/arch/arm/configs/dove_defconfig
+++ b/arch/arm/configs/dove_defconfig
@@ -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
--
1.7.10.4
^ permalink raw reply related [flat|nested] 36+ messages in thread
* Re: [PATCH v3 1/4] thermal: Add support for the thermal sensor on Kirkwood SoCs
2013-02-02 14:35 ` Andrew Lunn
@ 2013-02-04 2:49 ` Zhang Rui
-1 siblings, 0 replies; 36+ messages in thread
From: Zhang Rui @ 2013-02-04 2:49 UTC (permalink / raw)
To: Andrew Lunn; +Cc: Jason Cooper, linux ARM, linux-pm, Nobuhiro Iwamatsu
On Sat, 2013-02-02 at 15:35 +0100, Andrew Lunn wrote:
> From: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
>
> This patch adds support for Kirkwood 88F6282 and 88F6283 thermal sensor.
>
> Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
> Signed-off-by: Andrew Lunn <andrew@lunn.ch>
> ---
> .../bindings/thermal/kirkwood-thermal.txt | 15 +++
> drivers/thermal/Kconfig | 7 +
> drivers/thermal/Makefile | 1 +
> drivers/thermal/kirkwood_thermal.c | 136 ++++++++++++++++++++
> 4 files changed, 159 insertions(+)
> create mode 100644 Documentation/devicetree/bindings/thermal/kirkwood-thermal.txt
> create mode 100644 drivers/thermal/kirkwood_thermal.c
>
> diff --git a/Documentation/devicetree/bindings/thermal/kirkwood-thermal.txt b/Documentation/devicetree/bindings/thermal/kirkwood-thermal.txt
> new file mode 100644
> index 0000000..8c0f5eb
> --- /dev/null
> +++ b/Documentation/devicetree/bindings/thermal/kirkwood-thermal.txt
> @@ -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@10078 {
> + compatible = "marvell,kirkwood-thermal";
> + reg = <0x10078 0x4>;
> + };
> diff --git a/drivers/thermal/Kconfig b/drivers/thermal/Kconfig
> index c2c77d1..e691500 100644
> --- a/drivers/thermal/Kconfig
> +++ b/drivers/thermal/Kconfig
> @@ -93,6 +93,13 @@ 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
> + 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)
> diff --git a/drivers/thermal/Makefile b/drivers/thermal/Makefile
> index d8da683..99026b2 100644
> --- a/drivers/thermal/Makefile
> +++ b/drivers/thermal/Makefile
> @@ -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
> diff --git a/drivers/thermal/kirkwood_thermal.c b/drivers/thermal/kirkwood_thermal.c
> new file mode 100644
> index 0000000..000cfc9
> --- /dev/null
> +++ b/drivers/thermal/kirkwood_thermal.c
> @@ -0,0 +1,136 @@
> +/*
> + * Kirkwood thermal sensor driver
> + *
> + * Copyright (C) 2012 Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
> + *
> + * 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" },
> + {}
> +};
> +
you do not need #ifdef CONFIG_OF here?
thanks,
rui
> +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) {
> + dev_err(&pdev->dev, "kzalloc fail\n");
> + 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 <iwamatsu@nigauri.org>");
> +MODULE_DESCRIPTION("kirkwood thermal driver");
> +MODULE_LICENSE("GPL");
^ permalink raw reply [flat|nested] 36+ messages in thread
* [PATCH v3 1/4] thermal: Add support for the thermal sensor on Kirkwood SoCs
@ 2013-02-04 2:49 ` Zhang Rui
0 siblings, 0 replies; 36+ messages in thread
From: Zhang Rui @ 2013-02-04 2:49 UTC (permalink / raw)
To: linux-arm-kernel
On Sat, 2013-02-02 at 15:35 +0100, Andrew Lunn wrote:
> From: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
>
> This patch adds support for Kirkwood 88F6282 and 88F6283 thermal sensor.
>
> Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
> Signed-off-by: Andrew Lunn <andrew@lunn.ch>
> ---
> .../bindings/thermal/kirkwood-thermal.txt | 15 +++
> drivers/thermal/Kconfig | 7 +
> drivers/thermal/Makefile | 1 +
> drivers/thermal/kirkwood_thermal.c | 136 ++++++++++++++++++++
> 4 files changed, 159 insertions(+)
> create mode 100644 Documentation/devicetree/bindings/thermal/kirkwood-thermal.txt
> create mode 100644 drivers/thermal/kirkwood_thermal.c
>
> diff --git a/Documentation/devicetree/bindings/thermal/kirkwood-thermal.txt b/Documentation/devicetree/bindings/thermal/kirkwood-thermal.txt
> new file mode 100644
> index 0000000..8c0f5eb
> --- /dev/null
> +++ b/Documentation/devicetree/bindings/thermal/kirkwood-thermal.txt
> @@ -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>;
> + };
> diff --git a/drivers/thermal/Kconfig b/drivers/thermal/Kconfig
> index c2c77d1..e691500 100644
> --- a/drivers/thermal/Kconfig
> +++ b/drivers/thermal/Kconfig
> @@ -93,6 +93,13 @@ 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
> + 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)
> diff --git a/drivers/thermal/Makefile b/drivers/thermal/Makefile
> index d8da683..99026b2 100644
> --- a/drivers/thermal/Makefile
> +++ b/drivers/thermal/Makefile
> @@ -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
> diff --git a/drivers/thermal/kirkwood_thermal.c b/drivers/thermal/kirkwood_thermal.c
> new file mode 100644
> index 0000000..000cfc9
> --- /dev/null
> +++ b/drivers/thermal/kirkwood_thermal.c
> @@ -0,0 +1,136 @@
> +/*
> + * Kirkwood thermal sensor driver
> + *
> + * Copyright (C) 2012 Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
> + *
> + * 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" },
> + {}
> +};
> +
you do not need #ifdef CONFIG_OF here?
thanks,
rui
> +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) {
> + dev_err(&pdev->dev, "kzalloc fail\n");
> + 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 <iwamatsu@nigauri.org>");
> +MODULE_DESCRIPTION("kirkwood thermal driver");
> +MODULE_LICENSE("GPL");
^ permalink raw reply [flat|nested] 36+ messages in thread
* Re: [PATCH v3 2/4] ARM: Kirkwood: Add support thermal sensor for 88F6282 and 88F6283
2013-02-02 14:35 ` Andrew Lunn
@ 2013-02-04 3:14 ` Zhang Rui
-1 siblings, 0 replies; 36+ messages in thread
From: Zhang Rui @ 2013-02-04 3:14 UTC (permalink / raw)
To: Andrew Lunn; +Cc: Jason Cooper, linux ARM, linux-pm, Nobuhiro Iwamatsu
On Sat, 2013-02-02 at 15:35 +0100, Andrew Lunn wrote:
> From: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
>
> 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 <iwamatsu@nigauri.org>
> Signed-off-by: Andrew Lunn <andrew@lunn.ch>
I can take this one but I need ACK from ARM experts first.
thanks,
rui
> ---
> arch/arm/boot/dts/kirkwood-6282.dtsi | 6 ++++++
> arch/arm/configs/kirkwood_defconfig | 2 ++
> 2 files changed, 8 insertions(+)
>
> diff --git a/arch/arm/boot/dts/kirkwood-6282.dtsi b/arch/arm/boot/dts/kirkwood-6282.dtsi
> index 4ccea21..bd168b6 100644
> --- a/arch/arm/boot/dts/kirkwood-6282.dtsi
> +++ b/arch/arm/boot/dts/kirkwood-6282.dtsi
> @@ -32,6 +32,12 @@
> };
> };
>
> + thermal@10078 {
> + compatible = "marvell,kirkwood-thermal";
> + reg = <0x10078 0x4>;
> + status = "okay";
> + };
> +
> i2c@11100 {
> compatible = "marvell,mv64xxx-i2c";
> reg = <0x11100 0x20>;
> diff --git a/arch/arm/configs/kirkwood_defconfig b/arch/arm/configs/kirkwood_defconfig
> index 93f3794..3d8667f 100644
> --- a/arch/arm/configs/kirkwood_defconfig
> +++ b/arch/arm/configs/kirkwood_defconfig
> @@ -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
^ permalink raw reply [flat|nested] 36+ messages in thread
* [PATCH v3 2/4] ARM: Kirkwood: Add support thermal sensor for 88F6282 and 88F6283
@ 2013-02-04 3:14 ` Zhang Rui
0 siblings, 0 replies; 36+ messages in thread
From: Zhang Rui @ 2013-02-04 3:14 UTC (permalink / raw)
To: linux-arm-kernel
On Sat, 2013-02-02 at 15:35 +0100, Andrew Lunn wrote:
> From: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
>
> 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 <iwamatsu@nigauri.org>
> Signed-off-by: Andrew Lunn <andrew@lunn.ch>
I can take this one but I need ACK from ARM experts first.
thanks,
rui
> ---
> arch/arm/boot/dts/kirkwood-6282.dtsi | 6 ++++++
> arch/arm/configs/kirkwood_defconfig | 2 ++
> 2 files changed, 8 insertions(+)
>
> diff --git a/arch/arm/boot/dts/kirkwood-6282.dtsi b/arch/arm/boot/dts/kirkwood-6282.dtsi
> index 4ccea21..bd168b6 100644
> --- a/arch/arm/boot/dts/kirkwood-6282.dtsi
> +++ b/arch/arm/boot/dts/kirkwood-6282.dtsi
> @@ -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>;
> diff --git a/arch/arm/configs/kirkwood_defconfig b/arch/arm/configs/kirkwood_defconfig
> index 93f3794..3d8667f 100644
> --- a/arch/arm/configs/kirkwood_defconfig
> +++ b/arch/arm/configs/kirkwood_defconfig
> @@ -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
^ permalink raw reply [flat|nested] 36+ messages in thread
* Re: [PATCH v3 2/4] ARM: Kirkwood: Add support thermal sensor for 88F6282 and 88F6283
2013-02-04 3:14 ` Zhang Rui
@ 2013-02-04 14:19 ` Jason Cooper
-1 siblings, 0 replies; 36+ messages in thread
From: Jason Cooper @ 2013-02-04 14:19 UTC (permalink / raw)
To: Zhang Rui; +Cc: Andrew Lunn, linux ARM, linux-pm, Nobuhiro Iwamatsu
On Mon, Feb 04, 2013 at 11:14:53AM +0800, Zhang Rui wrote:
> On Sat, 2013-02-02 at 15:35 +0100, Andrew Lunn wrote:
> > From: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
> >
> > 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 <iwamatsu@nigauri.org>
> > Signed-off-by: Andrew Lunn <andrew@lunn.ch>
>
> I can take this one but I need ACK from ARM experts first.
If you don't mind, I prefer to take patches 2 and 4. If you could take
1 and 3 and let me know what tree/branch you place them in, then I'll
depend on them when I push them up.
thx,
Jason.
^ permalink raw reply [flat|nested] 36+ messages in thread
* [PATCH v3 2/4] ARM: Kirkwood: Add support thermal sensor for 88F6282 and 88F6283
@ 2013-02-04 14:19 ` Jason Cooper
0 siblings, 0 replies; 36+ messages in thread
From: Jason Cooper @ 2013-02-04 14:19 UTC (permalink / raw)
To: linux-arm-kernel
On Mon, Feb 04, 2013 at 11:14:53AM +0800, Zhang Rui wrote:
> On Sat, 2013-02-02 at 15:35 +0100, Andrew Lunn wrote:
> > From: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
> >
> > 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 <iwamatsu@nigauri.org>
> > Signed-off-by: Andrew Lunn <andrew@lunn.ch>
>
> I can take this one but I need ACK from ARM experts first.
If you don't mind, I prefer to take patches 2 and 4. If you could take
1 and 3 and let me know what tree/branch you place them in, then I'll
depend on them when I push them up.
thx,
Jason.
^ permalink raw reply [flat|nested] 36+ messages in thread
* [PATCH v4 0/4] Kirkwood and Dove Thermal drivers
2013-02-04 2:49 ` Zhang Rui
@ 2013-02-04 19:19 ` Andrew Lunn
-1 siblings, 0 replies; 36+ messages in thread
From: Andrew Lunn @ 2013-02-04 19:19 UTC (permalink / raw)
To: jason, rui.zhang; +Cc: Sebastian Hesselbarth, linux ARM, linux-pm, Andrew Lunn
This patchset adds thermal support for Kirkwood and Dove SoCs.
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 | 211 ++++++++++++++++++++
drivers/thermal/kirkwood_thermal.c | 136 +++++++++++++
10 files changed, 413 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
--
1.7.10.4
^ permalink raw reply [flat|nested] 36+ messages in thread
* [PATCH v4 0/4] Kirkwood and Dove Thermal drivers
@ 2013-02-04 19:19 ` Andrew Lunn
0 siblings, 0 replies; 36+ messages in thread
From: Andrew Lunn @ 2013-02-04 19:19 UTC (permalink / raw)
To: linux-arm-kernel
This patchset adds thermal support for Kirkwood and Dove SoCs.
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 | 211 ++++++++++++++++++++
drivers/thermal/kirkwood_thermal.c | 136 +++++++++++++
10 files changed, 413 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
--
1.7.10.4
^ permalink raw reply [flat|nested] 36+ messages in thread
* [PATCH v4 1/4] thermal: Add support for the thermal sensor on Kirkwood SoCs
2013-02-04 19:19 ` Andrew Lunn
@ 2013-02-04 19:19 ` Andrew Lunn
-1 siblings, 0 replies; 36+ messages in thread
From: Andrew Lunn @ 2013-02-04 19:19 UTC (permalink / raw)
To: jason, rui.zhang
Cc: Sebastian Hesselbarth, linux ARM, linux-pm, Nobuhiro Iwamatsu,
Andrew Lunn
From: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
This patch adds support for Kirkwood 88F6282 and 88F6283 thermal sensor.
Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
Signed-off-by: Andrew Lunn <andrew@lunn.ch>
---
.../bindings/thermal/kirkwood-thermal.txt | 15 +++
drivers/thermal/Kconfig | 8 ++
drivers/thermal/Makefile | 1 +
drivers/thermal/kirkwood_thermal.c | 136 ++++++++++++++++++++
4 files changed, 160 insertions(+)
create mode 100644 Documentation/devicetree/bindings/thermal/kirkwood-thermal.txt
create mode 100644 drivers/thermal/kirkwood_thermal.c
diff --git a/Documentation/devicetree/bindings/thermal/kirkwood-thermal.txt b/Documentation/devicetree/bindings/thermal/kirkwood-thermal.txt
new file mode 100644
index 0000000..8c0f5eb
--- /dev/null
+++ b/Documentation/devicetree/bindings/thermal/kirkwood-thermal.txt
@@ -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@10078 {
+ compatible = "marvell,kirkwood-thermal";
+ reg = <0x10078 0x4>;
+ };
diff --git a/drivers/thermal/Kconfig b/drivers/thermal/Kconfig
index c2c77d1..ff34a0a 100644
--- a/drivers/thermal/Kconfig
+++ b/drivers/thermal/Kconfig
@@ -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)
diff --git a/drivers/thermal/Makefile b/drivers/thermal/Makefile
index d8da683..99026b2 100644
--- a/drivers/thermal/Makefile
+++ b/drivers/thermal/Makefile
@@ -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
diff --git a/drivers/thermal/kirkwood_thermal.c b/drivers/thermal/kirkwood_thermal.c
new file mode 100644
index 0000000..000cfc9
--- /dev/null
+++ b/drivers/thermal/kirkwood_thermal.c
@@ -0,0 +1,136 @@
+/*
+ * Kirkwood thermal sensor driver
+ *
+ * Copyright (C) 2012 Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
+ *
+ * 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) {
+ dev_err(&pdev->dev, "kzalloc fail\n");
+ 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 <iwamatsu@nigauri.org>");
+MODULE_DESCRIPTION("kirkwood thermal driver");
+MODULE_LICENSE("GPL");
--
1.7.10.4
^ permalink raw reply related [flat|nested] 36+ messages in thread
* [PATCH v4 1/4] thermal: Add support for the thermal sensor on Kirkwood SoCs
@ 2013-02-04 19:19 ` Andrew Lunn
0 siblings, 0 replies; 36+ messages in thread
From: Andrew Lunn @ 2013-02-04 19:19 UTC (permalink / raw)
To: linux-arm-kernel
From: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
This patch adds support for Kirkwood 88F6282 and 88F6283 thermal sensor.
Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
Signed-off-by: Andrew Lunn <andrew@lunn.ch>
---
.../bindings/thermal/kirkwood-thermal.txt | 15 +++
drivers/thermal/Kconfig | 8 ++
drivers/thermal/Makefile | 1 +
drivers/thermal/kirkwood_thermal.c | 136 ++++++++++++++++++++
4 files changed, 160 insertions(+)
create mode 100644 Documentation/devicetree/bindings/thermal/kirkwood-thermal.txt
create mode 100644 drivers/thermal/kirkwood_thermal.c
diff --git a/Documentation/devicetree/bindings/thermal/kirkwood-thermal.txt b/Documentation/devicetree/bindings/thermal/kirkwood-thermal.txt
new file mode 100644
index 0000000..8c0f5eb
--- /dev/null
+++ b/Documentation/devicetree/bindings/thermal/kirkwood-thermal.txt
@@ -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>;
+ };
diff --git a/drivers/thermal/Kconfig b/drivers/thermal/Kconfig
index c2c77d1..ff34a0a 100644
--- a/drivers/thermal/Kconfig
+++ b/drivers/thermal/Kconfig
@@ -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)
diff --git a/drivers/thermal/Makefile b/drivers/thermal/Makefile
index d8da683..99026b2 100644
--- a/drivers/thermal/Makefile
+++ b/drivers/thermal/Makefile
@@ -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
diff --git a/drivers/thermal/kirkwood_thermal.c b/drivers/thermal/kirkwood_thermal.c
new file mode 100644
index 0000000..000cfc9
--- /dev/null
+++ b/drivers/thermal/kirkwood_thermal.c
@@ -0,0 +1,136 @@
+/*
+ * Kirkwood thermal sensor driver
+ *
+ * Copyright (C) 2012 Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
+ *
+ * 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) {
+ dev_err(&pdev->dev, "kzalloc fail\n");
+ 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 <iwamatsu@nigauri.org>");
+MODULE_DESCRIPTION("kirkwood thermal driver");
+MODULE_LICENSE("GPL");
--
1.7.10.4
^ permalink raw reply related [flat|nested] 36+ messages in thread
* [PATCH v4 2/4] ARM: Kirkwood: Add support thermal sensor for 88F6282 and 88F6283
2013-02-04 19:19 ` Andrew Lunn
@ 2013-02-04 19:19 ` Andrew Lunn
-1 siblings, 0 replies; 36+ messages in thread
From: Andrew Lunn @ 2013-02-04 19:19 UTC (permalink / raw)
To: jason, rui.zhang
Cc: Sebastian Hesselbarth, linux ARM, linux-pm, Nobuhiro Iwamatsu,
Andrew Lunn
From: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
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 <iwamatsu@nigauri.org>
Signed-off-by: Andrew Lunn <andrew@lunn.ch>
---
arch/arm/boot/dts/kirkwood-6282.dtsi | 6 ++++++
arch/arm/configs/kirkwood_defconfig | 2 ++
2 files changed, 8 insertions(+)
diff --git a/arch/arm/boot/dts/kirkwood-6282.dtsi b/arch/arm/boot/dts/kirkwood-6282.dtsi
index 4ccea21..bd168b6 100644
--- a/arch/arm/boot/dts/kirkwood-6282.dtsi
+++ b/arch/arm/boot/dts/kirkwood-6282.dtsi
@@ -32,6 +32,12 @@
};
};
+ thermal@10078 {
+ compatible = "marvell,kirkwood-thermal";
+ reg = <0x10078 0x4>;
+ status = "okay";
+ };
+
i2c@11100 {
compatible = "marvell,mv64xxx-i2c";
reg = <0x11100 0x20>;
diff --git a/arch/arm/configs/kirkwood_defconfig b/arch/arm/configs/kirkwood_defconfig
index 93f3794..3d8667f 100644
--- a/arch/arm/configs/kirkwood_defconfig
+++ b/arch/arm/configs/kirkwood_defconfig
@@ -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
--
1.7.10.4
^ permalink raw reply related [flat|nested] 36+ messages in thread
* [PATCH v4 2/4] ARM: Kirkwood: Add support thermal sensor for 88F6282 and 88F6283
@ 2013-02-04 19:19 ` Andrew Lunn
0 siblings, 0 replies; 36+ messages in thread
From: Andrew Lunn @ 2013-02-04 19:19 UTC (permalink / raw)
To: linux-arm-kernel
From: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
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 <iwamatsu@nigauri.org>
Signed-off-by: Andrew Lunn <andrew@lunn.ch>
---
arch/arm/boot/dts/kirkwood-6282.dtsi | 6 ++++++
arch/arm/configs/kirkwood_defconfig | 2 ++
2 files changed, 8 insertions(+)
diff --git a/arch/arm/boot/dts/kirkwood-6282.dtsi b/arch/arm/boot/dts/kirkwood-6282.dtsi
index 4ccea21..bd168b6 100644
--- a/arch/arm/boot/dts/kirkwood-6282.dtsi
+++ b/arch/arm/boot/dts/kirkwood-6282.dtsi
@@ -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>;
diff --git a/arch/arm/configs/kirkwood_defconfig b/arch/arm/configs/kirkwood_defconfig
index 93f3794..3d8667f 100644
--- a/arch/arm/configs/kirkwood_defconfig
+++ b/arch/arm/configs/kirkwood_defconfig
@@ -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
--
1.7.10.4
^ permalink raw reply related [flat|nested] 36+ messages in thread
* [PATCH v4 3/4] Thermal: Dove: Add Themal sensor support for Dove.
2013-02-04 19:19 ` Andrew Lunn
@ 2013-02-04 19:19 ` Andrew Lunn
-1 siblings, 0 replies; 36+ messages in thread
From: Andrew Lunn @ 2013-02-04 19:19 UTC (permalink / raw)
To: jason, rui.zhang
Cc: Sebastian Hesselbarth, linux ARM, linux-pm, Andrew Lunn,
Sebastian Hesselbarth
The Marvell Dove SoC has a thermal sensor. Add a driver using the
thermal framework.
Signed-off-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
---
.../devicetree/bindings/thermal/dove-thermal.txt | 18 ++
drivers/thermal/Kconfig | 8 +
drivers/thermal/Makefile | 1 +
drivers/thermal/dove_thermal.c | 211 ++++++++++++++++++++
4 files changed, 238 insertions(+)
create mode 100644 Documentation/devicetree/bindings/thermal/dove-thermal.txt
create mode 100644 drivers/thermal/dove_thermal.c
diff --git a/Documentation/devicetree/bindings/thermal/dove-thermal.txt b/Documentation/devicetree/bindings/thermal/dove-thermal.txt
new file mode 100644
index 0000000..6f47467
--- /dev/null
+++ b/Documentation/devicetree/bindings/thermal/dove-thermal.txt
@@ -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@10078 {
+ compatible = "marvell,dove-thermal";
+ reg = <0xd001c 0x0c>, <0xd005c 0x08>;
+ };
diff --git a/drivers/thermal/Kconfig b/drivers/thermal/Kconfig
index ff34a0a..342fd81 100644
--- a/drivers/thermal/Kconfig
+++ b/drivers/thermal/Kconfig
@@ -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
diff --git a/drivers/thermal/Makefile b/drivers/thermal/Makefile
index 99026b2..5ed357e 100644
--- a/drivers/thermal/Makefile
+++ b/drivers/thermal/Makefile
@@ -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
diff --git a/drivers/thermal/dove_thermal.c b/drivers/thermal/dove_thermal.c
new file mode 100644
index 0000000..3a92b55
--- /dev/null
+++ b/drivers/thermal/dove_thermal.c
@@ -0,0 +1,211 @@
+/*
+ * Dove thermal sensor driver
+ *
+ * Copyright (C) 2013 Andrew Lunn <andrew@lunn.ch>
+ *
+ * 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) {
+ dev_err(&pdev->dev, "kzalloc fail\n");
+ 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 <andrew@lunn.ch>");
+MODULE_DESCRIPTION("Dove thermal driver");
+MODULE_LICENSE("GPL");
--
1.7.10.4
^ permalink raw reply related [flat|nested] 36+ messages in thread
* [PATCH v4 3/4] Thermal: Dove: Add Themal sensor support for Dove.
@ 2013-02-04 19:19 ` Andrew Lunn
0 siblings, 0 replies; 36+ messages in thread
From: Andrew Lunn @ 2013-02-04 19:19 UTC (permalink / raw)
To: linux-arm-kernel
The Marvell Dove SoC has a thermal sensor. Add a driver using the
thermal framework.
Signed-off-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
---
.../devicetree/bindings/thermal/dove-thermal.txt | 18 ++
drivers/thermal/Kconfig | 8 +
drivers/thermal/Makefile | 1 +
drivers/thermal/dove_thermal.c | 211 ++++++++++++++++++++
4 files changed, 238 insertions(+)
create mode 100644 Documentation/devicetree/bindings/thermal/dove-thermal.txt
create mode 100644 drivers/thermal/dove_thermal.c
diff --git a/Documentation/devicetree/bindings/thermal/dove-thermal.txt b/Documentation/devicetree/bindings/thermal/dove-thermal.txt
new file mode 100644
index 0000000..6f47467
--- /dev/null
+++ b/Documentation/devicetree/bindings/thermal/dove-thermal.txt
@@ -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>;
+ };
diff --git a/drivers/thermal/Kconfig b/drivers/thermal/Kconfig
index ff34a0a..342fd81 100644
--- a/drivers/thermal/Kconfig
+++ b/drivers/thermal/Kconfig
@@ -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
diff --git a/drivers/thermal/Makefile b/drivers/thermal/Makefile
index 99026b2..5ed357e 100644
--- a/drivers/thermal/Makefile
+++ b/drivers/thermal/Makefile
@@ -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
diff --git a/drivers/thermal/dove_thermal.c b/drivers/thermal/dove_thermal.c
new file mode 100644
index 0000000..3a92b55
--- /dev/null
+++ b/drivers/thermal/dove_thermal.c
@@ -0,0 +1,211 @@
+/*
+ * Dove thermal sensor driver
+ *
+ * Copyright (C) 2013 Andrew Lunn <andrew@lunn.ch>
+ *
+ * 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) {
+ dev_err(&pdev->dev, "kzalloc fail\n");
+ 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 <andrew@lunn.ch>");
+MODULE_DESCRIPTION("Dove thermal driver");
+MODULE_LICENSE("GPL");
--
1.7.10.4
^ permalink raw reply related [flat|nested] 36+ messages in thread
* [PATCH v4 4/4] Dove: Thermal: Add DT node and enable in defconfig
2013-02-04 19:19 ` Andrew Lunn
@ 2013-02-04 19:19 ` Andrew Lunn
-1 siblings, 0 replies; 36+ messages in thread
From: Andrew Lunn @ 2013-02-04 19:19 UTC (permalink / raw)
To: jason, rui.zhang; +Cc: Sebastian Hesselbarth, linux ARM, linux-pm, Andrew Lunn
Add a device tree node to instantiate the dove thermal driver.
Enable the driver and the thermal framework in dove_defconfig.
Signed-off-by: Andrew Lunn <andrew@lunn.ch>
---
arch/arm/boot/dts/dove.dtsi | 5 +++++
arch/arm/configs/dove_defconfig | 2 ++
2 files changed, 7 insertions(+)
diff --git a/arch/arm/boot/dts/dove.dtsi b/arch/arm/boot/dts/dove.dtsi
index 42eac1f..3584a00 100644
--- a/arch/arm/boot/dts/dove.dtsi
+++ b/arch/arm/boot/dts/dove.dtsi
@@ -50,6 +50,11 @@
#clock-cells = <1>;
};
+ thermal: thermal@d001c {
+ compatible = "marvell,dove-thermal";
+ reg = <0xd001c 0x0c>, <0xd005c 0x08>;
+ };
+
uart0: serial@12000 {
compatible = "ns16550a";
reg = <0x12000 0x100>;
diff --git a/arch/arm/configs/dove_defconfig b/arch/arm/configs/dove_defconfig
index 0b7ee92..9713b5b 100644
--- a/arch/arm/configs/dove_defconfig
+++ b/arch/arm/configs/dove_defconfig
@@ -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
--
1.7.10.4
^ permalink raw reply related [flat|nested] 36+ messages in thread
* [PATCH v4 4/4] Dove: Thermal: Add DT node and enable in defconfig
@ 2013-02-04 19:19 ` Andrew Lunn
0 siblings, 0 replies; 36+ messages in thread
From: Andrew Lunn @ 2013-02-04 19:19 UTC (permalink / raw)
To: linux-arm-kernel
Add a device tree node to instantiate the dove thermal driver.
Enable the driver and the thermal framework in dove_defconfig.
Signed-off-by: Andrew Lunn <andrew@lunn.ch>
---
arch/arm/boot/dts/dove.dtsi | 5 +++++
arch/arm/configs/dove_defconfig | 2 ++
2 files changed, 7 insertions(+)
diff --git a/arch/arm/boot/dts/dove.dtsi b/arch/arm/boot/dts/dove.dtsi
index 42eac1f..3584a00 100644
--- a/arch/arm/boot/dts/dove.dtsi
+++ b/arch/arm/boot/dts/dove.dtsi
@@ -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>;
diff --git a/arch/arm/configs/dove_defconfig b/arch/arm/configs/dove_defconfig
index 0b7ee92..9713b5b 100644
--- a/arch/arm/configs/dove_defconfig
+++ b/arch/arm/configs/dove_defconfig
@@ -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
--
1.7.10.4
^ permalink raw reply related [flat|nested] 36+ messages in thread
* Re: [PATCH v4 3/4] Thermal: Dove: Add Themal sensor support for Dove.
2013-02-04 19:19 ` Andrew Lunn
@ 2013-02-05 17:09 ` Ezequiel Garcia
-1 siblings, 0 replies; 36+ messages in thread
From: Ezequiel Garcia @ 2013-02-05 17:09 UTC (permalink / raw)
To: Andrew Lunn
Cc: jason, rui.zhang, Sebastian Hesselbarth, Sebastian Hesselbarth,
linux ARM, linux-pm
Hi Andrew,
Nice work!
Do you also intend to work
on thermal support for Armada family?
I have a minor comment, see below.
On Mon, Feb 04, 2013 at 08:19:19PM +0100, Andrew Lunn wrote:
> The Marvell Dove SoC has a thermal sensor. Add a driver using the
> thermal framework.
>
> Signed-off-by: Andrew Lunn <andrew@lunn.ch>
> Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
> ---
> .../devicetree/bindings/thermal/dove-thermal.txt | 18 ++
> drivers/thermal/Kconfig | 8 +
> drivers/thermal/Makefile | 1 +
> drivers/thermal/dove_thermal.c | 211 ++++++++++++++++++++
> 4 files changed, 238 insertions(+)
> create mode 100644 Documentation/devicetree/bindings/thermal/dove-thermal.txt
> create mode 100644 drivers/thermal/dove_thermal.c
>
> diff --git a/Documentation/devicetree/bindings/thermal/dove-thermal.txt b/Documentation/devicetree/bindings/thermal/dove-thermal.txt
> new file mode 100644
> index 0000000..6f47467
> --- /dev/null
> +++ b/Documentation/devicetree/bindings/thermal/dove-thermal.txt
> @@ -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@10078 {
> + compatible = "marvell,dove-thermal";
> + reg = <0xd001c 0x0c>, <0xd005c 0x08>;
> + };
> diff --git a/drivers/thermal/Kconfig b/drivers/thermal/Kconfig
> index ff34a0a..342fd81 100644
> --- a/drivers/thermal/Kconfig
> +++ b/drivers/thermal/Kconfig
> @@ -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
> diff --git a/drivers/thermal/Makefile b/drivers/thermal/Makefile
> index 99026b2..5ed357e 100644
> --- a/drivers/thermal/Makefile
> +++ b/drivers/thermal/Makefile
> @@ -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
> diff --git a/drivers/thermal/dove_thermal.c b/drivers/thermal/dove_thermal.c
> new file mode 100644
> index 0000000..3a92b55
> --- /dev/null
> +++ b/drivers/thermal/dove_thermal.c
> @@ -0,0 +1,211 @@
> +/*
> + * Dove thermal sensor driver
> + *
> + * Copyright (C) 2013 Andrew Lunn <andrew@lunn.ch>
> + *
> + * 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) {
> + dev_err(&pdev->dev, "kzalloc fail\n");
You don't need this to print an error here (and same goes to the
Kirkwood patch).
It just bloats the kernel and it doesn't really add anything relevant.
If this allocation fails you'll get a stack dump from
warn_alloc_failed().
Note that many many drivers still do this kind of printking,
and that Joe Perches has some fun removing them :-)
https://lkml.org/lkml/2013/2/3/393
> + 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 <andrew@lunn.ch>");
> +MODULE_DESCRIPTION("Dove thermal driver");
> +MODULE_LICENSE("GPL");
> --
> 1.7.10.4
>
>
> _______________________________________________
> linux-arm-kernel mailing list
> linux-arm-kernel@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
--
Ezequiel García, Free Electrons
Embedded Linux, Kernel and Android Engineering
http://free-electrons.com
^ permalink raw reply [flat|nested] 36+ messages in thread
* [PATCH v4 3/4] Thermal: Dove: Add Themal sensor support for Dove.
@ 2013-02-05 17:09 ` Ezequiel Garcia
0 siblings, 0 replies; 36+ messages in thread
From: Ezequiel Garcia @ 2013-02-05 17:09 UTC (permalink / raw)
To: linux-arm-kernel
Hi Andrew,
Nice work!
Do you also intend to work
on thermal support for Armada family?
I have a minor comment, see below.
On Mon, Feb 04, 2013 at 08:19:19PM +0100, Andrew Lunn wrote:
> The Marvell Dove SoC has a thermal sensor. Add a driver using the
> thermal framework.
>
> Signed-off-by: Andrew Lunn <andrew@lunn.ch>
> Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
> ---
> .../devicetree/bindings/thermal/dove-thermal.txt | 18 ++
> drivers/thermal/Kconfig | 8 +
> drivers/thermal/Makefile | 1 +
> drivers/thermal/dove_thermal.c | 211 ++++++++++++++++++++
> 4 files changed, 238 insertions(+)
> create mode 100644 Documentation/devicetree/bindings/thermal/dove-thermal.txt
> create mode 100644 drivers/thermal/dove_thermal.c
>
> diff --git a/Documentation/devicetree/bindings/thermal/dove-thermal.txt b/Documentation/devicetree/bindings/thermal/dove-thermal.txt
> new file mode 100644
> index 0000000..6f47467
> --- /dev/null
> +++ b/Documentation/devicetree/bindings/thermal/dove-thermal.txt
> @@ -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>;
> + };
> diff --git a/drivers/thermal/Kconfig b/drivers/thermal/Kconfig
> index ff34a0a..342fd81 100644
> --- a/drivers/thermal/Kconfig
> +++ b/drivers/thermal/Kconfig
> @@ -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
> diff --git a/drivers/thermal/Makefile b/drivers/thermal/Makefile
> index 99026b2..5ed357e 100644
> --- a/drivers/thermal/Makefile
> +++ b/drivers/thermal/Makefile
> @@ -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
> diff --git a/drivers/thermal/dove_thermal.c b/drivers/thermal/dove_thermal.c
> new file mode 100644
> index 0000000..3a92b55
> --- /dev/null
> +++ b/drivers/thermal/dove_thermal.c
> @@ -0,0 +1,211 @@
> +/*
> + * Dove thermal sensor driver
> + *
> + * Copyright (C) 2013 Andrew Lunn <andrew@lunn.ch>
> + *
> + * 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) {
> + dev_err(&pdev->dev, "kzalloc fail\n");
You don't need this to print an error here (and same goes to the
Kirkwood patch).
It just bloats the kernel and it doesn't really add anything relevant.
If this allocation fails you'll get a stack dump from
warn_alloc_failed().
Note that many many drivers still do this kind of printking,
and that Joe Perches has some fun removing them :-)
https://lkml.org/lkml/2013/2/3/393
> + 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 <andrew@lunn.ch>");
> +MODULE_DESCRIPTION("Dove thermal driver");
> +MODULE_LICENSE("GPL");
> --
> 1.7.10.4
>
>
> _______________________________________________
> linux-arm-kernel mailing list
> linux-arm-kernel at lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
--
Ezequiel Garc?a, Free Electrons
Embedded Linux, Kernel and Android Engineering
http://free-electrons.com
^ permalink raw reply [flat|nested] 36+ messages in thread
* Re: [PATCH v4 1/4] thermal: Add support for the thermal sensor on Kirkwood SoCs
2013-02-04 19:19 ` Andrew Lunn
@ 2013-02-05 17:10 ` Ezequiel Garcia
-1 siblings, 0 replies; 36+ messages in thread
From: Ezequiel Garcia @ 2013-02-05 17:10 UTC (permalink / raw)
To: Andrew Lunn
Cc: jason, rui.zhang, Sebastian Hesselbarth, Nobuhiro Iwamatsu,
linux ARM, linux-pm
On Mon, Feb 04, 2013 at 08:19:17PM +0100, Andrew Lunn wrote:
> From: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
>
> This patch adds support for Kirkwood 88F6282 and 88F6283 thermal sensor.
>
> Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
> Signed-off-by: Andrew Lunn <andrew@lunn.ch>
> ---
> .../bindings/thermal/kirkwood-thermal.txt | 15 +++
> drivers/thermal/Kconfig | 8 ++
> drivers/thermal/Makefile | 1 +
> drivers/thermal/kirkwood_thermal.c | 136 ++++++++++++++++++++
> 4 files changed, 160 insertions(+)
> create mode 100644 Documentation/devicetree/bindings/thermal/kirkwood-thermal.txt
> create mode 100644 drivers/thermal/kirkwood_thermal.c
>
> diff --git a/Documentation/devicetree/bindings/thermal/kirkwood-thermal.txt b/Documentation/devicetree/bindings/thermal/kirkwood-thermal.txt
> new file mode 100644
> index 0000000..8c0f5eb
> --- /dev/null
> +++ b/Documentation/devicetree/bindings/thermal/kirkwood-thermal.txt
> @@ -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@10078 {
> + compatible = "marvell,kirkwood-thermal";
> + reg = <0x10078 0x4>;
> + };
> diff --git a/drivers/thermal/Kconfig b/drivers/thermal/Kconfig
> index c2c77d1..ff34a0a 100644
> --- a/drivers/thermal/Kconfig
> +++ b/drivers/thermal/Kconfig
> @@ -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)
> diff --git a/drivers/thermal/Makefile b/drivers/thermal/Makefile
> index d8da683..99026b2 100644
> --- a/drivers/thermal/Makefile
> +++ b/drivers/thermal/Makefile
> @@ -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
> diff --git a/drivers/thermal/kirkwood_thermal.c b/drivers/thermal/kirkwood_thermal.c
> new file mode 100644
> index 0000000..000cfc9
> --- /dev/null
> +++ b/drivers/thermal/kirkwood_thermal.c
> @@ -0,0 +1,136 @@
> +/*
> + * Kirkwood thermal sensor driver
> + *
> + * Copyright (C) 2012 Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
> + *
> + * 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) {
> + dev_err(&pdev->dev, "kzalloc fail\n");
Not needed, see my answer to the Dove patch.
> + 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 <iwamatsu@nigauri.org>");
> +MODULE_DESCRIPTION("kirkwood thermal driver");
> +MODULE_LICENSE("GPL");
> --
> 1.7.10.4
>
>
> _______________________________________________
> linux-arm-kernel mailing list
> linux-arm-kernel@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
--
Ezequiel García, Free Electrons
Embedded Linux, Kernel and Android Engineering
http://free-electrons.com
^ permalink raw reply [flat|nested] 36+ messages in thread
* [PATCH v4 1/4] thermal: Add support for the thermal sensor on Kirkwood SoCs
@ 2013-02-05 17:10 ` Ezequiel Garcia
0 siblings, 0 replies; 36+ messages in thread
From: Ezequiel Garcia @ 2013-02-05 17:10 UTC (permalink / raw)
To: linux-arm-kernel
On Mon, Feb 04, 2013 at 08:19:17PM +0100, Andrew Lunn wrote:
> From: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
>
> This patch adds support for Kirkwood 88F6282 and 88F6283 thermal sensor.
>
> Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
> Signed-off-by: Andrew Lunn <andrew@lunn.ch>
> ---
> .../bindings/thermal/kirkwood-thermal.txt | 15 +++
> drivers/thermal/Kconfig | 8 ++
> drivers/thermal/Makefile | 1 +
> drivers/thermal/kirkwood_thermal.c | 136 ++++++++++++++++++++
> 4 files changed, 160 insertions(+)
> create mode 100644 Documentation/devicetree/bindings/thermal/kirkwood-thermal.txt
> create mode 100644 drivers/thermal/kirkwood_thermal.c
>
> diff --git a/Documentation/devicetree/bindings/thermal/kirkwood-thermal.txt b/Documentation/devicetree/bindings/thermal/kirkwood-thermal.txt
> new file mode 100644
> index 0000000..8c0f5eb
> --- /dev/null
> +++ b/Documentation/devicetree/bindings/thermal/kirkwood-thermal.txt
> @@ -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>;
> + };
> diff --git a/drivers/thermal/Kconfig b/drivers/thermal/Kconfig
> index c2c77d1..ff34a0a 100644
> --- a/drivers/thermal/Kconfig
> +++ b/drivers/thermal/Kconfig
> @@ -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)
> diff --git a/drivers/thermal/Makefile b/drivers/thermal/Makefile
> index d8da683..99026b2 100644
> --- a/drivers/thermal/Makefile
> +++ b/drivers/thermal/Makefile
> @@ -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
> diff --git a/drivers/thermal/kirkwood_thermal.c b/drivers/thermal/kirkwood_thermal.c
> new file mode 100644
> index 0000000..000cfc9
> --- /dev/null
> +++ b/drivers/thermal/kirkwood_thermal.c
> @@ -0,0 +1,136 @@
> +/*
> + * Kirkwood thermal sensor driver
> + *
> + * Copyright (C) 2012 Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
> + *
> + * 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) {
> + dev_err(&pdev->dev, "kzalloc fail\n");
Not needed, see my answer to the Dove patch.
> + 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 <iwamatsu@nigauri.org>");
> +MODULE_DESCRIPTION("kirkwood thermal driver");
> +MODULE_LICENSE("GPL");
> --
> 1.7.10.4
>
>
> _______________________________________________
> linux-arm-kernel mailing list
> linux-arm-kernel at lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
--
Ezequiel Garc?a, Free Electrons
Embedded Linux, Kernel and Android Engineering
http://free-electrons.com
^ permalink raw reply [flat|nested] 36+ messages in thread
* Re: [PATCH v4 3/4] Thermal: Dove: Add Themal sensor support for Dove.
2013-02-05 17:09 ` Ezequiel Garcia
@ 2013-02-05 17:32 ` Andrew Lunn
-1 siblings, 0 replies; 36+ messages in thread
From: Andrew Lunn @ 2013-02-05 17:32 UTC (permalink / raw)
To: Ezequiel Garcia
Cc: Andrew Lunn, jason, rui.zhang, Sebastian Hesselbarth,
Sebastian Hesselbarth, linux ARM, linux-pm
On Tue, Feb 05, 2013 at 02:09:09PM -0300, Ezequiel Garcia wrote:
> Hi Andrew,
>
> Nice work!
>
> Do you also intend to work
> on thermal support for Armada family?
Hi Ezequiel
I don't have enough information about Armada 370/XP to write a driver
for them. Once a datasheet becomes available i will have a go.
Thanks for the comment about kzalloc(). I will remove the dev_err()
call.
Andrew
^ permalink raw reply [flat|nested] 36+ messages in thread
* [PATCH v4 3/4] Thermal: Dove: Add Themal sensor support for Dove.
@ 2013-02-05 17:32 ` Andrew Lunn
0 siblings, 0 replies; 36+ messages in thread
From: Andrew Lunn @ 2013-02-05 17:32 UTC (permalink / raw)
To: linux-arm-kernel
On Tue, Feb 05, 2013 at 02:09:09PM -0300, Ezequiel Garcia wrote:
> Hi Andrew,
>
> Nice work!
>
> Do you also intend to work
> on thermal support for Armada family?
Hi Ezequiel
I don't have enough information about Armada 370/XP to write a driver
for them. Once a datasheet becomes available i will have a go.
Thanks for the comment about kzalloc(). I will remove the dev_err()
call.
Andrew
^ permalink raw reply [flat|nested] 36+ messages in thread
* Re: [PATCH v3 2/4] ARM: Kirkwood: Add support thermal sensor for 88F6282 and 88F6283
2013-02-04 14:19 ` Jason Cooper
@ 2013-02-08 7:31 ` Zhang Rui
-1 siblings, 0 replies; 36+ messages in thread
From: Zhang Rui @ 2013-02-08 7:31 UTC (permalink / raw)
To: Jason Cooper; +Cc: Andrew Lunn, linux ARM, linux-pm, Nobuhiro Iwamatsu
Hi, Jason,
On Mon, 2013-02-04 at 09:19 -0500, Jason Cooper wrote:
> On Mon, Feb 04, 2013 at 11:14:53AM +0800, Zhang Rui wrote:
> > On Sat, 2013-02-02 at 15:35 +0100, Andrew Lunn wrote:
> > > From: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
> > >
> > > 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 <iwamatsu@nigauri.org>
> > > Signed-off-by: Andrew Lunn <andrew@lunn.ch>
> >
> > I can take this one but I need ACK from ARM experts first.
>
> If you don't mind, I prefer to take patches 2 and 4. If you could take
> 1 and 3 and let me know what tree/branch you place them in, then I'll
> depend on them when I push them up.
>
great.
patch 1/4, 3/4 in V5 have been applied to thermal tree -next branch.
git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux.git
but I'll put all the 3.9 candidates in thermal -release branch before
next merge window opened. does this still work for you?
thanks,
rui
^ permalink raw reply [flat|nested] 36+ messages in thread
* [PATCH v3 2/4] ARM: Kirkwood: Add support thermal sensor for 88F6282 and 88F6283
@ 2013-02-08 7:31 ` Zhang Rui
0 siblings, 0 replies; 36+ messages in thread
From: Zhang Rui @ 2013-02-08 7:31 UTC (permalink / raw)
To: linux-arm-kernel
Hi, Jason,
On Mon, 2013-02-04 at 09:19 -0500, Jason Cooper wrote:
> On Mon, Feb 04, 2013 at 11:14:53AM +0800, Zhang Rui wrote:
> > On Sat, 2013-02-02 at 15:35 +0100, Andrew Lunn wrote:
> > > From: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
> > >
> > > 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 <iwamatsu@nigauri.org>
> > > Signed-off-by: Andrew Lunn <andrew@lunn.ch>
> >
> > I can take this one but I need ACK from ARM experts first.
>
> If you don't mind, I prefer to take patches 2 and 4. If you could take
> 1 and 3 and let me know what tree/branch you place them in, then I'll
> depend on them when I push them up.
>
great.
patch 1/4, 3/4 in V5 have been applied to thermal tree -next branch.
git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux.git
but I'll put all the 3.9 candidates in thermal -release branch before
next merge window opened. does this still work for you?
thanks,
rui
^ permalink raw reply [flat|nested] 36+ messages in thread
* Re: [PATCH v3 2/4] ARM: Kirkwood: Add support thermal sensor for 88F6282 and 88F6283
2013-02-08 7:31 ` Zhang Rui
@ 2013-02-08 14:33 ` Jason Cooper
-1 siblings, 0 replies; 36+ messages in thread
From: Jason Cooper @ 2013-02-08 14:33 UTC (permalink / raw)
To: Zhang Rui; +Cc: Andrew Lunn, linux ARM, linux-pm, Nobuhiro Iwamatsu
On Fri, Feb 08, 2013 at 03:31:25PM +0800, Zhang Rui wrote:
> Hi, Jason,
>
> On Mon, 2013-02-04 at 09:19 -0500, Jason Cooper wrote:
> > On Mon, Feb 04, 2013 at 11:14:53AM +0800, Zhang Rui wrote:
> > > On Sat, 2013-02-02 at 15:35 +0100, Andrew Lunn wrote:
> > > > From: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
> > > >
> > > > 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 <iwamatsu@nigauri.org>
> > > > Signed-off-by: Andrew Lunn <andrew@lunn.ch>
> > >
> > > I can take this one but I need ACK from ARM experts first.
> >
> > If you don't mind, I prefer to take patches 2 and 4. If you could take
> > 1 and 3 and let me know what tree/branch you place them in, then I'll
> > depend on them when I push them up.
> >
> great.
> patch 1/4, 3/4 in V5 have been applied to thermal tree -next branch.
> git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux.git
>
> but I'll put all the 3.9 candidates in thermal -release branch before
> next merge window opened. does this still work for you?
great, thanks.
Jason.
^ permalink raw reply [flat|nested] 36+ messages in thread
* [PATCH v3 2/4] ARM: Kirkwood: Add support thermal sensor for 88F6282 and 88F6283
@ 2013-02-08 14:33 ` Jason Cooper
0 siblings, 0 replies; 36+ messages in thread
From: Jason Cooper @ 2013-02-08 14:33 UTC (permalink / raw)
To: linux-arm-kernel
On Fri, Feb 08, 2013 at 03:31:25PM +0800, Zhang Rui wrote:
> Hi, Jason,
>
> On Mon, 2013-02-04 at 09:19 -0500, Jason Cooper wrote:
> > On Mon, Feb 04, 2013 at 11:14:53AM +0800, Zhang Rui wrote:
> > > On Sat, 2013-02-02 at 15:35 +0100, Andrew Lunn wrote:
> > > > From: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
> > > >
> > > > 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 <iwamatsu@nigauri.org>
> > > > Signed-off-by: Andrew Lunn <andrew@lunn.ch>
> > >
> > > I can take this one but I need ACK from ARM experts first.
> >
> > If you don't mind, I prefer to take patches 2 and 4. If you could take
> > 1 and 3 and let me know what tree/branch you place them in, then I'll
> > depend on them when I push them up.
> >
> great.
> patch 1/4, 3/4 in V5 have been applied to thermal tree -next branch.
> git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux.git
>
> but I'll put all the 3.9 candidates in thermal -release branch before
> next merge window opened. does this still work for you?
great, thanks.
Jason.
^ permalink raw reply [flat|nested] 36+ messages in thread
end of thread, other threads:[~2013-02-08 14:33 UTC | newest]
Thread overview: 36+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2013-02-02 14:35 [PATCH v3 0/4] Kirkwood and Dove Thermal drivers Andrew Lunn
2013-02-02 14:35 ` Andrew Lunn
2013-02-02 14:35 ` [PATCH v3 1/4] thermal: Add support for the thermal sensor on Kirkwood SoCs Andrew Lunn
2013-02-02 14:35 ` Andrew Lunn
2013-02-04 2:49 ` Zhang Rui
2013-02-04 2:49 ` Zhang Rui
2013-02-04 19:19 ` [PATCH v4 0/4] Kirkwood and Dove Thermal drivers Andrew Lunn
2013-02-04 19:19 ` Andrew Lunn
2013-02-04 19:19 ` [PATCH v4 1/4] thermal: Add support for the thermal sensor on Kirkwood SoCs Andrew Lunn
2013-02-04 19:19 ` Andrew Lunn
2013-02-05 17:10 ` Ezequiel Garcia
2013-02-05 17:10 ` Ezequiel Garcia
2013-02-04 19:19 ` [PATCH v4 2/4] ARM: Kirkwood: Add support thermal sensor for 88F6282 and 88F6283 Andrew Lunn
2013-02-04 19:19 ` Andrew Lunn
2013-02-04 19:19 ` [PATCH v4 3/4] Thermal: Dove: Add Themal sensor support for Dove Andrew Lunn
2013-02-04 19:19 ` Andrew Lunn
2013-02-05 17:09 ` Ezequiel Garcia
2013-02-05 17:09 ` Ezequiel Garcia
2013-02-05 17:32 ` Andrew Lunn
2013-02-05 17:32 ` Andrew Lunn
2013-02-04 19:19 ` [PATCH v4 4/4] Dove: Thermal: Add DT node and enable in defconfig Andrew Lunn
2013-02-04 19:19 ` Andrew Lunn
2013-02-02 14:35 ` [PATCH v3 2/4] ARM: Kirkwood: Add support thermal sensor for 88F6282 and 88F6283 Andrew Lunn
2013-02-02 14:35 ` Andrew Lunn
2013-02-04 3:14 ` Zhang Rui
2013-02-04 3:14 ` Zhang Rui
2013-02-04 14:19 ` Jason Cooper
2013-02-04 14:19 ` Jason Cooper
2013-02-08 7:31 ` Zhang Rui
2013-02-08 7:31 ` Zhang Rui
2013-02-08 14:33 ` Jason Cooper
2013-02-08 14:33 ` Jason Cooper
2013-02-02 14:35 ` [PATCH v3 3/4] Thermal: Dove: Add Themal sensor support for Dove Andrew Lunn
2013-02-02 14:35 ` Andrew Lunn
2013-02-02 14:35 ` [PATCH v3 4/4] Dove: Thermal: Add DT node and enable in defconfig Andrew Lunn
2013-02-02 14:35 ` Andrew Lunn
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.