diff for duplicates of <1444280468-17159-9-git-send-email-rnayak@codeaurora.org> diff --git a/a/1.txt b/N1/1.txt index f70adcb..8065ac4 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -22,12 +22,12 @@ index 0554fbd..80570a1 100644 + thermal-sensors = <&tsens 5>; + + trips { -+ cpu_alert0: trip@0 { ++ cpu_alert0: trip at 0 { + temperature = <75000>; + hysteresis = <2000>; + type = "passive"; + }; -+ cpu_crit0: trip@1 { ++ cpu_crit0: trip at 1 { + temperature = <95000>; + hysteresis = <2000>; + type = "critical"; @@ -42,12 +42,12 @@ index 0554fbd..80570a1 100644 + thermal-sensors = <&tsens 6>; + + trips { -+ cpu_alert1: trip@0 { ++ cpu_alert1: trip at 0 { + temperature = <75000>; + hysteresis = <2000>; + type = "passive"; + }; -+ cpu_crit1: trip@1 { ++ cpu_crit1: trip at 1 { + temperature = <95000>; + hysteresis = <2000>; + type = "critical"; @@ -62,12 +62,12 @@ index 0554fbd..80570a1 100644 + thermal-sensors = <&tsens 7>; + + trips { -+ cpu_alert2: trip@0 { ++ cpu_alert2: trip at 0 { + temperature = <75000>; + hysteresis = <2000>; + type = "passive"; + }; -+ cpu_crit2: trip@1 { ++ cpu_crit2: trip at 1 { + temperature = <95000>; + hysteresis = <2000>; + type = "critical"; @@ -82,12 +82,12 @@ index 0554fbd..80570a1 100644 + thermal-sensors = <&tsens 8>; + + trips { -+ cpu_alert3: trip@0 { ++ cpu_alert3: trip at 0 { + temperature = <75000>; + hysteresis = <2000>; + type = "passive"; + }; -+ cpu_crit3: trip@1 { ++ cpu_crit3: trip at 1 { + temperature = <95000>; + hysteresis = <2000>; + type = "critical"; @@ -103,20 +103,20 @@ index 0554fbd..80570a1 100644 <0xf9002000 0x1000>; }; -+ qfprom: qfprom@fc4bc000 { ++ qfprom: qfprom at fc4bc000 { + #address-cells = <1>; + #size-cells = <1>; + compatible = "qcom,qfprom"; + reg = <0xfc4bc000 0x1000>; -+ tsens_calib: calib@d0 { ++ tsens_calib: calib at d0 { + reg = <0xd0 0x18>; + }; -+ tsens_backup: backup@440 { ++ tsens_backup: backup at 440 { + reg = <0x440 0x10>; + }; + }; + -+ tsens: thermal-sensor@fc4a8000 { ++ tsens: thermal-sensor at fc4a8000 { + compatible = "qcom,msm8974-tsens"; + reg = <0xfc4a8000 0x2000>; + nvmem-cells = <&tsens_calib>, <&tsens_backup>; @@ -126,7 +126,7 @@ index 0554fbd..80570a1 100644 + #thermal-sensor-cells = <1>; + }; + - timer@f9020000 { + timer at f9020000 { #address-cells = <1>; #size-cells = <1>; -- diff --git a/a/content_digest b/N1/content_digest index 3bc1d6d..26c5bb6 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 8/9] arm: dts: apq8084: Add thermal zones, tsens and qfprom nodes\0" "Date\0Thu, 8 Oct 2015 10:31:07 +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 5>;\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 = <75000>;\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 = <95000>;\n" "+\t\t\t\t\thysteresis = <2000>;\n" "+\t\t\t\t\ttype = \"critical\";\n" @@ -60,12 +49,12 @@ "+\t\t\tthermal-sensors = <&tsens 6>;\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 = <75000>;\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 = <95000>;\n" "+\t\t\t\t\thysteresis = <2000>;\n" "+\t\t\t\t\ttype = \"critical\";\n" @@ -80,12 +69,12 @@ "+\t\t\tthermal-sensors = <&tsens 7>;\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 = <75000>;\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 = <95000>;\n" "+\t\t\t\t\thysteresis = <2000>;\n" "+\t\t\t\t\ttype = \"critical\";\n" @@ -100,12 +89,12 @@ "+\t\t\tthermal-sensors = <&tsens 8>;\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 = <75000>;\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 = <95000>;\n" "+\t\t\t\t\thysteresis = <2000>;\n" "+\t\t\t\t\ttype = \"critical\";\n" @@ -121,20 +110,20 @@ " \t\t\t <0xf9002000 0x1000>;\n" " \t\t};\n" " \n" - "+\t\tqfprom: qfprom@fc4bc000 {\n" + "+\t\tqfprom: qfprom at fc4bc000 {\n" "+\t\t\t#address-cells = <1>;\n" "+\t\t\t#size-cells = <1>;\n" "+\t\t\tcompatible = \"qcom,qfprom\";\n" "+\t\t\treg = <0xfc4bc000 0x1000>;\n" - "+\t\t\ttsens_calib: calib@d0 {\n" + "+\t\t\ttsens_calib: calib at d0 {\n" "+\t\t\t\treg = <0xd0 0x18>;\n" "+\t\t\t};\n" - "+\t\t\ttsens_backup: backup@440 {\n" + "+\t\t\ttsens_backup: backup at 440 {\n" "+\t\t\t\treg = <0x440 0x10>;\n" "+\t\t\t};\n" "+\t\t};\n" "+\n" - "+\t\ttsens: thermal-sensor@fc4a8000 {\n" + "+\t\ttsens: thermal-sensor at fc4a8000 {\n" "+\t\t\tcompatible = \"qcom,msm8974-tsens\";\n" "+\t\t\treg = <0xfc4a8000 0x2000>;\n" "+\t\t\tnvmem-cells = <&tsens_calib>, <&tsens_backup>;\n" @@ -144,11 +133,11 @@ "+\t\t\t#thermal-sensor-cells = <1>;\n" "+\t\t};\n" "+\n" - " \t\ttimer@f9020000 {\n" + " \t\ttimer at f9020000 {\n" " \t\t\t#address-cells = <1>;\n" " \t\t\t#size-cells = <1>;\n" "-- \n" "QUALCOMM INDIA, on behalf of Qualcomm Innovation Center, Inc. is a member\n" of Code Aurora Forum, hosted by The Linux Foundation -b415916e59a38f3655facabb5cdc16461938c46a02623b530d6e68766e705700 +ccd793da96a9e77e26d20d0f6047ebc3692c96a1e40cf2d84f139c2a63ba6c37
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.