diff for duplicates of <20140925225406.19023.25065@quantum> diff --git a/a/1.txt b/N1/1.txt index 2e640b7..5acb522 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -10,28 +10,23 @@ stuff seems weird). Regards, Mike -> = - +> > -Scott -> = - +> > On Thu, 2014-09-25 at 04:47 -0500, Lu Jingchang-B35083 wrote: > > Hi, Scott and Mike, -> > = - +> > > > Could you please help review this patch and give an ACK if ok. Thanks. -> > = - +> > > > Best Regards, > > Jingchang -> > = - +> > > > >-----Original Message----- -> > >From: Jingchang Lu [mailto:jingchang.lu@freescale.com] +> > >From: Jingchang Lu [mailto:jingchang.lu at freescale.com] > > >Sent: Tuesday, September 23, 2014 2:47 PM -> > >To: mturquette@linaro.org -> > >Cc: Wood Scott-B07421; linuxppc-dev@lists.ozlabs.org; linux- -> > >kernel@vger.kernel.org; linux-arm-kernel@lists.infradead.org; Lu +> > >To: mturquette at linaro.org +> > >Cc: Wood Scott-B07421; linuxppc-dev at lists.ozlabs.org; linux- +> > >kernel at vger.kernel.org; linux-arm-kernel at lists.infradead.org; Lu > > >Jingchang-B35083 > > >Subject: [PATCHv4] clk: ppc-corenet: rename to ppc-qoriq and add > > >CLK_OF_DECLARE support @@ -53,11 +48,10 @@ Mike > > > > > > drivers/clk/Kconfig | 9 +++++---- > > > drivers/clk/Makefile | 2 +- -> > > drivers/clk/{clk-ppc-corenet.c =3D> clk-qoriq.c} | 27 +++++++++++++++= ------- +> > > drivers/clk/{clk-ppc-corenet.c => clk-qoriq.c} | 27 +++++++++++++++------ > > >----- > > > 3 files changed, 22 insertions(+), 16 deletions(-) rename -> > >drivers/clk/{clk-ppc-corenet.c =3D> clk-qoriq.c} (89%) +> > >drivers/clk/{clk-ppc-corenet.c => clk-qoriq.c} (89%) > > > > > >diff --git a/drivers/clk/Kconfig b/drivers/clk/Kconfig index > > >85131ae..f5f76cb 100644 @@ -88,25 +82,24 @@ Mike > > >27c542b..20f42e9 100644 > > >--- a/drivers/clk/Makefile > > >+++ b/drivers/clk/Makefile -> > >@@ -29,7 +29,7 @@ obj-$(CONFIG_ARCH_MOXART) +=3D clk-moxart.o -> > > obj-$(CONFIG_ARCH_NOMADIK) +=3D clk-nomadik.o -> > > obj-$(CONFIG_ARCH_NSPIRE) +=3D clk-nspire.o -> > > obj-$(CONFIG_COMMON_CLK_PALMAS) +=3D clk-palmas.o -> > >-obj-$(CONFIG_CLK_PPC_CORENET) +=3D clk-ppc-corenet.o -> > >+obj-$(CONFIG_CLK_QORIQ) +=3D clk-qoriq.o -> > > obj-$(CONFIG_COMMON_CLK_S2MPS11) +=3D clk-s2mps11.o -> > > obj-$(CONFIG_COMMON_CLK_SI5351) +=3D clk-si5351.o -> > > obj-$(CONFIG_COMMON_CLK_SI570) +=3D clk-si570.o +> > >@@ -29,7 +29,7 @@ obj-$(CONFIG_ARCH_MOXART) += clk-moxart.o +> > > obj-$(CONFIG_ARCH_NOMADIK) += clk-nomadik.o +> > > obj-$(CONFIG_ARCH_NSPIRE) += clk-nspire.o +> > > obj-$(CONFIG_COMMON_CLK_PALMAS) += clk-palmas.o +> > >-obj-$(CONFIG_CLK_PPC_CORENET) += clk-ppc-corenet.o +> > >+obj-$(CONFIG_CLK_QORIQ) += clk-qoriq.o +> > > obj-$(CONFIG_COMMON_CLK_S2MPS11) += clk-s2mps11.o +> > > obj-$(CONFIG_COMMON_CLK_SI5351) += clk-si5351.o +> > > obj-$(CONFIG_COMMON_CLK_SI570) += clk-si570.o > > >diff --git a/drivers/clk/clk-ppc-corenet.c b/drivers/clk/clk-qoriq.c -> > >similarity index 89% rename from drivers/clk/clk-ppc-corenet.c rename = -to +> > >similarity index 89% rename from drivers/clk/clk-ppc-corenet.c rename to > > >drivers/clk/clk-qoriq.c index 8e58edf..cba8abe 100644 > > >--- a/drivers/clk/clk-ppc-corenet.c > > >+++ b/drivers/clk/clk-qoriq.c > > >@@ -155,7 +155,7 @@ static void __init core_pll_init(struct device_node > > >*np) > > > -> > > base =3D of_iomap(np, 0); +> > > base = of_iomap(np, 0); > > > if (!base) { > > >- pr_err("clk-ppc: iomap error\n"); > > >+ pr_err("clk-qoriq: iomap error\n"); @@ -124,7 +117,7 @@ to > > > } > > > > > >@@ -278,30 +278,35 @@ static const struct of_device_id clk_match[] -> > >__initconst =3D { +> > >__initconst = { > > > {} > > > }; > > > @@ -136,24 +129,24 @@ to > > > return 0; > > > } > > > -> > >-static const struct of_device_id ppc_clk_ids[] __initconst =3D { -> > >+static const struct of_device_id qoriq_clk_ids[] __initconst =3D { -> > > { .compatible =3D "fsl,qoriq-clockgen-1.0", }, -> > > { .compatible =3D "fsl,qoriq-clockgen-2.0", }, +> > >-static const struct of_device_id ppc_clk_ids[] __initconst = { +> > >+static const struct of_device_id qoriq_clk_ids[] __initconst = { +> > > { .compatible = "fsl,qoriq-clockgen-1.0", }, +> > > { .compatible = "fsl,qoriq-clockgen-2.0", }, > > > {} > > > }; > > > -> > >-static struct platform_driver ppc_corenet_clk_driver __initdata =3D { -> > >+static struct platform_driver qoriq_clk_driver __initdata =3D { -> > > .driver =3D { -> > >- .name =3D "ppc_corenet_clock", -> > >+ .name =3D "qoriq_clock", -> > > .owner =3D THIS_MODULE, -> > >- .of_match_table =3D ppc_clk_ids, -> > >+ .of_match_table =3D qoriq_clk_ids, +> > >-static struct platform_driver ppc_corenet_clk_driver __initdata = { +> > >+static struct platform_driver qoriq_clk_driver __initdata = { +> > > .driver = { +> > >- .name = "ppc_corenet_clock", +> > >+ .name = "qoriq_clock", +> > > .owner = THIS_MODULE, +> > >- .of_match_table = ppc_clk_ids, +> > >+ .of_match_table = qoriq_clk_ids, > > > }, -> > >- .probe =3D ppc_corenet_clk_probe, -> > >+ .probe =3D qoriq_clk_probe, +> > >- .probe = ppc_corenet_clk_probe, +> > >+ .probe = qoriq_clk_probe, > > > }; > > > > > >-static int __init ppc_corenet_clk_init(void) @@ -173,8 +166,6 @@ to > > >+"fsl,qoriq-core-mux-2.0", core_mux_init); > > >-- > > >1.8.0 -> > = - -> = - ->=20 +> > +> +> diff --git a/a/content_digest b/N1/content_digest index b6b263e..aeaa2cb 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,14 +1,10 @@ "ref\01411454806-8214-1-git-send-email-jingchang.lu@freescale.com\0" "ref\0d4a375f40b544cf1ae78ac82dc20569c@BL2PR03MB467.namprd03.prod.outlook.com\0" "ref\01411675680.13320.201.camel@snotra.buserror.net\0" - "From\0Mike Turquette <mturquette@linaro.org>\0" - "Subject\0Re: [PATCHv4] clk: ppc-corenet: rename to ppc-qoriq and add CLK_OF_DECLARE support\0" + "From\0mturquette@linaro.org (Mike Turquette)\0" + "Subject\0[PATCHv4] clk: ppc-corenet: rename to ppc-qoriq and add CLK_OF_DECLARE support\0" "Date\0Thu, 25 Sep 2014 15:54:06 -0700\0" - "To\0Scott Wood <scottwood@freescale.com>" - " Lu Jingchang-B35083 <jingchang.lu@freescale.com>\0" - "Cc\0linuxppc-dev@lists.ozlabs.org <linuxppc-dev@lists.ozlabs.org>" - linux-kernel@vger.kernel.org <linux-kernel@vger.kernel.org> - " 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" "Quoting Scott Wood (2014-09-25 13:08:00)\n" @@ -23,28 +19,23 @@ "Regards,\n" "Mike\n" "\n" - "> =\n" - "\n" + "> \n" "> -Scott\n" - "> =\n" - "\n" + "> \n" "> On Thu, 2014-09-25 at 04:47 -0500, Lu Jingchang-B35083 wrote:\n" "> > Hi, Scott and Mike,\n" - "> > =\n" - "\n" + "> > \n" "> > Could you please help review this patch and give an ACK if ok. Thanks.\n" - "> > =\n" - "\n" + "> > \n" "> > Best Regards,\n" "> > Jingchang\n" - "> > =\n" - "\n" + "> > \n" "> > >-----Original Message-----\n" - "> > >From: Jingchang Lu [mailto:jingchang.lu@freescale.com]\n" + "> > >From: Jingchang Lu [mailto:jingchang.lu at freescale.com]\n" "> > >Sent: Tuesday, September 23, 2014 2:47 PM\n" - "> > >To: mturquette@linaro.org\n" - "> > >Cc: Wood Scott-B07421; linuxppc-dev@lists.ozlabs.org; linux-\n" - "> > >kernel@vger.kernel.org; linux-arm-kernel@lists.infradead.org; Lu\n" + "> > >To: mturquette at linaro.org\n" + "> > >Cc: Wood Scott-B07421; linuxppc-dev at lists.ozlabs.org; linux-\n" + "> > >kernel at vger.kernel.org; linux-arm-kernel at lists.infradead.org; Lu\n" "> > >Jingchang-B35083\n" "> > >Subject: [PATCHv4] clk: ppc-corenet: rename to ppc-qoriq and add\n" "> > >CLK_OF_DECLARE support\n" @@ -66,11 +57,10 @@ "> > >\n" "> > > drivers/clk/Kconfig | 9 +++++----\n" "> > > drivers/clk/Makefile | 2 +-\n" - "> > > drivers/clk/{clk-ppc-corenet.c =3D> clk-qoriq.c} | 27 +++++++++++++++=\n" - "------\n" + "> > > drivers/clk/{clk-ppc-corenet.c => clk-qoriq.c} | 27 +++++++++++++++------\n" "> > >-----\n" "> > > 3 files changed, 22 insertions(+), 16 deletions(-) rename\n" - "> > >drivers/clk/{clk-ppc-corenet.c =3D> clk-qoriq.c} (89%)\n" + "> > >drivers/clk/{clk-ppc-corenet.c => clk-qoriq.c} (89%)\n" "> > >\n" "> > >diff --git a/drivers/clk/Kconfig b/drivers/clk/Kconfig index\n" "> > >85131ae..f5f76cb 100644\n" @@ -101,25 +91,24 @@ "> > >27c542b..20f42e9 100644\n" "> > >--- a/drivers/clk/Makefile\n" "> > >+++ b/drivers/clk/Makefile\n" - "> > >@@ -29,7 +29,7 @@ obj-$(CONFIG_ARCH_MOXART) +=3D clk-moxart.o\n" - "> > > obj-$(CONFIG_ARCH_NOMADIK) +=3D clk-nomadik.o\n" - "> > > obj-$(CONFIG_ARCH_NSPIRE) +=3D clk-nspire.o\n" - "> > > obj-$(CONFIG_COMMON_CLK_PALMAS) +=3D clk-palmas.o\n" - "> > >-obj-$(CONFIG_CLK_PPC_CORENET) +=3D clk-ppc-corenet.o\n" - "> > >+obj-$(CONFIG_CLK_QORIQ) +=3D clk-qoriq.o\n" - "> > > obj-$(CONFIG_COMMON_CLK_S2MPS11) +=3D clk-s2mps11.o\n" - "> > > obj-$(CONFIG_COMMON_CLK_SI5351) +=3D clk-si5351.o\n" - "> > > obj-$(CONFIG_COMMON_CLK_SI570) +=3D clk-si570.o\n" + "> > >@@ -29,7 +29,7 @@ obj-$(CONFIG_ARCH_MOXART) += clk-moxart.o\n" + "> > > obj-$(CONFIG_ARCH_NOMADIK) += clk-nomadik.o\n" + "> > > obj-$(CONFIG_ARCH_NSPIRE) += clk-nspire.o\n" + "> > > obj-$(CONFIG_COMMON_CLK_PALMAS) += clk-palmas.o\n" + "> > >-obj-$(CONFIG_CLK_PPC_CORENET) += clk-ppc-corenet.o\n" + "> > >+obj-$(CONFIG_CLK_QORIQ) += clk-qoriq.o\n" + "> > > obj-$(CONFIG_COMMON_CLK_S2MPS11) += clk-s2mps11.o\n" + "> > > obj-$(CONFIG_COMMON_CLK_SI5351) += clk-si5351.o\n" + "> > > obj-$(CONFIG_COMMON_CLK_SI570) += clk-si570.o\n" "> > >diff --git a/drivers/clk/clk-ppc-corenet.c b/drivers/clk/clk-qoriq.c\n" - "> > >similarity index 89% rename from drivers/clk/clk-ppc-corenet.c rename =\n" - "to\n" + "> > >similarity index 89% rename from drivers/clk/clk-ppc-corenet.c rename to\n" "> > >drivers/clk/clk-qoriq.c index 8e58edf..cba8abe 100644\n" "> > >--- a/drivers/clk/clk-ppc-corenet.c\n" "> > >+++ b/drivers/clk/clk-qoriq.c\n" "> > >@@ -155,7 +155,7 @@ static void __init core_pll_init(struct device_node\n" "> > >*np)\n" "> > >\n" - "> > > base =3D of_iomap(np, 0);\n" + "> > > base = of_iomap(np, 0);\n" "> > > if (!base) {\n" "> > >- pr_err(\"clk-ppc: iomap error\\n\");\n" "> > >+ pr_err(\"clk-qoriq: iomap error\\n\");\n" @@ -137,7 +126,7 @@ "> > > }\n" "> > >\n" "> > >@@ -278,30 +278,35 @@ static const struct of_device_id clk_match[]\n" - "> > >__initconst =3D {\n" + "> > >__initconst = {\n" "> > > {}\n" "> > > };\n" "> > >\n" @@ -149,24 +138,24 @@ "> > > return 0;\n" "> > > }\n" "> > >\n" - "> > >-static const struct of_device_id ppc_clk_ids[] __initconst =3D {\n" - "> > >+static const struct of_device_id qoriq_clk_ids[] __initconst =3D {\n" - "> > > { .compatible =3D \"fsl,qoriq-clockgen-1.0\", },\n" - "> > > { .compatible =3D \"fsl,qoriq-clockgen-2.0\", },\n" + "> > >-static const struct of_device_id ppc_clk_ids[] __initconst = {\n" + "> > >+static const struct of_device_id qoriq_clk_ids[] __initconst = {\n" + "> > > { .compatible = \"fsl,qoriq-clockgen-1.0\", },\n" + "> > > { .compatible = \"fsl,qoriq-clockgen-2.0\", },\n" "> > > {}\n" "> > > };\n" "> > >\n" - "> > >-static struct platform_driver ppc_corenet_clk_driver __initdata =3D {\n" - "> > >+static struct platform_driver qoriq_clk_driver __initdata =3D {\n" - "> > > .driver =3D {\n" - "> > >- .name =3D \"ppc_corenet_clock\",\n" - "> > >+ .name =3D \"qoriq_clock\",\n" - "> > > .owner =3D THIS_MODULE,\n" - "> > >- .of_match_table =3D ppc_clk_ids,\n" - "> > >+ .of_match_table =3D qoriq_clk_ids,\n" + "> > >-static struct platform_driver ppc_corenet_clk_driver __initdata = {\n" + "> > >+static struct platform_driver qoriq_clk_driver __initdata = {\n" + "> > > .driver = {\n" + "> > >- .name = \"ppc_corenet_clock\",\n" + "> > >+ .name = \"qoriq_clock\",\n" + "> > > .owner = THIS_MODULE,\n" + "> > >- .of_match_table = ppc_clk_ids,\n" + "> > >+ .of_match_table = qoriq_clk_ids,\n" "> > > },\n" - "> > >- .probe =3D ppc_corenet_clk_probe,\n" - "> > >+ .probe =3D qoriq_clk_probe,\n" + "> > >- .probe = ppc_corenet_clk_probe,\n" + "> > >+ .probe = qoriq_clk_probe,\n" "> > > };\n" "> > >\n" "> > >-static int __init ppc_corenet_clk_init(void)\n" @@ -186,10 +175,8 @@ "> > >+\"fsl,qoriq-core-mux-2.0\", core_mux_init);\n" "> > >--\n" "> > >1.8.0\n" - "> > =\n" - "\n" - "> =\n" - "\n" - >=20 + "> > \n" + "> \n" + > -50f91aae648bdfa41001e8e7e8378192fa6096380df24ca0ce3b89c38cf4af79 +437e40a8b20d99a2deed42109a239860513da8c0ecc284e5b8d79c9f4e30f347
diff --git a/a/1.txt b/N2/1.txt index 2e640b7..ab70246 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -10,22 +10,17 @@ stuff seems weird). Regards, Mike -> = - +> > -Scott -> = - +> > On Thu, 2014-09-25 at 04:47 -0500, Lu Jingchang-B35083 wrote: > > Hi, Scott and Mike, -> > = - +> > > > Could you please help review this patch and give an ACK if ok. Thanks. -> > = - +> > > > Best Regards, > > Jingchang -> > = - +> > > > >-----Original Message----- > > >From: Jingchang Lu [mailto:jingchang.lu@freescale.com] > > >Sent: Tuesday, September 23, 2014 2:47 PM @@ -53,11 +48,10 @@ Mike > > > > > > drivers/clk/Kconfig | 9 +++++---- > > > drivers/clk/Makefile | 2 +- -> > > drivers/clk/{clk-ppc-corenet.c =3D> clk-qoriq.c} | 27 +++++++++++++++= ------- +> > > drivers/clk/{clk-ppc-corenet.c => clk-qoriq.c} | 27 +++++++++++++++------ > > >----- > > > 3 files changed, 22 insertions(+), 16 deletions(-) rename -> > >drivers/clk/{clk-ppc-corenet.c =3D> clk-qoriq.c} (89%) +> > >drivers/clk/{clk-ppc-corenet.c => clk-qoriq.c} (89%) > > > > > >diff --git a/drivers/clk/Kconfig b/drivers/clk/Kconfig index > > >85131ae..f5f76cb 100644 @@ -88,25 +82,24 @@ Mike > > >27c542b..20f42e9 100644 > > >--- a/drivers/clk/Makefile > > >+++ b/drivers/clk/Makefile -> > >@@ -29,7 +29,7 @@ obj-$(CONFIG_ARCH_MOXART) +=3D clk-moxart.o -> > > obj-$(CONFIG_ARCH_NOMADIK) +=3D clk-nomadik.o -> > > obj-$(CONFIG_ARCH_NSPIRE) +=3D clk-nspire.o -> > > obj-$(CONFIG_COMMON_CLK_PALMAS) +=3D clk-palmas.o -> > >-obj-$(CONFIG_CLK_PPC_CORENET) +=3D clk-ppc-corenet.o -> > >+obj-$(CONFIG_CLK_QORIQ) +=3D clk-qoriq.o -> > > obj-$(CONFIG_COMMON_CLK_S2MPS11) +=3D clk-s2mps11.o -> > > obj-$(CONFIG_COMMON_CLK_SI5351) +=3D clk-si5351.o -> > > obj-$(CONFIG_COMMON_CLK_SI570) +=3D clk-si570.o +> > >@@ -29,7 +29,7 @@ obj-$(CONFIG_ARCH_MOXART) += clk-moxart.o +> > > obj-$(CONFIG_ARCH_NOMADIK) += clk-nomadik.o +> > > obj-$(CONFIG_ARCH_NSPIRE) += clk-nspire.o +> > > obj-$(CONFIG_COMMON_CLK_PALMAS) += clk-palmas.o +> > >-obj-$(CONFIG_CLK_PPC_CORENET) += clk-ppc-corenet.o +> > >+obj-$(CONFIG_CLK_QORIQ) += clk-qoriq.o +> > > obj-$(CONFIG_COMMON_CLK_S2MPS11) += clk-s2mps11.o +> > > obj-$(CONFIG_COMMON_CLK_SI5351) += clk-si5351.o +> > > obj-$(CONFIG_COMMON_CLK_SI570) += clk-si570.o > > >diff --git a/drivers/clk/clk-ppc-corenet.c b/drivers/clk/clk-qoriq.c -> > >similarity index 89% rename from drivers/clk/clk-ppc-corenet.c rename = -to +> > >similarity index 89% rename from drivers/clk/clk-ppc-corenet.c rename to > > >drivers/clk/clk-qoriq.c index 8e58edf..cba8abe 100644 > > >--- a/drivers/clk/clk-ppc-corenet.c > > >+++ b/drivers/clk/clk-qoriq.c > > >@@ -155,7 +155,7 @@ static void __init core_pll_init(struct device_node > > >*np) > > > -> > > base =3D of_iomap(np, 0); +> > > base = of_iomap(np, 0); > > > if (!base) { > > >- pr_err("clk-ppc: iomap error\n"); > > >+ pr_err("clk-qoriq: iomap error\n"); @@ -124,7 +117,7 @@ to > > > } > > > > > >@@ -278,30 +278,35 @@ static const struct of_device_id clk_match[] -> > >__initconst =3D { +> > >__initconst = { > > > {} > > > }; > > > @@ -136,24 +129,24 @@ to > > > return 0; > > > } > > > -> > >-static const struct of_device_id ppc_clk_ids[] __initconst =3D { -> > >+static const struct of_device_id qoriq_clk_ids[] __initconst =3D { -> > > { .compatible =3D "fsl,qoriq-clockgen-1.0", }, -> > > { .compatible =3D "fsl,qoriq-clockgen-2.0", }, +> > >-static const struct of_device_id ppc_clk_ids[] __initconst = { +> > >+static const struct of_device_id qoriq_clk_ids[] __initconst = { +> > > { .compatible = "fsl,qoriq-clockgen-1.0", }, +> > > { .compatible = "fsl,qoriq-clockgen-2.0", }, > > > {} > > > }; > > > -> > >-static struct platform_driver ppc_corenet_clk_driver __initdata =3D { -> > >+static struct platform_driver qoriq_clk_driver __initdata =3D { -> > > .driver =3D { -> > >- .name =3D "ppc_corenet_clock", -> > >+ .name =3D "qoriq_clock", -> > > .owner =3D THIS_MODULE, -> > >- .of_match_table =3D ppc_clk_ids, -> > >+ .of_match_table =3D qoriq_clk_ids, +> > >-static struct platform_driver ppc_corenet_clk_driver __initdata = { +> > >+static struct platform_driver qoriq_clk_driver __initdata = { +> > > .driver = { +> > >- .name = "ppc_corenet_clock", +> > >+ .name = "qoriq_clock", +> > > .owner = THIS_MODULE, +> > >- .of_match_table = ppc_clk_ids, +> > >+ .of_match_table = qoriq_clk_ids, > > > }, -> > >- .probe =3D ppc_corenet_clk_probe, -> > >+ .probe =3D qoriq_clk_probe, +> > >- .probe = ppc_corenet_clk_probe, +> > >+ .probe = qoriq_clk_probe, > > > }; > > > > > >-static int __init ppc_corenet_clk_init(void) @@ -173,8 +166,6 @@ to > > >+"fsl,qoriq-core-mux-2.0", core_mux_init); > > >-- > > >1.8.0 -> > = - -> = - ->=20 +> > +> +> diff --git a/a/content_digest b/N2/content_digest index b6b263e..2be74fb 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -23,22 +23,17 @@ "Regards,\n" "Mike\n" "\n" - "> =\n" - "\n" + "> \n" "> -Scott\n" - "> =\n" - "\n" + "> \n" "> On Thu, 2014-09-25 at 04:47 -0500, Lu Jingchang-B35083 wrote:\n" "> > Hi, Scott and Mike,\n" - "> > =\n" - "\n" + "> > \n" "> > Could you please help review this patch and give an ACK if ok. Thanks.\n" - "> > =\n" - "\n" + "> > \n" "> > Best Regards,\n" "> > Jingchang\n" - "> > =\n" - "\n" + "> > \n" "> > >-----Original Message-----\n" "> > >From: Jingchang Lu [mailto:jingchang.lu@freescale.com]\n" "> > >Sent: Tuesday, September 23, 2014 2:47 PM\n" @@ -66,11 +61,10 @@ "> > >\n" "> > > drivers/clk/Kconfig | 9 +++++----\n" "> > > drivers/clk/Makefile | 2 +-\n" - "> > > drivers/clk/{clk-ppc-corenet.c =3D> clk-qoriq.c} | 27 +++++++++++++++=\n" - "------\n" + "> > > drivers/clk/{clk-ppc-corenet.c => clk-qoriq.c} | 27 +++++++++++++++------\n" "> > >-----\n" "> > > 3 files changed, 22 insertions(+), 16 deletions(-) rename\n" - "> > >drivers/clk/{clk-ppc-corenet.c =3D> clk-qoriq.c} (89%)\n" + "> > >drivers/clk/{clk-ppc-corenet.c => clk-qoriq.c} (89%)\n" "> > >\n" "> > >diff --git a/drivers/clk/Kconfig b/drivers/clk/Kconfig index\n" "> > >85131ae..f5f76cb 100644\n" @@ -101,25 +95,24 @@ "> > >27c542b..20f42e9 100644\n" "> > >--- a/drivers/clk/Makefile\n" "> > >+++ b/drivers/clk/Makefile\n" - "> > >@@ -29,7 +29,7 @@ obj-$(CONFIG_ARCH_MOXART) +=3D clk-moxart.o\n" - "> > > obj-$(CONFIG_ARCH_NOMADIK) +=3D clk-nomadik.o\n" - "> > > obj-$(CONFIG_ARCH_NSPIRE) +=3D clk-nspire.o\n" - "> > > obj-$(CONFIG_COMMON_CLK_PALMAS) +=3D clk-palmas.o\n" - "> > >-obj-$(CONFIG_CLK_PPC_CORENET) +=3D clk-ppc-corenet.o\n" - "> > >+obj-$(CONFIG_CLK_QORIQ) +=3D clk-qoriq.o\n" - "> > > obj-$(CONFIG_COMMON_CLK_S2MPS11) +=3D clk-s2mps11.o\n" - "> > > obj-$(CONFIG_COMMON_CLK_SI5351) +=3D clk-si5351.o\n" - "> > > obj-$(CONFIG_COMMON_CLK_SI570) +=3D clk-si570.o\n" + "> > >@@ -29,7 +29,7 @@ obj-$(CONFIG_ARCH_MOXART) += clk-moxart.o\n" + "> > > obj-$(CONFIG_ARCH_NOMADIK) += clk-nomadik.o\n" + "> > > obj-$(CONFIG_ARCH_NSPIRE) += clk-nspire.o\n" + "> > > obj-$(CONFIG_COMMON_CLK_PALMAS) += clk-palmas.o\n" + "> > >-obj-$(CONFIG_CLK_PPC_CORENET) += clk-ppc-corenet.o\n" + "> > >+obj-$(CONFIG_CLK_QORIQ) += clk-qoriq.o\n" + "> > > obj-$(CONFIG_COMMON_CLK_S2MPS11) += clk-s2mps11.o\n" + "> > > obj-$(CONFIG_COMMON_CLK_SI5351) += clk-si5351.o\n" + "> > > obj-$(CONFIG_COMMON_CLK_SI570) += clk-si570.o\n" "> > >diff --git a/drivers/clk/clk-ppc-corenet.c b/drivers/clk/clk-qoriq.c\n" - "> > >similarity index 89% rename from drivers/clk/clk-ppc-corenet.c rename =\n" - "to\n" + "> > >similarity index 89% rename from drivers/clk/clk-ppc-corenet.c rename to\n" "> > >drivers/clk/clk-qoriq.c index 8e58edf..cba8abe 100644\n" "> > >--- a/drivers/clk/clk-ppc-corenet.c\n" "> > >+++ b/drivers/clk/clk-qoriq.c\n" "> > >@@ -155,7 +155,7 @@ static void __init core_pll_init(struct device_node\n" "> > >*np)\n" "> > >\n" - "> > > base =3D of_iomap(np, 0);\n" + "> > > base = of_iomap(np, 0);\n" "> > > if (!base) {\n" "> > >- pr_err(\"clk-ppc: iomap error\\n\");\n" "> > >+ pr_err(\"clk-qoriq: iomap error\\n\");\n" @@ -137,7 +130,7 @@ "> > > }\n" "> > >\n" "> > >@@ -278,30 +278,35 @@ static const struct of_device_id clk_match[]\n" - "> > >__initconst =3D {\n" + "> > >__initconst = {\n" "> > > {}\n" "> > > };\n" "> > >\n" @@ -149,24 +142,24 @@ "> > > return 0;\n" "> > > }\n" "> > >\n" - "> > >-static const struct of_device_id ppc_clk_ids[] __initconst =3D {\n" - "> > >+static const struct of_device_id qoriq_clk_ids[] __initconst =3D {\n" - "> > > { .compatible =3D \"fsl,qoriq-clockgen-1.0\", },\n" - "> > > { .compatible =3D \"fsl,qoriq-clockgen-2.0\", },\n" + "> > >-static const struct of_device_id ppc_clk_ids[] __initconst = {\n" + "> > >+static const struct of_device_id qoriq_clk_ids[] __initconst = {\n" + "> > > { .compatible = \"fsl,qoriq-clockgen-1.0\", },\n" + "> > > { .compatible = \"fsl,qoriq-clockgen-2.0\", },\n" "> > > {}\n" "> > > };\n" "> > >\n" - "> > >-static struct platform_driver ppc_corenet_clk_driver __initdata =3D {\n" - "> > >+static struct platform_driver qoriq_clk_driver __initdata =3D {\n" - "> > > .driver =3D {\n" - "> > >- .name =3D \"ppc_corenet_clock\",\n" - "> > >+ .name =3D \"qoriq_clock\",\n" - "> > > .owner =3D THIS_MODULE,\n" - "> > >- .of_match_table =3D ppc_clk_ids,\n" - "> > >+ .of_match_table =3D qoriq_clk_ids,\n" + "> > >-static struct platform_driver ppc_corenet_clk_driver __initdata = {\n" + "> > >+static struct platform_driver qoriq_clk_driver __initdata = {\n" + "> > > .driver = {\n" + "> > >- .name = \"ppc_corenet_clock\",\n" + "> > >+ .name = \"qoriq_clock\",\n" + "> > > .owner = THIS_MODULE,\n" + "> > >- .of_match_table = ppc_clk_ids,\n" + "> > >+ .of_match_table = qoriq_clk_ids,\n" "> > > },\n" - "> > >- .probe =3D ppc_corenet_clk_probe,\n" - "> > >+ .probe =3D qoriq_clk_probe,\n" + "> > >- .probe = ppc_corenet_clk_probe,\n" + "> > >+ .probe = qoriq_clk_probe,\n" "> > > };\n" "> > >\n" "> > >-static int __init ppc_corenet_clk_init(void)\n" @@ -186,10 +179,8 @@ "> > >+\"fsl,qoriq-core-mux-2.0\", core_mux_init);\n" "> > >--\n" "> > >1.8.0\n" - "> > =\n" - "\n" - "> =\n" - "\n" - >=20 + "> > \n" + "> \n" + > -50f91aae648bdfa41001e8e7e8378192fa6096380df24ca0ce3b89c38cf4af79 +106616c19c753e89932b0ba15eea1cbcfc958aad65042602d5964d3be85e6a42
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.