diff for duplicates of <504A1775.1060300@ti.com> diff --git a/a/1.txt b/N1/1.txt index 5de6a99..60dc3ed 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -28,7 +28,7 @@ Benoit > BeagleBoard after testing it properly. > > Cc: Benoit Cousson <b-cousson@ti.com> -> Cc: devicetree-discuss@lists.ozlabs.org +> Cc: devicetree-discuss at lists.ozlabs.org > Signed-off-by: Tony Lindgren <tony@atomide.com> > --- > arch/arm/boot/dts/omap3-beagle-xm.dts | 6 +++--- @@ -77,13 +77,13 @@ Benoit > clock-frequency = <48000000>; > }; > -> - uart4: serial@49042000 { +> - uart4: serial at 49042000 { > - compatible = "ti,omap3-uart"; > - ti,hwmods = "uart4"; > - clock-frequency = <48000000>; > - }; > - -> i2c1: i2c@48070000 { +> i2c1: i2c at 48070000 { > compatible = "ti,omap3-i2c"; > #address-cells = <1>; > diff --git a/arch/arm/boot/dts/omap36xx.dtsi b/arch/arm/boot/dts/omap36xx.dtsi @@ -110,7 +110,7 @@ Benoit > + }; > + > + ocp { -> + uart4: serial@49042000 { +> + uart4: serial at 49042000 { > + compatible = "ti,omap3-uart"; > + ti,hwmods = "uart4"; > + clock-frequency = <48000000>; diff --git a/a/content_digest b/N1/content_digest index 8f7648e..2c0ea9d 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,12 +1,9 @@ "ref\020120906185615.1172.23588.stgit@muffinssi.local\0" "ref\020120906185821.1172.18455.stgit@muffinssi.local\0" - "From\0Benoit Cousson <b-cousson@ti.com>\0" - "Subject\0Re: [PATCH 1/5] arm/dts: Add omap36xx.dtsi file and rename omap3-beagle to omap3-beagle-xm\0" + "From\0b-cousson@ti.com (Benoit Cousson)\0" + "Subject\0[PATCH 1/5] arm/dts: Add omap36xx.dtsi file and rename omap3-beagle to omap3-beagle-xm\0" "Date\0Fri, 7 Sep 2012 17:49:09 +0200\0" - "To\0Tony Lindgren <tony@atomide.com>\0" - "Cc\0linux-arm-kernel@lists.infradead.org" - devicetree-discuss@lists.ozlabs.org - " linux-omap@vger.kernel.org\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "Hi Tony,\n" @@ -39,7 +36,7 @@ "> BeagleBoard after testing it properly.\n" "> \n" "> Cc: Benoit Cousson <b-cousson@ti.com>\n" - "> Cc: devicetree-discuss@lists.ozlabs.org\n" + "> Cc: devicetree-discuss at lists.ozlabs.org\n" "> Signed-off-by: Tony Lindgren <tony@atomide.com>\n" "> ---\n" "> arch/arm/boot/dts/omap3-beagle-xm.dts | 6 +++---\n" @@ -88,13 +85,13 @@ "> \t\t\tclock-frequency = <48000000>;\n" "> \t\t};\n" "> \n" - "> -\t\tuart4: serial@49042000 {\n" + "> -\t\tuart4: serial at 49042000 {\n" "> -\t\t\tcompatible = \"ti,omap3-uart\";\n" "> -\t\t\tti,hwmods = \"uart4\";\n" "> -\t\t\tclock-frequency = <48000000>;\n" "> -\t\t};\n" "> -\n" - "> \t\ti2c1: i2c@48070000 {\n" + "> \t\ti2c1: i2c at 48070000 {\n" "> \t\t\tcompatible = \"ti,omap3-i2c\";\n" "> \t\t\t#address-cells = <1>;\n" "> diff --git a/arch/arm/boot/dts/omap36xx.dtsi b/arch/arm/boot/dts/omap36xx.dtsi\n" @@ -121,7 +118,7 @@ "> +\t};\n" "> +\n" "> +\tocp {\n" - "> +\t\tuart4: serial@49042000 {\n" + "> +\t\tuart4: serial at 49042000 {\n" "> +\t\t\tcompatible = \"ti,omap3-uart\";\n" "> +\t\t\tti,hwmods = \"uart4\";\n" "> +\t\t\tclock-frequency = <48000000>;\n" @@ -143,4 +140,4 @@ "> dtb-$(CONFIG_SOC_OMAP5)\t\t+= omap5-evm.dtb\n" > -6197375b92b39db6482ae91edaefd42f825a3cb3b9f6f371d73e75b9e5620c46 +02a988b155b878bc442861b7dc975cafeb24bf417c1cf24dd1277405ee48b347
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.