diff for duplicates of <1441750812-13041-1-git-send-email-sboyd@codeaurora.org> diff --git a/a/1.txt b/N1/1.txt index 306e7d9..66296dc 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -39,18 +39,18 @@ index 71e146de4fe4..16dfae8feece 100644 #hwlock-cells = <1>; }; -- smem@fa00000 { +- smem at fa00000 { - compatible = "qcom,smem"; - - memory-region = <&smem_region>; -+ rpm_msg_ram: memory@fc428000 { ++ rpm_msg_ram: memory at fc428000 { + compatible = "qcom,rpm-msg-ram"; reg = <0xfc428000 0x4000>; - - hwlocks = <&tcsr_mutex 3>; }; - blsp1_uart2: serial@f991e000 { + blsp1_uart2: serial at f991e000 { diff --git a/drivers/soc/qcom/smem.c b/drivers/soc/qcom/smem.c index 74017114ce6e..19019aa092e8 100644 --- a/drivers/soc/qcom/smem.c diff --git a/a/content_digest b/N1/content_digest index ad87101..24015e4 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,11 +1,7 @@ - "From\0Stephen Boyd <sboyd@codeaurora.org>\0" + "From\0sboyd@codeaurora.org (Stephen Boyd)\0" "Subject\0[PATCH] soc: qcom: smem: Move RPM message ram out of smem DT node\0" "Date\0Tue, 8 Sep 2015 15:20:12 -0700\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 - " Bjorn Andersson <bjorn.andersson@sonymobile.com>\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "SMEM is a software construct built on top of a DDR carveout and\n" @@ -49,18 +45,18 @@ " \t\t\t#hwlock-cells = <1>;\n" " \t\t};\n" " \n" - "-\t\tsmem@fa00000 {\n" + "-\t\tsmem at fa00000 {\n" "-\t\t\tcompatible = \"qcom,smem\";\n" "-\n" "-\t\t\tmemory-region = <&smem_region>;\n" - "+\t\trpm_msg_ram: memory@fc428000 {\n" + "+\t\trpm_msg_ram: memory at fc428000 {\n" "+\t\t\tcompatible = \"qcom,rpm-msg-ram\";\n" " \t\t\treg = <0xfc428000 0x4000>;\n" "-\n" "-\t\t\thwlocks = <&tcsr_mutex 3>;\n" " \t\t};\n" " \n" - " \t\tblsp1_uart2: serial@f991e000 {\n" + " \t\tblsp1_uart2: serial at f991e000 {\n" "diff --git a/drivers/soc/qcom/smem.c b/drivers/soc/qcom/smem.c\n" "index 74017114ce6e..19019aa092e8 100644\n" "--- a/drivers/soc/qcom/smem.c\n" @@ -174,4 +170,4 @@ "The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,\n" a Linux Foundation Collaborative Project -2c709eea61e0a3175e1ed51eeb1c310c4692073f7af8e2a23cd7487d1bd64eae +889afd0c31a84314506342ebd298afd6e3f4e42eba4f23103003581bc2161e9b
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.