diff for duplicates of <5085348C.60105@ti.com> diff --git a/a/1.txt b/N1/1.txt index f2cb80b..3bc6e99 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -15,35 +15,35 @@ On 10/22/2012 01:16 PM, Sourav wrote: >> --- a/arch/arm/boot/dts/omap5.dtsi >> +++ 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>; >> ti,hwmods = "uart1"; >> clock-frequency = <48000000>; >> }; ->> uart2: serial@4806c000 { +>> uart2: serial at 4806c000 { >> compatible = "ti,omap4-uart"; >> + reg = <0x4806c000 0x100>; >> + interrupts = <0 73 0x4>; >> ti,hwmods = "uart2"; >> clock-frequency = <48000000>; >> }; ->> uart3: serial@48020000 { +>> uart3: serial at 48020000 { >> compatible = "ti,omap4-uart"; >> + reg = <0x48020000 0x100>; >> + interrupts = <0 74 0x4>; >> ti,hwmods = "uart3"; >> clock-frequency = <48000000>; >> }; ->> uart4: serial@4806e000 { +>> uart4: serial at 4806e000 { >> compatible = "ti,omap4-uart"; >> + reg = <0x4806e000 0x100>; >> + interrupts = <0 70 0x4>; >> ti,hwmods = "uart4"; >> clock-frequency = <48000000>; >> }; ->> uart5: serial@48066000 { +>> uart5: serial at 48066000 { >> - compatible = "ti,omap5-uart"; >> + compatible = "ti,omap4-uart"; >> + reg = <0x48066000 0x100>; @@ -57,7 +57,7 @@ wrong... or the HW spec :-) >> ti,hwmods = "uart5"; >> 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 49cdd01..67af5d5 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,16 +1,10 @@ "ref\01350901328-3525-1-git-send-email-s-guiriec@ti.com\0" "ref\01350901328-3525-4-git-send-email-s-guiriec@ti.com\0" "ref\050852AF9.10703@ti.com\0" - "From\0Benoit Cousson <b-cousson@ti.com>\0" - "Subject\0Re: [PATCH 3/4] ARM/dts: omap5: Update UART with address space and interrupts\0" + "From\0b-cousson@ti.com (Benoit Cousson)\0" + "Subject\0[PATCH 3/4] ARM/dts: omap5: Update UART with address space and interrupts\0" "Date\0Mon, 22 Oct 2012 13:57:00 +0200\0" - "To\0Sourav <sourav.poddar@ti.com>\0" - "Cc\0Sebastien Guiriec <s-guiriec@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 Sourav,\n" @@ -30,35 +24,35 @@ ">> --- a/arch/arm/boot/dts/omap5.dtsi\n" ">> +++ b/arch/arm/boot/dts/omap5.dtsi\n" ">> @@ -237,36 +237,48 @@\n" - ">> uart1: serial@4806a000 {\n" + ">> uart1: serial at 4806a000 {\n" ">> compatible = \"ti,omap4-uart\";\n" ">> + reg = <0x4806a000 0x100>;\n" ">> + interrupts = <0 72 0x4>;\n" ">> ti,hwmods = \"uart1\";\n" ">> clock-frequency = <48000000>;\n" ">> };\n" - ">> uart2: serial@4806c000 {\n" + ">> uart2: serial at 4806c000 {\n" ">> compatible = \"ti,omap4-uart\";\n" ">> + reg = <0x4806c000 0x100>;\n" ">> + interrupts = <0 73 0x4>;\n" ">> ti,hwmods = \"uart2\";\n" ">> clock-frequency = <48000000>;\n" ">> };\n" - ">> uart3: serial@48020000 {\n" + ">> uart3: serial at 48020000 {\n" ">> compatible = \"ti,omap4-uart\";\n" ">> + reg = <0x48020000 0x100>;\n" ">> + interrupts = <0 74 0x4>;\n" ">> ti,hwmods = \"uart3\";\n" ">> clock-frequency = <48000000>;\n" ">> };\n" - ">> uart4: serial@4806e000 {\n" + ">> uart4: serial at 4806e000 {\n" ">> compatible = \"ti,omap4-uart\";\n" ">> + reg = <0x4806e000 0x100>;\n" ">> + interrupts = <0 70 0x4>;\n" ">> ti,hwmods = \"uart4\";\n" ">> clock-frequency = <48000000>;\n" ">> };\n" - ">> uart5: serial@48066000 {\n" + ">> uart5: serial at 48066000 {\n" ">> - compatible = \"ti,omap5-uart\";\n" ">> + compatible = \"ti,omap4-uart\";\n" ">> + reg = <0x48066000 0x100>;\n" @@ -72,7 +66,7 @@ ">> ti,hwmods = \"uart5\";\n" ">> clock-frequency = <48000000>;\n" ">> };\n" - ">> uart6: serial@48068000 {\n" + ">> uart6: serial at 48068000 {\n" ">> - compatible = \"ti,omap6-uart\";\n" ">> + compatible = \"ti,omap4-uart\";\n" ">> + reg = <0x48068000 0x100>;\n" @@ -84,4 +78,4 @@ "Regards,\n" Benoit -ad9c22fafe0c67cc10de94a2d5ce0f9c19b6cc185a9ff9454ac6ac6bc2e72f5a +e0f7a7dd1f088dee365806d0d4caba0d81b0cd87e5b7bddf7fa80402f0b7ddaa
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.