diff for duplicates of <1448070586-2653-1-git-send-email-sboyd@codeaurora.org> diff --git a/a/1.txt b/N1/1.txt index 500d8f0..53c2bb5 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -19,7 +19,7 @@ index 11aca7fb1793..d0670d0ee08c 100644 +++ b/arch/arm/boot/dts/qcom-apq8064.dtsi @@ -430,7 +430,8 @@ - pm8921_gpio: gpio@150 { + pm8921_gpio: gpio at 150 { - compatible = "qcom,pm8921-gpio"; + compatible = "qcom,pm8921-gpio", @@ -30,7 +30,7 @@ index 11aca7fb1793..d0670d0ee08c 100644 @@ -454,7 +455,8 @@ }; - pm8921_mpps: mpps@50 { + pm8921_mpps: mpps at 50 { - compatible = "qcom,pm8921-mpp"; + compatible = "qcom,pm8921-mpp", + "qcom,ssbi-mpp"; @@ -44,7 +44,7 @@ index 523bee959f98..9f357f68713c 100644 @@ -10,7 +10,7 @@ #size-cells = <0>; - pm8841_mpps: mpps@a000 { + pm8841_mpps: mpps at a000 { - compatible = "qcom,pm8841-mpp"; + compatible = "qcom,pm8841-mpp", "qcom,spmi-mpp"; reg = <0xa000 0x400>; @@ -57,7 +57,7 @@ index 12c1202ba2ca..64622bd251d1 100644 @@ -48,7 +48,7 @@ }; - pm8941_gpios: gpios@c000 { + pm8941_gpios: gpios at c000 { - compatible = "qcom,pm8941-gpio"; + compatible = "qcom,pm8941-gpio", "qcom,spmi-gpio"; reg = <0xc000 0x2400>; @@ -66,7 +66,7 @@ index 12c1202ba2ca..64622bd251d1 100644 @@ -91,7 +91,7 @@ }; - pm8941_mpps: mpps@a000 { + pm8941_mpps: mpps at a000 { - compatible = "qcom,pm8941-mpp"; + compatible = "qcom,pm8941-mpp", "qcom,spmi-mpp"; reg = <0xa000 0x800>; @@ -79,7 +79,7 @@ index 10b8f9e6d60b..4e9bd3f88473 100644 @@ -19,7 +19,7 @@ }; - pma8084_gpios: gpios@c000 { + pma8084_gpios: gpios at c000 { - compatible = "qcom,pma8084-gpio"; + compatible = "qcom,pma8084-gpio", "qcom,spmi-gpio"; reg = <0xc000 0x1600>; @@ -88,7 +88,7 @@ index 10b8f9e6d60b..4e9bd3f88473 100644 @@ -48,7 +48,7 @@ }; - pma8084_mpps: mpps@a000 { + pma8084_mpps: mpps at a000 { - compatible = "qcom,pma8084-mpp"; + compatible = "qcom,pma8084-mpp", "qcom,spmi-mpp"; reg = <0xa000 0x800>; diff --git a/a/content_digest b/N1/content_digest index e401240..e52c84d 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,14 +1,7 @@ - "From\0Stephen Boyd <sboyd@codeaurora.org>\0" + "From\0sboyd@codeaurora.org (Stephen Boyd)\0" "Subject\0[PATCH] arm: dts: qcom: Add generic PMIC gpio/MPP compat strings\0" "Date\0Fri, 20 Nov 2015 17:49:46 -0800\0" - "To\0Andy Gross <agross@codeaurora.org>\0" - "Cc\0linux-kernel@vger.kernel.org" - linux-arm-msm@vger.kernel.org - linux-arm-kernel@lists.infradead.org - devicetree@vger.kernel.org - Ivan T. Ivanov <iivanov@mm-sol.com> - Bjorn Andersson <bjorn.andersson@sonymobile.com> - " Rob Herring <robh@kernel.org>\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "Add the generic compatible strings for the PMIC gpio and MPP\n" @@ -32,7 +25,7 @@ "+++ b/arch/arm/boot/dts/qcom-apq8064.dtsi\n" "@@ -430,7 +430,8 @@\n" " \n" - " \t\t\t\tpm8921_gpio: gpio@150 {\n" + " \t\t\t\tpm8921_gpio: gpio at 150 {\n" " \n" "-\t\t\t\t\tcompatible = \"qcom,pm8921-gpio\";\n" "+\t\t\t\t\tcompatible = \"qcom,pm8921-gpio\",\n" @@ -43,7 +36,7 @@ "@@ -454,7 +455,8 @@\n" " \t\t\t\t};\n" " \n" - " \t\t\t\tpm8921_mpps: mpps@50 {\n" + " \t\t\t\tpm8921_mpps: mpps at 50 {\n" "-\t\t\t\t\tcompatible = \"qcom,pm8921-mpp\";\n" "+\t\t\t\t\tcompatible = \"qcom,pm8921-mpp\",\n" "+\t\t\t\t\t\t \"qcom,ssbi-mpp\";\n" @@ -57,7 +50,7 @@ "@@ -10,7 +10,7 @@\n" " \t\t#size-cells = <0>;\n" " \n" - " \t\tpm8841_mpps: mpps@a000 {\n" + " \t\tpm8841_mpps: mpps at a000 {\n" "-\t\t\tcompatible = \"qcom,pm8841-mpp\";\n" "+\t\t\tcompatible = \"qcom,pm8841-mpp\", \"qcom,spmi-mpp\";\n" " \t\t\treg = <0xa000 0x400>;\n" @@ -70,7 +63,7 @@ "@@ -48,7 +48,7 @@\n" " \t\t};\n" " \n" - " \t\tpm8941_gpios: gpios@c000 {\n" + " \t\tpm8941_gpios: gpios at c000 {\n" "-\t\t\tcompatible = \"qcom,pm8941-gpio\";\n" "+\t\t\tcompatible = \"qcom,pm8941-gpio\", \"qcom,spmi-gpio\";\n" " \t\t\treg = <0xc000 0x2400>;\n" @@ -79,7 +72,7 @@ "@@ -91,7 +91,7 @@\n" " \t\t};\n" " \n" - " \t\tpm8941_mpps: mpps@a000 {\n" + " \t\tpm8941_mpps: mpps at a000 {\n" "-\t\t\tcompatible = \"qcom,pm8941-mpp\";\n" "+\t\t\tcompatible = \"qcom,pm8941-mpp\", \"qcom,spmi-mpp\";\n" " \t\t\treg = <0xa000 0x800>;\n" @@ -92,7 +85,7 @@ "@@ -19,7 +19,7 @@\n" " \t\t};\n" " \n" - " \t\tpma8084_gpios: gpios@c000 {\n" + " \t\tpma8084_gpios: gpios at c000 {\n" "-\t\t\tcompatible = \"qcom,pma8084-gpio\";\n" "+\t\t\tcompatible = \"qcom,pma8084-gpio\", \"qcom,spmi-gpio\";\n" " \t\t\treg = <0xc000 0x1600>;\n" @@ -101,7 +94,7 @@ "@@ -48,7 +48,7 @@\n" " \t\t};\n" " \n" - " \t\tpma8084_mpps: mpps@a000 {\n" + " \t\tpma8084_mpps: mpps at a000 {\n" "-\t\t\tcompatible = \"qcom,pma8084-mpp\";\n" "+\t\t\tcompatible = \"qcom,pma8084-mpp\", \"qcom,spmi-mpp\";\n" " \t\t\treg = <0xa000 0x800>;\n" @@ -111,4 +104,4 @@ "The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,\n" a Linux Foundation Collaborative Project -ee0358c89bc3a84aaf0c1383631542e0dd2e0550bc833fc3d8c69d410192e910 +77935720a1ff08a82d50dd448fee7173bac8790f53ad39fc732f6468f21fbc9b
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.