diff for duplicates of <1473121447.2201.20.camel@intel.com> diff --git a/a/1.txt b/N1/1.txt index fe5dafb..c123334 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -1,8 +1,8 @@ -On 四, 2016-08-18 at 11:50 +0800, Dawei Chien 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. > -> Signed-off-by: Dawei Chien <dawei.chien-NuS5LvNUpcJWk0Htik3J/w@public.gmane.org> +> Signed-off-by: Dawei Chien <dawei.chien@mediatek.com> > --- > This patch depned on: > https://patchwork.kernel.org/patch/9249589/ @@ -12,11 +12,11 @@ Hmm, does this mean that I should take all these three patches and hold the patches in next merge window until the above patch has been merged? 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 @@ -24,9 +24,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>; /* @@ -37,19 +37,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"; @@ -58,15 +58,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>; @@ -80,8 +80,4 @@ rui > + mediatek,apmixedsys = <&apmixedsys>; > + }; > + -> }; --- -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 ed71efa..f491ca4 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,36 +1,16 @@ "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\01471492253-7185-4-git-send-email-dawei.chien-NuS5LvNUpcJWk0Htik3J/w@public.gmane.org\0" - "From\0Zhang Rui <rui.zhang-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org>\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:24:07 +0800\0" - "To\0Dawei Chien <dawei.chien-NuS5LvNUpcJWk0Htik3J/w@public.gmane.org>" - " Eduardo Valentin <edubezval-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>\0" - "Cc\0Rob 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> - Ian Campbell <ijc+devicetree-KcIKpvwj1kUDXYZnReoRVg@public.gmane.org> - Kumar Gala <galak-sgV2jX0FEOL9JmXXK+q4OQ@public.gmane.org> - Russell King <linux-I+IVW8TIWO2tmTQ+vhA3Yw@public.gmane.org> - Matthias Brugger <matthias.bgg-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> - linux-pm-u79uwXL29TY76Z2rM5mHXA@public.gmane.org - devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org - linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org - linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org - linux-mediatek-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org - srv_heupstream-NuS5LvNUpcJWk0Htik3J/w@public.gmane.org - Sascha Hauer <kernel-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org> - Fan Chen <fan.chen-NuS5LvNUpcJWk0Htik3J/w@public.gmane.org> - Eddie Huang <eddie.huang-NuS5LvNUpcJWk0Htik3J/w@public.gmane.org> - Yingjoe Chen <yingjoe.chen-NuS5LvNUpcJWk0Htik3J/w@public.gmane.org> - " Erin Lo <erin.lo-NuS5LvNUpcJWk0Htik3J/w@public.gmane.org>\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" - "On \345\233\233, 2016-08-18 at 11:50 +0800, Dawei Chien wrote:\n" + "On ?, 2016-08-18 at 11:50 +0800, Dawei Chien wrote:\n" "> This adds the thermal controller and auxadc nodes\n" "> to the Mediatek MT2701 dtsi file.\n" "> \n" - "> Signed-off-by: Dawei Chien <dawei.chien-NuS5LvNUpcJWk0Htik3J/w@public.gmane.org>\n" + "> Signed-off-by: Dawei Chien <dawei.chien@mediatek.com>\n" "> ---\n" "> This patch depned on:\n" "> https://patchwork.kernel.org/patch/9249589/\n" @@ -40,11 +20,11 @@ "the patches in next merge window until the above patch has been merged?\n" "\n" "thanks,\n" - "rui\302\240\n" + "rui?\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" @@ -52,9 +32,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" @@ -65,19 +45,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" @@ -86,15 +66,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" @@ -108,10 +88,6 @@ "> +\t\tmediatek,apmixedsys = <&apmixedsys>;\n" "> +\t};\n" "> +\n" - "> \302\240};\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 + > ?}; -b7c35023f37340c9447f0b3d44580dd37e777dc5e3483142646c7e3d36d3858b +81946361039c9ce977232153b18dcc3443a7fc4a8dbbe788268f48b19868f85b
diff --git a/a/1.txt b/N2/1.txt index fe5dafb..16e0254 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -2,7 +2,7 @@ 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. > -> Signed-off-by: Dawei Chien <dawei.chien-NuS5LvNUpcJWk0Htik3J/w@public.gmane.org> +> Signed-off-by: Dawei Chien <dawei.chien@mediatek.com> > --- > This patch depned on: > https://patchwork.kernel.org/patch/9249589/ @@ -81,7 +81,3 @@ rui > + }; > + > }; --- -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/N2/content_digest index ed71efa..6ab764d 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,36 +1,35 @@ "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\01471492253-7185-4-git-send-email-dawei.chien-NuS5LvNUpcJWk0Htik3J/w@public.gmane.org\0" - "From\0Zhang Rui <rui.zhang-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org>\0" + "From\0Zhang Rui <rui.zhang@intel.com>\0" "Subject\0Re: [PATCH v2 3/3] arm: dts: thermal: add thermal/auxadc node.\0" "Date\0Tue, 06 Sep 2016 08:24:07 +0800\0" - "To\0Dawei Chien <dawei.chien-NuS5LvNUpcJWk0Htik3J/w@public.gmane.org>" - " Eduardo Valentin <edubezval-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>\0" - "Cc\0Rob 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> - Ian Campbell <ijc+devicetree-KcIKpvwj1kUDXYZnReoRVg@public.gmane.org> - Kumar Gala <galak-sgV2jX0FEOL9JmXXK+q4OQ@public.gmane.org> - Russell King <linux-I+IVW8TIWO2tmTQ+vhA3Yw@public.gmane.org> - Matthias Brugger <matthias.bgg-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> - linux-pm-u79uwXL29TY76Z2rM5mHXA@public.gmane.org - devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org - linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org - linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org - linux-mediatek-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org - srv_heupstream-NuS5LvNUpcJWk0Htik3J/w@public.gmane.org - Sascha Hauer <kernel-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org> - Fan Chen <fan.chen-NuS5LvNUpcJWk0Htik3J/w@public.gmane.org> - Eddie Huang <eddie.huang-NuS5LvNUpcJWk0Htik3J/w@public.gmane.org> - Yingjoe Chen <yingjoe.chen-NuS5LvNUpcJWk0Htik3J/w@public.gmane.org> - " Erin Lo <erin.lo-NuS5LvNUpcJWk0Htik3J/w@public.gmane.org>\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" "\00:1\0" "b\0" "On \345\233\233, 2016-08-18 at 11:50 +0800, Dawei Chien wrote:\n" "> This adds the thermal controller and auxadc nodes\n" "> to the Mediatek MT2701 dtsi file.\n" "> \n" - "> Signed-off-by: Dawei Chien <dawei.chien-NuS5LvNUpcJWk0Htik3J/w@public.gmane.org>\n" + "> Signed-off-by: Dawei Chien <dawei.chien@mediatek.com>\n" "> ---\n" "> This patch depned on:\n" "> https://patchwork.kernel.org/patch/9249589/\n" @@ -108,10 +107,6 @@ "> +\t\tmediatek,apmixedsys = <&apmixedsys>;\n" "> +\t};\n" "> +\n" - "> \302\240};\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 + "> \302\240};" -b7c35023f37340c9447f0b3d44580dd37e777dc5e3483142646c7e3d36d3858b +983ba3bcb3c4b5eb498f517b6e4cb0740400c910e871d3e68d49127b66671dcf
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.