diff for duplicates of <1434490313-13905-2-git-send-email-sboyd@codeaurora.org> diff --git a/a/1.txt b/N1/1.txt index 1f9ffff..7085a8e 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -18,8 +18,8 @@ index 7084010ee61b..0554fbd72c40 100644 interrupts = <0 208 0>; }; -- serial@f995e000 { -+ blsp2_uart2: serial@f995e000 { +- serial at f995e000 { ++ blsp2_uart2: serial at f995e000 { compatible = "qcom,msm-uartdm-v1.4", "qcom,msm-uartdm"; reg = <0xf995e000 0x1000>; interrupts = <0 114 0x0>; @@ -31,8 +31,8 @@ index 9f727d8eadf6..fa698635eea0 100644 syscon-tcsr = <&tcsr>; -- serial@16340000 { -+ gsbi4_serial: serial@16340000 { +- serial at 16340000 { ++ gsbi4_serial: serial at 16340000 { compatible = "qcom,msm-uartdm-v1.3", "qcom,msm-uartdm"; reg = <0x16340000 0x1000>, <0x16300000 0x1000>; @@ -44,8 +44,8 @@ index e0b2ce2910e0..80070bd41d5d 100644 syscon-tcsr = <&tcsr>; -- serial@19c40000 { -+ gsbi12_serial: serial@19c40000 { +- serial at 19c40000 { ++ gsbi12_serial: serial at 19c40000 { compatible = "qcom,msm-uartdm-v1.3", "qcom,msm-uartdm"; reg = <0x19c40000 0x1000>, <0x19c00000 0x1000>; @@ -57,8 +57,8 @@ index a02b984cc68d..502d332eb7bc 100644 syscon-tcsr = <&tcsr>; -- serial@16440000 { -+ gsbi5_serial: serial@16440000 { +- serial at 16440000 { ++ gsbi5_serial: serial at 16440000 { compatible = "qcom,msm-uartdm-v1.3", "qcom,msm-uartdm"; reg = <0x16440000 0x1000>, <0x16400000 0x1000>; @@ -70,8 +70,8 @@ index 37b47b5538b8..d549f7edf21f 100644 reg = <0xfd8c0000 0x6000>; }; -- serial@f991e000 { -+ blsp1_uart2: serial@f991e000 { +- serial at f991e000 { ++ blsp1_uart2: serial at f991e000 { compatible = "qcom,msm-uartdm-v1.4", "qcom,msm-uartdm"; reg = <0xf991e000 0x1000>; interrupts = <0 108 0x0>; diff --git a/a/content_digest b/N1/content_digest index 1040290..bfea6b4 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,11 +1,8 @@ "ref\01434490313-13905-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 01/10] ARM: dts: qcom: Label serial nodes for aliasing and stdout-path\0" "Date\0Tue, 16 Jun 2015 14:31:44 -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\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "Add a label to the serial nodes that are being used for the\n" @@ -28,8 +25,8 @@ " \t\t\tinterrupts = <0 208 0>;\n" " \t\t};\n" " \n" - "-\t\tserial@f995e000 {\n" - "+\t\tblsp2_uart2: serial@f995e000 {\n" + "-\t\tserial at f995e000 {\n" + "+\t\tblsp2_uart2: serial at f995e000 {\n" " \t\t\tcompatible = \"qcom,msm-uartdm-v1.4\", \"qcom,msm-uartdm\";\n" " \t\t\treg = <0xf995e000 0x1000>;\n" " \t\t\tinterrupts = <0 114 0x0>;\n" @@ -41,8 +38,8 @@ " \n" " \t\t\tsyscon-tcsr = <&tcsr>;\n" " \n" - "-\t\t\tserial@16340000 {\n" - "+\t\t\tgsbi4_serial: serial@16340000 {\n" + "-\t\t\tserial at 16340000 {\n" + "+\t\t\tgsbi4_serial: serial at 16340000 {\n" " \t\t\t\tcompatible = \"qcom,msm-uartdm-v1.3\", \"qcom,msm-uartdm\";\n" " \t\t\t\treg = <0x16340000 0x1000>,\n" " \t\t\t\t <0x16300000 0x1000>;\n" @@ -54,8 +51,8 @@ " \n" " \t\t\tsyscon-tcsr = <&tcsr>;\n" " \n" - "-\t\t\tserial@19c40000 {\n" - "+\t\t\tgsbi12_serial: serial@19c40000 {\n" + "-\t\t\tserial at 19c40000 {\n" + "+\t\t\tgsbi12_serial: serial at 19c40000 {\n" " \t\t\t\tcompatible = \"qcom,msm-uartdm-v1.3\", \"qcom,msm-uartdm\";\n" " \t\t\t\treg = <0x19c40000 0x1000>,\n" " \t\t\t\t <0x19c00000 0x1000>;\n" @@ -67,8 +64,8 @@ " \n" " \t\t\tsyscon-tcsr = <&tcsr>;\n" " \n" - "-\t\t\tserial@16440000 {\n" - "+\t\t\tgsbi5_serial: serial@16440000 {\n" + "-\t\t\tserial at 16440000 {\n" + "+\t\t\tgsbi5_serial: serial at 16440000 {\n" " \t\t\t\tcompatible = \"qcom,msm-uartdm-v1.3\", \"qcom,msm-uartdm\";\n" " \t\t\t\treg = <0x16440000 0x1000>,\n" " \t\t\t\t <0x16400000 0x1000>;\n" @@ -80,8 +77,8 @@ " \t\t\treg = <0xfd8c0000 0x6000>;\n" " \t\t};\n" " \n" - "-\t\tserial@f991e000 {\n" - "+\t\tblsp1_uart2: serial@f991e000 {\n" + "-\t\tserial at f991e000 {\n" + "+\t\tblsp1_uart2: serial at f991e000 {\n" " \t\t\tcompatible = \"qcom,msm-uartdm-v1.4\", \"qcom,msm-uartdm\";\n" " \t\t\treg = <0xf991e000 0x1000>;\n" " \t\t\tinterrupts = <0 108 0x0>;\n" @@ -89,4 +86,4 @@ "The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,\n" a Linux Foundation Collaborative Project -d65e7d7f7b2cd4d7b02f47833d75ef55fe8d649aca424fe0661b10c5624d424d +8513bf68a8810485a8b3cf4d3b989c44ae50ffca57021d6d804089aed743214e
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.