| Message ID | 1363991114-4225-2-git-send-email-ezequiel.garcia@free-electrons.com (mailing list archive) |
|---|---|
| State | Rejected |
| Delegated to: | Zhang Rui |
| Headers | show |
Hello Ezequiel, Two minor comments. On 22-03-2013 18:25, Ezequiel Garcia wrote: > This driver will support several Marvell SoC, so it is convenient > to rename it to 'mvebu' to represent accurately the hardware it > supports. > > Signed-off-by: Ezequiel Garcia <ezequiel.garcia@free-electrons.com> > > --- > .../bindings/thermal/kirkwood-thermal.txt | 15 --- > .../devicetree/bindings/thermal/mvebu-thermal.txt | 15 +++ > drivers/thermal/Kconfig | 10 +- > drivers/thermal/Makefile | 2 +- > drivers/thermal/kirkwood_thermal.c | 134 -------------------- > drivers/thermal/mvebu_thermal.c | 134 ++++++++++++++++++++ > 6 files changed, 155 insertions(+), 155 deletions(-) > delete mode 100644 Documentation/devicetree/bindings/thermal/kirkwood-thermal.txt > create mode 100644 Documentation/devicetree/bindings/thermal/mvebu-thermal.txt > delete mode 100644 drivers/thermal/kirkwood_thermal.c > create mode 100644 drivers/thermal/mvebu_thermal.c When sending renames, use git format-patch --find-renames. The summary will be much descriptive on what you have done. I tried applying this patch on top of linux-next, linus/master, ruis/thermal, on top of the your suggested dependencies, and all failed. What is your base? > > diff --git a/Documentation/devicetree/bindings/thermal/kirkwood-thermal.txt b/Documentation/devicetree/bindings/thermal/kirkwood-thermal.txt > deleted file mode 100644 > index 8c0f5eb..0000000 > --- a/Documentation/devicetree/bindings/thermal/kirkwood-thermal.txt > +++ /dev/null > @@ -1,15 +0,0 @@ > -* 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/Documentation/devicetree/bindings/thermal/mvebu-thermal.txt b/Documentation/devicetree/bindings/thermal/mvebu-thermal.txt > new file mode 100644 > index 0000000..8c0f5eb > --- /dev/null > +++ b/Documentation/devicetree/bindings/thermal/mvebu-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 a764f16..74f6b97 100644 > --- a/drivers/thermal/Kconfig > +++ b/drivers/thermal/Kconfig > @@ -101,13 +101,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 > +config MVEBU_THERMAL > + tristate "Temperature sensor on Marvell EBU SoCs" > + depends on PLAT_ORION > depends on OF > help > - Support for the Kirkwood thermal sensor driver into the Linux thermal > - framework. Only kirkwood 88F6282 and 88F6283 have this sensor. > + Support for the thermal controllers available in several Marvell > + EBU SoCs in the thermal framework. > > config EXYNOS_THERMAL > tristate "Temperature sensor on Samsung EXYNOS" > diff --git a/drivers/thermal/Makefile b/drivers/thermal/Makefile > index d3a2b38..40293a1 100644 > --- a/drivers/thermal/Makefile > +++ b/drivers/thermal/Makefile > @@ -15,7 +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_MVEBU_THERMAL) += mvebu_thermal.o > obj-$(CONFIG_EXYNOS_THERMAL) += exynos_thermal.o > obj-$(CONFIG_DOVE_THERMAL) += dove_thermal.o > obj-$(CONFIG_DB8500_THERMAL) += db8500_thermal.o > diff --git a/drivers/thermal/kirkwood_thermal.c b/drivers/thermal/kirkwood_thermal.c > deleted file mode 100644 > index 19320dd..0000000 > --- a/drivers/thermal/kirkwood_thermal.c > +++ /dev/null > @@ -1,134 +0,0 @@ > -/* > - * 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. According to Marvell internal > - * documentation the formula for this is: > - * Celsius = (322-reg)/1.3625 > - */ > - reg = (reg >> KIRKWOOD_THERMAL_TEMP_OFFSET) & > - KIRKWOOD_THERMAL_TEMP_MASK; > - *temp = ((3220000000UL - (10000000UL * reg)) / 13625); > - > - return 0; > -} > - > -static struct thermal_zone_device_ops ops = { > - .get_temp = kirkwood_get_temp, > -}; > - > -static const struct of_device_id kirkwood_thermal_id_table[] = { > - { .compatible = "marvell,kirkwood-thermal" }, > - {} > -}; > - > -static int kirkwood_thermal_probe(struct platform_device *pdev) > -{ > - struct thermal_zone_device *thermal = NULL; > - struct kirkwood_thermal_priv *priv; > - struct resource *res; > - > - res = platform_get_resource(pdev, IORESOURCE_MEM, 0); > - if (!res) { > - dev_err(&pdev->dev, "Failed to get platform resource\n"); > - return -ENODEV; > - } > - > - priv = devm_kzalloc(&pdev->dev, sizeof(*priv), GFP_KERNEL); > - if (!priv) > - return -ENOMEM; > - > - priv->sensor = devm_request_and_ioremap(&pdev->dev, res); > - if (!priv->sensor) { > - dev_err(&pdev->dev, "Failed to request_ioremap memory\n"); > - return -EADDRNOTAVAIL; > - } > - > - thermal = thermal_zone_device_register("kirkwood_thermal", 0, 0, > - priv, &ops, NULL, 0, 0); > - if (IS_ERR(thermal)) { > - dev_err(&pdev->dev, > - "Failed to register thermal zone device\n"); > - return PTR_ERR(thermal); > - } > - > - platform_set_drvdata(pdev, thermal); > - > - return 0; > -} > - > -static int kirkwood_thermal_exit(struct platform_device *pdev) > -{ > - struct thermal_zone_device *kirkwood_thermal = > - platform_get_drvdata(pdev); > - > - thermal_zone_device_unregister(kirkwood_thermal); > - platform_set_drvdata(pdev, NULL); > - > - return 0; > -} > - > -MODULE_DEVICE_TABLE(of, kirkwood_thermal_id_table); > - > -static struct platform_driver kirkwood_thermal_driver = { > - .probe = kirkwood_thermal_probe, > - .remove = kirkwood_thermal_exit, > - .driver = { > - .name = "kirkwood_thermal", > - .owner = THIS_MODULE, > - .of_match_table = of_match_ptr(kirkwood_thermal_id_table), > - }, > -}; > - > -module_platform_driver(kirkwood_thermal_driver); > - > -MODULE_AUTHOR("Nobuhiro Iwamatsu <iwamatsu@nigauri.org>"); > -MODULE_DESCRIPTION("kirkwood thermal driver"); > -MODULE_LICENSE("GPL"); > diff --git a/drivers/thermal/mvebu_thermal.c b/drivers/thermal/mvebu_thermal.c > new file mode 100644 > index 0000000..19320dd > --- /dev/null > +++ b/drivers/thermal/mvebu_thermal.c > @@ -0,0 +1,134 @@ > +/* > + * 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. According to Marvell internal > + * documentation the formula for this is: > + * Celsius = (322-reg)/1.3625 > + */ > + reg = (reg >> KIRKWOOD_THERMAL_TEMP_OFFSET) & > + KIRKWOOD_THERMAL_TEMP_MASK; > + *temp = ((3220000000UL - (10000000UL * reg)) / 13625); > + > + return 0; > +} > + > +static struct thermal_zone_device_ops ops = { > + .get_temp = kirkwood_get_temp, > +}; > + > +static const struct of_device_id kirkwood_thermal_id_table[] = { > + { .compatible = "marvell,kirkwood-thermal" }, > + {} > +}; > + > +static int kirkwood_thermal_probe(struct platform_device *pdev) > +{ > + struct thermal_zone_device *thermal = NULL; > + struct kirkwood_thermal_priv *priv; > + struct resource *res; > + > + res = platform_get_resource(pdev, IORESOURCE_MEM, 0); > + if (!res) { > + dev_err(&pdev->dev, "Failed to get platform resource\n"); > + return -ENODEV; > + } > + > + priv = devm_kzalloc(&pdev->dev, sizeof(*priv), GFP_KERNEL); > + if (!priv) > + return -ENOMEM; > + > + priv->sensor = devm_request_and_ioremap(&pdev->dev, res); > + if (!priv->sensor) { > + dev_err(&pdev->dev, "Failed to request_ioremap memory\n"); > + return -EADDRNOTAVAIL; > + } > + > + thermal = thermal_zone_device_register("kirkwood_thermal", 0, 0, > + priv, &ops, NULL, 0, 0); > + if (IS_ERR(thermal)) { > + dev_err(&pdev->dev, > + "Failed to register thermal zone device\n"); > + return PTR_ERR(thermal); > + } > + > + platform_set_drvdata(pdev, thermal); > + > + return 0; > +} > + > +static int kirkwood_thermal_exit(struct platform_device *pdev) > +{ > + struct thermal_zone_device *kirkwood_thermal = > + platform_get_drvdata(pdev); > + > + thermal_zone_device_unregister(kirkwood_thermal); > + platform_set_drvdata(pdev, NULL); > + > + return 0; > +} > + > +MODULE_DEVICE_TABLE(of, kirkwood_thermal_id_table); > + > +static struct platform_driver kirkwood_thermal_driver = { > + .probe = kirkwood_thermal_probe, > + .remove = kirkwood_thermal_exit, > + .driver = { > + .name = "kirkwood_thermal", > + .owner = THIS_MODULE, > + .of_match_table = of_match_ptr(kirkwood_thermal_id_table), > + }, > +}; > + > +module_platform_driver(kirkwood_thermal_driver); > + > +MODULE_AUTHOR("Nobuhiro Iwamatsu <iwamatsu@nigauri.org>"); > +MODULE_DESCRIPTION("kirkwood thermal driver"); > +MODULE_LICENSE("GPL"); > -- To unsubscribe from this list: send the line "unsubscribe linux-pm" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Ezequiel, On 22-03-2013 18:25, Ezequiel Garcia wrote: > This driver will support several Marvell SoC, so it is convenient > to rename it to 'mvebu' to represent accurately the hardware it > supports. > > Signed-off-by: Ezequiel Garcia <ezequiel.garcia@free-electrons.com> > > --- > .../bindings/thermal/kirkwood-thermal.txt | 15 --- > .../devicetree/bindings/thermal/mvebu-thermal.txt | 15 +++ > drivers/thermal/Kconfig | 10 +- > drivers/thermal/Makefile | 2 +- > drivers/thermal/kirkwood_thermal.c | 134 -------------------- > drivers/thermal/mvebu_thermal.c | 134 ++++++++++++++++++++ > 6 files changed, 155 insertions(+), 155 deletions(-) > delete mode 100644 Documentation/devicetree/bindings/thermal/kirkwood-thermal.txt > create mode 100644 Documentation/devicetree/bindings/thermal/mvebu-thermal.txt > delete mode 100644 drivers/thermal/kirkwood_thermal.c > create mode 100644 drivers/thermal/mvebu_thermal.c > > diff --git a/Documentation/devicetree/bindings/thermal/kirkwood-thermal.txt b/Documentation/devicetree/bindings/thermal/kirkwood-thermal.txt > deleted file mode 100644 > index 8c0f5eb..0000000 > --- a/Documentation/devicetree/bindings/thermal/kirkwood-thermal.txt > +++ /dev/null > @@ -1,15 +0,0 @@ > -* 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/Documentation/devicetree/bindings/thermal/mvebu-thermal.txt b/Documentation/devicetree/bindings/thermal/mvebu-thermal.txt > new file mode 100644 > index 0000000..8c0f5eb > --- /dev/null > +++ b/Documentation/devicetree/bindings/thermal/mvebu-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 a764f16..74f6b97 100644 > --- a/drivers/thermal/Kconfig > +++ b/drivers/thermal/Kconfig > @@ -101,13 +101,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 > +config MVEBU_THERMAL > + tristate "Temperature sensor on Marvell EBU SoCs" > + depends on PLAT_ORION > depends on OF > help > - Support for the Kirkwood thermal sensor driver into the Linux thermal > - framework. Only kirkwood 88F6282 and 88F6283 have this sensor. > + Support for the thermal controllers available in several Marvell > + EBU SoCs in the thermal framework. While here, could you please be more descriptive? WARNING: please write a paragraph that describes the config symbol fully #90: FILE: drivers/thermal/Kconfig:104: +config MVEBU_THERMAL total: 0 errors, 1 warnings, 175 lines checked v2-01-14-thermal-Rename-driver-kirkwood---mvebu.patch has style problems, please review. If any of these errors are false positives, please report them to the maintainer, see CHECKPATCH in MAINTAINERS. > > config EXYNOS_THERMAL > tristate "Temperature sensor on Samsung EXYNOS" > diff --git a/drivers/thermal/Makefile b/drivers/thermal/Makefile > index d3a2b38..40293a1 100644 > --- a/drivers/thermal/Makefile > +++ b/drivers/thermal/Makefile > @@ -15,7 +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_MVEBU_THERMAL) += mvebu_thermal.o > obj-$(CONFIG_EXYNOS_THERMAL) += exynos_thermal.o > obj-$(CONFIG_DOVE_THERMAL) += dove_thermal.o > obj-$(CONFIG_DB8500_THERMAL) += db8500_thermal.o > diff --git a/drivers/thermal/kirkwood_thermal.c b/drivers/thermal/kirkwood_thermal.c > deleted file mode 100644 > index 19320dd..0000000 > --- a/drivers/thermal/kirkwood_thermal.c > +++ /dev/null > @@ -1,134 +0,0 @@ > -/* > - * 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. According to Marvell internal > - * documentation the formula for this is: > - * Celsius = (322-reg)/1.3625 > - */ > - reg = (reg >> KIRKWOOD_THERMAL_TEMP_OFFSET) & > - KIRKWOOD_THERMAL_TEMP_MASK; > - *temp = ((3220000000UL - (10000000UL * reg)) / 13625); > - > - return 0; > -} > - > -static struct thermal_zone_device_ops ops = { > - .get_temp = kirkwood_get_temp, > -}; > - > -static const struct of_device_id kirkwood_thermal_id_table[] = { > - { .compatible = "marvell,kirkwood-thermal" }, > - {} > -}; > - > -static int kirkwood_thermal_probe(struct platform_device *pdev) > -{ > - struct thermal_zone_device *thermal = NULL; > - struct kirkwood_thermal_priv *priv; > - struct resource *res; > - > - res = platform_get_resource(pdev, IORESOURCE_MEM, 0); > - if (!res) { > - dev_err(&pdev->dev, "Failed to get platform resource\n"); > - return -ENODEV; > - } > - > - priv = devm_kzalloc(&pdev->dev, sizeof(*priv), GFP_KERNEL); > - if (!priv) > - return -ENOMEM; > - > - priv->sensor = devm_request_and_ioremap(&pdev->dev, res); > - if (!priv->sensor) { > - dev_err(&pdev->dev, "Failed to request_ioremap memory\n"); > - return -EADDRNOTAVAIL; > - } > - > - thermal = thermal_zone_device_register("kirkwood_thermal", 0, 0, > - priv, &ops, NULL, 0, 0); > - if (IS_ERR(thermal)) { > - dev_err(&pdev->dev, > - "Failed to register thermal zone device\n"); > - return PTR_ERR(thermal); > - } > - > - platform_set_drvdata(pdev, thermal); > - > - return 0; > -} > - > -static int kirkwood_thermal_exit(struct platform_device *pdev) > -{ > - struct thermal_zone_device *kirkwood_thermal = > - platform_get_drvdata(pdev); > - > - thermal_zone_device_unregister(kirkwood_thermal); > - platform_set_drvdata(pdev, NULL); > - > - return 0; > -} > - > -MODULE_DEVICE_TABLE(of, kirkwood_thermal_id_table); > - > -static struct platform_driver kirkwood_thermal_driver = { > - .probe = kirkwood_thermal_probe, > - .remove = kirkwood_thermal_exit, > - .driver = { > - .name = "kirkwood_thermal", > - .owner = THIS_MODULE, > - .of_match_table = of_match_ptr(kirkwood_thermal_id_table), > - }, > -}; > - > -module_platform_driver(kirkwood_thermal_driver); > - > -MODULE_AUTHOR("Nobuhiro Iwamatsu <iwamatsu@nigauri.org>"); > -MODULE_DESCRIPTION("kirkwood thermal driver"); > -MODULE_LICENSE("GPL"); > diff --git a/drivers/thermal/mvebu_thermal.c b/drivers/thermal/mvebu_thermal.c > new file mode 100644 > index 0000000..19320dd > --- /dev/null > +++ b/drivers/thermal/mvebu_thermal.c > @@ -0,0 +1,134 @@ > +/* > + * 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. According to Marvell internal > + * documentation the formula for this is: > + * Celsius = (322-reg)/1.3625 > + */ > + reg = (reg >> KIRKWOOD_THERMAL_TEMP_OFFSET) & > + KIRKWOOD_THERMAL_TEMP_MASK; > + *temp = ((3220000000UL - (10000000UL * reg)) / 13625); > + > + return 0; > +} > + > +static struct thermal_zone_device_ops ops = { > + .get_temp = kirkwood_get_temp, > +}; > + > +static const struct of_device_id kirkwood_thermal_id_table[] = { > + { .compatible = "marvell,kirkwood-thermal" }, > + {} > +}; > + > +static int kirkwood_thermal_probe(struct platform_device *pdev) > +{ > + struct thermal_zone_device *thermal = NULL; > + struct kirkwood_thermal_priv *priv; > + struct resource *res; > + > + res = platform_get_resource(pdev, IORESOURCE_MEM, 0); > + if (!res) { > + dev_err(&pdev->dev, "Failed to get platform resource\n"); > + return -ENODEV; > + } > + > + priv = devm_kzalloc(&pdev->dev, sizeof(*priv), GFP_KERNEL); > + if (!priv) > + return -ENOMEM; > + > + priv->sensor = devm_request_and_ioremap(&pdev->dev, res); > + if (!priv->sensor) { > + dev_err(&pdev->dev, "Failed to request_ioremap memory\n"); > + return -EADDRNOTAVAIL; > + } > + > + thermal = thermal_zone_device_register("kirkwood_thermal", 0, 0, > + priv, &ops, NULL, 0, 0); > + if (IS_ERR(thermal)) { > + dev_err(&pdev->dev, > + "Failed to register thermal zone device\n"); > + return PTR_ERR(thermal); > + } > + > + platform_set_drvdata(pdev, thermal); > + > + return 0; > +} > + > +static int kirkwood_thermal_exit(struct platform_device *pdev) > +{ > + struct thermal_zone_device *kirkwood_thermal = > + platform_get_drvdata(pdev); > + > + thermal_zone_device_unregister(kirkwood_thermal); > + platform_set_drvdata(pdev, NULL); > + > + return 0; > +} > + > +MODULE_DEVICE_TABLE(of, kirkwood_thermal_id_table); > + > +static struct platform_driver kirkwood_thermal_driver = { > + .probe = kirkwood_thermal_probe, > + .remove = kirkwood_thermal_exit, > + .driver = { > + .name = "kirkwood_thermal", > + .owner = THIS_MODULE, > + .of_match_table = of_match_ptr(kirkwood_thermal_id_table), > + }, > +}; > + > +module_platform_driver(kirkwood_thermal_driver); > + > +MODULE_AUTHOR("Nobuhiro Iwamatsu <iwamatsu@nigauri.org>"); > +MODULE_DESCRIPTION("kirkwood thermal driver"); > +MODULE_LICENSE("GPL"); > -- To unsubscribe from this list: send the line "unsubscribe linux-pm" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Hi Eduardo, Thanks for your testing. On Thu, Apr 11, 2013 at 12:00:48PM -0400, Eduardo Valentin wrote: > Hello Ezequiel, > > Two minor comments. > > On 22-03-2013 18:25, Ezequiel Garcia wrote: > > This driver will support several Marvell SoC, so it is convenient > > to rename it to 'mvebu' to represent accurately the hardware it > > supports. > > > > Signed-off-by: Ezequiel Garcia <ezequiel.garcia@free-electrons.com> > > > > --- > > .../bindings/thermal/kirkwood-thermal.txt | 15 --- > > .../devicetree/bindings/thermal/mvebu-thermal.txt | 15 +++ > > drivers/thermal/Kconfig | 10 +- > > drivers/thermal/Makefile | 2 +- > > drivers/thermal/kirkwood_thermal.c | 134 -------------------- > > drivers/thermal/mvebu_thermal.c | 134 ++++++++++++++++++++ > > 6 files changed, 155 insertions(+), 155 deletions(-) > > delete mode 100644 Documentation/devicetree/bindings/thermal/kirkwood-thermal.txt > > create mode 100644 Documentation/devicetree/bindings/thermal/mvebu-thermal.txt > > delete mode 100644 drivers/thermal/kirkwood_thermal.c > > create mode 100644 drivers/thermal/mvebu_thermal.c > > When sending renames, use git format-patch --find-renames. The summary > will be much descriptive on what you have done. > Yes, you're right I forgot about this. > I tried applying this patch on top of linux-next, linus/master, > ruis/thermal, on top of the your suggested dependencies, and all failed. > What is your base? > Well, first of all this patchset has been dropped entirely after some discussion. If you're interested in this discussion you can read: http://www.spinics.net/lists/arm-kernel/msg231697.html If you still want to try this series, the easiest way is to try https://github.com/MISL-EBU-System-SW/mainline-public/commits/mvebu-thermal-v2 That branch is based on v3.9-rc2, with a bunch of patches applied as explained in the cover letter. I appreciate your feedback a lot, but this are really ancient patches! You came in a little late :)
On 11-04-2013 12:31, Ezequiel Garcia wrote: > Hi Eduardo, > > Thanks for your testing. > > On Thu, Apr 11, 2013 at 12:00:48PM -0400, Eduardo Valentin wrote: >> Hello Ezequiel, >> >> Two minor comments. >> >> On 22-03-2013 18:25, Ezequiel Garcia wrote: >>> This driver will support several Marvell SoC, so it is convenient >>> to rename it to 'mvebu' to represent accurately the hardware it >>> supports. >>> >>> Signed-off-by: Ezequiel Garcia <ezequiel.garcia@free-electrons.com> >>> >>> --- >>> .../bindings/thermal/kirkwood-thermal.txt | 15 --- >>> .../devicetree/bindings/thermal/mvebu-thermal.txt | 15 +++ >>> drivers/thermal/Kconfig | 10 +- >>> drivers/thermal/Makefile | 2 +- >>> drivers/thermal/kirkwood_thermal.c | 134 -------------------- >>> drivers/thermal/mvebu_thermal.c | 134 ++++++++++++++++++++ >>> 6 files changed, 155 insertions(+), 155 deletions(-) >>> delete mode 100644 Documentation/devicetree/bindings/thermal/kirkwood-thermal.txt >>> create mode 100644 Documentation/devicetree/bindings/thermal/mvebu-thermal.txt >>> delete mode 100644 drivers/thermal/kirkwood_thermal.c >>> create mode 100644 drivers/thermal/mvebu_thermal.c >> >> When sending renames, use git format-patch --find-renames. The summary >> will be much descriptive on what you have done. >> > > Yes, you're right I forgot about this. > >> I tried applying this patch on top of linux-next, linus/master, >> ruis/thermal, on top of the your suggested dependencies, and all failed. >> What is your base? >> > > Well, first of all this patchset has been dropped entirely after some discussion. > If you're interested in this discussion you can read: > > http://www.spinics.net/lists/arm-kernel/msg231697.html > > If you still want to try this series, the easiest way is to try > > https://github.com/MISL-EBU-System-SW/mainline-public/commits/mvebu-thermal-v2 > > That branch is based on v3.9-rc2, with a bunch of patches applied as > explained in the cover letter. > > I appreciate your feedback a lot, but this are really ancient patches! > You came in a little late :) OK. Thanks for updating me. On the other hand. Some of your patches are still applicable. Can you please resend them based on kirkwood file still? > -- To unsubscribe from this list: send the line "unsubscribe linux-pm" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On 11-04-2013 14:47, Eduardo Valentin wrote: > On 11-04-2013 12:31, Ezequiel Garcia wrote: >> Hi Eduardo, >> >> Thanks for your testing. >> >> On Thu, Apr 11, 2013 at 12:00:48PM -0400, Eduardo Valentin wrote: >>> Hello Ezequiel, >>> >>> Two minor comments. >>> >>> On 22-03-2013 18:25, Ezequiel Garcia wrote: >>>> This driver will support several Marvell SoC, so it is convenient >>>> to rename it to 'mvebu' to represent accurately the hardware it >>>> supports. >>>> >>>> Signed-off-by: Ezequiel Garcia <ezequiel.garcia@free-electrons.com> >>>> >>>> --- >>>> .../bindings/thermal/kirkwood-thermal.txt | 15 --- >>>> .../devicetree/bindings/thermal/mvebu-thermal.txt | 15 +++ >>>> drivers/thermal/Kconfig | 10 +- >>>> drivers/thermal/Makefile | 2 +- >>>> drivers/thermal/kirkwood_thermal.c | 134 >>>> -------------------- >>>> drivers/thermal/mvebu_thermal.c | 134 >>>> ++++++++++++++++++++ >>>> 6 files changed, 155 insertions(+), 155 deletions(-) >>>> delete mode 100644 >>>> Documentation/devicetree/bindings/thermal/kirkwood-thermal.txt >>>> create mode 100644 >>>> Documentation/devicetree/bindings/thermal/mvebu-thermal.txt >>>> delete mode 100644 drivers/thermal/kirkwood_thermal.c >>>> create mode 100644 drivers/thermal/mvebu_thermal.c >>> >>> When sending renames, use git format-patch --find-renames. The summary >>> will be much descriptive on what you have done. >>> >> >> Yes, you're right I forgot about this. >> >>> I tried applying this patch on top of linux-next, linus/master, >>> ruis/thermal, on top of the your suggested dependencies, and all failed. >>> What is your base? >>> >> >> Well, first of all this patchset has been dropped entirely after some >> discussion. >> If you're interested in this discussion you can read: >> >> http://www.spinics.net/lists/arm-kernel/msg231697.html >> >> If you still want to try this series, the easiest way is to try >> >> >> https://github.com/MISL-EBU-System-SW/mainline-public/commits/mvebu-thermal-v2 >> >> >> That branch is based on v3.9-rc2, with a bunch of patches applied as >> explained in the cover letter. >> >> I appreciate your feedback a lot, but this are really ancient patches! >> You came in a little late :) > > > OK. Thanks for updating me. On the other hand. Some of your patches are > still applicable. Can you please resend them based on kirkwood file still? > Specifically, patches 04/05/06 are still applicable to the kirkwood driver. Feel free to resend them with my Acked-by. >> > > > -- To unsubscribe from this list: send the line "unsubscribe linux-pm" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Thu, Apr 11, 2013 at 02:47:27PM -0400, Eduardo Valentin wrote: > > > > I appreciate your feedback a lot, but this are really ancient patches! > > You came in a little late :) > > > OK. Thanks for updating me. On the other hand. Some of your patches are > still applicable. Can you please resend them based on kirkwood file still? > Yes, that's the plan! (and thanks for remembering me) I'll resubmit the appropriate patches, with your Acked-by. Thanks for reviewing,
diff --git a/Documentation/devicetree/bindings/thermal/kirkwood-thermal.txt b/Documentation/devicetree/bindings/thermal/kirkwood-thermal.txt deleted file mode 100644 index 8c0f5eb..0000000 --- a/Documentation/devicetree/bindings/thermal/kirkwood-thermal.txt +++ /dev/null @@ -1,15 +0,0 @@ -* 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/Documentation/devicetree/bindings/thermal/mvebu-thermal.txt b/Documentation/devicetree/bindings/thermal/mvebu-thermal.txt new file mode 100644 index 0000000..8c0f5eb --- /dev/null +++ b/Documentation/devicetree/bindings/thermal/mvebu-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 a764f16..74f6b97 100644 --- a/drivers/thermal/Kconfig +++ b/drivers/thermal/Kconfig @@ -101,13 +101,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 +config MVEBU_THERMAL + tristate "Temperature sensor on Marvell EBU SoCs" + depends on PLAT_ORION depends on OF help - Support for the Kirkwood thermal sensor driver into the Linux thermal - framework. Only kirkwood 88F6282 and 88F6283 have this sensor. + Support for the thermal controllers available in several Marvell + EBU SoCs in the thermal framework. config EXYNOS_THERMAL tristate "Temperature sensor on Samsung EXYNOS" diff --git a/drivers/thermal/Makefile b/drivers/thermal/Makefile index d3a2b38..40293a1 100644 --- a/drivers/thermal/Makefile +++ b/drivers/thermal/Makefile @@ -15,7 +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_MVEBU_THERMAL) += mvebu_thermal.o obj-$(CONFIG_EXYNOS_THERMAL) += exynos_thermal.o obj-$(CONFIG_DOVE_THERMAL) += dove_thermal.o obj-$(CONFIG_DB8500_THERMAL) += db8500_thermal.o diff --git a/drivers/thermal/kirkwood_thermal.c b/drivers/thermal/kirkwood_thermal.c deleted file mode 100644 index 19320dd..0000000 --- a/drivers/thermal/kirkwood_thermal.c +++ /dev/null @@ -1,134 +0,0 @@ -/* - * 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. According to Marvell internal - * documentation the formula for this is: - * Celsius = (322-reg)/1.3625 - */ - reg = (reg >> KIRKWOOD_THERMAL_TEMP_OFFSET) & - KIRKWOOD_THERMAL_TEMP_MASK; - *temp = ((3220000000UL - (10000000UL * reg)) / 13625); - - return 0; -} - -static struct thermal_zone_device_ops ops = { - .get_temp = kirkwood_get_temp, -}; - -static const struct of_device_id kirkwood_thermal_id_table[] = { - { .compatible = "marvell,kirkwood-thermal" }, - {} -}; - -static int kirkwood_thermal_probe(struct platform_device *pdev) -{ - struct thermal_zone_device *thermal = NULL; - struct kirkwood_thermal_priv *priv; - struct resource *res; - - res = platform_get_resource(pdev, IORESOURCE_MEM, 0); - if (!res) { - dev_err(&pdev->dev, "Failed to get platform resource\n"); - return -ENODEV; - } - - priv = devm_kzalloc(&pdev->dev, sizeof(*priv), GFP_KERNEL); - if (!priv) - return -ENOMEM; - - priv->sensor = devm_request_and_ioremap(&pdev->dev, res); - if (!priv->sensor) { - dev_err(&pdev->dev, "Failed to request_ioremap memory\n"); - return -EADDRNOTAVAIL; - } - - thermal = thermal_zone_device_register("kirkwood_thermal", 0, 0, - priv, &ops, NULL, 0, 0); - if (IS_ERR(thermal)) { - dev_err(&pdev->dev, - "Failed to register thermal zone device\n"); - return PTR_ERR(thermal); - } - - platform_set_drvdata(pdev, thermal); - - return 0; -} - -static int kirkwood_thermal_exit(struct platform_device *pdev) -{ - struct thermal_zone_device *kirkwood_thermal = - platform_get_drvdata(pdev); - - thermal_zone_device_unregister(kirkwood_thermal); - platform_set_drvdata(pdev, NULL); - - return 0; -} - -MODULE_DEVICE_TABLE(of, kirkwood_thermal_id_table); - -static struct platform_driver kirkwood_thermal_driver = { - .probe = kirkwood_thermal_probe, - .remove = kirkwood_thermal_exit, - .driver = { - .name = "kirkwood_thermal", - .owner = THIS_MODULE, - .of_match_table = of_match_ptr(kirkwood_thermal_id_table), - }, -}; - -module_platform_driver(kirkwood_thermal_driver); - -MODULE_AUTHOR("Nobuhiro Iwamatsu <iwamatsu@nigauri.org>"); -MODULE_DESCRIPTION("kirkwood thermal driver"); -MODULE_LICENSE("GPL"); diff --git a/drivers/thermal/mvebu_thermal.c b/drivers/thermal/mvebu_thermal.c new file mode 100644 index 0000000..19320dd --- /dev/null +++ b/drivers/thermal/mvebu_thermal.c @@ -0,0 +1,134 @@ +/* + * 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. According to Marvell internal + * documentation the formula for this is: + * Celsius = (322-reg)/1.3625 + */ + reg = (reg >> KIRKWOOD_THERMAL_TEMP_OFFSET) & + KIRKWOOD_THERMAL_TEMP_MASK; + *temp = ((3220000000UL - (10000000UL * reg)) / 13625); + + return 0; +} + +static struct thermal_zone_device_ops ops = { + .get_temp = kirkwood_get_temp, +}; + +static const struct of_device_id kirkwood_thermal_id_table[] = { + { .compatible = "marvell,kirkwood-thermal" }, + {} +}; + +static int kirkwood_thermal_probe(struct platform_device *pdev) +{ + struct thermal_zone_device *thermal = NULL; + struct kirkwood_thermal_priv *priv; + struct resource *res; + + res = platform_get_resource(pdev, IORESOURCE_MEM, 0); + if (!res) { + dev_err(&pdev->dev, "Failed to get platform resource\n"); + return -ENODEV; + } + + priv = devm_kzalloc(&pdev->dev, sizeof(*priv), GFP_KERNEL); + if (!priv) + return -ENOMEM; + + priv->sensor = devm_request_and_ioremap(&pdev->dev, res); + if (!priv->sensor) { + dev_err(&pdev->dev, "Failed to request_ioremap memory\n"); + return -EADDRNOTAVAIL; + } + + thermal = thermal_zone_device_register("kirkwood_thermal", 0, 0, + priv, &ops, NULL, 0, 0); + if (IS_ERR(thermal)) { + dev_err(&pdev->dev, + "Failed to register thermal zone device\n"); + return PTR_ERR(thermal); + } + + platform_set_drvdata(pdev, thermal); + + return 0; +} + +static int kirkwood_thermal_exit(struct platform_device *pdev) +{ + struct thermal_zone_device *kirkwood_thermal = + platform_get_drvdata(pdev); + + thermal_zone_device_unregister(kirkwood_thermal); + platform_set_drvdata(pdev, NULL); + + return 0; +} + +MODULE_DEVICE_TABLE(of, kirkwood_thermal_id_table); + +static struct platform_driver kirkwood_thermal_driver = { + .probe = kirkwood_thermal_probe, + .remove = kirkwood_thermal_exit, + .driver = { + .name = "kirkwood_thermal", + .owner = THIS_MODULE, + .of_match_table = of_match_ptr(kirkwood_thermal_id_table), + }, +}; + +module_platform_driver(kirkwood_thermal_driver); + +MODULE_AUTHOR("Nobuhiro Iwamatsu <iwamatsu@nigauri.org>"); +MODULE_DESCRIPTION("kirkwood thermal driver"); +MODULE_LICENSE("GPL");
This driver will support several Marvell SoC, so it is convenient to rename it to 'mvebu' to represent accurately the hardware it supports. Signed-off-by: Ezequiel Garcia <ezequiel.garcia@free-electrons.com> --- .../bindings/thermal/kirkwood-thermal.txt | 15 --- .../devicetree/bindings/thermal/mvebu-thermal.txt | 15 +++ drivers/thermal/Kconfig | 10 +- drivers/thermal/Makefile | 2 +- drivers/thermal/kirkwood_thermal.c | 134 -------------------- drivers/thermal/mvebu_thermal.c | 134 ++++++++++++++++++++ 6 files changed, 155 insertions(+), 155 deletions(-) delete mode 100644 Documentation/devicetree/bindings/thermal/kirkwood-thermal.txt create mode 100644 Documentation/devicetree/bindings/thermal/mvebu-thermal.txt delete mode 100644 drivers/thermal/kirkwood_thermal.c create mode 100644 drivers/thermal/mvebu_thermal.c