diff for duplicates of <1448062280-15406-6-git-send-email-sboyd@codeaurora.org> diff --git a/a/1.txt b/N1/1.txt index 963cc9b..b210e84 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -57,9 +57,9 @@ index 8f1a0b162017..523bee959f98 100644 &spmi_bus { -- usid4: pm8841@4 { +- usid4: pm8841 at 4 { - compatible = "qcom,spmi-pmic"; -+ pm8841_0: pm8841@4 { ++ pm8841_0: pm8841 at 4 { + compatible = "qcom,pm8841", "qcom,spmi-pmic"; reg = <0x4 SPMI_USID>; #address-cells = <1>; @@ -68,9 +68,9 @@ index 8f1a0b162017..523bee959f98 100644 }; }; -- usid5: pm8841@5 { +- usid5: pm8841 at 5 { - compatible = "qcom,spmi-pmic"; -+ pm8841_1: pm8841@5 { ++ pm8841_1: pm8841 at 5 { + compatible = "qcom,pm8841", "qcom,spmi-pmic"; reg = <0x5 SPMI_USID>; #address-cells = <1>; @@ -83,9 +83,9 @@ index c19a48732b2d..12c1202ba2ca 100644 &spmi_bus { -- usid0: pm8941@0 { +- usid0: pm8941 at 0 { - compatible ="qcom,spmi-pmic"; -+ pm8941_0: pm8941@0 { ++ pm8941_0: pm8941 at 0 { + compatible = "qcom,pm8941", "qcom,spmi-pmic"; reg = <0x0 SPMI_USID>; #address-cells = <1>; @@ -94,9 +94,9 @@ index c19a48732b2d..12c1202ba2ca 100644 }; }; -- usid1: pm8941@1 { +- usid1: pm8941 at 1 { - compatible = "qcom,spmi-pmic"; -+ pm8941_1: pm8941@1 { ++ pm8941_1: pm8941 at 1 { + compatible = "qcom,pm8941", "qcom,spmi-pmic"; reg = <0x1 SPMI_USID>; #address-cells = <1>; @@ -109,9 +109,9 @@ index 5e240ccc08b7..10b8f9e6d60b 100644 &spmi_bus { -- usid0: pma8084@0 { +- usid0: pma8084 at 0 { - compatible = "qcom,spmi-pmic"; -+ pma8084_0: pma8084@0 { ++ pma8084_0: pma8084 at 0 { + compatible = "qcom,pma8084", "qcom,spmi-pmic"; reg = <0x0 SPMI_USID>; #address-cells = <1>; @@ -120,9 +120,9 @@ index 5e240ccc08b7..10b8f9e6d60b 100644 }; }; -- usid1: pma8084@1 { +- usid1: pma8084 at 1 { - compatible = "qcom,spmi-pmic"; -+ pma8084_1: pma8084@1 { ++ pma8084_1: pma8084 at 1 { + compatible = "qcom,pma8084", "qcom,spmi-pmic"; reg = <0x1 SPMI_USID>; #address-cells = <1>; diff --git a/a/content_digest b/N1/content_digest index 8ffa7ce..412f6f5 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,15 +1,8 @@ "ref\01448062280-15406-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 v2 5/5] arm: dts: qcom: Add aliases for PMICs\0" "Date\0Fri, 20 Nov 2015 15:31:20 -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 - Olof Johansson <olof@lixom.net> - Kevin Hilman <khilman@kernel.org> - Arnd Bergmann <arnd@arndb.de> - " devicetree@vger.kernel.org\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "Add an alias for the PMICs found on qcom based SoCs so that the\n" @@ -71,9 +64,9 @@ " \n" " &spmi_bus {\n" " \n" - "-\tusid4: pm8841@4 {\n" + "-\tusid4: pm8841 at 4 {\n" "-\t\tcompatible = \"qcom,spmi-pmic\";\n" - "+\tpm8841_0: pm8841@4 {\n" + "+\tpm8841_0: pm8841 at 4 {\n" "+\t\tcompatible = \"qcom,pm8841\", \"qcom,spmi-pmic\";\n" " \t\treg = <0x4 SPMI_USID>;\n" " \t\t#address-cells = <1>;\n" @@ -82,9 +75,9 @@ " \t\t};\n" " \t};\n" " \n" - "-\tusid5: pm8841@5 {\n" + "-\tusid5: pm8841 at 5 {\n" "-\t\tcompatible = \"qcom,spmi-pmic\";\n" - "+\tpm8841_1: pm8841@5 {\n" + "+\tpm8841_1: pm8841 at 5 {\n" "+\t\tcompatible = \"qcom,pm8841\", \"qcom,spmi-pmic\";\n" " \t\treg = <0x5 SPMI_USID>;\n" " \t\t#address-cells = <1>;\n" @@ -97,9 +90,9 @@ " \n" " &spmi_bus {\n" " \n" - "-\tusid0: pm8941@0 {\n" + "-\tusid0: pm8941 at 0 {\n" "-\t\tcompatible =\"qcom,spmi-pmic\";\n" - "+\tpm8941_0: pm8941@0 {\n" + "+\tpm8941_0: pm8941 at 0 {\n" "+\t\tcompatible = \"qcom,pm8941\", \"qcom,spmi-pmic\";\n" " \t\treg = <0x0 SPMI_USID>;\n" " \t\t#address-cells = <1>;\n" @@ -108,9 +101,9 @@ " \t\t};\n" " \t};\n" " \n" - "-\tusid1: pm8941@1 {\n" + "-\tusid1: pm8941 at 1 {\n" "-\t\tcompatible = \"qcom,spmi-pmic\";\n" - "+\tpm8941_1: pm8941@1 {\n" + "+\tpm8941_1: pm8941 at 1 {\n" "+\t\tcompatible = \"qcom,pm8941\", \"qcom,spmi-pmic\";\n" " \t\treg = <0x1 SPMI_USID>;\n" " \t\t#address-cells = <1>;\n" @@ -123,9 +116,9 @@ " \n" " &spmi_bus {\n" " \n" - "-\tusid0: pma8084@0 {\n" + "-\tusid0: pma8084 at 0 {\n" "-\t\tcompatible = \"qcom,spmi-pmic\";\n" - "+\tpma8084_0: pma8084@0 {\n" + "+\tpma8084_0: pma8084 at 0 {\n" "+\t\tcompatible = \"qcom,pma8084\", \"qcom,spmi-pmic\";\n" " \t\treg = <0x0 SPMI_USID>;\n" " \t\t#address-cells = <1>;\n" @@ -134,9 +127,9 @@ " \t\t};\n" " \t};\n" " \n" - "-\tusid1: pma8084@1 {\n" + "-\tusid1: pma8084 at 1 {\n" "-\t\tcompatible = \"qcom,spmi-pmic\";\n" - "+\tpma8084_1: pma8084@1 {\n" + "+\tpma8084_1: pma8084 at 1 {\n" "+\t\tcompatible = \"qcom,pma8084\", \"qcom,spmi-pmic\";\n" " \t\treg = <0x1 SPMI_USID>;\n" " \t\t#address-cells = <1>;\n" @@ -145,4 +138,4 @@ "The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,\n" a Linux Foundation Collaborative Project -15f1ff914607a9706f466630df3d7e693e8cd9f14ac7e48aa783a400a885aa2e +379fde31a6dd9930021f4f4d8827100d56c4e69bf0fa0da38be9df4e48f32f09
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.