diff for duplicates of <1868022.yBeGKSLdet@avalon> diff --git a/a/1.txt b/N1/1.txt index 081255b..48d1579 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -66,21 +66,18 @@ On Friday 09 Sep 2016 20:43:12 bd-phuc@jinso.co.jp wrote: > *ch, unsigned int index, ch->match_value = ch->max_match_value; > raw_spin_lock_init(&ch->lock); > -> - ch->timer_bit = cmt->info->model == SH_CMT_48BIT_GEN2 ? 0 : ch->hwidx; +> - ch->timer_bit = cmt->info->model = SH_CMT_48BIT_GEN2 ? 0 : ch->hwidx; > - > ret = sh_cmt_register(ch, dev_name(&cmt->pdev->dev), > clockevent, clocksource); > if (ret) { > @@ -944,6 +960,7 @@ static const struct of_device_id sh_cmt_of_table[] > __maybe_unused = { -> { .compatible = "renesas,cmt-32-fast", .data = -> &sh_cmt_info[SH_CMT_32BIT_FAST] }, +> { .compatible = "renesas,cmt-32-fast", .data > &sh_cmt_info[SH_CMT_32BIT_FAST] }, > { .compatible = "renesas,cmt-48", .data = &sh_cmt_info[SH_CMT_48BIT] > }, -> { .compatible = "renesas,cmt-48-gen2", .data = -> &sh_cmt_info[SH_CMT_48BIT_GEN2] }, -> + { .compatible = "renesas,cmt-48-gen3", .data = -> &sh_cmt_info[SH_CMT_48BIT_GEN3] }, +> { .compatible = "renesas,cmt-48-gen2", .data > &sh_cmt_info[SH_CMT_48BIT_GEN2] }, +> + { .compatible = "renesas,cmt-48-gen3", .data > &sh_cmt_info[SH_CMT_48BIT_GEN3] }, Given that the Gen2 and Gen3 CMT seem identical based on the above code, how about just using SH_CMT_48BIT_GEN2 here ? You wouldn't need any of the above diff --git a/a/content_digest b/N1/content_digest index ee5a4af..47382e5 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -2,25 +2,8 @@ "ref\01473421394-9745-7-git-send-email-bd-phuc@jinso.co.jp\0" "From\0Laurent Pinchart <laurent.pinchart@ideasonboard.com>\0" "Subject\0Re: [PATCH 6/8] clocksource: sh_cmt: Support separate R-car Gen3 CMT0/1\0" - "Date\0Fri, 09 Sep 2016 15:12:26 +0300\0" - "To\0bd-phuc@jinso.co.jp\0" - "Cc\0daniel.lezcano@linaro.org" - tglx@linutronix.de - devicetree@vger.kernel.org - linux-arm-kernel@lists.infradead.org - linux-sh@vger.kernel.org - geert+renesas@glider.be - linux-renesas-soc@vger.kernel.org - linux-arm-kernel@vger.kernel.org - laurent.pinchart+renesas@ideasonboard.com - magnus.damm@gmail.com - horms@verge.net.au - kuninori.morimoto.gx@renesas.com - yoshihiro.shimoda.uh@renesas.com - ryusuke.sakato.bx@renesas.com - h-inayoshi@jinso.co.jp - cm-hiep@jinso.co.jp - " nv-dung@jinso.co.jp\0" + "Date\0Fri, 09 Sep 2016 12:12:26 +0000\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "Hi Bui Duc,\n" @@ -91,21 +74,18 @@ "> *ch, unsigned int index, ch->match_value = ch->max_match_value;\n" "> \traw_spin_lock_init(&ch->lock);\n" "> \n" - "> -\tch->timer_bit = cmt->info->model == SH_CMT_48BIT_GEN2 ? 0 : ch->hwidx;\n" + "> -\tch->timer_bit = cmt->info->model = SH_CMT_48BIT_GEN2 ? 0 : ch->hwidx;\n" "> -\n" "> \tret = sh_cmt_register(ch, dev_name(&cmt->pdev->dev),\n" "> \t\t\t clockevent, clocksource);\n" "> \tif (ret) {\n" "> @@ -944,6 +960,7 @@ static const struct of_device_id sh_cmt_of_table[]\n" "> __maybe_unused = {\n" - "> \t{ .compatible = \"renesas,cmt-32-fast\", .data =\n" - "> &sh_cmt_info[SH_CMT_32BIT_FAST] },\n" + "> \t{ .compatible = \"renesas,cmt-32-fast\", .data > &sh_cmt_info[SH_CMT_32BIT_FAST] },\n" "> \t{ .compatible = \"renesas,cmt-48\", .data = &sh_cmt_info[SH_CMT_48BIT]\n" "> },\n" - "> \t{ .compatible = \"renesas,cmt-48-gen2\", .data =\n" - "> &sh_cmt_info[SH_CMT_48BIT_GEN2] },\n" - "> +\t{ .compatible = \"renesas,cmt-48-gen3\", .data =\n" - "> &sh_cmt_info[SH_CMT_48BIT_GEN3] },\n" + "> \t{ .compatible = \"renesas,cmt-48-gen2\", .data > &sh_cmt_info[SH_CMT_48BIT_GEN2] },\n" + "> +\t{ .compatible = \"renesas,cmt-48-gen3\", .data > &sh_cmt_info[SH_CMT_48BIT_GEN3] },\n" "\n" "Given that the Gen2 and Gen3 CMT seem identical based on the above code, how \n" "about just using SH_CMT_48BIT_GEN2 here ? You wouldn't need any of the above \n" @@ -120,4 +100,4 @@ "\n" Laurent Pinchart -7a6613c51cebaf66e953cda09091ef0d49e33b4cdc62ce618011fd7a40222d37 +521a5b3ac0abbf198bc0c82830df3b305462330a29c4738be85ba917e85b0c1a
diff --git a/a/1.txt b/N2/1.txt index 081255b..249beb4 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -2,7 +2,7 @@ Hi Bui Duc, Thank you for the patch. -On Friday 09 Sep 2016 20:43:12 bd-phuc@jinso.co.jp wrote: +On Friday 09 Sep 2016 20:43:12 bd-phuc at jinso.co.jp wrote: > From: Bui Duc Phuc <bd-phuc@jinso.co.jp> > > Add support for the new R-Car Gen3 CMT0 and CMT1 bindings. diff --git a/a/content_digest b/N2/content_digest index ee5a4af..01669c6 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,33 +1,16 @@ "ref\01473421394-9745-1-git-send-email-bd-phuc@jinso.co.jp\0" "ref\01473421394-9745-7-git-send-email-bd-phuc@jinso.co.jp\0" - "From\0Laurent Pinchart <laurent.pinchart@ideasonboard.com>\0" - "Subject\0Re: [PATCH 6/8] clocksource: sh_cmt: Support separate R-car Gen3 CMT0/1\0" + "From\0laurent.pinchart@ideasonboard.com (Laurent Pinchart)\0" + "Subject\0[PATCH 6/8] clocksource: sh_cmt: Support separate R-car Gen3 CMT0/1\0" "Date\0Fri, 09 Sep 2016 15:12:26 +0300\0" - "To\0bd-phuc@jinso.co.jp\0" - "Cc\0daniel.lezcano@linaro.org" - tglx@linutronix.de - devicetree@vger.kernel.org - linux-arm-kernel@lists.infradead.org - linux-sh@vger.kernel.org - geert+renesas@glider.be - linux-renesas-soc@vger.kernel.org - linux-arm-kernel@vger.kernel.org - laurent.pinchart+renesas@ideasonboard.com - magnus.damm@gmail.com - horms@verge.net.au - kuninori.morimoto.gx@renesas.com - yoshihiro.shimoda.uh@renesas.com - ryusuke.sakato.bx@renesas.com - h-inayoshi@jinso.co.jp - cm-hiep@jinso.co.jp - " nv-dung@jinso.co.jp\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "Hi Bui Duc,\n" "\n" "Thank you for the patch.\n" "\n" - "On Friday 09 Sep 2016 20:43:12 bd-phuc@jinso.co.jp wrote:\n" + "On Friday 09 Sep 2016 20:43:12 bd-phuc at jinso.co.jp wrote:\n" "> From: Bui Duc Phuc <bd-phuc@jinso.co.jp>\n" "> \n" "> Add support for the new R-Car Gen3 CMT0 and CMT1 bindings.\n" @@ -120,4 +103,4 @@ "\n" Laurent Pinchart -7a6613c51cebaf66e953cda09091ef0d49e33b4cdc62ce618011fd7a40222d37 +f1f48ae7e9eaebb20f9d43bca45e1907b848caf6dce1c2260708f27b46797c16
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.