diff for duplicates of <54667D13.2070105@gmail.com> diff --git a/a/1.txt b/N1/1.txt index c56ff58..74e1d0f 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -26,7 +26,7 @@ Index: linux/Documentation/devicetree/bindings/serial/qcom,msm-uartdm.txt -A uartdm v1.4 device with dma capabilities. +- A uartdm v1.4 device with dma capabilities. + -+ serial@f991e000 { ++ serial at f991e000 { + compatible = "qcom,msm-uartdm-v1.4", "qcom,msm-uartdm"; + reg = <0xf991e000 0x1000>; + interrupts = <0 108 0x0>; @@ -38,7 +38,7 @@ Index: linux/Documentation/devicetree/bindings/serial/qcom,msm-uartdm.txt + +- A uartdm v1.3 device without dma capabilities and part of a GSBI complex. + -+ serial@19c40000 { ++ serial at 19c40000 { + compatible = "qcom,msm-uartdm-v1.3", "qcom,msm-uartdm"; + reg = <0x19c40000 0x1000>, + <0x19c00000 0x1000>; @@ -55,15 +55,15 @@ Index: linux/Documentation/devicetree/bindings/serial/qcom,msm-uartdm.txt + serial2 = &uartb; + }; + -+ uarta: serial@12490000 { ++ uarta: serial at 12490000 { + status = "ok"; + }; + -+ uartb: serial@16340000 { ++ uartb: serial at 16340000 { + status = "ok"; + }; --serial@f991e000 { +-serial at f991e000 { - compatible = "qcom,msm-uartdm-v1.4", "qcom,msm-uartdm"; - reg = <0xf991e000 0x1000>; - interrupts = <0 108 0x0>; @@ -75,7 +75,7 @@ Index: linux/Documentation/devicetree/bindings/serial/qcom,msm-uartdm.txt - -A uartdm v1.3 device without dma capabilities and part of a GSBI complex. - --serial@19c40000 { +-serial at 19c40000 { - compatible = "qcom,msm-uartdm-v1.3", "qcom,msm-uartdm"; - reg = <0x19c40000 0x1000>, - <0x19c00000 0x1000>; @@ -83,6 +83,6 @@ Index: linux/Documentation/devicetree/bindings/serial/qcom,msm-uartdm.txt - clocks = <&gsbi5_uart_cxc>, <&gsbi5_ahb_cxc>; - clock-names = "core", "iface"; -}; -+ uartc: serial@1a240000 { ++ uartc: serial at 1a240000 { + status = "ok"; + }; diff --git a/a/content_digest b/N1/content_digest index 0de929b..1171f55 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,17 +1,7 @@ - "From\0Frank Rowand <frowand.list@gmail.com>\0" + "From\0frowand.list@gmail.com (Frank Rowand)\0" "Subject\0[PATCH] tty: serial: msm_serial: document DT alias\0" "Date\0Fri, 14 Nov 2014 14:07:15 -0800\0" - "To\0Greg Kroah-Hartman <gregkh@linuxfoundation.org>" - " Stephen Boyd <sboyd@codeaurora.org>\0" - "Cc\0Linux Kernel list <linux-kernel@vger.kernel.org>" - linux-arm-msm@vger.kernel.org <linux-arm-msm@vger.kernel.org> - linux-arm-kernel@lists.infradead.org <linux-arm-kernel@lists.infradead.org> - linux-serial@vger.kernel.org - Olof Johansson <olof@lixom.net> - Arnd Bergmann <arnd@arndb.de> - Tyler Baker <tyler.baker@linaro.org> - Kevin Hilman <khilman@kernel.org> - " devicetree@vger.kernel.org <devicetree@vger.kernel.org>\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "From: Frank Rowand <frank.rowand@sonymobile.com>\n" @@ -42,7 +32,7 @@ "-A uartdm v1.4 device with dma capabilities.\n" "+- A uartdm v1.4 device with dma capabilities.\n" "+\n" - "+\tserial@f991e000 {\n" + "+\tserial at f991e000 {\n" "+\t\tcompatible = \"qcom,msm-uartdm-v1.4\", \"qcom,msm-uartdm\";\n" "+\t\treg = <0xf991e000 0x1000>;\n" "+\t\tinterrupts = <0 108 0x0>;\n" @@ -54,7 +44,7 @@ "+\n" "+- A uartdm v1.3 device without dma capabilities and part of a GSBI complex.\n" "+\n" - "+\tserial@19c40000 {\n" + "+\tserial at 19c40000 {\n" "+\t\tcompatible = \"qcom,msm-uartdm-v1.3\", \"qcom,msm-uartdm\";\n" "+\t\treg = <0x19c40000 0x1000>,\n" "+\t \t<0x19c00000 0x1000>;\n" @@ -71,15 +61,15 @@ "+\t\tserial2 = &uartb;\n" "+\t};\n" "+\n" - "+\tuarta: serial@12490000 {\n" + "+\tuarta: serial at 12490000 {\n" "+\t\tstatus = \"ok\";\n" "+\t};\n" "+\n" - "+\tuartb: serial@16340000 {\n" + "+\tuartb: serial at 16340000 {\n" "+\t\tstatus = \"ok\";\n" "+\t};\n" " \n" - "-serial@f991e000 {\n" + "-serial at f991e000 {\n" "-\tcompatible = \"qcom,msm-uartdm-v1.4\", \"qcom,msm-uartdm\";\n" "-\treg = <0xf991e000 0x1000>;\n" "-\tinterrupts = <0 108 0x0>;\n" @@ -91,7 +81,7 @@ "-\n" "-A uartdm v1.3 device without dma capabilities and part of a GSBI complex.\n" "-\n" - "-serial@19c40000 {\n" + "-serial at 19c40000 {\n" "-\tcompatible = \"qcom,msm-uartdm-v1.3\", \"qcom,msm-uartdm\";\n" "-\treg = <0x19c40000 0x1000>,\n" "-\t <0x19c00000 0x1000>;\n" @@ -99,8 +89,8 @@ "-\tclocks = <&gsbi5_uart_cxc>, <&gsbi5_ahb_cxc>;\n" "-\tclock-names = \"core\", \"iface\";\n" "-};\n" - "+\tuartc: serial@1a240000 {\n" + "+\tuartc: serial at 1a240000 {\n" "+\t\tstatus = \"ok\";\n" "+\t};" -be69302d00892b7595c5f87611c01741cdfb491b3dfb085bf7b8e2ceeb6b1f97 +92974f6cb92cfc04bd2d6546f71a881cdce7ad8e4aad730c9383fce2fd135d87
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.