diff for duplicates of <1471610370.2691.62.camel@intel.com> diff --git a/a/1.txt b/N1/1.txt index 999fe24..1bf291d 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -1,4 +1,4 @@ -On 四, 2016-06-30 at 11:08 +0800, Jia Hongtao wrote: +On ?, 2016-06-30 at 11:08 +0800, Jia Hongtao wrote: > This driver add thermal management support by enabling TMU (Thermal > Monitoring Unit) on QorIQ platform. > @@ -17,52 +17,52 @@ rui > Changes of V2: > * Add HAS_IOMEM dependency to fix build error on UM > -> drivers/thermal/Kconfig | 10 ++ -> drivers/thermal/Makefile | 1 + -> drivers/thermal/qoriq_thermal.c | 328 +> ?drivers/thermal/Kconfig?????????|??10 ++ +> ?drivers/thermal/Makefile????????|???1 + +> ?drivers/thermal/qoriq_thermal.c | 328 > ++++++++++++++++++++++++++++++++++++++++ -> 3 files changed, 339 insertions(+) -> create mode 100644 drivers/thermal/qoriq_thermal.c +> ?3 files changed, 339 insertions(+) +> ?create mode 100644 drivers/thermal/qoriq_thermal.c > > diff --git a/drivers/thermal/Kconfig b/drivers/thermal/Kconfig > index 2d702ca..56ef30d 100644 > --- a/drivers/thermal/Kconfig > +++ b/drivers/thermal/Kconfig > @@ -195,6 +195,16 @@ config IMX_THERMAL -> cpufreq is used as the cooling device to throttle CPUs +> ? ??cpufreq is used as the cooling device to throttle CPUs > when the -> passive trip is crossed. +> ? ??passive trip is crossed. > > +config QORIQ_THERMAL > + tristate "QorIQ Thermal Monitoring Unit" > + depends on THERMAL_OF > + depends on HAS_IOMEM > + help -> + Support for Thermal Monitoring Unit (TMU) found on QorIQ +> + ??Support for Thermal Monitoring Unit (TMU) found on QorIQ > platforms. -> + It supports one critical trip point and one passive trip +> + ??It supports one critical trip point and one passive trip > point. The -> + cpufreq is used as the cooling device to throttle CPUs +> + ??cpufreq is used as the cooling device to throttle CPUs > when the -> + passive trip is crossed. +> + ??passive trip is crossed. > + -> config SPEAR_THERMAL -> tristate "SPEAr thermal sensor driver" -> depends on PLAT_SPEAR || COMPILE_TEST +> ?config SPEAR_THERMAL +> ? tristate "SPEAr thermal sensor driver" +> ? depends on PLAT_SPEAR || COMPILE_TEST > diff --git a/drivers/thermal/Makefile b/drivers/thermal/Makefile > index 10b07c1..6662232 100644 > --- a/drivers/thermal/Makefile > +++ b/drivers/thermal/Makefile > @@ -37,6 +37,7 @@ obj-$(CONFIG_DB8500_THERMAL) += > db8500_thermal.o -> obj-$(CONFIG_ARMADA_THERMAL) += armada_thermal.o -> obj-$(CONFIG_TANGO_THERMAL) += tango_thermal.o -> obj-$(CONFIG_IMX_THERMAL) += imx_thermal.o +> ?obj-$(CONFIG_ARMADA_THERMAL) += armada_thermal.o +> ?obj-$(CONFIG_TANGO_THERMAL) += tango_thermal.o +> ?obj-$(CONFIG_IMX_THERMAL) += imx_thermal.o > +obj-$(CONFIG_QORIQ_THERMAL) += qoriq_thermal.o -> obj-$(CONFIG_DB8500_CPUFREQ_COOLING) += +> ?obj-$(CONFIG_DB8500_CPUFREQ_COOLING) += > db8500_cpufreq_cooling.o -> obj-$(CONFIG_INTEL_POWERCLAMP) += intel_powerclamp.o -> obj-$(CONFIG_X86_PKG_TEMP_THERMAL) += x86_pkg_temp_thermal.o +> ?obj-$(CONFIG_INTEL_POWERCLAMP) += intel_powerclamp.o +> ?obj-$(CONFIG_X86_PKG_TEMP_THERMAL) += x86_pkg_temp_thermal.o > diff --git a/drivers/thermal/qoriq_thermal.c > b/drivers/thermal/qoriq_thermal.c > new file mode 100644 @@ -82,7 +82,7 @@ rui > WITHOUT > + * ANY WARRANTY; without even the implied warranty of > MERCHANTABILITY or -> + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public +> + * FITNESS FOR A PARTICULAR PURPOSE.??See the GNU General Public > License for > + * more details. > + * @@ -308,7 +308,7 @@ rui > + > + data = devm_kzalloc(&pdev->dev, sizeof(struct > qoriq_tmu_data), -> + GFP_KERNEL); +> + ????GFP_KERNEL); > + if (!data) > + return -ENOMEM; > + @@ -411,7 +411,7 @@ rui > +#endif > + > +static SIMPLE_DEV_PM_OPS(qoriq_tmu_pm_ops, -> + qoriq_tmu_suspend, qoriq_tmu_resume); +> + ?qoriq_tmu_suspend, qoriq_tmu_resume); > + > +static const struct of_device_id qoriq_tmu_match[] = { > + { .compatible = "fsl,qoriq-tmu", }, diff --git a/a/content_digest b/N1/content_digest index c4ed253..c9b7d01 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,21 +1,11 @@ "ref\01467256118-41754-1-git-send-email-hongtao.jia@nxp.com\0" - "From\0Zhang Rui <rui.zhang@intel.com>\0" - "Subject\0Re: [PATCH V2 7/7] thermal: qoriq: Add thermal management support\0" + "From\0rui.zhang@intel.com (Zhang Rui)\0" + "Subject\0[PATCH V2 7/7] thermal: qoriq: Add thermal management support\0" "Date\0Fri, 19 Aug 2016 20:39:30 +0800\0" - "To\0Jia Hongtao <hongtao.jia@nxp.com>" - edubezval@gmail.com - robh+dt@kernel.org - galak@codeaurora.org - scott.wood@nxp.com - " shawnguo@kernel.org\0" - "Cc\0linux-pm@vger.kernel.org" - devicetree@vger.kernel.org - linux-kernel@vger.kernel.org - linuxppc-dev@lists.ozlabs.org - " linux-arm-kernel@lists.infradead.org\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" - "On \345\233\233, 2016-06-30 at 11:08 +0800, Jia Hongtao wrote:\n" + "On ?, 2016-06-30 at 11:08 +0800, Jia Hongtao wrote:\n" "> This driver add thermal management support by enabling TMU (Thermal\n" "> Monitoring Unit) on QorIQ platform.\n" "> \n" @@ -34,52 +24,52 @@ "> Changes of V2:\n" "> * Add HAS_IOMEM dependency to fix build error on UM\n" "> \n" - "> \302\240drivers/thermal/Kconfig\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240|\302\240\302\24010 ++\n" - "> \302\240drivers/thermal/Makefile\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240|\302\240\302\240\302\2401 +\n" - "> \302\240drivers/thermal/qoriq_thermal.c | 328\n" + "> ?drivers/thermal/Kconfig?????????|??10 ++\n" + "> ?drivers/thermal/Makefile????????|???1 +\n" + "> ?drivers/thermal/qoriq_thermal.c | 328\n" "> ++++++++++++++++++++++++++++++++++++++++\n" - "> \302\2403 files changed, 339 insertions(+)\n" - "> \302\240create mode 100644 drivers/thermal/qoriq_thermal.c\n" + "> ?3 files changed, 339 insertions(+)\n" + "> ?create mode 100644 drivers/thermal/qoriq_thermal.c\n" "> \n" "> diff --git a/drivers/thermal/Kconfig b/drivers/thermal/Kconfig\n" "> index 2d702ca..56ef30d 100644\n" "> --- a/drivers/thermal/Kconfig\n" "> +++ b/drivers/thermal/Kconfig\n" "> @@ -195,6 +195,16 @@ config IMX_THERMAL\n" - "> \302\240\t\302\240\302\240cpufreq is used as the cooling device to throttle CPUs\n" + "> ?\t??cpufreq is used as the cooling device to throttle CPUs\n" "> when the\n" - "> \302\240\t\302\240\302\240passive trip is crossed.\n" + "> ?\t??passive trip is crossed.\n" "> \n" "> +config QORIQ_THERMAL\n" "> +\ttristate \"QorIQ Thermal Monitoring Unit\"\n" "> +\tdepends on THERMAL_OF\n" "> +\tdepends on HAS_IOMEM\n" "> +\thelp\n" - "> +\t\302\240\302\240Support for Thermal Monitoring Unit (TMU) found on QorIQ\n" + "> +\t??Support for Thermal Monitoring Unit (TMU) found on QorIQ\n" "> platforms.\n" - "> +\t\302\240\302\240It supports one critical trip point and one passive trip\n" + "> +\t??It supports one critical trip point and one passive trip\n" "> point. The\n" - "> +\t\302\240\302\240cpufreq is used as the cooling device to throttle CPUs\n" + "> +\t??cpufreq is used as the cooling device to throttle CPUs\n" "> when the\n" - "> +\t\302\240\302\240passive trip is crossed.\n" + "> +\t??passive trip is crossed.\n" "> +\n" - "> \302\240config SPEAR_THERMAL\n" - "> \302\240\ttristate \"SPEAr thermal sensor driver\"\n" - "> \302\240\tdepends on PLAT_SPEAR || COMPILE_TEST\n" + "> ?config SPEAR_THERMAL\n" + "> ?\ttristate \"SPEAr thermal sensor driver\"\n" + "> ?\tdepends on PLAT_SPEAR || COMPILE_TEST\n" "> diff --git a/drivers/thermal/Makefile b/drivers/thermal/Makefile\n" "> index 10b07c1..6662232 100644\n" "> --- a/drivers/thermal/Makefile\n" "> +++ b/drivers/thermal/Makefile\n" "> @@ -37,6 +37,7 @@ obj-$(CONFIG_DB8500_THERMAL)\t+=\n" "> db8500_thermal.o\n" - "> \302\240obj-$(CONFIG_ARMADA_THERMAL)\t+= armada_thermal.o\n" - "> \302\240obj-$(CONFIG_TANGO_THERMAL)\t+= tango_thermal.o\n" - "> \302\240obj-$(CONFIG_IMX_THERMAL)\t+= imx_thermal.o\n" + "> ?obj-$(CONFIG_ARMADA_THERMAL)\t+= armada_thermal.o\n" + "> ?obj-$(CONFIG_TANGO_THERMAL)\t+= tango_thermal.o\n" + "> ?obj-$(CONFIG_IMX_THERMAL)\t+= imx_thermal.o\n" "> +obj-$(CONFIG_QORIQ_THERMAL)\t+= qoriq_thermal.o\n" - "> \302\240obj-$(CONFIG_DB8500_CPUFREQ_COOLING)\t+=\n" + "> ?obj-$(CONFIG_DB8500_CPUFREQ_COOLING)\t+=\n" "> db8500_cpufreq_cooling.o\n" - "> \302\240obj-$(CONFIG_INTEL_POWERCLAMP)\t+= intel_powerclamp.o\n" - "> \302\240obj-$(CONFIG_X86_PKG_TEMP_THERMAL)\t+= x86_pkg_temp_thermal.o\n" + "> ?obj-$(CONFIG_INTEL_POWERCLAMP)\t+= intel_powerclamp.o\n" + "> ?obj-$(CONFIG_X86_PKG_TEMP_THERMAL)\t+= x86_pkg_temp_thermal.o\n" "> diff --git a/drivers/thermal/qoriq_thermal.c\n" "> b/drivers/thermal/qoriq_thermal.c\n" "> new file mode 100644\n" @@ -99,7 +89,7 @@ "> WITHOUT\n" "> + * ANY WARRANTY; without even the implied warranty of\n" "> MERCHANTABILITY or\n" - "> + * FITNESS FOR A PARTICULAR PURPOSE.\302\240\302\240See the GNU General Public\n" + "> + * FITNESS FOR A PARTICULAR PURPOSE.??See the GNU General Public\n" "> License for\n" "> + * more details.\n" "> + *\n" @@ -325,7 +315,7 @@ "> +\n" "> +\tdata = devm_kzalloc(&pdev->dev, sizeof(struct\n" "> qoriq_tmu_data),\n" - "> +\t\t\t\302\240\302\240\302\240\302\240GFP_KERNEL);\n" + "> +\t\t\t????GFP_KERNEL);\n" "> +\tif (!data)\n" "> +\t\treturn -ENOMEM;\n" "> +\n" @@ -428,7 +418,7 @@ "> +#endif\n" "> +\n" "> +static SIMPLE_DEV_PM_OPS(qoriq_tmu_pm_ops,\n" - "> +\t\t\t\302\240qoriq_tmu_suspend, qoriq_tmu_resume);\n" + "> +\t\t\t?qoriq_tmu_suspend, qoriq_tmu_resume);\n" "> +\n" "> +static const struct of_device_id qoriq_tmu_match[] = {\n" "> +\t{ .compatible = \"fsl,qoriq-tmu\", },\n" @@ -454,4 +444,4 @@ "> 2.1.0.27.g96db324\n" > -fd56b6b55ddbde5a46c97a3ba3370104c91b09232757bc9920206902da7ecf26 +f2ef92dfacc182353d8a25cde0e940e65dc34b21938294b2fb4f614af85ea489
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.