diff for duplicates of <513A5B23.5070302@ti.com> diff --git a/a/1.txt b/N1/1.txt index 6eb4cd4..4c04ffe 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -19,7 +19,7 @@ On 03/08/2013 02:25 PM, Javier Martinez Canillas wrote: >> pinctrl-single,function-mask = <0x3f>; >> }; >> ->> + gpmc: gpmc@6800a000 { +>> + gpmc: gpmc at 6800a000 { >> + compatible = "ti,omap2420-gpmc"; >> + reg = <0x6800a000 0x1000>; >> + #address-cells = <2>; @@ -30,7 +30,7 @@ On 03/08/2013 02:25 PM, Javier Martinez Canillas wrote: >> + ti,hwmods = "gpmc"; >> + }; >> + ->> mcbsp1: mcbsp@48074000 { +>> mcbsp1: mcbsp at 48074000 { >> compatible = "ti,omap2420-mcbsp"; >> reg = <0x48074000 0xff>; >> diff --git a/arch/arm/boot/dts/omap2430.dtsi b/arch/arm/boot/dts/omap2430.dtsi @@ -41,7 +41,7 @@ On 03/08/2013 02:25 PM, Javier Martinez Canillas wrote: >> pinctrl-single,function-mask = <0x3f>; >> }; >> ->> + gpmc: gpmc@6e000000 { +>> + gpmc: gpmc at 6e000000 { >> + compatible = "ti,omap2430-gpmc"; >> + reg = <0x6e000000 0x1000>; >> + #address-cells = <2>; @@ -52,7 +52,7 @@ On 03/08/2013 02:25 PM, Javier Martinez Canillas wrote: >> + ti,hwmods = "gpmc"; >> + }; >> + ->> mcbsp1: mcbsp@48074000 { +>> mcbsp1: mcbsp at 48074000 { >> compatible = "ti,omap2430-mcbsp"; >> reg = <0x48074000 0xff>; >> diff --git a/arch/arm/boot/dts/omap4.dtsi b/arch/arm/boot/dts/omap4.dtsi @@ -63,7 +63,7 @@ On 03/08/2013 02:25 PM, Javier Martinez Canillas wrote: >> #interrupt-cells = <1>; >> }; >> ->> + gpmc: gpmc@50000000 { +>> + gpmc: gpmc at 50000000 { >> + compatible = "ti,omap4430-gpmc"; >> + reg = <0x50000000 0x1000>; > diff --git a/a/content_digest b/N1/content_digest index dae16e0..086f209 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,15 +1,10 @@ "ref\01362763654-9660-1-git-send-email-jon-hunter@ti.com\0" "ref\01362763654-9660-6-git-send-email-jon-hunter@ti.com\0" "ref\0CABxcv==OKX4z8x7ztqDJ5CozNmTQ5UaD43mTLWfQuqUt-y7xcQ@mail.gmail.com\0" - "From\0Jon Hunter <jon-hunter@ti.com>\0" - "Subject\0Re: [PATCH 5/9] ARM: dts: Add GPMC node for OMAP2, OMAP4 and OMAP5\0" + "From\0jon-hunter@ti.com (Jon Hunter)\0" + "Subject\0[PATCH 5/9] ARM: dts: Add GPMC node for OMAP2, OMAP4 and OMAP5\0" "Date\0Fri, 8 Mar 2013 15:41:55 -0600\0" - "To\0Javier Martinez Canillas <javier@dowhile0.org>\0" - "Cc\0Tony Lindgren <tony@atomide.com>" - Benoit Cousson <b-cousson@ti.com> - device-tree <devicetree-discuss@lists.ozlabs.org> - linux-omap <linux-omap@vger.kernel.org> - " linux-arm <linux-arm-kernel@lists.infradead.org>\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "\n" @@ -33,7 +28,7 @@ ">> pinctrl-single,function-mask = <0x3f>;\n" ">> };\n" ">>\n" - ">> + gpmc: gpmc@6800a000 {\n" + ">> + gpmc: gpmc at 6800a000 {\n" ">> + compatible = \"ti,omap2420-gpmc\";\n" ">> + reg = <0x6800a000 0x1000>;\n" ">> + #address-cells = <2>;\n" @@ -44,7 +39,7 @@ ">> + ti,hwmods = \"gpmc\";\n" ">> + };\n" ">> +\n" - ">> mcbsp1: mcbsp@48074000 {\n" + ">> mcbsp1: mcbsp at 48074000 {\n" ">> compatible = \"ti,omap2420-mcbsp\";\n" ">> reg = <0x48074000 0xff>;\n" ">> diff --git a/arch/arm/boot/dts/omap2430.dtsi b/arch/arm/boot/dts/omap2430.dtsi\n" @@ -55,7 +50,7 @@ ">> pinctrl-single,function-mask = <0x3f>;\n" ">> };\n" ">>\n" - ">> + gpmc: gpmc@6e000000 {\n" + ">> + gpmc: gpmc at 6e000000 {\n" ">> + compatible = \"ti,omap2430-gpmc\";\n" ">> + reg = <0x6e000000 0x1000>;\n" ">> + #address-cells = <2>;\n" @@ -66,7 +61,7 @@ ">> + ti,hwmods = \"gpmc\";\n" ">> + };\n" ">> +\n" - ">> mcbsp1: mcbsp@48074000 {\n" + ">> mcbsp1: mcbsp at 48074000 {\n" ">> compatible = \"ti,omap2430-mcbsp\";\n" ">> reg = <0x48074000 0xff>;\n" ">> diff --git a/arch/arm/boot/dts/omap4.dtsi b/arch/arm/boot/dts/omap4.dtsi\n" @@ -77,7 +72,7 @@ ">> #interrupt-cells = <1>;\n" ">> };\n" ">>\n" - ">> + gpmc: gpmc@50000000 {\n" + ">> + gpmc: gpmc at 50000000 {\n" ">> + compatible = \"ti,omap4430-gpmc\";\n" ">> + reg = <0x50000000 0x1000>;\n" "> \n" @@ -107,4 +102,4 @@ "Cheers\n" Jon -f7be6821067e00fc08f18d8df69c83fe82586e954b1bd38af427d234c1eac191 +d26eb498cc63e235f1792b46981e310ff14f4e25b14666b1638e757197afbc33
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.