diff for duplicates of <52148C67.3080106@baylibre.com> diff --git a/a/1.txt b/N1/1.txt index b0a5390..d6a5a3b 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -42,14 +42,14 @@ Benoit >> }; >> >> - ocp2scp { ->> + ocp2scp@4a080000 { +>> + ocp2scp at 4a080000 { >> compatible = "ti,omap-ocp2scp"; >> #address-cells = <1>; >> #size-cells = <1>; >> + reg = <0x4a080000 0x20>; >> ranges; >> ti,hwmods = "ocp2scp1"; ->> usb2_phy: usb2phy@4a084000 { +>> usb2_phy: usb2phy at 4a084000 { >> diff --git a/arch/arm/mach-omap2/omap_hwmod_54xx_data.c b/arch/arm/mach-omap2/omap_hwmod_54xx_data.c >> index 2435109..d9118a1 100644 >> --- a/arch/arm/mach-omap2/omap_hwmod_54xx_data.c diff --git a/a/content_digest b/N1/content_digest index b17bf3b..447ac26 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,12 +1,9 @@ "ref\01373642066-5235-1-git-send-email-balbi@ti.com\0" "ref\020130821074728.GV7656@atomide.com\0" - "From\0Benoit Cousson <bcousson@baylibre.com>\0" - "Subject\0Re: [PATCH] arm: omap5: hwmod: add missing ocp2scp hwmod data\0" + "From\0bcousson@baylibre.com (Benoit Cousson)\0" + "Subject\0[PATCH] arm: omap5: hwmod: add missing ocp2scp hwmod data\0" "Date\0Wed, 21 Aug 2013 11:46:15 +0200\0" - "To\0Tony Lindgren <tony@atomide.com>\0" - "Cc\0Felipe Balbi <balbi@ti.com>" - Linux OMAP Mailing List <linux-omap@vger.kernel.org> - " Linux ARM Kernel Mailing List <linux-arm-kernel@lists.infradead.org>\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "On 21/08/2013 09:47, Tony Lindgren wrote:\n" @@ -53,14 +50,14 @@ ">> \t\t};\n" ">>\n" ">> -\t\tocp2scp {\n" - ">> +\t\tocp2scp@4a080000 {\n" + ">> +\t\tocp2scp at 4a080000 {\n" ">> \t\t\tcompatible = \"ti,omap-ocp2scp\";\n" ">> \t\t\t#address-cells = <1>;\n" ">> \t\t\t#size-cells = <1>;\n" ">> +\t\t\treg = <0x4a080000 0x20>;\n" ">> \t\t\tranges;\n" ">> \t\t\tti,hwmods = \"ocp2scp1\";\n" - ">> \t\t\tusb2_phy: usb2phy@4a084000 {\n" + ">> \t\t\tusb2_phy: usb2phy at 4a084000 {\n" ">> diff --git a/arch/arm/mach-omap2/omap_hwmod_54xx_data.c b/arch/arm/mach-omap2/omap_hwmod_54xx_data.c\n" ">> index 2435109..d9118a1 100644\n" ">> --- a/arch/arm/mach-omap2/omap_hwmod_54xx_data.c\n" @@ -135,4 +132,4 @@ ">> 1.8.2.1\n" >> -742c174a735f1c2e94fb0a90398e21d48bed42a228d892c034ca04c200160e1c +12c74293b0f35a8272e7300c4f3dac802d5cb149af22f7e196d25160ec806649
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.