diff for duplicates of <53705548.7020400@ti.com> diff --git a/a/1.txt b/N1/1.txt index feeaddd..44104ff 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -28,7 +28,7 @@ Acked-by: George Cherian <george.cherian@ti.com> > + * dma-controller node must be the first one to prevent > + * spurious probe deferrals. > + */ -> + cppi41dma: dma-controller@47402000 { +> + cppi41dma: dma-controller at 47402000 { > + compatible = "ti,am3359-cppi41"; > + reg = <0x47400000 0x1000 > + 0x47402000 0x1000 @@ -43,14 +43,14 @@ Acked-by: George Cherian <george.cherian@ti.com> > + status = "disabled"; > + }; > + -> usb_ctrl_mod: control@44e10620 { +> usb_ctrl_mod: control at 44e10620 { > compatible = "ti,am335x-usb-ctrl-module"; > reg = <0x44e10620 0x10 > @@ -556,20 +576,6 @@ > "tx14", "tx15"; > }; > -> - cppi41dma: dma-controller@47402000 { +> - cppi41dma: dma-controller at 47402000 { > - compatible = "ti,am3359-cppi41"; > - reg = <0x47400000 0x1000 > - 0x47402000 0x1000 @@ -66,7 +66,7 @@ Acked-by: George Cherian <george.cherian@ti.com> > - }; > }; > -> epwmss0: epwmss@48300000 { +> epwmss0: epwmss at 48300000 { -- diff --git a/a/content_digest b/N1/content_digest index bc4a265..7f74313 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,14 +1,8 @@ "ref\01398373881-23369-1-git-send-email-ezequiel@vanguardiasur.com.ar\0" - "From\0George Cherian <george.cherian@ti.com>\0" - "Subject\0Re: [PATCH v2] ARM: dts: am33xx: Move the cppi41dma node so it's probed early\0" + "From\0george.cherian@ti.com (George Cherian)\0" + "Subject\0[PATCH v2] ARM: dts: am33xx: Move the cppi41dma node so it's probed early\0" "Date\0Mon, 12 May 2014 10:29:52 +0530\0" - "To\0Ezequiel Garcia <ezequiel@vanguardiasur.com.ar>" - linux-arm-kernel@lists.infradead.org - linux-omap@vger.kernel.org - " Benoit Cousson <bcousson@baylibre.com>\0" - "Cc\0Sebastian Andrzej Siewior <bigeasy@linutronix.de>" - Felipe Balbi <balbi@ti.com> - " Tony Lindgren <tony@atomide.com>\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "On 4/25/2014 2:41 AM, Ezequiel Garcia wrote:\n" @@ -41,7 +35,7 @@ "> +\t\t\t * dma-controller node must be the first one to prevent\n" "> +\t\t\t * spurious probe deferrals.\n" "> +\t\t\t */\n" - "> +\t\t\tcppi41dma: dma-controller@47402000 {\n" + "> +\t\t\tcppi41dma: dma-controller at 47402000 {\n" "> +\t\t\t\tcompatible = \"ti,am3359-cppi41\";\n" "> +\t\t\t\treg = <0x47400000 0x1000\n" "> +\t\t\t\t\t0x47402000 0x1000\n" @@ -56,14 +50,14 @@ "> +\t\t\t\tstatus = \"disabled\";\n" "> +\t\t\t};\n" "> +\n" - "> \t\t\tusb_ctrl_mod: control@44e10620 {\n" + "> \t\t\tusb_ctrl_mod: control at 44e10620 {\n" "> \t\t\t\tcompatible = \"ti,am335x-usb-ctrl-module\";\n" "> \t\t\t\treg = <0x44e10620 0x10\n" "> @@ -556,20 +576,6 @@\n" "> \t\t\t\t\t\"tx14\", \"tx15\";\n" "> \t\t\t};\n" "> \n" - "> -\t\t\tcppi41dma: dma-controller@47402000 {\n" + "> -\t\t\tcppi41dma: dma-controller at 47402000 {\n" "> -\t\t\t\tcompatible = \"ti,am3359-cppi41\";\n" "> -\t\t\t\treg = <0x47400000 0x1000\n" "> -\t\t\t\t\t0x47402000 0x1000\n" @@ -79,10 +73,10 @@ "> -\t\t\t};\n" "> \t\t};\n" "> \n" - "> \t\tepwmss0: epwmss@48300000 {\n" + "> \t\tepwmss0: epwmss at 48300000 {\n" "\n" "\n" "-- \n" -George -f50067dc0451af4654a8293a4af905c8c4d5841046c4716c308d877cb3345b4f +681353577a7cc11d59b93533ccb1d2c5db2036e828b7fdb95ca7562ce6075230
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.