diff for duplicates of <1473121807.2201.23.camel@intel.com> diff --git a/a/1.txt b/N1/1.txt index ff9e9c5..6f6a6a7 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -1,5 +1,5 @@ -On 二, 2016-09-06 at 08:24 +0800, Zhang Rui wrote: -> On 四, 2016-08-18 at 11:50 +0800, Dawei Chien wrote: +On ?, 2016-09-06 at 08:24 +0800, Zhang Rui wrote: +> On ?, 2016-08-18 at 11:50 +0800, Dawei Chien wrote: > > > > This adds the thermal controller and auxadc nodes > > to the Mediatek MT2701 dtsi file. @@ -22,12 +22,12 @@ in the dt tree. thanks, rui > thanks, -> rui +> rui? > > > > --- -> > arch/arm/boot/dts/mt2701.dtsi | 44 +> > ?arch/arm/boot/dts/mt2701.dtsi |???44 > > +++++++++++++++++++++++++++++++++++++++++ -> > 1 file changed, 44 insertions(+) +> > ?1 file changed, 44 insertions(+) > > > > diff --git a/arch/arm/boot/dts/mt2701.dtsi > > b/arch/arm/boot/dts/mt2701.dtsi @@ -35,9 +35,9 @@ rui > > --- a/arch/arm/boot/dts/mt2701.dtsi > > +++ b/arch/arm/boot/dts/mt2701.dtsi > > @@ -87,6 +87,36 @@ -> > clock-output-names = "rtc32k"; -> > }; -> > +> > ? clock-output-names = "rtc32k"; +> > ? }; +> > ? > > + thermal-zones { > > + cpu_thermal: cpu_thermal { > > + polling-delay-passive = <1000>; /* @@ -48,19 +48,19 @@ rui > > + sustainable-power = <1000>; > > + > > + trips { -> > + threshold: trip-point@0 { +> > + threshold: trip-point at 0 { > > + temperature = <68000>; > > + hysteresis = <2000>; > > + type = "passive"; > > + }; > > + -> > + target: trip-point@1 { +> > + target: trip-point at 1 { > > + temperature = <85000>; > > + hysteresis = <2000>; > > + type = "passive"; > > + }; > > + -> > + cpu_crit: cpu_crit@0 { +> > + cpu_crit: cpu_crit at 0 { > > + temperature = <115000>; > > + hysteresis = <2000>; > > + type = "critical"; @@ -69,15 +69,15 @@ rui > > + }; > > + }; > > + -> > timer { -> > compatible = "arm,armv7-timer"; -> > interrupt-parent = <&gic>; +> > ? timer { +> > ? compatible = "arm,armv7-timer"; +> > ? interrupt-parent = <&gic>; > > @@ -222,4 +252,18 @@ -> > clock-names = "baud", "bus"; -> > status = "disabled"; -> > }; +> > ? clock-names = "baud", "bus"; +> > ? status = "disabled"; +> > ? }; > > + -> > + thermal: thermal@1100b000 { +> > + thermal: thermal at 1100b000 { > > + #thermal-sensor-cells = <0>; > > + compatible = "mediatek,mt2701-thermal"; > > + reg = <0 0x1100b000 0 0x1000>; @@ -91,9 +91,9 @@ rui > > + mediatek,apmixedsys = <&apmixedsys>; > > + }; > > + -> > }; +> > ?}; > -- > 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 +> the body of a message to majordomo at vger.kernel.org +> More majordomo info at??http://vger.kernel.org/majordomo-info.html diff --git a/a/content_digest b/N1/content_digest index 9df14bd..90d35ec 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,33 +1,14 @@ "ref\01471492253-7185-1-git-send-email-dawei.chien@mediatek.com\0" "ref\01471492253-7185-4-git-send-email-dawei.chien@mediatek.com\0" "ref\01473121447.2201.20.camel@intel.com\0" - "From\0Zhang Rui <rui.zhang@intel.com>\0" - "Subject\0Re: [PATCH v2 3/3] arm: dts: thermal: add thermal/auxadc node.\0" + "From\0rui.zhang@intel.com (Zhang Rui)\0" + "Subject\0[PATCH v2 3/3] arm: dts: thermal: add thermal/auxadc node.\0" "Date\0Tue, 06 Sep 2016 08:30:07 +0800\0" - "To\0Dawei Chien <dawei.chien@mediatek.com>" - " Eduardo Valentin <edubezval@gmail.com>\0" - "Cc\0Rob Herring <robh+dt@kernel.org>" - Pawel Moll <pawel.moll@arm.com> - Mark Rutland <mark.rutland@arm.com> - Ian Campbell <ijc+devicetree@hellion.org.uk> - Kumar Gala <galak@codeaurora.org> - Russell King <linux@armlinux.org.uk> - Matthias Brugger <matthias.bgg@gmail.com> - linux-pm@vger.kernel.org - devicetree@vger.kernel.org - linux-kernel@vger.kernel.org - linux-arm-kernel@lists.infradead.org - linux-mediatek@lists.infradead.org - srv_heupstream@mediatek.com - Sascha Hauer <kernel@pengutronix.de> - Fan Chen <fan.chen@mediatek.com> - Eddie Huang <eddie.huang@mediatek.com> - Yingjoe Chen <yingjoe.chen@mediatek.com> - " Erin Lo <erin.lo@mediatek.com>\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" - "On \344\272\214, 2016-09-06 at 08:24 +0800, Zhang Rui wrote:\n" - "> On \345\233\233, 2016-08-18 at 11:50 +0800, Dawei Chien wrote:\n" + "On ?, 2016-09-06 at 08:24 +0800, Zhang Rui wrote:\n" + "> On ?, 2016-08-18 at 11:50 +0800, Dawei Chien wrote:\n" "> > \n" "> > This adds the thermal controller and auxadc nodes\n" "> > to the Mediatek MT2701 dtsi file.\n" @@ -50,12 +31,12 @@ "thanks,\n" "rui\n" "> thanks,\n" - "> rui\302\240\n" + "> rui?\n" "> > \n" "> > ---\n" - "> > \302\240arch/arm/boot/dts/mt2701.dtsi |\302\240\302\240\302\24044\n" + "> > ?arch/arm/boot/dts/mt2701.dtsi |???44\n" "> > +++++++++++++++++++++++++++++++++++++++++\n" - "> > \302\2401 file changed, 44 insertions(+)\n" + "> > ?1 file changed, 44 insertions(+)\n" "> > \n" "> > diff --git a/arch/arm/boot/dts/mt2701.dtsi\n" "> > b/arch/arm/boot/dts/mt2701.dtsi\n" @@ -63,9 +44,9 @@ "> > --- a/arch/arm/boot/dts/mt2701.dtsi\n" "> > +++ b/arch/arm/boot/dts/mt2701.dtsi\n" "> > @@ -87,6 +87,36 @@\n" - "> > \302\240\t\tclock-output-names = \"rtc32k\";\n" - "> > \302\240\t};\n" - "> > \302\240\n" + "> > ?\t\tclock-output-names = \"rtc32k\";\n" + "> > ?\t};\n" + "> > ?\n" "> > +\tthermal-zones {\n" "> > +\t\tcpu_thermal: cpu_thermal {\n" "> > +\t\t\tpolling-delay-passive = <1000>; /*\n" @@ -76,19 +57,19 @@ "> > +\t\t\tsustainable-power = <1000>;\n" "> > +\n" "> > +\t\t\ttrips {\n" - "> > +\t\t\t\tthreshold: trip-point@0 {\n" + "> > +\t\t\t\tthreshold: trip-point at 0 {\n" "> > +\t\t\t\t\ttemperature = <68000>;\n" "> > +\t\t\t\t\thysteresis = <2000>;\n" "> > +\t\t\t\t\ttype = \"passive\";\n" "> > +\t\t\t\t};\n" "> > +\n" - "> > +\t\t\t\ttarget: trip-point@1 {\n" + "> > +\t\t\t\ttarget: trip-point at 1 {\n" "> > +\t\t\t\t\ttemperature = <85000>;\n" "> > +\t\t\t\t\thysteresis = <2000>;\n" "> > +\t\t\t\t\ttype = \"passive\";\n" "> > +\t\t\t\t};\n" "> > +\n" - "> > +\t\t\t\tcpu_crit: cpu_crit@0 {\n" + "> > +\t\t\t\tcpu_crit: cpu_crit at 0 {\n" "> > +\t\t\t\t\ttemperature = <115000>;\n" "> > +\t\t\t\t\thysteresis = <2000>;\n" "> > +\t\t\t\t\ttype = \"critical\";\n" @@ -97,15 +78,15 @@ "> > +\t\t};\n" "> > +\t};\n" "> > +\n" - "> > \302\240\ttimer {\n" - "> > \302\240\t\tcompatible = \"arm,armv7-timer\";\n" - "> > \302\240\t\tinterrupt-parent = <&gic>;\n" + "> > ?\ttimer {\n" + "> > ?\t\tcompatible = \"arm,armv7-timer\";\n" + "> > ?\t\tinterrupt-parent = <&gic>;\n" "> > @@ -222,4 +252,18 @@\n" - "> > \302\240\t\tclock-names = \"baud\", \"bus\";\n" - "> > \302\240\t\tstatus = \"disabled\";\n" - "> > \302\240\t};\n" + "> > ?\t\tclock-names = \"baud\", \"bus\";\n" + "> > ?\t\tstatus = \"disabled\";\n" + "> > ?\t};\n" "> > +\n" - "> > +\tthermal: thermal@1100b000 {\n" + "> > +\tthermal: thermal at 1100b000 {\n" "> > +\t\t#thermal-sensor-cells = <0>;\n" "> > +\t\tcompatible = \"mediatek,mt2701-thermal\";\n" "> > +\t\treg = <0 0x1100b000 0 0x1000>;\n" @@ -119,11 +100,11 @@ "> > +\t\tmediatek,apmixedsys = <&apmixedsys>;\n" "> > +\t};\n" "> > +\n" - "> > \302\240};\n" + "> > ?};\n" "> --\n" "> To unsubscribe from this list: send the line \"unsubscribe linux-pm\"\n" "> in\n" - "> the body of a message to majordomo@vger.kernel.org\n" - "> More majordomo info at\302\240\302\240http://vger.kernel.org/majordomo-info.html" + "> the body of a message to majordomo at vger.kernel.org\n" + > More majordomo info at??http://vger.kernel.org/majordomo-info.html -4e5d527c085003cea1f4b70f97d6a5b5e1cc378ab2e3c35dc3057f4c85d803df +8644ed58d9094b98ab8385cf1f960f1904c61704dde1d4d28677a1ceb201594f
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.