diff for duplicates of <1502777298.2591.1.camel@intel.com> diff --git a/a/1.txt b/N1/1.txt index 01b2c04..5e6c086 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -18,43 +18,43 @@ On Wed, 2017-08-09 at 15:02 -0700, Markus Mayer wrote: > Signed-off-by: Doug Berger <opendmb@gmail.com> > Signed-off-by: Markus Mayer <mmayer@broadcom.com> > --- -> drivers/thermal/Kconfig | 2 +- -> drivers/thermal/broadcom/Kconfig | 7 + -> drivers/thermal/broadcom/Makefile | 1 + -> drivers/thermal/broadcom/brcmstb_thermal.c | 386 +> ?drivers/thermal/Kconfig????????????????????|???2 +- +> ?drivers/thermal/broadcom/Kconfig???????????|???7 + +> ?drivers/thermal/broadcom/Makefile??????????|???1 + +> ?drivers/thermal/broadcom/brcmstb_thermal.c | 386 > +++++++++++++++++++++++++++++ -> 4 files changed, 395 insertions(+), 1 deletion(-) -> create mode 100644 drivers/thermal/broadcom/brcmstb_thermal.c +> ?4 files changed, 395 insertions(+), 1 deletion(-) +> ?create mode 100644 drivers/thermal/broadcom/brcmstb_thermal.c > > diff --git a/drivers/thermal/Kconfig b/drivers/thermal/Kconfig > index b5b5fac..396ad6b 100644 > --- a/drivers/thermal/Kconfig > +++ b/drivers/thermal/Kconfig > @@ -408,7 +408,7 @@ config MTK_THERMAL -> controller present in Mediatek SoCs -> -> menu "Broadcom thermal drivers" +> ? ??controller present in Mediatek SoCs +> ? +> ?menu "Broadcom thermal drivers" > -depends on ARCH_BCM || COMPILE_TEST > +depends on ARCH_BCM || ARCH_BRCMSTB || COMPILE_TEST -> source "drivers/thermal/broadcom/Kconfig" -> endmenu -> +> ?source "drivers/thermal/broadcom/Kconfig" +> ?endmenu +> ? > diff --git a/drivers/thermal/broadcom/Kconfig > b/drivers/thermal/broadcom/Kconfig > index 42c098e..c106a15 100644 > --- a/drivers/thermal/broadcom/Kconfig > +++ b/drivers/thermal/broadcom/Kconfig > @@ -6,6 +6,13 @@ config BCM2835_THERMAL -> help -> Support for thermal sensors on Broadcom bcm2835 SoCs. -> +> ? help +> ? ??Support for thermal sensors on Broadcom bcm2835 SoCs. +> ? > +config BRCMSTB_THERMAL > + tristate "Broadcom STB AVS TMON thermal driver" > + depends on ARCH_BRCMSTB || COMPILE_TEST > + help -> + Enable this driver if you have a Broadcom STB SoC and +> + ??Enable this driver if you have a Broadcom STB SoC and > would like -> + thermal framework support. +> + ??thermal framework support. > + I don't understand why I got the following checkpatch warning @@ -69,18 +69,18 @@ I didn't see this for other Kconfig changes. thanks, rui -> config BCM_NS_THERMAL -> tristate "Northstar thermal driver" -> depends on ARCH_BCM_IPROC || COMPILE_TEST +> ?config BCM_NS_THERMAL +> ? tristate "Northstar thermal driver" +> ? depends on ARCH_BCM_IPROC || COMPILE_TEST > diff --git a/drivers/thermal/broadcom/Makefile > b/drivers/thermal/broadcom/Makefile > index c6f62e4..fae10ec 100644 > --- a/drivers/thermal/broadcom/Makefile > +++ b/drivers/thermal/broadcom/Makefile > @@ -1,2 +1,3 @@ -> obj-$(CONFIG_BCM2835_THERMAL) += bcm2835_thermal.o +> ?obj-$(CONFIG_BCM2835_THERMAL) += bcm2835_thermal.o > +obj-$(CONFIG_BRCMSTB_THERMAL) += brcmstb_thermal.o -> obj-$(CONFIG_BCM_NS_THERMAL) += ns-thermal.o +> ?obj-$(CONFIG_BCM_NS_THERMAL) += ns-thermal.o > diff --git a/drivers/thermal/broadcom/brcmstb_thermal.c > b/drivers/thermal/broadcom/brcmstb_thermal.c > new file mode 100644 @@ -286,7 +286,7 @@ rui > +} > + > +static void avs_tmon_trip_enable(struct brcmstb_thermal_priv *priv, -> + enum avs_tmon_trip_type type, int +> + ?enum avs_tmon_trip_type type, int > en) > +{ > + struct avs_tmon_trip *trip = &avs_tmon_trips[type]; @@ -304,7 +304,7 @@ rui > +} > + > +static int avs_tmon_get_trip_temp(struct brcmstb_thermal_priv *priv, -> + enum avs_tmon_trip_type type) +> + ??enum avs_tmon_trip_type type) > +{ > + struct avs_tmon_trip *trip = &avs_tmon_trips[type]; > + u32 val = __raw_readl(priv->tmon_base + trip->reg_offs); @@ -317,8 +317,8 @@ rui > + > +static void avs_tmon_set_trip_temp(struct brcmstb_thermal_priv > *priv, -> + enum avs_tmon_trip_type type, -> + int temp) +> + ???enum avs_tmon_trip_type type, +> + ???int temp) > +{ > + struct avs_tmon_trip *trip = &avs_tmon_trips[type]; > + u32 val, orig; @@ -327,7 +327,7 @@ rui > + > + /* round toward low temp for the low interrupt */ > + val = avs_tmon_temp_to_code(priv->thermal, temp, -> + type == TMON_TRIP_TYPE_LOW); +> + ????type == TMON_TRIP_TYPE_LOW); > + > + val <<= trip->reg_shift; > + val &= trip->reg_msk; @@ -366,10 +366,10 @@ rui > + avs_tmon_trip_enable(priv, TMON_TRIP_TYPE_LOW, 0); > + > + /* -> + * Notify using the interrupt temperature, in case the +> + ?* Notify using the interrupt temperature, in case the > temperature -> + * changes before it can next be read out -> + */ +> + ?* changes before it can next be read out +> + ?*/ > + thermal_zone_device_update(priv->thermal, intr); > + > + return IRQ_HANDLED; diff --git a/a/content_digest b/N1/content_digest index 19e1cd8..e7f9e0f 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,28 +1,9 @@ "ref\020170809220257.4234-1-code@mmayer.net\0" "ref\020170809220257.4234-3-code@mmayer.net\0" - "From\0Zhang Rui <rui.zhang@intel.com>\0" - "Subject\0Re: [PATCH v4 2/4] thermal: add brcmstb AVS TMON driver\0" + "From\0rui.zhang@intel.com (Zhang Rui)\0" + "Subject\0[PATCH v4 2/4] thermal: add brcmstb AVS TMON driver\0" "Date\0Tue, 15 Aug 2017 14:08:18 +0800\0" - "To\0Markus Mayer <code@mmayer.net>" - Eduardo Valentin <edubezval@gmail.com> - Rob Herring <robh+dt@kernel.org> - Mark Rutland <mark.rutland@arm.com> - Doug Berger <opendmb@gmail.com> - Brian Norris <computersforpeace@gmail.com> - Gregory Fong <gregory.0xf0@gmail.com> - Florian Fainelli <f.fainelli@gmail.com> - " Rafa\305\202 Mi\305\202ecki <rafal@milecki.pl>" - Russell King <linux@armlinux.org.uk> - Catalin Marinas <catalin.marinas@arm.com> - Will Deacon <will.deacon@arm.com> - Arnd Bergmann <arnd@arndb.de> - " Olof Johansson <olof@lixom.net>\0" - "Cc\0Broadcom Kernel List <bcm-kernel-feedback-list@broadcom.com>" - Power Management List <linux-pm@vger.kernel.org> - Device Tree List <devicetree@vger.kernel.org> - ARM Kernel List <linux-arm-kernel@lists.infradead.org> - Linux Kernel Mailing List <linux-kernel@vger.kernel.org> - " Markus Mayer <mmayer@broadcom.com>\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "On Wed, 2017-08-09 at 15:02 -0700, Markus Mayer wrote:\n" @@ -45,43 +26,43 @@ "> Signed-off-by: Doug Berger <opendmb@gmail.com>\n" "> Signed-off-by: Markus Mayer <mmayer@broadcom.com>\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\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240|\302\240\302\240\302\2402 +-\n" - "> \302\240drivers/thermal/broadcom/Kconfig\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240|\302\240\302\240\302\2407 +\n" - "> \302\240drivers/thermal/broadcom/Makefile\302\240\302\240\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/broadcom/brcmstb_thermal.c | 386\n" + "> ?drivers/thermal/Kconfig????????????????????|???2 +-\n" + "> ?drivers/thermal/broadcom/Kconfig???????????|???7 +\n" + "> ?drivers/thermal/broadcom/Makefile??????????|???1 +\n" + "> ?drivers/thermal/broadcom/brcmstb_thermal.c | 386\n" "> +++++++++++++++++++++++++++++\n" - "> \302\2404 files changed, 395 insertions(+), 1 deletion(-)\n" - "> \302\240create mode 100644 drivers/thermal/broadcom/brcmstb_thermal.c\n" + "> ?4 files changed, 395 insertions(+), 1 deletion(-)\n" + "> ?create mode 100644 drivers/thermal/broadcom/brcmstb_thermal.c\n" "> \n" "> diff --git a/drivers/thermal/Kconfig b/drivers/thermal/Kconfig\n" "> index b5b5fac..396ad6b 100644\n" "> --- a/drivers/thermal/Kconfig\n" "> +++ b/drivers/thermal/Kconfig\n" "> @@ -408,7 +408,7 @@ config MTK_THERMAL\n" - "> \302\240\t\302\240\302\240controller present in Mediatek SoCs\n" - "> \302\240\n" - "> \302\240menu \"Broadcom thermal drivers\"\n" + "> ?\t??controller present in Mediatek SoCs\n" + "> ?\n" + "> ?menu \"Broadcom thermal drivers\"\n" "> -depends on ARCH_BCM || COMPILE_TEST\n" "> +depends on ARCH_BCM || ARCH_BRCMSTB || COMPILE_TEST\n" - "> \302\240source \"drivers/thermal/broadcom/Kconfig\"\n" - "> \302\240endmenu\n" - "> \302\240\n" + "> ?source \"drivers/thermal/broadcom/Kconfig\"\n" + "> ?endmenu\n" + "> ?\n" "> diff --git a/drivers/thermal/broadcom/Kconfig\n" "> b/drivers/thermal/broadcom/Kconfig\n" "> index 42c098e..c106a15 100644\n" "> --- a/drivers/thermal/broadcom/Kconfig\n" "> +++ b/drivers/thermal/broadcom/Kconfig\n" "> @@ -6,6 +6,13 @@ config BCM2835_THERMAL\n" - "> \302\240\thelp\n" - "> \302\240\t\302\240\302\240Support for thermal sensors on Broadcom bcm2835 SoCs.\n" - "> \302\240\n" + "> ?\thelp\n" + "> ?\t??Support for thermal sensors on Broadcom bcm2835 SoCs.\n" + "> ?\n" "> +config BRCMSTB_THERMAL\n" "> +\ttristate \"Broadcom STB AVS TMON thermal driver\"\n" "> +\tdepends on ARCH_BRCMSTB || COMPILE_TEST\n" "> +\thelp\n" - "> +\t\302\240\302\240Enable this driver if you have a Broadcom STB SoC and\n" + "> +\t??Enable this driver if you have a Broadcom STB SoC and\n" "> would like\n" - "> +\t\302\240\302\240thermal framework support.\n" + "> +\t??thermal framework support.\n" "> +\n" "\n" "I don't understand why I got the following checkpatch warning\n" @@ -96,18 +77,18 @@ "thanks,\n" "rui\n" "\n" - "> \302\240config BCM_NS_THERMAL\n" - "> \302\240\ttristate \"Northstar thermal driver\"\n" - "> \302\240\tdepends on ARCH_BCM_IPROC || COMPILE_TEST\n" + "> ?config BCM_NS_THERMAL\n" + "> ?\ttristate \"Northstar thermal driver\"\n" + "> ?\tdepends on ARCH_BCM_IPROC || COMPILE_TEST\n" "> diff --git a/drivers/thermal/broadcom/Makefile\n" "> b/drivers/thermal/broadcom/Makefile\n" "> index c6f62e4..fae10ec 100644\n" "> --- a/drivers/thermal/broadcom/Makefile\n" "> +++ b/drivers/thermal/broadcom/Makefile\n" "> @@ -1,2 +1,3 @@\n" - "> \302\240obj-$(CONFIG_BCM2835_THERMAL)\t\t+= bcm2835_thermal.o\n" + "> ?obj-$(CONFIG_BCM2835_THERMAL)\t\t+= bcm2835_thermal.o\n" "> +obj-$(CONFIG_BRCMSTB_THERMAL)\t\t+= brcmstb_thermal.o\n" - "> \302\240obj-$(CONFIG_BCM_NS_THERMAL)\t\t+= ns-thermal.o\n" + "> ?obj-$(CONFIG_BCM_NS_THERMAL)\t\t+= ns-thermal.o\n" "> diff --git a/drivers/thermal/broadcom/brcmstb_thermal.c\n" "> b/drivers/thermal/broadcom/brcmstb_thermal.c\n" "> new file mode 100644\n" @@ -313,7 +294,7 @@ "> +}\n" "> +\n" "> +static void avs_tmon_trip_enable(struct brcmstb_thermal_priv *priv,\n" - "> +\t\t\t\t\302\240enum avs_tmon_trip_type type, int\n" + "> +\t\t\t\t?enum avs_tmon_trip_type type, int\n" "> en)\n" "> +{\n" "> +\tstruct avs_tmon_trip *trip = &avs_tmon_trips[type];\n" @@ -331,7 +312,7 @@ "> +}\n" "> +\n" "> +static int avs_tmon_get_trip_temp(struct brcmstb_thermal_priv *priv,\n" - "> +\t\t\t\t\302\240\302\240enum avs_tmon_trip_type type)\n" + "> +\t\t\t\t??enum avs_tmon_trip_type type)\n" "> +{\n" "> +\tstruct avs_tmon_trip *trip = &avs_tmon_trips[type];\n" "> +\tu32 val = __raw_readl(priv->tmon_base + trip->reg_offs);\n" @@ -344,8 +325,8 @@ "> +\n" "> +static void avs_tmon_set_trip_temp(struct brcmstb_thermal_priv\n" "> *priv,\n" - "> +\t\t\t\t\302\240\302\240\302\240enum avs_tmon_trip_type type,\n" - "> +\t\t\t\t\302\240\302\240\302\240int temp)\n" + "> +\t\t\t\t???enum avs_tmon_trip_type type,\n" + "> +\t\t\t\t???int temp)\n" "> +{\n" "> +\tstruct avs_tmon_trip *trip = &avs_tmon_trips[type];\n" "> +\tu32 val, orig;\n" @@ -354,7 +335,7 @@ "> +\n" "> +\t/* round toward low temp for the low interrupt */\n" "> +\tval = avs_tmon_temp_to_code(priv->thermal, temp,\n" - "> +\t\t\t\t\302\240\302\240\302\240\302\240type == TMON_TRIP_TYPE_LOW);\n" + "> +\t\t\t\t????type == TMON_TRIP_TYPE_LOW);\n" "> +\n" "> +\tval <<= trip->reg_shift;\n" "> +\tval &= trip->reg_msk;\n" @@ -393,10 +374,10 @@ "> +\t\tavs_tmon_trip_enable(priv, TMON_TRIP_TYPE_LOW, 0);\n" "> +\n" "> +\t/*\n" - "> +\t\302\240* Notify using the interrupt temperature, in case the\n" + "> +\t?* Notify using the interrupt temperature, in case the\n" "> temperature\n" - "> +\t\302\240* changes before it can next be read out\n" - "> +\t\302\240*/\n" + "> +\t?* changes before it can next be read out\n" + "> +\t?*/\n" "> +\tthermal_zone_device_update(priv->thermal, intr);\n" "> +\n" "> +\treturn IRQ_HANDLED;\n" @@ -525,4 +506,4 @@ "> +MODULE_AUTHOR(\"Brian Norris\");\n" "> +MODULE_DESCRIPTION(\"Broadcom STB AVS TMON thermal driver\");" -0df466770aaa38d6807e64abddd5c97ac1a9807252a662e90b73c7883d50d5d6 +39b05fcc858a2eaa998be1a4f8f1e197f390eb6c423db109234c35aff54e5994
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.