diff for duplicates of <1429796773-7151-8-git-send-email-rnayak@codeaurora.org> diff --git a/a/1.txt b/N1/1.txt index cd17bae..4b4993e 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -21,12 +21,12 @@ index b3154c0..1aed325 100644 + thermal-sensors = <&tsens 7>; + + 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"; @@ -41,12 +41,12 @@ index b3154c0..1aed325 100644 + thermal-sensors = <&tsens 8>; + + 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"; @@ -61,12 +61,12 @@ index b3154c0..1aed325 100644 + thermal-sensors = <&tsens 9>; + + trips { -+ cpu_alert2: trip@0 { ++ cpu_alert2: trip at 0 { + temperature = <100000>; + hysteresis = <2000>; + type = "passive"; + }; -+ cpu_crit2: trip@1 { ++ cpu_crit2: trip at 1 { + temperature = <125000>; + hysteresis = <2000>; + type = "critical"; @@ -81,12 +81,12 @@ index b3154c0..1aed325 100644 + thermal-sensors = <&tsens 10>; + + trips { -+ cpu_alert3: trip@0 { ++ cpu_alert3: trip at 0 { + temperature = <100000>; + hysteresis = <2000>; + type = "passive"; + }; -+ cpu_crit3: trip@1 { ++ cpu_crit3: trip at 1 { + temperature = <125000>; + hysteresis = <2000>; + type = "critical"; @@ -102,7 +102,7 @@ index b3154c0..1aed325 100644 qcom,controller-type = "pmic-arbiter"; }; -+ qfprom: qfprom@00700000 { ++ qfprom: qfprom at 00700000 { + compatible = "qcom,qfprom"; + reg = <0x00700000 0x1000>; + #address-cells = <1>; @@ -116,7 +116,7 @@ index b3154c0..1aed325 100644 + }; + }; + - gcc: clock-controller@900000 { + gcc: clock-controller at 900000 { compatible = "qcom,gcc-apq8064"; reg = <0x00900000 0x4000>; #clock-cells = <1>; @@ -125,7 +125,7 @@ index b3154c0..1aed325 100644 + #size-cells = <1>; + ranges; + -+ tsens: thermal-sensor@900000 { ++ tsens: thermal-sensor at 900000 { + compatible = "qcom,msm8960-tsens"; + calib = <&tsens_calib>; + calib_backup = <&tsens_backup>; @@ -135,7 +135,7 @@ index b3154c0..1aed325 100644 + }; }; - mmcc: clock-controller@4000000 { + mmcc: clock-controller at 4000000 { -- QUALCOMM INDIA, on behalf of Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, hosted by The Linux Foundation diff --git a/a/content_digest b/N1/content_digest index 8ba96d5..8a9c1bf 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,15 +1,8 @@ "ref\01429796773-7151-1-git-send-email-rnayak@codeaurora.org\0" - "From\0Rajendra Nayak <rnayak@codeaurora.org>\0" + "From\0rnayak@codeaurora.org (Rajendra Nayak)\0" "Subject\0[RFC 7/7] arm: dts: apq8064: Add thermal zones, tsens and eeprom nodes\0" "Date\0Thu, 23 Apr 2015 19:16:13 +0530\0" - "To\0linux-arm-msm@vger.kernel.org" - linux-arm-kernel@lists.infradead.org - " linux-pm@vger.kernel.org\0" - "Cc\0sboyd@codeaurora.org" - srinivas.kandagatla@linaro.org - nrajan@codeaurora.org - lina.iyer@linaro.org - " Rajendra Nayak <rnayak@codeaurora.org>\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "Add thermal zones, tsens and eeprom nodes\n" @@ -35,12 +28,12 @@ "+\t\t\tthermal-sensors = <&tsens 7>;\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" @@ -55,12 +48,12 @@ "+\t\t\tthermal-sensors = <&tsens 8>;\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" @@ -75,12 +68,12 @@ "+\t\t\tthermal-sensors = <&tsens 9>;\n" "+\n" "+\t\t\ttrips {\n" - "+\t\t\t\tcpu_alert2: trip@0 {\n" + "+\t\t\t\tcpu_alert2: 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_crit2: trip@1 {\n" + "+\t\t\t\tcpu_crit2: 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" @@ -95,12 +88,12 @@ "+\t\t\tthermal-sensors = <&tsens 10>;\n" "+\n" "+\t\t\ttrips {\n" - "+\t\t\t\tcpu_alert3: trip@0 {\n" + "+\t\t\t\tcpu_alert3: 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_crit3: trip@1 {\n" + "+\t\t\t\tcpu_crit3: 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" @@ -116,7 +109,7 @@ " \t\t\tqcom,controller-type = \"pmic-arbiter\";\n" " \t\t};\n" " \n" - "+\t\tqfprom: qfprom@00700000 {\n" + "+\t\tqfprom: qfprom at 00700000 {\n" "+\t\t\tcompatible\t= \"qcom,qfprom\";\n" "+\t\t\treg\t\t= <0x00700000 0x1000>;\n" "+\t\t\t#address-cells\t= <1>;\n" @@ -130,7 +123,7 @@ "+\t\t\t};\n" "+\t\t};\n" "+\n" - " \t\tgcc: clock-controller@900000 {\n" + " \t\tgcc: clock-controller at 900000 {\n" " \t\t\tcompatible = \"qcom,gcc-apq8064\";\n" " \t\t\treg = <0x00900000 0x4000>;\n" " \t\t\t#clock-cells = <1>;\n" @@ -139,7 +132,7 @@ "+\t\t\t#size-cells\t= <1>;\n" "+\t\t\tranges;\n" "+\n" - "+\t\t\ttsens: thermal-sensor@900000 {\n" + "+\t\t\ttsens: thermal-sensor at 900000 {\n" "+\t\t\t\tcompatible = \"qcom,msm8960-tsens\";\n" "+\t\t\t\tcalib = <&tsens_calib>;\n" "+\t\t\t\tcalib_backup = <&tsens_backup>;\n" @@ -149,9 +142,9 @@ "+\t\t\t};\n" " \t\t};\n" " \n" - " \t\tmmcc: clock-controller@4000000 {\n" + " \t\tmmcc: clock-controller at 4000000 {\n" "-- \n" "QUALCOMM INDIA, on behalf of Qualcomm Innovation Center, Inc. is a member\n" of Code Aurora Forum, hosted by The Linux Foundation -a72652b045a553db5fee851794f2f93f4d79c32e7cb0c51474143122349febdc +7f66d9e2328b36fe3ce71864b7d6a322e6be8532c9cefd27f42b2cb7823ec212
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.