diff for duplicates of <1455963652-24618-2-git-send-email-michael@amarulasolutions.com> diff --git a/a/1.txt b/N1/1.txt index a16b45e..07ff6f0 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -1,6 +1,6 @@ Add support for FLEXCAN1 and FLEXCAN2. -Signed-off-by: Michael Trimarchi <michael@amarulasolutions.com> +Signed-off-by: Michael Trimarchi <michael-dyjBcgdgk7Pe9wHmmfpqLFaTQe2KTcn/@public.gmane.org> --- arch/arm/boot/dts/imx6ul.dtsi | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) @@ -23,7 +23,7 @@ index 99b6465..cd32d1d 100644 status = "disabled"; }; + -+ flexcan1: can at 02090000 { ++ flexcan1: can@02090000 { + compatible = "fsl,imx6ul-flexcan", "fsl,imx6q-flexcan"; + reg = <0x02090000 0x4000>; + interrupts = <GIC_SPI 110 IRQ_TYPE_LEVEL_HIGH>; @@ -34,7 +34,7 @@ index 99b6465..cd32d1d 100644 + status = "disabled"; + }; + -+ flexcan2: can at 02094000 { ++ flexcan2: can@02094000 { + compatible = "fsl,imx6ul-flexcan", "fsl,imx6q-flexcan"; + reg = <0x02094000 0x4000>; + interrupts = <GIC_SPI 111 IRQ_TYPE_LEVEL_HIGH>; @@ -46,6 +46,11 @@ index 99b6465..cd32d1d 100644 + }; }; - gpt1: gpt at 02098000 { + gpt1: gpt@02098000 { -- 2.7.0 + +-- +To unsubscribe from this list: send the line "unsubscribe devicetree" in +the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org +More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/a/content_digest b/N1/content_digest index c4168ab..9a41fd0 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,13 +1,20 @@ "ref\01455963652-24618-1-git-send-email-michael@amarulasolutions.com\0" - "From\0michael@amarulasolutions.com (Michael Trimarchi)\0" + "ref\01455963652-24618-1-git-send-email-michael-dyjBcgdgk7Pe9wHmmfpqLFaTQe2KTcn/@public.gmane.org\0" + "From\0Michael Trimarchi <michael-dyjBcgdgk7Pe9wHmmfpqLFaTQe2KTcn/@public.gmane.org>\0" "Subject\0[PATCH 1/4] ARM: dts: imx6ul: Add flexcan1 and flexcan2 support\0" "Date\0Sat, 20 Feb 2016 11:20:49 +0100\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "To\0shawnguo-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org" + " kernel-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org\0" + "Cc\0linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org" + devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org + fabio.estevam-KZfg59tc24xl57MIdRCFDg@public.gmane.org + computersforpeace-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org + " michael-dyjBcgdgk7Pe9wHmmfpqLFaTQe2KTcn/@public.gmane.org\0" "\00:1\0" "b\0" "Add support for FLEXCAN1 and FLEXCAN2.\n" "\n" - "Signed-off-by: Michael Trimarchi <michael@amarulasolutions.com>\n" + "Signed-off-by: Michael Trimarchi <michael-dyjBcgdgk7Pe9wHmmfpqLFaTQe2KTcn/@public.gmane.org>\n" "---\n" " arch/arm/boot/dts/imx6ul.dtsi | 24 ++++++++++++++++++++++++\n" " 1 file changed, 24 insertions(+)\n" @@ -30,7 +37,7 @@ " \t\t\t\t\tstatus = \"disabled\";\n" " \t\t\t\t};\n" "+\n" - "+\t\t\t\tflexcan1: can at 02090000 {\n" + "+\t\t\t\tflexcan1: can@02090000 {\n" "+\t\t\t\t\tcompatible = \"fsl,imx6ul-flexcan\", \"fsl,imx6q-flexcan\";\n" "+\t\t\t\t\treg = <0x02090000 0x4000>;\n" "+\t\t\t\t\tinterrupts = <GIC_SPI 110 IRQ_TYPE_LEVEL_HIGH>;\n" @@ -41,7 +48,7 @@ "+\t\t\t\t\tstatus = \"disabled\";\n" "+\t\t\t\t};\n" "+\n" - "+\t\t\t\tflexcan2: can at 02094000 {\n" + "+\t\t\t\tflexcan2: can@02094000 {\n" "+\t\t\t\t\tcompatible = \"fsl,imx6ul-flexcan\", \"fsl,imx6q-flexcan\";\n" "+\t\t\t\t\treg = <0x02094000 0x4000>;\n" "+\t\t\t\t\tinterrupts = <GIC_SPI 111 IRQ_TYPE_LEVEL_HIGH>;\n" @@ -53,8 +60,13 @@ "+\t\t\t\t};\n" " \t\t\t};\n" " \n" - " \t\t\tgpt1: gpt at 02098000 {\n" + " \t\t\tgpt1: gpt@02098000 {\n" "-- \n" - 2.7.0 + "2.7.0\n" + "\n" + "--\n" + "To unsubscribe from this list: send the line \"unsubscribe devicetree\" in\n" + "the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org\n" + More majordomo info at http://vger.kernel.org/majordomo-info.html -a7bc9644c51a28873a2892eeae97e51b4aa3ddf0c1f210b8e7a516c658fbe257 +0a269ec9031f09b4db335a8117cebc3702c5f2288161795510a2a45669d2bfc9
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.