diff for duplicates of <87d36fzhkm.fsf@ti.com> diff --git a/a/1.txt b/N1/1.txt index 5d97620..2f03968 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -14,60 +14,60 @@ >>> Signed-off-by: Jean Pihet <j-pihet@ti.com> >>> Signed-off-by: J Keerthy <j-keerthy@ti.com> >>> --- ->>> arch/arm/mach-omap2/omap_hwmod_3xxx_data.c | 8 ++++---- ->>> arch/arm/mach-omap2/smartreflex.c | 2 +- ->>> 2 files changed, 5 insertions(+), 5 deletions(-) +>>> ?arch/arm/mach-omap2/omap_hwmod_3xxx_data.c | ? ?8 ++++---- +>>> ?arch/arm/mach-omap2/smartreflex.c ? ? ? ? ?| ? ?2 +- +>>> ?2 files changed, 5 insertions(+), 5 deletions(-) >>> >>> diff --git a/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c b/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c >>> index 144d118..15907b0 100644 >>> --- a/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c >>> +++ b/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c >>> @@ -1324,7 +1324,7 @@ static struct omap_hwmod_irq_info omap3_smartreflex_mpu_irqs[] = { ->>> }; +>>> ?}; >>> ->>> static struct omap_hwmod omap34xx_sr1_hwmod = { ->>> - .name = "sr1", ->>> + .name = "smartreflex_mpu_iva", ->>> .class = &omap34xx_smartreflex_hwmod_class, ->>> .main_clk = "sr1_fck", ->>> .prcm = { +>>> ?static struct omap_hwmod omap34xx_sr1_hwmod = { +>>> - ? ? .name ? ? ? ? ? = "sr1", +>>> + ? ? .name ? ? ? ? ? = "smartreflex_mpu_iva", +>>> ? ? ? .class ? ? ? ? ?= &omap34xx_smartreflex_hwmod_class, +>>> ? ? ? .main_clk ? ? ? = "sr1_fck", +>>> ? ? ? .prcm ? ? ? ? ? = { >>> @@ -1342,7 +1342,7 @@ static struct omap_hwmod omap34xx_sr1_hwmod = { ->>> }; +>>> ?}; >>> ->>> static struct omap_hwmod omap36xx_sr1_hwmod = { ->>> - .name = "sr1", ->>> + .name = "smartreflex_mpu_iva", ->>> .class = &omap36xx_smartreflex_hwmod_class, ->>> .main_clk = "sr1_fck", ->>> .prcm = { +>>> ?static struct omap_hwmod omap36xx_sr1_hwmod = { +>>> - ? ? .name ? ? ? ? ? = "sr1", +>>> + ? ? .name ? ? ? ? ? = "smartreflex_mpu_iva", +>>> ? ? ? .class ? ? ? ? ?= &omap36xx_smartreflex_hwmod_class, +>>> ? ? ? .main_clk ? ? ? = "sr1_fck", +>>> ? ? ? .prcm ? ? ? ? ? = { >>> @@ -1369,7 +1369,7 @@ static struct omap_hwmod_irq_info omap3_smartreflex_core_irqs[] = { ->>> }; +>>> ?}; >>> ->>> static struct omap_hwmod omap34xx_sr2_hwmod = { ->>> - .name = "sr2", ->>> + .name = "smartreflex_core", ->>> .class = &omap34xx_smartreflex_hwmod_class, ->>> .main_clk = "sr2_fck", ->>> .prcm = { +>>> ?static struct omap_hwmod omap34xx_sr2_hwmod = { +>>> - ? ? .name ? ? ? ? ? = "sr2", +>>> + ? ? .name ? ? ? ? ? = "smartreflex_core", +>>> ? ? ? .class ? ? ? ? ?= &omap34xx_smartreflex_hwmod_class, +>>> ? ? ? .main_clk ? ? ? = "sr2_fck", +>>> ? ? ? .prcm ? ? ? ? ? = { >>> @@ -1387,7 +1387,7 @@ static struct omap_hwmod omap34xx_sr2_hwmod = { ->>> }; +>>> ?}; >>> ->>> static struct omap_hwmod omap36xx_sr2_hwmod = { ->>> - .name = "sr2", ->>> + .name = "smartreflex_core", ->>> .class = &omap36xx_smartreflex_hwmod_class, ->>> .main_clk = "sr2_fck", ->>> .prcm = { +>>> ?static struct omap_hwmod omap36xx_sr2_hwmod = { +>>> - ? ? .name ? ? ? ? ? = "sr2", +>>> + ? ? .name ? ? ? ? ? = "smartreflex_core", +>>> ? ? ? .class ? ? ? ? ?= &omap36xx_smartreflex_hwmod_class, +>>> ? ? ? .main_clk ? ? ? = "sr2_fck", +>>> ? ? ? .prcm ? ? ? ? ? = { >>> diff --git a/arch/arm/mach-omap2/smartreflex.c b/arch/arm/mach-omap2/smartreflex.c >>> index 2edd1e2..d859277 100644 >>> --- a/arch/arm/mach-omap2/smartreflex.c >>> +++ b/arch/arm/mach-omap2/smartreflex.c >>> @@ -183,7 +183,7 @@ static void sr_set_regfields(struct omap_sr *sr) ->>> sr->err_weight = OMAP3430_SR_ERRWEIGHT; ->>> sr->err_maxlimit = OMAP3430_SR_ERRMAXLIMIT; ->>> sr->accum_data = OMAP3430_SR_ACCUMDATA; ->>> - if (!(strcmp(sr->name, "sr1"))) { ->>> + if (!(strcmp(sr->name, "smartreflex_mpu_iva"))) { +>>> ? ? ? ? ? ? ? sr->err_weight = OMAP3430_SR_ERRWEIGHT; +>>> ? ? ? ? ? ? ? sr->err_maxlimit = OMAP3430_SR_ERRMAXLIMIT; +>>> ? ? ? ? ? ? ? sr->accum_data = OMAP3430_SR_ACCUMDATA; +>>> - ? ? ? ? ? ? if (!(strcmp(sr->name, "sr1"))) { +>>> + ? ? ? ? ? ? if (!(strcmp(sr->name, "smartreflex_mpu_iva"))) { >> >> What if voltage rail is different for mpu and iva? I have seen some devices >> supports SmartReflex have different voltage rails for mpu and iva. @@ -80,9 +80,3 @@ Rather than enhancing the checks, this SoC specific data should probably just be made part of the SoC specific hwmod dev_attr. Kevin - - -_______________________________________________ -linux-arm-kernel mailing list -linux-arm-kernel@lists.infradead.org -http://lists.infradead.org/mailman/listinfo/linux-arm-kernel diff --git a/a/content_digest b/N1/content_digest index 11bfc1a..8416c69 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -2,20 +2,10 @@ "ref\01335462041-4949-5-git-send-email-j-keerthy@ti.com\0" "ref\0331ABD5ECB02734CA317220B2BBEABC13E9B1AA2@DBDE01.ent.ti.com\0" "ref\0CAJ6a13ZSWSa_RpGB9NxtfyChUba9NGivGogpsfyk7oT9pNayjg@mail.gmail.com\0" - "From\0Kevin Hilman <khilman@ti.com>\0" - "Subject\0Re: [PATCH V3 04/10] ARM: OMAP3: hwmod: rename the smartreflex entries\0" + "From\0khilman@ti.com (Kevin Hilman)\0" + "Subject\0[PATCH V3 04/10] ARM: OMAP3: hwmod: rename the smartreflex entries\0" "Date\0Mon, 07 May 2012 16:39:53 -0700\0" - "To\0J" - " KEERTHY <j-keerthy@ti.com>\0" - "Cc\0linux-kernel@vger.kernel.org <linux-kernel@vger.kernel.org>" - rjw@sisk.pl <rjw@sisk.pl> - AnilKumar - Chimata <anilkumar@ti.com> - linux-pm@lists.linux-foundation.org <linux-pm@lists.linux-foundation.org> - linux-omap@vger.kernel.org <linux-omap@vger.kernel.org> - Pihet-XID - Jean <j-pihet@ti.com> - " linux-arm-kernel@lists.infradead.org <linux-arm-kernel@lists.infradead.org>\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "\"J, KEERTHY\" <j-keerthy@ti.com> writes:\n" @@ -34,60 +24,60 @@ ">>> Signed-off-by: Jean Pihet <j-pihet@ti.com>\n" ">>> Signed-off-by: J Keerthy <j-keerthy@ti.com>\n" ">>> ---\n" - ">>> \302\240arch/arm/mach-omap2/omap_hwmod_3xxx_data.c | \302\240 \302\2408 ++++----\n" - ">>> \302\240arch/arm/mach-omap2/smartreflex.c \302\240 \302\240 \302\240 \302\240 \302\240| \302\240 \302\2402 +-\n" - ">>> \302\2402 files changed, 5 insertions(+), 5 deletions(-)\n" + ">>> ?arch/arm/mach-omap2/omap_hwmod_3xxx_data.c | ? ?8 ++++----\n" + ">>> ?arch/arm/mach-omap2/smartreflex.c ? ? ? ? ?| ? ?2 +-\n" + ">>> ?2 files changed, 5 insertions(+), 5 deletions(-)\n" ">>>\n" ">>> diff --git a/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c b/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c\n" ">>> index 144d118..15907b0 100644\n" ">>> --- a/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c\n" ">>> +++ b/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c\n" ">>> @@ -1324,7 +1324,7 @@ static struct omap_hwmod_irq_info omap3_smartreflex_mpu_irqs[] = {\n" - ">>> \302\240};\n" + ">>> ?};\n" ">>>\n" - ">>> \302\240static struct omap_hwmod omap34xx_sr1_hwmod = {\n" - ">>> - \302\240 \302\240 .name \302\240 \302\240 \302\240 \302\240 \302\240 = \"sr1\",\n" - ">>> + \302\240 \302\240 .name \302\240 \302\240 \302\240 \302\240 \302\240 = \"smartreflex_mpu_iva\",\n" - ">>> \302\240 \302\240 \302\240 .class \302\240 \302\240 \302\240 \302\240 \302\240= &omap34xx_smartreflex_hwmod_class,\n" - ">>> \302\240 \302\240 \302\240 .main_clk \302\240 \302\240 \302\240 = \"sr1_fck\",\n" - ">>> \302\240 \302\240 \302\240 .prcm \302\240 \302\240 \302\240 \302\240 \302\240 = {\n" + ">>> ?static struct omap_hwmod omap34xx_sr1_hwmod = {\n" + ">>> - ? ? .name ? ? ? ? ? = \"sr1\",\n" + ">>> + ? ? .name ? ? ? ? ? = \"smartreflex_mpu_iva\",\n" + ">>> ? ? ? .class ? ? ? ? ?= &omap34xx_smartreflex_hwmod_class,\n" + ">>> ? ? ? .main_clk ? ? ? = \"sr1_fck\",\n" + ">>> ? ? ? .prcm ? ? ? ? ? = {\n" ">>> @@ -1342,7 +1342,7 @@ static struct omap_hwmod omap34xx_sr1_hwmod = {\n" - ">>> \302\240};\n" + ">>> ?};\n" ">>>\n" - ">>> \302\240static struct omap_hwmod omap36xx_sr1_hwmod = {\n" - ">>> - \302\240 \302\240 .name \302\240 \302\240 \302\240 \302\240 \302\240 = \"sr1\",\n" - ">>> + \302\240 \302\240 .name \302\240 \302\240 \302\240 \302\240 \302\240 = \"smartreflex_mpu_iva\",\n" - ">>> \302\240 \302\240 \302\240 .class \302\240 \302\240 \302\240 \302\240 \302\240= &omap36xx_smartreflex_hwmod_class,\n" - ">>> \302\240 \302\240 \302\240 .main_clk \302\240 \302\240 \302\240 = \"sr1_fck\",\n" - ">>> \302\240 \302\240 \302\240 .prcm \302\240 \302\240 \302\240 \302\240 \302\240 = {\n" + ">>> ?static struct omap_hwmod omap36xx_sr1_hwmod = {\n" + ">>> - ? ? .name ? ? ? ? ? = \"sr1\",\n" + ">>> + ? ? .name ? ? ? ? ? = \"smartreflex_mpu_iva\",\n" + ">>> ? ? ? .class ? ? ? ? ?= &omap36xx_smartreflex_hwmod_class,\n" + ">>> ? ? ? .main_clk ? ? ? = \"sr1_fck\",\n" + ">>> ? ? ? .prcm ? ? ? ? ? = {\n" ">>> @@ -1369,7 +1369,7 @@ static struct omap_hwmod_irq_info omap3_smartreflex_core_irqs[] = {\n" - ">>> \302\240};\n" + ">>> ?};\n" ">>>\n" - ">>> \302\240static struct omap_hwmod omap34xx_sr2_hwmod = {\n" - ">>> - \302\240 \302\240 .name \302\240 \302\240 \302\240 \302\240 \302\240 = \"sr2\",\n" - ">>> + \302\240 \302\240 .name \302\240 \302\240 \302\240 \302\240 \302\240 = \"smartreflex_core\",\n" - ">>> \302\240 \302\240 \302\240 .class \302\240 \302\240 \302\240 \302\240 \302\240= &omap34xx_smartreflex_hwmod_class,\n" - ">>> \302\240 \302\240 \302\240 .main_clk \302\240 \302\240 \302\240 = \"sr2_fck\",\n" - ">>> \302\240 \302\240 \302\240 .prcm \302\240 \302\240 \302\240 \302\240 \302\240 = {\n" + ">>> ?static struct omap_hwmod omap34xx_sr2_hwmod = {\n" + ">>> - ? ? .name ? ? ? ? ? = \"sr2\",\n" + ">>> + ? ? .name ? ? ? ? ? = \"smartreflex_core\",\n" + ">>> ? ? ? .class ? ? ? ? ?= &omap34xx_smartreflex_hwmod_class,\n" + ">>> ? ? ? .main_clk ? ? ? = \"sr2_fck\",\n" + ">>> ? ? ? .prcm ? ? ? ? ? = {\n" ">>> @@ -1387,7 +1387,7 @@ static struct omap_hwmod omap34xx_sr2_hwmod = {\n" - ">>> \302\240};\n" + ">>> ?};\n" ">>>\n" - ">>> \302\240static struct omap_hwmod omap36xx_sr2_hwmod = {\n" - ">>> - \302\240 \302\240 .name \302\240 \302\240 \302\240 \302\240 \302\240 = \"sr2\",\n" - ">>> + \302\240 \302\240 .name \302\240 \302\240 \302\240 \302\240 \302\240 = \"smartreflex_core\",\n" - ">>> \302\240 \302\240 \302\240 .class \302\240 \302\240 \302\240 \302\240 \302\240= &omap36xx_smartreflex_hwmod_class,\n" - ">>> \302\240 \302\240 \302\240 .main_clk \302\240 \302\240 \302\240 = \"sr2_fck\",\n" - ">>> \302\240 \302\240 \302\240 .prcm \302\240 \302\240 \302\240 \302\240 \302\240 = {\n" + ">>> ?static struct omap_hwmod omap36xx_sr2_hwmod = {\n" + ">>> - ? ? .name ? ? ? ? ? = \"sr2\",\n" + ">>> + ? ? .name ? ? ? ? ? = \"smartreflex_core\",\n" + ">>> ? ? ? .class ? ? ? ? ?= &omap36xx_smartreflex_hwmod_class,\n" + ">>> ? ? ? .main_clk ? ? ? = \"sr2_fck\",\n" + ">>> ? ? ? .prcm ? ? ? ? ? = {\n" ">>> diff --git a/arch/arm/mach-omap2/smartreflex.c b/arch/arm/mach-omap2/smartreflex.c\n" ">>> index 2edd1e2..d859277 100644\n" ">>> --- a/arch/arm/mach-omap2/smartreflex.c\n" ">>> +++ b/arch/arm/mach-omap2/smartreflex.c\n" ">>> @@ -183,7 +183,7 @@ static void sr_set_regfields(struct omap_sr *sr)\n" - ">>> \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 sr->err_weight = OMAP3430_SR_ERRWEIGHT;\n" - ">>> \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 sr->err_maxlimit = OMAP3430_SR_ERRMAXLIMIT;\n" - ">>> \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 sr->accum_data = OMAP3430_SR_ACCUMDATA;\n" - ">>> - \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 if (!(strcmp(sr->name, \"sr1\"))) {\n" - ">>> + \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 if (!(strcmp(sr->name, \"smartreflex_mpu_iva\"))) {\n" + ">>> ? ? ? ? ? ? ? sr->err_weight = OMAP3430_SR_ERRWEIGHT;\n" + ">>> ? ? ? ? ? ? ? sr->err_maxlimit = OMAP3430_SR_ERRMAXLIMIT;\n" + ">>> ? ? ? ? ? ? ? sr->accum_data = OMAP3430_SR_ACCUMDATA;\n" + ">>> - ? ? ? ? ? ? if (!(strcmp(sr->name, \"sr1\"))) {\n" + ">>> + ? ? ? ? ? ? if (!(strcmp(sr->name, \"smartreflex_mpu_iva\"))) {\n" ">>\n" ">> What if voltage rail is different for mpu and iva? I have seen some devices\n" ">> supports SmartReflex have different voltage rails for mpu and iva.\n" @@ -99,12 +89,6 @@ "Rather than enhancing the checks, this SoC specific data should probably\n" "just be made part of the SoC specific hwmod dev_attr.\n" "\n" - "Kevin\n" - "\n" - "\n" - "_______________________________________________\n" - "linux-arm-kernel mailing list\n" - "linux-arm-kernel@lists.infradead.org\n" - http://lists.infradead.org/mailman/listinfo/linux-arm-kernel + Kevin -8326c69752df07d3ed1aedbd9555aaaf821e2a6445f006f75da1fd0406173352 +113cf7e1713dafa12b5b52b2f67550a3a140000e562431abf819d47c89c912ce
diff --git a/a/1.txt b/N2/1.txt index 5d97620..1a2fde2 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -80,9 +80,3 @@ Rather than enhancing the checks, this SoC specific data should probably just be made part of the SoC specific hwmod dev_attr. Kevin - - -_______________________________________________ -linux-arm-kernel mailing list -linux-arm-kernel@lists.infradead.org -http://lists.infradead.org/mailman/listinfo/linux-arm-kernel diff --git a/a/content_digest b/N2/content_digest index 11bfc1a..6b2676f 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -5,17 +5,17 @@ "From\0Kevin Hilman <khilman@ti.com>\0" "Subject\0Re: [PATCH V3 04/10] ARM: OMAP3: hwmod: rename the smartreflex entries\0" "Date\0Mon, 07 May 2012 16:39:53 -0700\0" - "To\0J" + "To\0J\\" " KEERTHY <j-keerthy@ti.com>\0" - "Cc\0linux-kernel@vger.kernel.org <linux-kernel@vger.kernel.org>" - rjw@sisk.pl <rjw@sisk.pl> - AnilKumar + "Cc\0AnilKumar\\" Chimata <anilkumar@ti.com> - linux-pm@lists.linux-foundation.org <linux-pm@lists.linux-foundation.org> - linux-omap@vger.kernel.org <linux-omap@vger.kernel.org> - Pihet-XID - Jean <j-pihet@ti.com> - " linux-arm-kernel@lists.infradead.org <linux-arm-kernel@lists.infradead.org>\0" + " linux-omap\\@vger.kernel.org <linux-omap@vger.kernel.org>" + " linux-arm-kernel\\@lists.infradead.org <linux-arm-kernel@lists.infradead.org>" + " rjw\\@sisk.pl <rjw@sisk.pl>" + " linux-kernel\\@vger.kernel.org <linux-kernel@vger.kernel.org>" + " linux-pm\\@lists.linux-foundation.org <linux-pm@lists.linux-foundation.org>" + " Pihet-XID\\" + " Jean <j-pihet@ti.com>\0" "\00:1\0" "b\0" "\"J, KEERTHY\" <j-keerthy@ti.com> writes:\n" @@ -99,12 +99,6 @@ "Rather than enhancing the checks, this SoC specific data should probably\n" "just be made part of the SoC specific hwmod dev_attr.\n" "\n" - "Kevin\n" - "\n" - "\n" - "_______________________________________________\n" - "linux-arm-kernel mailing list\n" - "linux-arm-kernel@lists.infradead.org\n" - http://lists.infradead.org/mailman/listinfo/linux-arm-kernel + Kevin -8326c69752df07d3ed1aedbd9555aaaf821e2a6445f006f75da1fd0406173352 +91a889906cd7e88091fc22578b8c824cfd000655bb454e9c02dd9749bbc54666
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.