diff for duplicates of <1444280468-17159-10-git-send-email-rnayak@codeaurora.org> diff --git a/a/1.txt b/N1/1.txt index e50ebc8..272b323 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -22,12 +22,12 @@ index 3e7083c..63b5262 100644 + thermal-sensors = <&tsens 4>; + + trips { -+ cpu_alert0: trip@0 { ++ cpu_alert0: trip at 0 { + temperature = <100000>; + hysteresis = <2000>; + type = "passive"; + }; -+ cpu_crit0: trip@1 { ++ cpu_crit0: trip at 1 { + temperature = <125000>; + hysteresis = <2000>; + type = "critical"; @@ -42,12 +42,12 @@ index 3e7083c..63b5262 100644 + thermal-sensors = <&tsens 3>; + + trips { -+ cpu_alert1: trip@0 { ++ cpu_alert1: trip at 0 { + temperature = <100000>; + hysteresis = <2000>; + type = "passive"; + }; -+ cpu_crit1: trip@1 { ++ cpu_crit1: trip at 1 { + temperature = <125000>; + hysteresis = <2000>; + type = "critical"; @@ -65,20 +65,20 @@ index 3e7083c..63b5262 100644 #interrupt-cells = <4>; }; + -+ qfprom: qfprom@5c000 { ++ qfprom: qfprom at 5c000 { + compatible = "qcom,qfprom"; + reg = <0x5c000 0x1000>; + #address-cells = <1>; + #size-cells = <1>; -+ tsens_caldata: caldata@d0 { ++ tsens_caldata: caldata at d0 { + reg = <0xd0 0x8>; + }; -+ tsens_calsel: calsel@ec { ++ tsens_calsel: calsel at ec { + reg = <0xec 0x4>; + }; + }; + -+ tsens: thermal-sensor@4a8000 { ++ tsens: thermal-sensor at 4a8000 { + compatible = "qcom,msm8916-tsens"; + reg = <0x4a8000 0x2000>; + nvmem-cells = <&tsens_caldata>, <&tsens_calsel>; diff --git a/a/content_digest b/N1/content_digest index 8b425e3..927bab6 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,19 +1,8 @@ "ref\01444280468-17159-1-git-send-email-rnayak@codeaurora.org\0" - "From\0Rajendra Nayak <rnayak@codeaurora.org>\0" + "From\0rnayak@codeaurora.org (Rajendra Nayak)\0" "Subject\0[PATCH v3 9/9] arm64: dts: msm8916: Add thermal zones, tsens and qfprom nodes\0" "Date\0Thu, 8 Oct 2015 10:31:08 +0530\0" - "To\0linux-arm-msm@vger.kernel.org" - linux-arm-kernel@lists.infradead.org - linux-pm@vger.kernel.org - rui.zhang@intel.com - " edubezval@gmail.com\0" - "Cc\0sboyd@codeaurora.org" - srinivas.kandagatla@linaro.org - nrajan@codeaurora.org - lina.iyer@linaro.org - punit.agrawal@arm.com - Rajendra Nayak <rnayak@codeaurora.org> - " Andy Gross <agross@codeaurora.org>\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "Add thermal zones, tsens and qfprom nodes\n" @@ -40,12 +29,12 @@ "+\t\t\tthermal-sensors = <&tsens 4>;\n" "+\n" "+\t\t\ttrips {\n" - "+\t\t\t\tcpu_alert0: trip@0 {\n" + "+\t\t\t\tcpu_alert0: trip at 0 {\n" "+\t\t\t\t\ttemperature = <100000>;\n" "+\t\t\t\t\thysteresis = <2000>;\n" "+\t\t\t\t\ttype = \"passive\";\n" "+\t\t\t\t};\n" - "+\t\t\t\tcpu_crit0: trip@1 {\n" + "+\t\t\t\tcpu_crit0: trip at 1 {\n" "+\t\t\t\t\ttemperature = <125000>;\n" "+\t\t\t\t\thysteresis = <2000>;\n" "+\t\t\t\t\ttype = \"critical\";\n" @@ -60,12 +49,12 @@ "+\t\t\tthermal-sensors = <&tsens 3>;\n" "+\n" "+\t\t\ttrips {\n" - "+\t\t\t\tcpu_alert1: trip@0 {\n" + "+\t\t\t\tcpu_alert1: trip at 0 {\n" "+\t\t\t\t\ttemperature = <100000>;\n" "+\t\t\t\t\thysteresis = <2000>;\n" "+\t\t\t\t\ttype = \"passive\";\n" "+\t\t\t\t};\n" - "+\t\t\t\tcpu_crit1: trip@1 {\n" + "+\t\t\t\tcpu_crit1: trip at 1 {\n" "+\t\t\t\t\ttemperature = <125000>;\n" "+\t\t\t\t\thysteresis = <2000>;\n" "+\t\t\t\t\ttype = \"critical\";\n" @@ -83,20 +72,20 @@ " \t\t\t#interrupt-cells = <4>;\n" " \t\t};\n" "+\n" - "+\t\tqfprom: qfprom@5c000 {\n" + "+\t\tqfprom: qfprom at 5c000 {\n" "+\t\t\tcompatible = \"qcom,qfprom\";\n" "+\t\t\treg = <0x5c000 0x1000>;\n" "+\t\t\t#address-cells = <1>;\n" "+\t\t\t#size-cells = <1>;\n" - "+\t\t\ttsens_caldata: caldata@d0 {\n" + "+\t\t\ttsens_caldata: caldata at d0 {\n" "+\t\t\t\treg = <0xd0 0x8>;\n" "+\t\t\t};\n" - "+\t\t\ttsens_calsel: calsel@ec {\n" + "+\t\t\ttsens_calsel: calsel at ec {\n" "+\t\t\t\treg = <0xec 0x4>;\n" "+\t\t\t};\n" "+\t\t};\n" "+\n" - "+\t\ttsens: thermal-sensor@4a8000 {\n" + "+\t\ttsens: thermal-sensor at 4a8000 {\n" "+\t\t\tcompatible = \"qcom,msm8916-tsens\";\n" "+\t\t\treg = <0x4a8000 0x2000>;\n" "+\t\t\tnvmem-cells = <&tsens_caldata>, <&tsens_calsel>;\n" @@ -112,4 +101,4 @@ "QUALCOMM INDIA, on behalf of Qualcomm Innovation Center, Inc. is a member\n" of Code Aurora Forum, hosted by The Linux Foundation -ba2d3ad644ce93e589a8d14b466ae5e89fad483248bbeaf52c58a11c364dd0c6 +8b1ce1cca1c619087c608f69db537d29251974fe09a5dffbc49e1600d9218c03
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.