diff for duplicates of <4ED38F61.50604@gmail.com> diff --git a/a/1.txt b/N1/1.txt index c5b1644..f7170be 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -30,32 +30,32 @@ Rob > + }; > + > cpus { -> cpu@0 { +> cpu at 0 { > compatible = "arm,cortex-a8"; > @@ -59,5 +66,29 @@ > interrupt-controller; > #interrupt-cells = <1>; > }; > + -> + uart1: serial@0x4806a000 { +> + uart1: serial at 0x4806a000 { > + compatible = "ti,omap3-uart"; > + ti,hwmods = "uart1"; > + clock-frequency = <48000000>; > + }; > + -> + uart2: serial@0x4806c000 { +> + uart2: serial at 0x4806c000 { > + compatible = "ti,omap3-uart"; > + ti,hwmods = "uart2"; > + clock-frequency = <48000000>; > + }; > + -> + uart3: serial@0x49020000 { +> + uart3: serial at 0x49020000 { > + compatible = "ti,omap3-uart"; > + ti,hwmods = "uart3"; > + clock-frequency = <48000000>; > + }; > + -> + uart4: serial@0x49042000 { +> + uart4: serial at 0x49042000 { > + compatible = "ti,omap3-uart"; > + ti,hwmods = "uart4"; > + clock-frequency = <48000000>; @@ -82,25 +82,25 @@ Rob > <0x48240100 0x0100>; > }; > + -> + uart1: serial@0x4806a000 { +> + uart1: serial at 0x4806a000 { > + compatible = "ti,omap4-uart"; > + ti,hwmods = "uart1"; > + clock-frequency = <48000000>; > + }; > + -> + uart2: serial@0x4806c000 { +> + uart2: serial at 0x4806c000 { > + compatible = "ti,omap4-uart"; > + ti,hwmods = "uart2"; > + clock-frequency = <48000000>; > + }; > + -> + uart3: serial@0x48020000 { +> + uart3: serial at 0x48020000 { > + compatible = "ti,omap4-uart"; > + ti,hwmods = "uart3"; > + clock-frequency = <48000000>; > + }; > + -> + uart4: serial@0x4806e000 { +> + uart4: serial at 0x4806e000 { > + compatible = "ti,omap4-uart"; > + ti,hwmods = "uart4"; > + clock-frequency = <48000000>; diff --git a/a/content_digest b/N1/content_digest index 034ffd9..6aca6a9 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,19 +1,9 @@ "ref\01321969456-24266-1-git-send-email-rnayak@ti.com\0" "ref\01321969456-24266-5-git-send-email-rnayak@ti.com\0" - "From\0Rob Herring <robherring2@gmail.com>\0" - "Subject\0Re: [PATCH v2 4/4] ARM: omap: pass minimal SoC/board data for UART from dt\0" + "From\0robherring2@gmail.com (Rob Herring)\0" + "Subject\0[PATCH v2 4/4] ARM: omap: pass minimal SoC/board data for UART from dt\0" "Date\0Mon, 28 Nov 2011 07:40:49 -0600\0" - "To\0Rajendra Nayak <rnayak@ti.com>\0" - "Cc\0linux-serial@vger.kernel.org" - linux-omap@vger.kernel.org - devicetree-discuss@lists.ozlabs.org - tony@atomide.com - khilman@ti.com - govindraj.raja@ti.com - b-cousson@ti.com - linux-arm-kernel@lists.infradead.org - linaro-dev@lists.linaro.org - " patches@linaro.org\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "On 11/22/2011 07:44 AM, Rajendra Nayak wrote:\n" @@ -48,32 +38,32 @@ "> +\t};\n" "> +\n" "> \tcpus {\n" - "> \t\tcpu@0 {\n" + "> \t\tcpu at 0 {\n" "> \t\t\tcompatible = \"arm,cortex-a8\";\n" "> @@ -59,5 +66,29 @@\n" "> \t\t\tinterrupt-controller;\n" "> \t\t\t#interrupt-cells = <1>;\n" "> \t\t};\n" "> +\n" - "> +\t\tuart1: serial@0x4806a000 {\n" + "> +\t\tuart1: serial at 0x4806a000 {\n" "> +\t\t\tcompatible = \"ti,omap3-uart\";\n" "> +\t\t\tti,hwmods = \"uart1\";\n" "> +\t\t\tclock-frequency = <48000000>;\n" "> +\t\t};\n" "> +\n" - "> +\t\tuart2: serial@0x4806c000 {\n" + "> +\t\tuart2: serial at 0x4806c000 {\n" "> +\t\t\tcompatible = \"ti,omap3-uart\";\n" "> +\t\t\tti,hwmods = \"uart2\";\n" "> +\t\t\tclock-frequency = <48000000>;\n" "> +\t\t};\n" "> +\n" - "> +\t\tuart3: serial@0x49020000 {\n" + "> +\t\tuart3: serial at 0x49020000 {\n" "> +\t\t\tcompatible = \"ti,omap3-uart\";\n" "> +\t\t\tti,hwmods = \"uart3\";\n" "> +\t\t\tclock-frequency = <48000000>;\n" "> +\t\t};\n" "> +\n" - "> +\t\tuart4: serial@0x49042000 {\n" + "> +\t\tuart4: serial at 0x49042000 {\n" "> +\t\t\tcompatible = \"ti,omap3-uart\";\n" "> +\t\t\tti,hwmods = \"uart4\";\n" "> +\t\t\tclock-frequency = <48000000>;\n" @@ -100,25 +90,25 @@ "> \t\t\t <0x48240100 0x0100>;\n" "> \t\t};\n" "> +\n" - "> +\t\tuart1: serial@0x4806a000 {\n" + "> +\t\tuart1: serial at 0x4806a000 {\n" "> +\t\t\tcompatible = \"ti,omap4-uart\";\n" "> +\t\t\tti,hwmods = \"uart1\";\n" "> +\t\t\tclock-frequency = <48000000>;\n" "> +\t\t};\n" "> +\n" - "> +\t\tuart2: serial@0x4806c000 {\n" + "> +\t\tuart2: serial at 0x4806c000 {\n" "> +\t\t\tcompatible = \"ti,omap4-uart\";\n" "> +\t\t\tti,hwmods = \"uart2\";\n" "> +\t\t\tclock-frequency = <48000000>;\n" "> +\t\t};\n" "> +\n" - "> +\t\tuart3: serial@0x48020000 {\n" + "> +\t\tuart3: serial at 0x48020000 {\n" "> +\t\t\tcompatible = \"ti,omap4-uart\";\n" "> +\t\t\tti,hwmods = \"uart3\";\n" "> +\t\t\tclock-frequency = <48000000>;\n" "> +\t\t};\n" "> +\n" - "> +\t\tuart4: serial@0x4806e000 {\n" + "> +\t\tuart4: serial at 0x4806e000 {\n" "> +\t\t\tcompatible = \"ti,omap4-uart\";\n" "> +\t\t\tti,hwmods = \"uart4\";\n" "> +\t\t\tclock-frequency = <48000000>;\n" @@ -138,4 +128,4 @@ "> \n" "> \tof_platform_populate(NULL, omap_dt_match_table, NULL, NULL);" -a397c603610d42f6ca9e433ce512a722f96ef8822742c2d6acde9d27d3fe5da9 +4c385ef94d950fc2bcbb960ecf9a371c5e6f639163e3788458408ec6223bea25
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.