diff for duplicates of <50852AF9.10703@ti.com> diff --git a/a/1.txt b/N1/1.txt index bc6e269..f24683c 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -13,7 +13,7 @@ Incomplete sentence! > +++ b/arch/arm/boot/dts/omap5.dtsi > @@ -237,36 +237,48 @@ > -> uart1: serial@4806a000 { +> uart1: serial at 4806a000 { > compatible = "ti,omap4-uart"; > + reg = <0x4806a000 0x100>; > + interrupts = <0 72 0x4>; @@ -21,7 +21,7 @@ Incomplete sentence! > clock-frequency = <48000000>; > }; > -> uart2: serial@4806c000 { +> uart2: serial at 4806c000 { > compatible = "ti,omap4-uart"; > + reg = <0x4806c000 0x100>; > + interrupts = <0 73 0x4>; @@ -29,7 +29,7 @@ Incomplete sentence! > clock-frequency = <48000000>; > }; > -> uart3: serial@48020000 { +> uart3: serial at 48020000 { > compatible = "ti,omap4-uart"; > + reg = <0x48020000 0x100>; > + interrupts = <0 74 0x4>; @@ -37,7 +37,7 @@ Incomplete sentence! > clock-frequency = <48000000>; > }; > -> uart4: serial@4806e000 { +> uart4: serial at 4806e000 { > compatible = "ti,omap4-uart"; > + reg = <0x4806e000 0x100>; > + interrupts = <0 70 0x4>; @@ -45,7 +45,7 @@ Incomplete sentence! > clock-frequency = <48000000>; > }; > -> uart5: serial@48066000 { +> uart5: serial at 48066000 { > - compatible = "ti,omap5-uart"; > + compatible = "ti,omap4-uart"; > + reg = <0x48066000 0x100>; @@ -56,7 +56,7 @@ In Omap5 TRM, the interrupt number mentioned for uart5 is 138. How is > clock-frequency = <48000000>; > }; > -> uart6: serial@48068000 { +> uart6: serial at 48068000 { > - compatible = "ti,omap6-uart"; > + compatible = "ti,omap4-uart"; > + reg = <0x48068000 0x100>; diff --git a/a/content_digest b/N1/content_digest index ba84bdb..7485c25 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,15 +1,9 @@ "ref\01350901328-3525-1-git-send-email-s-guiriec@ti.com\0" "ref\01350901328-3525-4-git-send-email-s-guiriec@ti.com\0" - "From\0Sourav <sourav.poddar@ti.com>\0" - "Subject\0Re: [PATCH 3/4] ARM/dts: omap5: Update UART with address space and interrupts\0" + "From\0sourav.poddar@ti.com (Sourav)\0" + "Subject\0[PATCH 3/4] ARM/dts: omap5: Update UART with address space and interrupts\0" "Date\0Mon, 22 Oct 2012 16:46:09 +0530\0" - "To\0Sebastien Guiriec <s-guiriec@ti.com>\0" - "Cc\0Benoit Cousson <b-cousson@ti.com>" - Tony Lindgren <tony@atomide.com> - Peter Ujfalusi <peter.ujfalusi@ti.com> - linux-omap@vger.kernel.org - Santosh Shilimkar <santosh.shilimkar@ti.com> - " linux-arm-kernel@lists.infradead.org\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "Hi Sebastien,\n" @@ -27,7 +21,7 @@ "> +++ b/arch/arm/boot/dts/omap5.dtsi\n" "> @@ -237,36 +237,48 @@\n" "> \n" - "> \t\tuart1: serial@4806a000 {\n" + "> \t\tuart1: serial at 4806a000 {\n" "> \t\t\tcompatible = \"ti,omap4-uart\";\n" "> +\t\t\treg = <0x4806a000 0x100>;\n" "> +\t\t\tinterrupts = <0 72 0x4>;\n" @@ -35,7 +29,7 @@ "> \t\t\tclock-frequency = <48000000>;\n" "> \t\t};\n" "> \n" - "> \t\tuart2: serial@4806c000 {\n" + "> \t\tuart2: serial at 4806c000 {\n" "> \t\t\tcompatible = \"ti,omap4-uart\";\n" "> +\t\t\treg = <0x4806c000 0x100>;\n" "> +\t\t\tinterrupts = <0 73 0x4>;\n" @@ -43,7 +37,7 @@ "> \t\t\tclock-frequency = <48000000>;\n" "> \t\t};\n" "> \n" - "> \t\tuart3: serial@48020000 {\n" + "> \t\tuart3: serial at 48020000 {\n" "> \t\t\tcompatible = \"ti,omap4-uart\";\n" "> +\t\t\treg = <0x48020000 0x100>;\n" "> +\t\t\tinterrupts = <0 74 0x4>;\n" @@ -51,7 +45,7 @@ "> \t\t\tclock-frequency = <48000000>;\n" "> \t\t};\n" "> \n" - "> \t\tuart4: serial@4806e000 {\n" + "> \t\tuart4: serial at 4806e000 {\n" "> \t\t\tcompatible = \"ti,omap4-uart\";\n" "> +\t\t\treg = <0x4806e000 0x100>;\n" "> +\t\t\tinterrupts = <0 70 0x4>;\n" @@ -59,7 +53,7 @@ "> \t\t\tclock-frequency = <48000000>;\n" "> \t\t};\n" "> \n" - "> \t\tuart5: serial@48066000 {\n" + "> \t\tuart5: serial at 48066000 {\n" "> -\t\t\tcompatible = \"ti,omap5-uart\";\n" "> +\t\t\tcompatible = \"ti,omap4-uart\";\n" "> +\t\t\treg = <0x48066000 0x100>;\n" @@ -70,7 +64,7 @@ "> \t\t\tclock-frequency = <48000000>;\n" "> \t\t};\n" "> \n" - "> \t\tuart6: serial@48068000 {\n" + "> \t\tuart6: serial at 48068000 {\n" "> -\t\t\tcompatible = \"ti,omap6-uart\";\n" "> +\t\t\tcompatible = \"ti,omap4-uart\";\n" "> +\t\t\treg = <0x48068000 0x100>;\n" @@ -80,4 +74,4 @@ "> \t\t\tclock-frequency = <48000000>;\n" "> \t\t};" -0ce2bc26dda3a670e507cb011002e9ab83d3b927fe4ffdf9d47b4539639b4464 +5dcb04a38264fd36c41b04890388f6a74ebc60345ff381685d17ad9d72a502ee
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.