diff for duplicates of <8739mngjt5.fsf@ti.com> diff --git a/a/1.txt b/N1/1.txt index 051ede3..56f6f40 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -9,8 +9,8 @@ >> This also fixes the following error seen during boot as >> omap2_set_init_voltage can now find the iva device >> ->> omap2_set_init_voltage: Invalid parameters! ->> omap2_set_init_voltage: Unable to put vdd_iva to its init voltage +>> ? ? ? ?omap2_set_init_voltage: Invalid parameters! +>> ? ? ? ?omap2_set_init_voltage: Unable to put vdd_iva to its init voltage >> >> Signed-off-by: Shweta Gulati <shweta.gulati@ti.com> >> --- @@ -23,21 +23,21 @@ >> V2: >> Rephrased the Commit log. >> ->> arch/arm/mach-omap2/pm.c | 1 + ->> 1 files changed, 1 insertions(+), 0 deletions(-) +>> ?arch/arm/mach-omap2/pm.c | ? ?1 + +>> ?1 files changed, 1 insertions(+), 0 deletions(-) >> >> diff --git a/arch/arm/mach-omap2/pm.c b/arch/arm/mach-omap2/pm.c >> index 30af335..49486f5 100644 >> --- a/arch/arm/mach-omap2/pm.c >> +++ b/arch/arm/mach-omap2/pm.c >> @@ -89,6 +89,7 @@ static void omap2_init_processor_devices(void) ->> if (cpu_is_omap44xx()) { ->> _init_omap_device("l3_main_1", &l3_dev); ->> _init_omap_device("dsp", &dsp_dev); ->> + _init_omap_device("iva", &iva_dev); ->> } else { ->> _init_omap_device("l3_main", &l3_dev); ->> } +>> ? ? ? ?if (cpu_is_omap44xx()) { +>> ? ? ? ? ? ? ? ?_init_omap_device("l3_main_1", &l3_dev); +>> ? ? ? ? ? ? ? ?_init_omap_device("dsp", &dsp_dev); +>> + ? ? ? ? ? ? ? _init_omap_device("iva", &iva_dev); +>> ? ? ? ?} else { +>> ? ? ? ? ? ? ? ?_init_omap_device("l3_main", &l3_dev); +>> ? ? ? ?} >> -- > Looks fine to me. @@ -46,7 +46,3 @@ Thanks, I'll take this as an ack. Will queue as a fix for the .39-rc fixes cycle. Kevin --- -To unsubscribe from this list: send the line "unsubscribe linux-omap" in -the body of a message to majordomo@vger.kernel.org -More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/a/content_digest b/N1/content_digest index a2861bf..b6c93ce 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,13 +1,9 @@ "ref\01299926361-28482-1-git-send-email-shweta.gulati@ti.com\0" "ref\0AANLkTinympnok4Qw_n15ukDNE2L5yp9xvuhoP64B=2wJ@mail.gmail.com\0" - "From\0Kevin Hilman <khilman@ti.com>\0" - "Subject\0Re: [PATCH V2] OMAP4: Intialize IVA Device in addition to DSP device.\0" + "From\0khilman@ti.com (Kevin Hilman)\0" + "Subject\0[PATCH V2] OMAP4: Intialize IVA Device in addition to DSP device.\0" "Date\0Wed, 16 Mar 2011 08:35:18 -0700\0" - "To\0Menon" - " Nishanth <nm@ti.com>\0" - "Cc\0Shweta Gulati <shweta.gulati@ti.com>" - linux-omap@vger.kernel.org - " linux-arm-kernel@lists.infradead.org\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "\"Menon, Nishanth\" <nm@ti.com> writes:\n" @@ -21,8 +17,8 @@ ">> This also fixes the following error seen during boot as\n" ">> omap2_set_init_voltage can now find the iva device\n" ">>\n" - ">> \302\240 \302\240 \302\240 \302\240omap2_set_init_voltage: Invalid parameters!\n" - ">> \302\240 \302\240 \302\240 \302\240omap2_set_init_voltage: Unable to put vdd_iva to its init voltage\n" + ">> ? ? ? ?omap2_set_init_voltage: Invalid parameters!\n" + ">> ? ? ? ?omap2_set_init_voltage: Unable to put vdd_iva to its init voltage\n" ">>\n" ">> Signed-off-by: Shweta Gulati <shweta.gulati@ti.com>\n" ">> ---\n" @@ -35,21 +31,21 @@ ">> V2:\n" ">> Rephrased the Commit log.\n" ">>\n" - ">> \302\240arch/arm/mach-omap2/pm.c | \302\240 \302\2401 +\n" - ">> \302\2401 files changed, 1 insertions(+), 0 deletions(-)\n" + ">> ?arch/arm/mach-omap2/pm.c | ? ?1 +\n" + ">> ?1 files changed, 1 insertions(+), 0 deletions(-)\n" ">>\n" ">> diff --git a/arch/arm/mach-omap2/pm.c b/arch/arm/mach-omap2/pm.c\n" ">> index 30af335..49486f5 100644\n" ">> --- a/arch/arm/mach-omap2/pm.c\n" ">> +++ b/arch/arm/mach-omap2/pm.c\n" ">> @@ -89,6 +89,7 @@ static void omap2_init_processor_devices(void)\n" - ">> \302\240 \302\240 \302\240 \302\240if (cpu_is_omap44xx()) {\n" - ">> \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240_init_omap_device(\"l3_main_1\", &l3_dev);\n" - ">> \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240_init_omap_device(\"dsp\", &dsp_dev);\n" - ">> + \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 _init_omap_device(\"iva\", &iva_dev);\n" - ">> \302\240 \302\240 \302\240 \302\240} else {\n" - ">> \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240_init_omap_device(\"l3_main\", &l3_dev);\n" - ">> \302\240 \302\240 \302\240 \302\240}\n" + ">> ? ? ? ?if (cpu_is_omap44xx()) {\n" + ">> ? ? ? ? ? ? ? ?_init_omap_device(\"l3_main_1\", &l3_dev);\n" + ">> ? ? ? ? ? ? ? ?_init_omap_device(\"dsp\", &dsp_dev);\n" + ">> + ? ? ? ? ? ? ? _init_omap_device(\"iva\", &iva_dev);\n" + ">> ? ? ? ?} else {\n" + ">> ? ? ? ? ? ? ? ?_init_omap_device(\"l3_main\", &l3_dev);\n" + ">> ? ? ? ?}\n" ">> --\n" "> Looks fine to me.\n" "\n" @@ -57,10 +53,6 @@ "\n" "Will queue as a fix for the .39-rc fixes cycle.\n" "\n" - "Kevin\n" - "--\n" - "To unsubscribe from this list: send the line \"unsubscribe linux-omap\" in\n" - "the body of a message to majordomo@vger.kernel.org\n" - More majordomo info at http://vger.kernel.org/majordomo-info.html + Kevin -c873683a85dbf54ba287e25b730bb07cf0fa80e3979a446c84c7ada12d594f30 +5e87a7647c85dd8e8bee81d896d04df051bd7c4114806415118b95cd2b14a6d7
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.