diff for duplicates of <20141122000004.GG7046@atomide.com> diff --git a/a/1.txt b/N1/1.txt index aa3014d..f20f600 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -2,7 +2,7 @@ > Add node for RTC. > > Signed-off-by: Lokesh Vutla <lokeshvutla@ti.com> -> [nm@ti.com: update with rtc crossbar number] +> [nm at ti.com: update with rtc crossbar number] > Signed-off-by: Nishanth Menon <nm@ti.com> Applying into omap-for-v3.19/dt-v2 thanks. @@ -23,7 +23,7 @@ Tony > status = "disabled"; > }; > -> + rtc@48838000 { +> + rtc at 48838000 { > + compatible = "ti,am3352-rtc"; > + reg = <0x48838000 0x100>; > + interrupts = <GIC_SPI 217 IRQ_TYPE_LEVEL_HIGH>, @@ -32,7 +32,7 @@ Tony > + clocks = <&sys_32k_ck>; > + }; > + -> omap_control_usb2phy1: control-phy@4a002300 { +> omap_control_usb2phy1: control-phy at 4a002300 { > compatible = "ti,control-phy-usb2"; > reg = <0x4a002300 0x4>; > -- diff --git a/a/content_digest b/N1/content_digest index 0124259..30a9148 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,22 +1,16 @@ "ref\01416199509-3977-1-git-send-email-lokeshvutla@ti.com\0" "ref\01416399788-27557-1-git-send-email-lokeshvutla@ti.com\0" - "From\0Tony Lindgren <tony@atomide.com>\0" - "Subject\0Re: [PATCH V2] ARM: dts: DRA7: Add node for RTC\0" + "From\0tony@atomide.com (Tony Lindgren)\0" + "Subject\0[PATCH V2] ARM: dts: DRA7: Add node for RTC\0" "Date\0Fri, 21 Nov 2014 16:00:05 -0800\0" - "To\0Lokesh Vutla <lokeshvutla@ti.com>\0" - "Cc\0linux-omap@vger.kernel.org" - linux-arm-kernel@lists.infradead.org - devicetree@vger.kernel.org - nsekhar@ti.com - t-kristo@ti.com - " Nishanth Menon <nm@ti.com>\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "* Lokesh Vutla <lokeshvutla@ti.com> [141119 04:26]:\n" "> Add node for RTC.\n" "> \n" "> Signed-off-by: Lokesh Vutla <lokeshvutla@ti.com>\n" - "> [nm@ti.com: update with rtc crossbar number]\n" + "> [nm at ti.com: update with rtc crossbar number]\n" "> Signed-off-by: Nishanth Menon <nm@ti.com>\n" "\n" "Applying into omap-for-v3.19/dt-v2 thanks.\n" @@ -37,7 +31,7 @@ "> \t\t\tstatus = \"disabled\";\n" "> \t\t};\n" "> \n" - "> +\t\trtc@48838000 {\n" + "> +\t\trtc at 48838000 {\n" "> +\t\t\tcompatible = \"ti,am3352-rtc\";\n" "> +\t\t\treg = <0x48838000 0x100>;\n" "> +\t\t\tinterrupts = <GIC_SPI 217 IRQ_TYPE_LEVEL_HIGH>,\n" @@ -46,11 +40,11 @@ "> +\t\t\tclocks = <&sys_32k_ck>;\n" "> +\t\t};\n" "> +\n" - "> \t\tomap_control_usb2phy1: control-phy@4a002300 {\n" + "> \t\tomap_control_usb2phy1: control-phy at 4a002300 {\n" "> \t\t\tcompatible = \"ti,control-phy-usb2\";\n" "> \t\t\treg = <0x4a002300 0x4>;\n" "> -- \n" "> 1.9.1\n" > -4e8fcd8723506794cbd82b9c5bd4ef7a8e8ffe9204bd6178de1be605ebc375ec +9355eddc835823a86d24eab68f34fa4fd58ecd60d12b630bcea429e2675700ac
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.