diff for duplicates of <1479279262.21746.40.camel@buserror.net> diff --git a/a/1.txt b/N1/1.txt index eca9e07..ba97d98 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -1,4 +1,4 @@ -On Wed, 2016-11-16 at 13:58 +0800, yuantian.tang@nxp.com wrote: +On Wed, 2016-11-16 at 13:58 +0800, yuantian.tang at nxp.com wrote: > From: Tang Yuantian <Yuantian.Tang@nxp.com> > > Added ls1012a clock configuation information. @@ -8,17 +8,17 @@ Do we really need the same line in the changelog twice? > > Signed-off-by: Tang Yuantian <yuantian.tang@nxp.com> > --- -> drivers/clk/clk-qoriq.c | 19 +++++++++++++++++++ -> 1 file changed, 19 insertions(+) +> ?drivers/clk/clk-qoriq.c | 19 +++++++++++++++++++ +> ?1 file changed, 19 insertions(+) > > diff --git a/drivers/clk/clk-qoriq.c b/drivers/clk/clk-qoriq.c > index 1bece0f..563d874 100644 > --- a/drivers/clk/clk-qoriq.c > +++ b/drivers/clk/clk-qoriq.c > @@ -202,6 +202,14 @@ static const struct clockgen_muxinfo ls1021a_cmux = { -> } -> }; -> +> ? } +> ?}; +> ? > +static const struct clockgen_muxinfo ls1012a_cmux = { > + { > + [0] = { CLKSEL_VALID, CGA_PLL1, PLL_DIV1 }, @@ -29,16 +29,16 @@ Do we really need the same line in the changelog twice? > + Based on the "ls1021a_cmux" in the context it looks like this patch is -intended to apply on top of https://patchwork.kernel.org/patch/8923541/ but I +intended to apply on top of?https://patchwork.kernel.org/patch/8923541/?but I don't see any mention of that. -> static const struct clockgen_muxinfo t1040_cmux = { -> { -> [0] = { CLKSEL_VALID, CGA_PLL1, PLL_DIV1 }, +> ?static const struct clockgen_muxinfo t1040_cmux = { +> ? { +> ? [0] = { CLKSEL_VALID, CGA_PLL1, PLL_DIV1 }, > @@ -482,6 +490,16 @@ static const struct clockgen_chipinfo chipinfo[] = { -> .pll_mask = 0x03, -> }, -> { +> ? .pll_mask = 0x03, +> ? }, +> ? { > + .compat = "fsl,ls1012a-clockgen", > + .cmux_groups = { > + &ls1012a_cmux @@ -49,16 +49,16 @@ don't see any mention of that. > + .pll_mask = 0x03, > + }, > + { -> .compat = "fsl,ls1043a-clockgen", -> .init_periph = t2080_init_periph, -> .cmux_groups = { +> ? .compat = "fsl,ls1043a-clockgen", +> ? .init_periph = t2080_init_periph, +> ? .cmux_groups = { > @@ -1284,6 +1302,7 @@ CLK_OF_DECLARE(qoriq_clockgen_2, "fsl,qoriq-clockgen- > 2.0", clockgen_init); -> CLK_OF_DECLARE(qoriq_clockgen_ls1021a, "fsl,ls1021a-clockgen", +> ?CLK_OF_DECLARE(qoriq_clockgen_ls1021a, "fsl,ls1021a-clockgen", > clockgen_init); -> CLK_OF_DECLARE(qoriq_clockgen_ls1043a, "fsl,ls1043a-clockgen", +> ?CLK_OF_DECLARE(qoriq_clockgen_ls1043a, "fsl,ls1043a-clockgen", > clockgen_init); -> CLK_OF_DECLARE(qoriq_clockgen_ls2080a, "fsl,ls2080a-clockgen", +> ?CLK_OF_DECLARE(qoriq_clockgen_ls2080a, "fsl,ls2080a-clockgen", > clockgen_init); > +CLK_OF_DECLARE(qoriq_clockgen_ls1012a, "fsl,ls1012a-clockgen", > clockgen_init); diff --git a/a/content_digest b/N1/content_digest index 35aff3d..c1e49d9 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,17 +1,11 @@ "ref\01479275900-42365-1-git-send-email-yuantian.tang@nxp.com\0" - "From\0Scott Wood <oss@buserror.net>\0" - "Subject\0Re: [PATCH] clk: qoriq: added ls1012a clock configuration\0" + "From\0oss@buserror.net (Scott Wood)\0" + "Subject\0[PATCH] clk: qoriq: added ls1012a clock configuration\0" "Date\0Wed, 16 Nov 2016 00:54:22 -0600\0" - "To\0yuantian.tang@nxp.com" - " mturquette@baylibre.com\0" - "Cc\0sboyd@codeaurora.org" - linux-kernel@vger.kernel.org - scott.wood@nxp.com - linux-clk@vger.kernel.org - " linux-arm-kernel@lists.infradead.org\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" - "On Wed, 2016-11-16 at 13:58 +0800, yuantian.tang@nxp.com wrote:\n" + "On Wed, 2016-11-16 at 13:58 +0800, yuantian.tang at nxp.com wrote:\n" "> From: Tang Yuantian <Yuantian.Tang@nxp.com>\n" "> \n" "> Added ls1012a clock configuation information.\n" @@ -21,17 +15,17 @@ "> \n" "> Signed-off-by: Tang Yuantian <yuantian.tang@nxp.com>\n" "> ---\n" - "> \302\240drivers/clk/clk-qoriq.c | 19 +++++++++++++++++++\n" - "> \302\2401 file changed, 19 insertions(+)\n" + "> ?drivers/clk/clk-qoriq.c | 19 +++++++++++++++++++\n" + "> ?1 file changed, 19 insertions(+)\n" "> \n" "> diff --git a/drivers/clk/clk-qoriq.c b/drivers/clk/clk-qoriq.c\n" "> index 1bece0f..563d874 100644\n" "> --- a/drivers/clk/clk-qoriq.c\n" "> +++ b/drivers/clk/clk-qoriq.c\n" "> @@ -202,6 +202,14 @@ static const struct clockgen_muxinfo ls1021a_cmux = {\n" - "> \302\240\t}\n" - "> \302\240};\n" - "> \302\240\n" + "> ?\t}\n" + "> ?};\n" + "> ?\n" "> +static const struct clockgen_muxinfo ls1012a_cmux = {\n" "> +\t{\n" "> +\t\t[0] = { CLKSEL_VALID, CGA_PLL1, PLL_DIV1 },\n" @@ -42,16 +36,16 @@ "> +\n" "\n" "Based on the \"ls1021a_cmux\" in the context it looks like this patch is\n" - "intended to apply on top of\302\240https://patchwork.kernel.org/patch/8923541/\302\240but I\n" + "intended to apply on top of?https://patchwork.kernel.org/patch/8923541/?but I\n" "don't see any mention of that.\n" "\n" - "> \302\240static const struct clockgen_muxinfo t1040_cmux = {\n" - "> \302\240\t{\n" - "> \302\240\t\t[0] = { CLKSEL_VALID, CGA_PLL1, PLL_DIV1 },\n" + "> ?static const struct clockgen_muxinfo t1040_cmux = {\n" + "> ?\t{\n" + "> ?\t\t[0] = { CLKSEL_VALID, CGA_PLL1, PLL_DIV1 },\n" "> @@ -482,6 +490,16 @@ static const struct clockgen_chipinfo chipinfo[] = {\n" - "> \302\240\t\t.pll_mask = 0x03,\n" - "> \302\240\t},\n" - "> \302\240\t{\n" + "> ?\t\t.pll_mask = 0x03,\n" + "> ?\t},\n" + "> ?\t{\n" "> +\t\t.compat = \"fsl,ls1012a-clockgen\",\n" "> +\t\t.cmux_groups = {\n" "> +\t\t\t&ls1012a_cmux\n" @@ -62,16 +56,16 @@ "> +\t\t.pll_mask = 0x03,\n" "> +\t},\n" "> +\t{\n" - "> \302\240\t\t.compat = \"fsl,ls1043a-clockgen\",\n" - "> \302\240\t\t.init_periph = t2080_init_periph,\n" - "> \302\240\t\t.cmux_groups = {\n" + "> ?\t\t.compat = \"fsl,ls1043a-clockgen\",\n" + "> ?\t\t.init_periph = t2080_init_periph,\n" + "> ?\t\t.cmux_groups = {\n" "> @@ -1284,6 +1302,7 @@ CLK_OF_DECLARE(qoriq_clockgen_2, \"fsl,qoriq-clockgen-\n" "> 2.0\", clockgen_init);\n" - "> \302\240CLK_OF_DECLARE(qoriq_clockgen_ls1021a, \"fsl,ls1021a-clockgen\",\n" + "> ?CLK_OF_DECLARE(qoriq_clockgen_ls1021a, \"fsl,ls1021a-clockgen\",\n" "> clockgen_init);\n" - "> \302\240CLK_OF_DECLARE(qoriq_clockgen_ls1043a, \"fsl,ls1043a-clockgen\",\n" + "> ?CLK_OF_DECLARE(qoriq_clockgen_ls1043a, \"fsl,ls1043a-clockgen\",\n" "> clockgen_init);\n" - "> \302\240CLK_OF_DECLARE(qoriq_clockgen_ls2080a, \"fsl,ls2080a-clockgen\",\n" + "> ?CLK_OF_DECLARE(qoriq_clockgen_ls2080a, \"fsl,ls2080a-clockgen\",\n" "> clockgen_init);\n" "> +CLK_OF_DECLARE(qoriq_clockgen_ls1012a, \"fsl,ls1012a-clockgen\",\n" "> clockgen_init);\n" @@ -81,4 +75,4 @@ "\n" -Scott -ccf5db24608968455edf057a8690c850f63628fb5589293be49e2da4cdd26884 +d0b886b8f8a7ad6a55c2b75dfeae7787f19c9b690953cc728f31272e87af1e5e
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.