diff for duplicates of <1897420.z4gRLGjo6K@avalon> diff --git a/a/1.txt b/N1/1.txt index 0f6a1cc..c783167 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -1,7 +1,7 @@ On Monday 16 June 2014 17:07:21 Laurent Pinchart wrote: > Document DT bindings and parse them in the CMT driver. > -> Cc: devicetree@vger.kernel.org +> Cc: devicetree at vger.kernel.org > Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> > Tested-by: Simon Horman <horms+renesas@verge.net.au> > --- @@ -62,7 +62,7 @@ that and resubmit the pull request. > + CMT0 on R8A7790 implements hardware channels 5 and 6 only and names > + them channels 0 and 1 in the documentation. > + -> + cmt0: timer@ffca0000 { +> + cmt0: timer at ffca0000 { > + compatible = "renesas,cmt-48-gen2"; > + reg = <0 0xffca0000 0 0x1004>; > + interrupts = <0 142 IRQ_TYPE_LEVEL_HIGH>, @@ -108,8 +108,10 @@ that and resubmit the pull request. > + > +static const struct of_device_id sh_cmt_of_table[] __maybe_unused = { > + { .compatible = "renesas,cmt-32", .data = &sh_cmt_info[SH_CMT_32BIT] }, -> + { .compatible = "renesas,cmt-32-fast", .data > &sh_cmt_info[SH_CMT_32BIT_FAST] }, + { .compatible = "renasas,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-32-fast", .data = +> &sh_cmt_info[SH_CMT_32BIT_FAST] }, + { .compatible = "renasas,cmt-48", +> .data = &sh_cmt_info[SH_CMT_48BIT] }, + { .compatible = +> "renesas,cmt-48-gen2", .data = &sh_cmt_info[SH_CMT_48BIT_GEN2] }, + { } > +}; > +MODULE_DEVICE_TABLE(of, sh_cmt_of_table); > + @@ -167,7 +169,7 @@ that and resubmit the pull request. > + cmt->num_channels = hweight8(cmt->hw_channels); > cmt->channels = kzalloc(cmt->num_channels * sizeof(*cmt->channels), > GFP_KERNEL); -> if (cmt->channels = NULL) { +> if (cmt->channels == NULL) { > @@ -973,7 +1012,7 @@ static int sh_cmt_setup(struct sh_cmt_device *cmt, > struct platform_device *pdev) * Use the first channel as a clock event > device and the second channel * as a clock source. If only one channel is @@ -175,8 +177,8 @@ that and resubmit the pull request. > - for (i = 0, mask = cfg->channels_mask; i < cmt->num_channels; ++i) { > + for (i = 0, mask = cmt->hw_channels; i < cmt->num_channels; ++i) { > unsigned int hwidx = ffs(mask) - 1; -> bool clocksource = i = 1 || cmt->num_channels = 1; -> bool clockevent = i = 0; +> bool clocksource = i == 1 || cmt->num_channels == 1; +> bool clockevent = i == 0; > @@ -1044,21 +1083,12 @@ static int sh_cmt_remove(struct platform_device > *pdev) return -EBUSY; /* cannot unregister clockevent and clocksource */ } > diff --git a/a/content_digest b/N1/content_digest index b4b2856..fa5fb34 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,15 +1,15 @@ "ref\01402931251-22581-1-git-send-email-laurent.pinchart+renesas@ideasonboard.com\0" "ref\01402931251-22581-10-git-send-email-laurent.pinchart+renesas@ideasonboard.com\0" - "From\0Laurent Pinchart <laurent.pinchart@ideasonboard.com>\0" - "Subject\0Re: [PATCH v4 09/19] clocksource: sh_cmt: Add DT support\0" - "Date\0Fri, 04 Jul 2014 13:15:37 +0000\0" + "From\0laurent.pinchart@ideasonboard.com (Laurent Pinchart)\0" + "Subject\0[PATCH v4 09/19] clocksource: sh_cmt: Add DT support\0" + "Date\0Fri, 04 Jul 2014 15:15:37 +0200\0" "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "On Monday 16 June 2014 17:07:21 Laurent Pinchart wrote:\n" "> Document DT bindings and parse them in the CMT driver.\n" "> \n" - "> Cc: devicetree@vger.kernel.org\n" + "> Cc: devicetree at vger.kernel.org\n" "> Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>\n" "> Tested-by: Simon Horman <horms+renesas@verge.net.au>\n" "> ---\n" @@ -70,7 +70,7 @@ "> +\tCMT0 on R8A7790 implements hardware channels 5 and 6 only and names\n" "> +\tthem channels 0 and 1 in the documentation.\n" "> +\n" - "> +\tcmt0: timer@ffca0000 {\n" + "> +\tcmt0: timer at ffca0000 {\n" "> +\t\tcompatible = \"renesas,cmt-48-gen2\";\n" "> +\t\treg = <0 0xffca0000 0 0x1004>;\n" "> +\t\tinterrupts = <0 142 IRQ_TYPE_LEVEL_HIGH>,\n" @@ -116,8 +116,10 @@ "> +\n" "> +static const struct of_device_id sh_cmt_of_table[] __maybe_unused = {\n" "> +\t{ .compatible = \"renesas,cmt-32\", .data = &sh_cmt_info[SH_CMT_32BIT] },\n" - "> +\t{ .compatible = \"renesas,cmt-32-fast\", .data > &sh_cmt_info[SH_CMT_32BIT_FAST] }, +\t{ .compatible = \"renasas,cmt-48\",\n" - "> .data = &sh_cmt_info[SH_CMT_48BIT] }, +\t{ .compatible > \"renesas,cmt-48-gen2\", .data = &sh_cmt_info[SH_CMT_48BIT_GEN2] }, +\t{ }\n" + "> +\t{ .compatible = \"renesas,cmt-32-fast\", .data =\n" + "> &sh_cmt_info[SH_CMT_32BIT_FAST] }, +\t{ .compatible = \"renasas,cmt-48\",\n" + "> .data = &sh_cmt_info[SH_CMT_48BIT] }, +\t{ .compatible =\n" + "> \"renesas,cmt-48-gen2\", .data = &sh_cmt_info[SH_CMT_48BIT_GEN2] }, +\t{ }\n" "> +};\n" "> +MODULE_DEVICE_TABLE(of, sh_cmt_of_table);\n" "> +\n" @@ -175,7 +177,7 @@ "> +\tcmt->num_channels = hweight8(cmt->hw_channels);\n" "> \tcmt->channels = kzalloc(cmt->num_channels * sizeof(*cmt->channels),\n" "> \t\t\t\tGFP_KERNEL);\n" - "> \tif (cmt->channels = NULL) {\n" + "> \tif (cmt->channels == NULL) {\n" "> @@ -973,7 +1012,7 @@ static int sh_cmt_setup(struct sh_cmt_device *cmt,\n" "> struct platform_device *pdev) * Use the first channel as a clock event\n" "> device and the second channel * as a clock source. If only one channel is\n" @@ -183,8 +185,8 @@ "> -\tfor (i = 0, mask = cfg->channels_mask; i < cmt->num_channels; ++i) {\n" "> +\tfor (i = 0, mask = cmt->hw_channels; i < cmt->num_channels; ++i) {\n" "> \t\tunsigned int hwidx = ffs(mask) - 1;\n" - "> \t\tbool clocksource = i = 1 || cmt->num_channels = 1;\n" - "> \t\tbool clockevent = i = 0;\n" + "> \t\tbool clocksource = i == 1 || cmt->num_channels == 1;\n" + "> \t\tbool clockevent = i == 0;\n" "> @@ -1044,21 +1083,12 @@ static int sh_cmt_remove(struct platform_device\n" "> *pdev) return -EBUSY; /* cannot unregister clockevent and clocksource */ }\n" "> \n" @@ -213,4 +215,4 @@ "\n" Laurent Pinchart -7432d09057bbfce36d9c07c6abfa06a722249fa8a008ffd129a17d2c4df442b3 +0cc71cb550918c39763934567d3f3e17d63764006d1b6c88e662a82a42a754fd
diff --git a/a/1.txt b/N2/1.txt index 0f6a1cc..4f28d2b 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -108,8 +108,10 @@ that and resubmit the pull request. > + > +static const struct of_device_id sh_cmt_of_table[] __maybe_unused = { > + { .compatible = "renesas,cmt-32", .data = &sh_cmt_info[SH_CMT_32BIT] }, -> + { .compatible = "renesas,cmt-32-fast", .data > &sh_cmt_info[SH_CMT_32BIT_FAST] }, + { .compatible = "renasas,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-32-fast", .data = +> &sh_cmt_info[SH_CMT_32BIT_FAST] }, + { .compatible = "renasas,cmt-48", +> .data = &sh_cmt_info[SH_CMT_48BIT] }, + { .compatible = +> "renesas,cmt-48-gen2", .data = &sh_cmt_info[SH_CMT_48BIT_GEN2] }, + { } > +}; > +MODULE_DEVICE_TABLE(of, sh_cmt_of_table); > + @@ -167,7 +169,7 @@ that and resubmit the pull request. > + cmt->num_channels = hweight8(cmt->hw_channels); > cmt->channels = kzalloc(cmt->num_channels * sizeof(*cmt->channels), > GFP_KERNEL); -> if (cmt->channels = NULL) { +> if (cmt->channels == NULL) { > @@ -973,7 +1012,7 @@ static int sh_cmt_setup(struct sh_cmt_device *cmt, > struct platform_device *pdev) * Use the first channel as a clock event > device and the second channel * as a clock source. If only one channel is @@ -175,8 +177,8 @@ that and resubmit the pull request. > - for (i = 0, mask = cfg->channels_mask; i < cmt->num_channels; ++i) { > + for (i = 0, mask = cmt->hw_channels; i < cmt->num_channels; ++i) { > unsigned int hwidx = ffs(mask) - 1; -> bool clocksource = i = 1 || cmt->num_channels = 1; -> bool clockevent = i = 0; +> bool clocksource = i == 1 || cmt->num_channels == 1; +> bool clockevent = i == 0; > @@ -1044,21 +1083,12 @@ static int sh_cmt_remove(struct platform_device > *pdev) return -EBUSY; /* cannot unregister clockevent and clocksource */ } > diff --git a/a/content_digest b/N2/content_digest index b4b2856..e49f11b 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -2,8 +2,14 @@ "ref\01402931251-22581-10-git-send-email-laurent.pinchart+renesas@ideasonboard.com\0" "From\0Laurent Pinchart <laurent.pinchart@ideasonboard.com>\0" "Subject\0Re: [PATCH v4 09/19] clocksource: sh_cmt: Add DT support\0" - "Date\0Fri, 04 Jul 2014 13:15:37 +0000\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "Date\0Fri, 04 Jul 2014 15:15:37 +0200\0" + "To\0Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>\0" + "Cc\0linux-sh@vger.kernel.org" + linux-arm-kernel@lists.infradead.org + Daniel Lezcano <daniel.lezcano@linaro.org> + Thomas Gleixner <tglx@linutronix.de> + Simon Horman <horms@verge.net.au> + " devicetree@vger.kernel.org\0" "\00:1\0" "b\0" "On Monday 16 June 2014 17:07:21 Laurent Pinchart wrote:\n" @@ -116,8 +122,10 @@ "> +\n" "> +static const struct of_device_id sh_cmt_of_table[] __maybe_unused = {\n" "> +\t{ .compatible = \"renesas,cmt-32\", .data = &sh_cmt_info[SH_CMT_32BIT] },\n" - "> +\t{ .compatible = \"renesas,cmt-32-fast\", .data > &sh_cmt_info[SH_CMT_32BIT_FAST] }, +\t{ .compatible = \"renasas,cmt-48\",\n" - "> .data = &sh_cmt_info[SH_CMT_48BIT] }, +\t{ .compatible > \"renesas,cmt-48-gen2\", .data = &sh_cmt_info[SH_CMT_48BIT_GEN2] }, +\t{ }\n" + "> +\t{ .compatible = \"renesas,cmt-32-fast\", .data =\n" + "> &sh_cmt_info[SH_CMT_32BIT_FAST] }, +\t{ .compatible = \"renasas,cmt-48\",\n" + "> .data = &sh_cmt_info[SH_CMT_48BIT] }, +\t{ .compatible =\n" + "> \"renesas,cmt-48-gen2\", .data = &sh_cmt_info[SH_CMT_48BIT_GEN2] }, +\t{ }\n" "> +};\n" "> +MODULE_DEVICE_TABLE(of, sh_cmt_of_table);\n" "> +\n" @@ -175,7 +183,7 @@ "> +\tcmt->num_channels = hweight8(cmt->hw_channels);\n" "> \tcmt->channels = kzalloc(cmt->num_channels * sizeof(*cmt->channels),\n" "> \t\t\t\tGFP_KERNEL);\n" - "> \tif (cmt->channels = NULL) {\n" + "> \tif (cmt->channels == NULL) {\n" "> @@ -973,7 +1012,7 @@ static int sh_cmt_setup(struct sh_cmt_device *cmt,\n" "> struct platform_device *pdev) * Use the first channel as a clock event\n" "> device and the second channel * as a clock source. If only one channel is\n" @@ -183,8 +191,8 @@ "> -\tfor (i = 0, mask = cfg->channels_mask; i < cmt->num_channels; ++i) {\n" "> +\tfor (i = 0, mask = cmt->hw_channels; i < cmt->num_channels; ++i) {\n" "> \t\tunsigned int hwidx = ffs(mask) - 1;\n" - "> \t\tbool clocksource = i = 1 || cmt->num_channels = 1;\n" - "> \t\tbool clockevent = i = 0;\n" + "> \t\tbool clocksource = i == 1 || cmt->num_channels == 1;\n" + "> \t\tbool clockevent = i == 0;\n" "> @@ -1044,21 +1083,12 @@ static int sh_cmt_remove(struct platform_device\n" "> *pdev) return -EBUSY; /* cannot unregister clockevent and clocksource */ }\n" "> \n" @@ -213,4 +221,4 @@ "\n" Laurent Pinchart -7432d09057bbfce36d9c07c6abfa06a722249fa8a008ffd129a17d2c4df442b3 +7070eada52ac063ec9bcad41c3784edeff65b4b0e9c487e024bafda3938ce3ab
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.