diff for duplicates of <20141124193613.GA10106@kroah.com> diff --git a/a/1.txt b/N1/1.txt index 4ee9062..3a04ace 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -27,7 +27,7 @@ On Fri, Nov 14, 2014 at 02:07:15PM -0800, Frank Rowand wrote: > -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>; @@ -39,7 +39,7 @@ On Fri, Nov 14, 2014 at 02:07:15PM -0800, Frank Rowand wrote: > + > +- 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>; @@ -56,15 +56,15 @@ On Fri, Nov 14, 2014 at 02:07:15PM -0800, Frank Rowand wrote: > + 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>; @@ -76,7 +76,7 @@ On Fri, Nov 14, 2014 at 02:07:15PM -0800, Frank Rowand wrote: > - > -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>; @@ -84,7 +84,7 @@ On Fri, Nov 14, 2014 at 02:07:15PM -0800, Frank Rowand wrote: > - 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 990b09d..d0c575d 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,18 +1,8 @@ "ref\054667D13.2070105@gmail.com\0" - "From\0Greg Kroah-Hartman <gregkh@linuxfoundation.org>\0" - "Subject\0Re: [PATCH] tty: serial: msm_serial: document DT alias\0" + "From\0gregkh@linuxfoundation.org (Greg Kroah-Hartman)\0" + "Subject\0[PATCH] tty: serial: msm_serial: document DT alias\0" "Date\0Mon, 24 Nov 2014 11:36:13 -0800\0" - "To\0Frank Rowand <frowand.list@gmail.com>\0" - "Cc\0Stephen Boyd <sboyd@codeaurora.org>" - Linux 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" "On Fri, Nov 14, 2014 at 02:07:15PM -0800, Frank Rowand wrote:\n" @@ -44,7 +34,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" @@ -56,7 +46,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" @@ -73,15 +63,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" @@ -93,7 +83,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" @@ -101,7 +91,7 @@ "> -\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};\n" "\n" @@ -112,4 +102,4 @@ "\n" greg k-h -0ecb46e34a2291a93572e81ac80905b2c4ff79c9a96f4816c8c354433857359a +6768c4860d29d388589572d594d1f9f3d0f5988a3273729d0fdc0e17f5e7aae2
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.