diff for duplicates of <20161103215046.GT25787@tuxbot> diff --git a/a/1.txt b/N1/1.txt index 52d04e2..0fd6c70 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -42,7 +42,7 @@ Bjorn > > -&pmicintc { > +&pm8058 { -> keypad@148 { +> keypad at 148 { > linux,keymap = < > MATRIX_KEY(0, 0, KEY_FN_F1) > diff --git a/arch/arm/boot/dts/qcom-msm8660.dtsi b/arch/arm/boot/dts/qcom-msm8660.dtsi @@ -53,8 +53,8 @@ Bjorn > reg = <0x500000 0x1000>; > qcom,controller-type = "pmic-arbiter"; > -> - pmicintc: pmic@0 { -> + pm8058: pmic@0 { +> - pmicintc: pmic at 0 { +> + pm8058: pmic at 0 { > compatible = "qcom,pm8058"; > interrupt-parent = <&tlmm>; > interrupts = <88 8>; @@ -77,7 +77,7 @@ Bjorn > <128 IRQ_TYPE_NONE>, > <129 IRQ_TYPE_NONE>, > @@ -251,7 +251,7 @@ -> pwrkey@1c { +> pwrkey at 1c { > compatible = "qcom,pm8058-pwrkey"; > reg = <0x1c>; > - interrupt-parent = <&pmicintc>; @@ -86,7 +86,7 @@ Bjorn > debounce = <15625>; > pull-up; > @@ -260,7 +260,7 @@ -> keypad@148 { +> keypad at 148 { > compatible = "qcom,pm8058-keypad"; > reg = <0x148>; > - interrupt-parent = <&pmicintc>; @@ -95,7 +95,7 @@ Bjorn > debounce = <15>; > scan-delay = <32>; > @@ -270,7 +270,7 @@ -> rtc@1e8 { +> rtc at 1e8 { > compatible = "qcom,pm8058-rtc"; > reg = <0x1e8>; > - interrupt-parent = <&pmicintc>; diff --git a/a/content_digest b/N1/content_digest index c304bbd..d4e0c5c 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,13 +1,8 @@ "ref\01478164390-21613-1-git-send-email-linus.walleij@linaro.org\0" - "From\0Bjorn Andersson <bjorn.andersson@linaro.org>\0" - "Subject\0Re: [PATCH 1/3] ARM: dts: rename MSM8660/APQ8060 pmicintc to pm8058\0" + "From\0bjorn.andersson@linaro.org (Bjorn Andersson)\0" + "Subject\0[PATCH 1/3] ARM: dts: rename MSM8660/APQ8060 pmicintc to pm8058\0" "Date\0Thu, 3 Nov 2016 14:50:46 -0700\0" - "To\0Linus Walleij <linus.walleij@linaro.org>\0" - "Cc\0linux-arm-kernel@lists.infradead.org" - linux-arm-msm@vger.kernel.org - Andy Gross <andy.gross@linaro.org> - Stephen Boyd <sboyd@codeaurora.org> - " David Brown <david.brown@linaro.org>\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "On Thu 03 Nov 02:13 PDT 2016, Linus Walleij wrote:\n" @@ -54,7 +49,7 @@ "> \n" "> -&pmicintc {\n" "> +&pm8058 {\n" - "> \tkeypad@148 {\n" + "> \tkeypad at 148 {\n" "> \t\tlinux,keymap = <\n" "> \t\t\tMATRIX_KEY(0, 0, KEY_FN_F1)\n" "> diff --git a/arch/arm/boot/dts/qcom-msm8660.dtsi b/arch/arm/boot/dts/qcom-msm8660.dtsi\n" @@ -65,8 +60,8 @@ "> \t\t\treg = <0x500000 0x1000>;\n" "> \t\t\tqcom,controller-type = \"pmic-arbiter\";\n" "> \n" - "> -\t\t\tpmicintc: pmic@0 {\n" - "> +\t\t\tpm8058: pmic@0 {\n" + "> -\t\t\tpmicintc: pmic at 0 {\n" + "> +\t\t\tpm8058: pmic at 0 {\n" "> \t\t\t\tcompatible = \"qcom,pm8058\";\n" "> \t\t\t\tinterrupt-parent = <&tlmm>;\n" "> \t\t\t\tinterrupts = <88 8>;\n" @@ -89,7 +84,7 @@ "> \t\t\t\t\t<128 IRQ_TYPE_NONE>,\n" "> \t\t\t\t\t<129 IRQ_TYPE_NONE>,\n" "> @@ -251,7 +251,7 @@\n" - "> \t\t\t\tpwrkey@1c {\n" + "> \t\t\t\tpwrkey at 1c {\n" "> \t\t\t\t\tcompatible = \"qcom,pm8058-pwrkey\";\n" "> \t\t\t\t\treg = <0x1c>;\n" "> -\t\t\t\t\tinterrupt-parent = <&pmicintc>;\n" @@ -98,7 +93,7 @@ "> \t\t\t\t\tdebounce = <15625>;\n" "> \t\t\t\t\tpull-up;\n" "> @@ -260,7 +260,7 @@\n" - "> \t\t\t\tkeypad@148 {\n" + "> \t\t\t\tkeypad at 148 {\n" "> \t\t\t\t\tcompatible = \"qcom,pm8058-keypad\";\n" "> \t\t\t\t\treg = <0x148>;\n" "> -\t\t\t\t\tinterrupt-parent = <&pmicintc>;\n" @@ -107,7 +102,7 @@ "> \t\t\t\t\tdebounce = <15>;\n" "> \t\t\t\t\tscan-delay = <32>;\n" "> @@ -270,7 +270,7 @@\n" - "> \t\t\t\trtc@1e8 {\n" + "> \t\t\t\trtc at 1e8 {\n" "> \t\t\t\t\tcompatible = \"qcom,pm8058-rtc\";\n" "> \t\t\t\t\treg = <0x1e8>;\n" "> -\t\t\t\t\tinterrupt-parent = <&pmicintc>;\n" @@ -119,4 +114,4 @@ "> 2.7.4\n" > -6cf23bd4c5cffdf7e9be5badb43ee8d6e7debbe55c17a13bd5c096b0f466de01 +82b9844b408cb90069dff3462b35d09ad96ba397ea3f46bfe6352b072fd3f404
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.