diff for duplicates of <1479212973.2224.13.camel@intel.com> diff --git a/a/1.txt b/N1/1.txt index 8e3fb17..271d90e 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -1,55 +1,55 @@ -On Wed, 2016-11-02 at 10:18 +0000, kernel-TqfNSX0MhmxHKSADF0wUEw@public.gmane.org wrote: -> From: Martin Sperl <kernel-TqfNSX0MhmxHKSADF0wUEw@public.gmane.org> +On Wed, 2016-11-02 at 10:18 +0000, kernel at martin.sperl.org wrote: +> From: Martin Sperl <kernel@martin.sperl.org> > > Add basic thermal driver for bcm2835 SOC. > > This driver currently relies on the firmware setting up the > tsense HW block and does not set it up itself. > -> Signed-off-by: Martin Sperl <kernel-TqfNSX0MhmxHKSADF0wUEw@public.gmane.org> -> Acked-by: Eric Anholt <eric-WhKQ6XTQaPysTnJN9+BGXg@public.gmane.org> -> Acked-by: Stefan Wahren <stefan.wahren-eS4NqCHxEME@public.gmane.org> +> Signed-off-by: Martin Sperl <kernel@martin.sperl.org> +> Acked-by: Eric Anholt <eric@anholt.net> +> Acked-by: Stefan Wahren <stefan.wahren@i2se.com> > -Acked-by: Zhang Rui <rui.zhang-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org> +Acked-by: Zhang Rui <rui.zhang@intel.com> thanks, rui > ChangeLog: -> V1 -> V2: added specific settings depending on compatiblity -> added trip point based on register -> setting up ctrl-register if HW is not enabled by firmware -> as per recommendation of Eric (untested) -> check that clock frequency is in range -> (1.9 - 5MHz - as per comment in clk-bcm2835.c) -> V2 -> V4: moved back to thermal (not using bcm sub-directory) -> set polling interval to 1second (was 0ms, so +> ?V1 -> V2: added specific settings depending on compatiblity +> ???added trip point based on register +> ???setting up ctrl-register if HW is not enabled by firmware +> ?????as per recommendation of Eric (untested) +> ???check that clock frequency is in range +> ?????(1.9 - 5MHz - as per comment in clk-bcm2835.c) +> ?V2 -> V4: moved back to thermal (not using bcm sub-directory) +> ??????? ???set polling interval to 1second (was 0ms, so > interrupt driven) -> V5 -> V6: added correct depends in KConfig -> removed defined default for RESET_DELAY -> removed obvious comments -> clarify HW setup comments if not set up by FW already -> move clk_prepare_enable to an earlier stage and add error +> ?V5 -> V6: added correct depends in KConfig +> ???removed defined default for RESET_DELAY +> ???removed obvious comments +> ???clarify HW setup comments if not set up by FW already +> ???move clk_prepare_enable to an earlier stage and add error > handling -> clarify warning when TS-clock runs out of recommended range -> clk_disable_unprepare added in bcm2835_thermal_remove -> added comment on recommended temperature ranges for SOC -> V6 -> V7: removed depends on ARCH_BCM2836 || ARCH_BCM2837 in Kconfig -> V7 -> V8: rebased +> ???clarify warning when TS-clock runs out of recommended range +> ???clk_disable_unprepare added in bcm2835_thermal_remove +> ???added comment on recommended temperature ranges for SOC +> ?V6 -> V7: removed depends on ARCH_BCM2836 || ARCH_BCM2837 in Kconfig +> ?V7 -> V8: rebased > --- -> drivers/thermal/Kconfig | 8 + -> drivers/thermal/Makefile | 1 + -> drivers/thermal/bcm2835_thermal.c | 340 +> ?drivers/thermal/Kconfig???????????|???8 + +> ?drivers/thermal/Makefile??????????|???1 + +> ?drivers/thermal/bcm2835_thermal.c | 340 > ++++++++++++++++++++++++++++++++++++++ -> 3 files changed, 349 insertions(+) -> create mode 100644 drivers/thermal/bcm2835_thermal.c +> ?3 files changed, 349 insertions(+) +> ?create mode 100644 drivers/thermal/bcm2835_thermal.c > > diff --git a/drivers/thermal/Kconfig b/drivers/thermal/Kconfig > index a13541b..ab946ff 100644 > --- a/drivers/thermal/Kconfig > +++ b/drivers/thermal/Kconfig > @@ -434,4 +434,12 @@ depends on (ARCH_QCOM && OF) || COMPILE_TEST -> source "drivers/thermal/qcom/Kconfig" -> endmenu +> ?source "drivers/thermal/qcom/Kconfig" +> ?endmenu > > +config BCM2835_THERMAL > + tristate "Thermal sensors on bcm2835 SoC" @@ -57,17 +57,17 @@ rui > + depends on HAS_IOMEM > + depends on OF > + help -> + Support for thermal sensors on Broadcom bcm2835 SoCs. +> + ??Support for thermal sensors on Broadcom bcm2835 SoCs. > + -> endif +> ?endif > diff --git a/drivers/thermal/Makefile b/drivers/thermal/Makefile > index c92eb22..a10ebe0 100644 > --- a/drivers/thermal/Makefile > +++ b/drivers/thermal/Makefile > @@ -55,3 +55,4 @@ obj-$(CONFIG_TEGRA_SOCTHERM) += tegra/ -> obj-$(CONFIG_HISI_THERMAL) += hisi_thermal.o -> obj-$(CONFIG_MTK_THERMAL) += mtk_thermal.o -> obj-$(CONFIG_GENERIC_ADC_THERMAL) += thermal-generic-adc.o +> ?obj-$(CONFIG_HISI_THERMAL)?????+= hisi_thermal.o +> ?obj-$(CONFIG_MTK_THERMAL) += mtk_thermal.o +> ?obj-$(CONFIG_GENERIC_ADC_THERMAL) += thermal-generic-adc.o > +obj-$(CONFIG_BCM2835_THERMAL) += bcm2835_thermal.o > diff --git a/drivers/thermal/bcm2835_thermal.c > b/drivers/thermal/bcm2835_thermal.c @@ -90,7 +90,7 @@ rui > + * > + * 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 +> + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.??See the > + * GNU General Public License for more details. > + */ > + @@ -114,8 +114,8 @@ rui > +#define BCM2835_TS_TSENSCTL_RSTB BIT(1) > +#define BCM2835_TS_TSENSCTL_CTRL_BITS 3 > +#define BCM2835_TS_TSENSCTL_CTRL_SHIFT 2 -> +#define BCM2835_TS_TSENSCTL_CTRL_MASK \ -> + GENMASK(BCM2835_TS_TSENSCTL_CTRL_BITS + \ +> +#define BCM2835_TS_TSENSCTL_CTRL_MASK ????\ +> + GENMASK(BCM2835_TS_TSENSCTL_CTRL_BITS +?????\ > + BCM2835_TS_TSENSCTL_CTRL_SHIFT - 1, \ > + BCM2835_TS_TSENSCTL_CTRL_SHIFT) > +#define BCM2835_TS_TSENSCTL_CTRL_DEFAULT 1 @@ -124,8 +124,8 @@ rui > +#define BCM2835_TS_TSENSCTL_CLR_INT BIT(7) > +#define BCM2835_TS_TSENSCTL_THOLD_SHIFT 8 > +#define BCM2835_TS_TSENSCTL_THOLD_BITS 10 -> +#define BCM2835_TS_TSENSCTL_THOLD_MASK \ -> + GENMASK(BCM2835_TS_TSENSCTL_THOLD_BITS + \ +> +#define BCM2835_TS_TSENSCTL_THOLD_MASK ?????\ +> + GENMASK(BCM2835_TS_TSENSCTL_THOLD_BITS +?????\ > + BCM2835_TS_TSENSCTL_THOLD_SHIFT - 1, \ > + BCM2835_TS_TSENSCTL_THOLD_SHIFT) > +#define BCM2835_TS_TSENSCTL_RSTDELAY_SHIFT 18 @@ -134,8 +134,8 @@ rui > + > +#define BCM2835_TS_TSENSSTAT_DATA_BITS 10 > +#define BCM2835_TS_TSENSSTAT_DATA_SHIFT 0 -> +#define BCM2835_TS_TSENSSTAT_DATA_MASK \ -> + GENMASK(BCM2835_TS_TSENSSTAT_DATA_BITS + \ +> +#define BCM2835_TS_TSENSSTAT_DATA_MASK ?????\ +> + GENMASK(BCM2835_TS_TSENSSTAT_DATA_BITS +?????\ > + BCM2835_TS_TSENSSTAT_DATA_SHIFT - 1, \ > + BCM2835_TS_TSENSSTAT_DATA_SHIFT) > +#define BCM2835_TS_TSENSSTAT_VALID BIT(10) @@ -202,7 +202,7 @@ rui > +} > + > +static int bcm2835_thermal_get_temp(struct thermal_zone_device *tz, -> + int *temp) +> + ????int *temp) > +{ > + struct bcm2835_thermal_data *data = tz->devdata; > + u32 val = readl(data->regs + BCM2835_TS_TSENSSTAT); @@ -252,7 +252,7 @@ rui > + data->debugfsdir, regset); > +} > + -> +static struct thermal_zone_device_ops bcm2835_thermal_ops = { +> +static struct thermal_zone_device_ops bcm2835_thermal_ops??= { > + .get_temp = bcm2835_thermal_get_temp, > + .get_trip_temp = bcm2835_thermal_get_trip_temp, > + .get_trip_type = bcm2835_thermal_get_trip_type, @@ -304,31 +304,31 @@ rui > + rate = clk_get_rate(data->clk); > + if ((rate < 1920000) || (rate > 5000000)) > + dev_warn(&pdev->dev, -> + "Clock %pCn running at %pCr Hz is outside +> + ?"Clock %pCn running at %pCr Hz is outside > of the recommended range: 1.92 to 5MHz\n", -> + data->clk, data->clk); +> + ?data->clk, data->clk); > + > + /* -> + * right now the FW does set up the HW-block, so we are not -> + * touching the configuration registers. -> + * But if the HW is not enabled, then set it up -> + * using "sane" values used by the firmware right now. -> + */ +> + ?* right now the FW does set up the HW-block, so we are not +> + ?* touching the configuration registers. +> + ?* But if the HW is not enabled, then set it up +> + ?* using "sane" values used by the firmware right now. +> + ?*/ > + val = readl(data->regs + BCM2835_TS_TSENSCTL); > + if (!(val & BCM2835_TS_TSENSCTL_RSTB)) { > + /* the basic required flags */ > + val = (BCM2835_TS_TSENSCTL_CTRL_DEFAULT << -> + BCM2835_TS_TSENSCTL_CTRL_SHIFT) | -> + BCM2835_TS_TSENSCTL_REGULEN; +> + ???????BCM2835_TS_TSENSCTL_CTRL_SHIFT) | +> + ??????BCM2835_TS_TSENSCTL_REGULEN; > + > + /* -> + * reset delay using the current firmware value of +> + ?* reset delay using the current firmware value of > 14 -> + * - units of time are unknown. -> + */ +> + ?* - units of time are unknown. +> + ?*/ > + val |= (14 << BCM2835_TS_TSENSCTL_RSTDELAY_SHIFT); > + -> + /* trip_adc value from info */ +> + /*??trip_adc value from info */ > + val |= bcm2835_thermal_temp2adc(data->info, > + data->info- > >trip_temp) << @@ -343,10 +343,10 @@ rui > + > + /* register thermal zone with 1 trip point an 1s polling */ > + tz = thermal_zone_device_register("bcm2835_thermal", -> + 1, 0, data, -> + &bcm2835_thermal_ops, -> + NULL, -> + 0, 1000); +> + ??1, 0, data, +> + ??&bcm2835_thermal_ops, +> + ??NULL, +> + ??0, 1000); > + if (IS_ERR(tz)) { > + clk_disable_unprepare(data->clk); > + err = PTR_ERR(tz); @@ -431,7 +431,3 @@ rui > +MODULE_LICENSE("GPL"); > -- > 2.1.4 --- -To unsubscribe from this list: send the line "unsubscribe devicetree" in -the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org -More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/a/content_digest b/N1/content_digest index 3c13bee..e1c10bf 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,79 +1,63 @@ "ref\01478081906-12009-1-git-send-email-kernel@martin.sperl.org\0" "ref\01478081906-12009-3-git-send-email-kernel@martin.sperl.org\0" - "ref\01478081906-12009-3-git-send-email-kernel-TqfNSX0MhmxHKSADF0wUEw@public.gmane.org\0" - "From\0Zhang Rui <rui.zhang-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org>\0" - "Subject\0Re: [PATCH V8 2/6] thermal: bcm2835: add thermal driver for bcm2835 soc\0" + "From\0rui.zhang@intel.com (Zhang Rui)\0" + "Subject\0[PATCH V8 2/6] thermal: bcm2835: add thermal driver for bcm2835 soc\0" "Date\0Tue, 15 Nov 2016 20:29:33 +0800\0" - "To\0kernel-TqfNSX0MhmxHKSADF0wUEw@public.gmane.org" - Eduardo Valentin <edubezval-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> - Rob Herring <robh+dt-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org> - Pawel Moll <pawel.moll-5wv7dgnIgG8@public.gmane.org> - Mark Rutland <mark.rutland-5wv7dgnIgG8@public.gmane.org> - Stephen Warren <swarren-3lzwWm7+Weoh9ZMKESR00Q@public.gmane.org> - Lee Jones <lee-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org> - Eric Anholt <eric-WhKQ6XTQaPysTnJN9+BGXg@public.gmane.org> - Russell King <linux-lFZ/pmaqli7XmaaqVzeoHQ@public.gmane.org> - Florian Fainelli <f.fainelli-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> - Catalin Marinas <catalin.marinas-5wv7dgnIgG8@public.gmane.org> - Will Deacon <will.deacon-5wv7dgnIgG8@public.gmane.org> - linux-pm-u79uwXL29TY76Z2rM5mHXA@public.gmane.org - devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org - linux-rpi-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org - " linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" - "On Wed, 2016-11-02 at 10:18 +0000, kernel-TqfNSX0MhmxHKSADF0wUEw@public.gmane.org wrote:\n" - "> From: Martin Sperl <kernel-TqfNSX0MhmxHKSADF0wUEw@public.gmane.org>\n" + "On Wed, 2016-11-02 at 10:18 +0000, kernel at martin.sperl.org wrote:\n" + "> From: Martin Sperl <kernel@martin.sperl.org>\n" "> \n" "> Add basic thermal driver for bcm2835 SOC.\n" "> \n" "> This driver currently relies on the firmware setting up the\n" "> tsense HW block and does not set it up itself.\n" "> \n" - "> Signed-off-by: Martin Sperl <kernel-TqfNSX0MhmxHKSADF0wUEw@public.gmane.org>\n" - "> Acked-by: Eric Anholt <eric-WhKQ6XTQaPysTnJN9+BGXg@public.gmane.org>\n" - "> Acked-by: Stefan Wahren <stefan.wahren-eS4NqCHxEME@public.gmane.org>\n" + "> Signed-off-by: Martin Sperl <kernel@martin.sperl.org>\n" + "> Acked-by: Eric Anholt <eric@anholt.net>\n" + "> Acked-by: Stefan Wahren <stefan.wahren@i2se.com>\n" "> \n" - "Acked-by: Zhang Rui <rui.zhang-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org>\n" + "Acked-by: Zhang Rui <rui.zhang@intel.com>\n" "\n" "thanks,\n" "rui\n" "> ChangeLog:\n" - "> \302\240V1 -> V2: added specific settings depending on compatiblity\n" - "> \t\302\240\302\240\302\240added trip point based on register\n" - "> \t\302\240\302\240\302\240setting up ctrl-register if HW is not enabled by firmware\n" - "> \t\302\240\302\240\302\240\302\240\302\240as per recommendation of Eric (untested)\n" - "> \t\302\240\302\240\302\240check that clock frequency is in range\n" - "> \t\302\240\302\240\302\240\302\240\302\240(1.9 - 5MHz - as per comment in clk-bcm2835.c)\n" - "> \302\240V2 -> V4: moved back to thermal (not using bcm sub-directory)\n" - "> \302\240\302\240\302\240\302\240\302\240\302\240\302\240\t\302\240\302\240\302\240set polling interval to 1second (was 0ms, so\n" + "> ?V1 -> V2: added specific settings depending on compatiblity\n" + "> \t???added trip point based on register\n" + "> \t???setting up ctrl-register if HW is not enabled by firmware\n" + "> \t?????as per recommendation of Eric (untested)\n" + "> \t???check that clock frequency is in range\n" + "> \t?????(1.9 - 5MHz - as per comment in clk-bcm2835.c)\n" + "> ?V2 -> V4: moved back to thermal (not using bcm sub-directory)\n" + "> ???????\t???set polling interval to 1second (was 0ms, so\n" "> interrupt driven)\n" - "> \302\240V5 -> V6: added correct depends in KConfig\n" - "> \t\302\240\302\240\302\240removed defined default for RESET_DELAY\n" - "> \t\302\240\302\240\302\240removed obvious comments\n" - "> \t\302\240\302\240\302\240clarify HW setup comments if not set up by FW already\n" - "> \t\302\240\302\240\302\240move clk_prepare_enable to an earlier stage and add error\n" + "> ?V5 -> V6: added correct depends in KConfig\n" + "> \t???removed defined default for RESET_DELAY\n" + "> \t???removed obvious comments\n" + "> \t???clarify HW setup comments if not set up by FW already\n" + "> \t???move clk_prepare_enable to an earlier stage and add error\n" "> handling\n" - "> \t\302\240\302\240\302\240clarify warning when TS-clock runs out of recommended range\n" - "> \t\302\240\302\240\302\240clk_disable_unprepare added in bcm2835_thermal_remove\n" - "> \t\302\240\302\240\302\240added comment on recommended temperature ranges for SOC\n" - "> \302\240V6 -> V7: removed depends on ARCH_BCM2836 || ARCH_BCM2837 in Kconfig\n" - "> \302\240V7 -> V8: rebased\n" + "> \t???clarify warning when TS-clock runs out of recommended range\n" + "> \t???clk_disable_unprepare added in bcm2835_thermal_remove\n" + "> \t???added comment on recommended temperature ranges for SOC\n" + "> ?V6 -> V7: removed depends on ARCH_BCM2836 || ARCH_BCM2837 in Kconfig\n" + "> ?V7 -> V8: rebased\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\2408 +\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\240\302\240\302\2401 +\n" - "> \302\240drivers/thermal/bcm2835_thermal.c | 340\n" + "> ?drivers/thermal/Kconfig???????????|???8 +\n" + "> ?drivers/thermal/Makefile??????????|???1 +\n" + "> ?drivers/thermal/bcm2835_thermal.c | 340\n" "> ++++++++++++++++++++++++++++++++++++++\n" - "> \302\2403 files changed, 349 insertions(+)\n" - "> \302\240create mode 100644 drivers/thermal/bcm2835_thermal.c\n" + "> ?3 files changed, 349 insertions(+)\n" + "> ?create mode 100644 drivers/thermal/bcm2835_thermal.c\n" "> \n" "> diff --git a/drivers/thermal/Kconfig b/drivers/thermal/Kconfig\n" "> index a13541b..ab946ff 100644\n" "> --- a/drivers/thermal/Kconfig\n" "> +++ b/drivers/thermal/Kconfig\n" "> @@ -434,4 +434,12 @@ depends on (ARCH_QCOM && OF) || COMPILE_TEST\n" - "> \302\240source \"drivers/thermal/qcom/Kconfig\"\n" - "> \302\240endmenu\n" + "> ?source \"drivers/thermal/qcom/Kconfig\"\n" + "> ?endmenu\n" "> \n" "> +config BCM2835_THERMAL\n" "> +\ttristate \"Thermal sensors on bcm2835 SoC\"\n" @@ -81,17 +65,17 @@ "> +\tdepends on HAS_IOMEM\n" "> +\tdepends on OF\n" "> +\thelp\n" - "> +\t\302\240\302\240Support for thermal sensors on Broadcom bcm2835 SoCs.\n" + "> +\t??Support for thermal sensors on Broadcom bcm2835 SoCs.\n" "> +\n" - "> \302\240endif\n" + "> ?endif\n" "> diff --git a/drivers/thermal/Makefile b/drivers/thermal/Makefile\n" "> index c92eb22..a10ebe0 100644\n" "> --- a/drivers/thermal/Makefile\n" "> +++ b/drivers/thermal/Makefile\n" "> @@ -55,3 +55,4 @@ obj-$(CONFIG_TEGRA_SOCTHERM)\t+= tegra/\n" - "> \302\240obj-$(CONFIG_HISI_THERMAL)\302\240\302\240\302\240\302\240\302\240+= hisi_thermal.o\n" - "> \302\240obj-$(CONFIG_MTK_THERMAL)\t+= mtk_thermal.o\n" - "> \302\240obj-$(CONFIG_GENERIC_ADC_THERMAL)\t+= thermal-generic-adc.o\n" + "> ?obj-$(CONFIG_HISI_THERMAL)?????+= hisi_thermal.o\n" + "> ?obj-$(CONFIG_MTK_THERMAL)\t+= mtk_thermal.o\n" + "> ?obj-$(CONFIG_GENERIC_ADC_THERMAL)\t+= thermal-generic-adc.o\n" "> +obj-$(CONFIG_BCM2835_THERMAL)\t+= bcm2835_thermal.o\n" "> diff --git a/drivers/thermal/bcm2835_thermal.c\n" "> b/drivers/thermal/bcm2835_thermal.c\n" @@ -114,7 +98,7 @@ "> + *\n" "> + * This program is distributed in the hope that it will be useful,\n" "> + * but WITHOUT ANY WARRANTY; without even the implied warranty of\n" - "> + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\302\240\302\240See the\n" + "> + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.??See the\n" "> + * GNU General Public License for more details.\n" "> + */\n" "> +\n" @@ -138,8 +122,8 @@ "> +#define BCM2835_TS_TSENSCTL_RSTB\t\tBIT(1)\n" "> +#define BCM2835_TS_TSENSCTL_CTRL_BITS\t\t3\n" "> +#define BCM2835_TS_TSENSCTL_CTRL_SHIFT\t\t2\n" - "> +#define BCM2835_TS_TSENSCTL_CTRL_MASK\t\t\302\240\302\240\302\240\302\240\\\n" - "> +\tGENMASK(BCM2835_TS_TSENSCTL_CTRL_BITS +\302\240\302\240\302\240\302\240\302\240\\\n" + "> +#define BCM2835_TS_TSENSCTL_CTRL_MASK\t\t????\\\n" + "> +\tGENMASK(BCM2835_TS_TSENSCTL_CTRL_BITS +?????\\\n" "> +\t\tBCM2835_TS_TSENSCTL_CTRL_SHIFT - 1, \\\n" "> +\t\tBCM2835_TS_TSENSCTL_CTRL_SHIFT)\n" "> +#define BCM2835_TS_TSENSCTL_CTRL_DEFAULT\t1\n" @@ -148,8 +132,8 @@ "> +#define BCM2835_TS_TSENSCTL_CLR_INT\t\tBIT(7)\n" "> +#define BCM2835_TS_TSENSCTL_THOLD_SHIFT\t\t8\n" "> +#define BCM2835_TS_TSENSCTL_THOLD_BITS\t\t10\n" - "> +#define BCM2835_TS_TSENSCTL_THOLD_MASK\t\t\302\240\302\240\302\240\302\240\302\240\\\n" - "> +\tGENMASK(BCM2835_TS_TSENSCTL_THOLD_BITS +\302\240\302\240\302\240\302\240\302\240\\\n" + "> +#define BCM2835_TS_TSENSCTL_THOLD_MASK\t\t?????\\\n" + "> +\tGENMASK(BCM2835_TS_TSENSCTL_THOLD_BITS +?????\\\n" "> +\t\tBCM2835_TS_TSENSCTL_THOLD_SHIFT - 1, \\\n" "> +\t\tBCM2835_TS_TSENSCTL_THOLD_SHIFT)\n" "> +#define BCM2835_TS_TSENSCTL_RSTDELAY_SHIFT\t18\n" @@ -158,8 +142,8 @@ "> +\n" "> +#define BCM2835_TS_TSENSSTAT_DATA_BITS\t\t10\n" "> +#define BCM2835_TS_TSENSSTAT_DATA_SHIFT\t\t0\n" - "> +#define BCM2835_TS_TSENSSTAT_DATA_MASK\t\t\302\240\302\240\302\240\302\240\302\240\\\n" - "> +\tGENMASK(BCM2835_TS_TSENSSTAT_DATA_BITS +\302\240\302\240\302\240\302\240\302\240\\\n" + "> +#define BCM2835_TS_TSENSSTAT_DATA_MASK\t\t?????\\\n" + "> +\tGENMASK(BCM2835_TS_TSENSSTAT_DATA_BITS +?????\\\n" "> +\t\tBCM2835_TS_TSENSSTAT_DATA_SHIFT - 1, \\\n" "> +\t\tBCM2835_TS_TSENSSTAT_DATA_SHIFT)\n" "> +#define BCM2835_TS_TSENSSTAT_VALID\t\tBIT(10)\n" @@ -226,7 +210,7 @@ "> +}\n" "> +\n" "> +static int bcm2835_thermal_get_temp(struct thermal_zone_device *tz,\n" - "> +\t\t\t\t\302\240\302\240\302\240\302\240int *temp)\n" + "> +\t\t\t\t????int *temp)\n" "> +{\n" "> +\tstruct bcm2835_thermal_data *data = tz->devdata;\n" "> +\tu32 val = readl(data->regs + BCM2835_TS_TSENSSTAT);\n" @@ -276,7 +260,7 @@ "> +\t\t\t\tdata->debugfsdir, regset);\n" "> +}\n" "> +\n" - "> +static struct thermal_zone_device_ops bcm2835_thermal_ops\302\240\302\240= {\n" + "> +static struct thermal_zone_device_ops bcm2835_thermal_ops??= {\n" "> +\t.get_temp = bcm2835_thermal_get_temp,\n" "> +\t.get_trip_temp = bcm2835_thermal_get_trip_temp,\n" "> +\t.get_trip_type = bcm2835_thermal_get_trip_type,\n" @@ -328,31 +312,31 @@ "> +\trate = clk_get_rate(data->clk);\n" "> +\tif ((rate < 1920000) || (rate > 5000000))\n" "> +\t\tdev_warn(&pdev->dev,\n" - "> +\t\t\t\302\240\"Clock %pCn running at %pCr Hz is outside\n" + "> +\t\t\t?\"Clock %pCn running at %pCr Hz is outside\n" "> of the recommended range: 1.92 to 5MHz\\n\",\n" - "> +\t\t\t\302\240data->clk, data->clk);\n" + "> +\t\t\t?data->clk, data->clk);\n" "> +\n" "> +\t/*\n" - "> +\t\302\240* right now the FW does set up the HW-block, so we are not\n" - "> +\t\302\240* touching the configuration registers.\n" - "> +\t\302\240* But if the HW is not enabled, then set it up\n" - "> +\t\302\240* using \"sane\" values used by the firmware right now.\n" - "> +\t\302\240*/\n" + "> +\t?* right now the FW does set up the HW-block, so we are not\n" + "> +\t?* touching the configuration registers.\n" + "> +\t?* But if the HW is not enabled, then set it up\n" + "> +\t?* using \"sane\" values used by the firmware right now.\n" + "> +\t?*/\n" "> +\tval = readl(data->regs + BCM2835_TS_TSENSCTL);\n" "> +\tif (!(val & BCM2835_TS_TSENSCTL_RSTB)) {\n" "> +\t\t/* the basic required flags */\n" "> +\t\tval = (BCM2835_TS_TSENSCTL_CTRL_DEFAULT <<\n" - "> +\t\t\302\240\302\240\302\240\302\240\302\240\302\240\302\240BCM2835_TS_TSENSCTL_CTRL_SHIFT) |\n" - "> +\t\t\302\240\302\240\302\240\302\240\302\240\302\240BCM2835_TS_TSENSCTL_REGULEN;\n" + "> +\t\t???????BCM2835_TS_TSENSCTL_CTRL_SHIFT) |\n" + "> +\t\t??????BCM2835_TS_TSENSCTL_REGULEN;\n" "> +\n" "> +\t\t/*\n" - "> +\t\t\302\240* reset delay using the current firmware value of\n" + "> +\t\t?* reset delay using the current firmware value of\n" "> 14\n" - "> +\t\t\302\240* - units of time are unknown.\n" - "> +\t\t\302\240*/\n" + "> +\t\t?* - units of time are unknown.\n" + "> +\t\t?*/\n" "> +\t\tval |= (14 << BCM2835_TS_TSENSCTL_RSTDELAY_SHIFT);\n" "> +\n" - "> +\t\t/*\302\240\302\240trip_adc value from info */\n" + "> +\t\t/*??trip_adc value from info */\n" "> +\t\tval |= bcm2835_thermal_temp2adc(data->info,\n" "> +\t\t\t\t\t\tdata->info-\n" "> >trip_temp) <<\n" @@ -367,10 +351,10 @@ "> +\n" "> +\t/* register thermal zone with 1 trip point an 1s polling */\n" "> +\ttz = thermal_zone_device_register(\"bcm2835_thermal\",\n" - "> +\t\t\t\t\t\302\240\302\2401, 0, data,\n" - "> +\t\t\t\t\t\302\240\302\240&bcm2835_thermal_ops,\n" - "> +\t\t\t\t\t\302\240\302\240NULL,\n" - "> +\t\t\t\t\t\302\240\302\2400, 1000);\n" + "> +\t\t\t\t\t??1, 0, data,\n" + "> +\t\t\t\t\t??&bcm2835_thermal_ops,\n" + "> +\t\t\t\t\t??NULL,\n" + "> +\t\t\t\t\t??0, 1000);\n" "> +\tif (IS_ERR(tz)) {\n" "> +\t\tclk_disable_unprepare(data->clk);\n" "> +\t\terr = PTR_ERR(tz);\n" @@ -454,10 +438,6 @@ "> +MODULE_DESCRIPTION(\"Thermal driver for bcm2835 chip\");\n" "> +MODULE_LICENSE(\"GPL\");\n" "> --\n" - "> 2.1.4\n" - "--\n" - "To unsubscribe from this list: send the line \"unsubscribe devicetree\" in\n" - "the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org\n" - More majordomo info at http://vger.kernel.org/majordomo-info.html + > 2.1.4 -0ede530272263c280aff357f64159e20a2f239e481d12e3e0db19d2518d6fbcb +68cf2a350414a8c967640f703673567fd99a3283e6367bff69429dbcbb5c2552
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.