diff for duplicates of <1397006752-19494-2-git-send-email-sboyd@codeaurora.org> diff --git a/a/1.txt b/N1/1.txt index 86caea5..f41e200 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -22,7 +22,7 @@ index 169bad90dac9..a27eedff62d3 100644 }; + +&pmicintc { -+ keypad@148 { ++ keypad at 148 { + linux,keymap = < + MATRIX_KEY(0, 0, KEY_FN_F1) + MATRIX_KEY(0, 1, KEY_UP) @@ -57,7 +57,7 @@ index c52a9e964a44..985b4c16976a 100644 reg = <0x500000 0x1000>; qcom,controller-type = "pmic-arbiter"; + -+ pmicintc: pmic@0 { ++ pmicintc: pmic at 0 { + compatible = "qcom,pm8058"; + interrupt-parent = <&msmgpio>; + interrupts = <88 8>; @@ -66,7 +66,7 @@ index c52a9e964a44..985b4c16976a 100644 + #address-cells = <1>; + #size-cells = <0>; + -+ pwrkey@1c { ++ pwrkey at 1c { + compatible = "qcom,pm8058-pwrkey"; + reg = <0x1c>; + interrupt-parent = <&pmicintc>; @@ -75,7 +75,7 @@ index c52a9e964a44..985b4c16976a 100644 + pull-up; + }; + -+ keypad@148 { ++ keypad at 148 { + compatible = "qcom,pm8058-keypad"; + reg = <0x148>; + interrupt-parent = <&pmicintc>; @@ -85,7 +85,7 @@ index c52a9e964a44..985b4c16976a 100644 + row-hold = <91500>; + }; + -+ rtc@11d { ++ rtc at 11d { + compatible = "qcom,pm8058-rtc"; + interrupt-parent = <&pmicintc>; + interrupts = <39 1>; @@ -93,7 +93,7 @@ index c52a9e964a44..985b4c16976a 100644 + allow-set-time; + }; + -+ vibrator@4a { ++ vibrator at 4a { + compatible = "qcom,pm8058-vib"; + reg = <0x4a>; + }; diff --git a/a/content_digest b/N1/content_digest index c8236cc..ed86872 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,12 +1,8 @@ "ref\01397006752-19494-1-git-send-email-sboyd@codeaurora.org\0" - "From\0Stephen Boyd <sboyd@codeaurora.org>\0" + "From\0sboyd@codeaurora.org (Stephen Boyd)\0" "Subject\0[PATCH 2/2] ARM: dts: msm: Add 8058 PMIC to ssbi bus\0" "Date\0Tue, 8 Apr 2014 18:25:52 -0700\0" - "To\0David Brown <davidb@codeaurora.org>" - " Kumar Gala <galak@codeaurora.org>\0" - "Cc\0linux-kernel@vger.kernel.org" - linux-arm-msm@vger.kernel.org - " linux-arm-kernel@lists.infradead.org\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "Add the PMIC and the sub-devices that are currently supported in\n" @@ -33,7 +29,7 @@ " };\n" "+\n" "+&pmicintc {\n" - "+\tkeypad@148 {\n" + "+\tkeypad at 148 {\n" "+\t\tlinux,keymap = <\n" "+\t\t\tMATRIX_KEY(0, 0, KEY_FN_F1)\n" "+\t\t\tMATRIX_KEY(0, 1, KEY_UP)\n" @@ -68,7 +64,7 @@ " \t\treg = <0x500000 0x1000>;\n" " \t\tqcom,controller-type = \"pmic-arbiter\";\n" "+\n" - "+\t\tpmicintc: pmic@0 {\n" + "+\t\tpmicintc: pmic at 0 {\n" "+\t\t\tcompatible = \"qcom,pm8058\";\n" "+\t\t\tinterrupt-parent = <&msmgpio>;\n" "+\t\t\tinterrupts = <88 8>;\n" @@ -77,7 +73,7 @@ "+\t\t\t#address-cells = <1>;\n" "+\t\t\t#size-cells = <0>;\n" "+\n" - "+\t\t\tpwrkey@1c {\n" + "+\t\t\tpwrkey at 1c {\n" "+\t\t\t\tcompatible = \"qcom,pm8058-pwrkey\";\n" "+\t\t\t\treg = <0x1c>;\n" "+\t\t\t\tinterrupt-parent = <&pmicintc>;\n" @@ -86,7 +82,7 @@ "+\t\t\t\tpull-up;\n" "+\t\t\t};\n" "+\n" - "+\t\t\tkeypad@148 {\n" + "+\t\t\tkeypad at 148 {\n" "+\t\t\t\tcompatible = \"qcom,pm8058-keypad\";\n" "+\t\t\t\treg = <0x148>;\n" "+\t\t\t\tinterrupt-parent = <&pmicintc>;\n" @@ -96,7 +92,7 @@ "+\t\t\t\trow-hold = <91500>;\n" "+\t\t\t};\n" "+\n" - "+\t\t\trtc@11d {\n" + "+\t\t\trtc at 11d {\n" "+\t\t\t\tcompatible = \"qcom,pm8058-rtc\";\n" "+\t\t\t\tinterrupt-parent = <&pmicintc>;\n" "+\t\t\t\tinterrupts = <39 1>;\n" @@ -104,7 +100,7 @@ "+\t\t\t\tallow-set-time;\n" "+\t\t\t};\n" "+\n" - "+\t\t\tvibrator@4a {\n" + "+\t\t\tvibrator at 4a {\n" "+\t\t\t\tcompatible = \"qcom,pm8058-vib\";\n" "+\t\t\t\treg = <0x4a>;\n" "+\t\t\t};\n" @@ -115,4 +111,4 @@ "The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,\n" hosted by The Linux Foundation -2b44b90ae096a2622f11bccb71e8d5fcbacfdf6635d2fac19ad605505297b6c2 +caad73a31037cee2678d48449b8f28f7763a3d0c102d96c9480d05ba107727fc
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.