diff for duplicates of <20150511105347.GA20742@x1> diff --git a/a/1.txt b/N1/1.txt index c4897eb..563a09a 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -11,8 +11,7 @@ On Mon, 11 May 2015, Daniel Lezcano wrote: > >--- > > drivers/clocksource/Kconfig | 8 +++ > > drivers/clocksource/Makefile | 1 + -> > drivers/clocksource/clksrc_st_lpc.c | 123 ++++++++++++++++++++++++++++= -++++++++ +> > drivers/clocksource/clksrc_st_lpc.c | 123 ++++++++++++++++++++++++++++++++++++ > > 3 files changed, 132 insertions(+) > > create mode 100644 drivers/clocksource/clksrc_st_lpc.c > > @@ -37,24 +36,21 @@ On Mon, 11 May 2015, Daniel Lezcano wrote: > >index 752d5c7..e08da4d 100644 > >--- a/drivers/clocksource/Makefile > >+++ b/drivers/clocksource/Makefile -> >@@ -51,3 +51,4 @@ obj-$(CONFIG_ARCH_INTEGRATOR_AP) +=3D timer-integrator= --ap.o -> > obj-$(CONFIG_CLKSRC_VERSATILE) +=3D versatile.o -> > obj-$(CONFIG_CLKSRC_MIPS_GIC) +=3D mips-gic-timer.o -> > obj-$(CONFIG_ASM9260_TIMER) +=3D asm9260_timer.o -> >+obj-$(CONFIG_CLKSRC_ST_LPC) +=3D clksrc_st_lpc.o -> >diff --git a/drivers/clocksource/clksrc_st_lpc.c b/drivers/clocksource/c= -lksrc_st_lpc.c +> >@@ -51,3 +51,4 @@ obj-$(CONFIG_ARCH_INTEGRATOR_AP) += timer-integrator-ap.o +> > obj-$(CONFIG_CLKSRC_VERSATILE) += versatile.o +> > obj-$(CONFIG_CLKSRC_MIPS_GIC) += mips-gic-timer.o +> > obj-$(CONFIG_ASM9260_TIMER) += asm9260_timer.o +> >+obj-$(CONFIG_CLKSRC_ST_LPC) += clksrc_st_lpc.o +> >diff --git a/drivers/clocksource/clksrc_st_lpc.c b/drivers/clocksource/clksrc_st_lpc.c > >new file mode 100644 > >index 0000000..18a7dcd0 > >--- /dev/null > >+++ b/drivers/clocksource/clksrc_st_lpc.c > >@@ -0,0 +1,123 @@ > >+/* -> >+ * Clocksource using the Low Power Timer found in the Low Power Control= -ler (LPC) +> >+ * Clocksource using the Low Power Timer found in the Low Power Controller (LPC) > >+ * -> >+ * Copyright (C) 2015 STMicroelectronics =E2=80=93 All Rights Reserved +> >+ * Copyright (C) 2015 STMicroelectronics – All Rights Reserved > >+ * > >+ * Author(s): Francesco Virlinzi <francesco.virlinzi@st.com> > >+ * Ajit Pal Singh <ajitpal.singh@st.com> @@ -98,9 +94,9 @@ ler (LPC) > >+ > >+ st_clksrc_reset(); > >+ -> >+ rate =3D clk_get_rate(ddata.clk); +> >+ rate = clk_get_rate(ddata.clk); > >+ -> >+ ret =3D clocksource_mmio_init(ddata.base + LPC_LPT_LSB_OFF, +> >+ ret = clocksource_mmio_init(ddata.base + LPC_LPT_LSB_OFF, > >+ "clksrc-st-lpc", rate, 300, 32, > >+ clocksource_mmio_readl_up); > >+ if (ret) { @@ -116,14 +112,14 @@ ler (LPC) > >+ struct clk *clk; > >+ int ret; > >+ -> >+ clk =3D of_clk_get(np, 0); +> >+ clk = of_clk_get(np, 0); > >+ if (IS_ERR(clk)) { > >+ pr_err("clksrc-st-lpc: Failed to get LPC clock\n"); -> >+ ret =3D PTR_ERR(clk); +> >+ ret = PTR_ERR(clk); > >+ return ret; ->=20 +> > return PTR_ERR(clk); ->=20 +> > so you can get rid of the 'int ret' variable. Absolutely. Good spot. @@ -141,7 +137,7 @@ Absolutely. Good spot. > >+ return -EINVAL; > >+ } > >+ -> >+ ddata.clk =3D clk; +> >+ ddata.clk = clk; > >+ > >+ return 0; > >+} @@ -151,19 +147,19 @@ Absolutely. Good spot. > >+ int ret; > >+ uint32_t mode; > >+ -> >+ ret =3D of_property_read_u32(np, "st,lpc-mode", &mode); +> >+ ret = of_property_read_u32(np, "st,lpc-mode", &mode); > >+ if (ret) { > >+ pr_err("clksrc-st-lpc: An LPC mode must be provided\n"); > >+ return; > >+ } > >+ > >+ /* LPC can either run as a Clocksource or in RTC or WDT mode */ -> >+ if (mode !=3D ST_LPC_MODE_CLKSRC) +> >+ if (mode != ST_LPC_MODE_CLKSRC) > >+ return; ->=20 +> > I am confused with this patch description + comment and the patch > 1's description. ->=20 +> > For the former, I understand the LPC could be in RTC or WDT mode and > used as a clocksource (clksrc + rtc / clksrc + wdt), for the latter > I understand there are three modes clocksource, rtc and watchdog @@ -173,7 +169,7 @@ They are all mutually exclusive. I will fix-up the commit log to re-enforce this. > >+ -> >+ ddata.base =3D of_iomap(np, 0); +> >+ ddata.base = of_iomap(np, 0); > >+ if (!ddata.base) { > >+ pr_err("clksrc-st-lpc: Unable to map iomem\n"); > >+ return; @@ -194,24 +190,15 @@ re-enforce this. > >+} > >+CLOCKSOURCE_OF_DECLARE(ddata, "st,stih407-lpc", st_clksrc_of_register); > > ->=20 ->=20 +> +> ---=20 +-- Lee Jones Linaro STMicroelectronics Landing Team Lead -Linaro.org =E2=94=82 Open source software for ARM SoCs +Linaro.org │ Open source software for ARM SoCs Follow Linaro: Facebook | Twitter | Blog - ---=20 ---=20 -You received this message because you are subscribed to "rtc-linux". -Membership options at http://groups.google.com/group/rtc-linux . -Please read http://groups.google.com/group/rtc-linux/web/checklist -before submitting a driver. ----=20 -You received this message because you are subscribed to the Google Groups "= -rtc-linux" group. -To unsubscribe from this group and stop receiving emails from it, send an e= -mail to rtc-linux+unsubscribe@googlegroups.com. -For more options, visit https://groups.google.com/d/optout. +-- +To unsubscribe from this list: send the line "unsubscribe linux-watchdog" in +the body of a message to majordomo@vger.kernel.org +More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/a/content_digest b/N1/content_digest index a23bca2..a7c1483 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -2,7 +2,7 @@ "ref\01431005924-21777-3-git-send-email-lee.jones@linaro.org\0" "ref\055506B87.3070807@linaro.org\0" "From\0Lee Jones <lee.jones@linaro.org>\0" - "Subject\0[rtc-linux] Re: [PATCH 02/12] clocksource: sti: Provide support for the ST LPC Clocksource IP\0" + "Subject\0Re: [PATCH 02/12] clocksource: sti: Provide support for the ST LPC Clocksource IP\0" "Date\0Mon, 11 May 2015 11:53:47 +0100\0" "To\0Daniel Lezcano <daniel.lezcano@linaro.org>\0" "Cc\0linux-arm-kernel@lists.infradead.org" @@ -30,8 +30,7 @@ "> >---\n" "> > drivers/clocksource/Kconfig | 8 +++\n" "> > drivers/clocksource/Makefile | 1 +\n" - "> > drivers/clocksource/clksrc_st_lpc.c | 123 ++++++++++++++++++++++++++++=\n" - "++++++++\n" + "> > drivers/clocksource/clksrc_st_lpc.c | 123 ++++++++++++++++++++++++++++++++++++\n" "> > 3 files changed, 132 insertions(+)\n" "> > create mode 100644 drivers/clocksource/clksrc_st_lpc.c\n" "> >\n" @@ -56,24 +55,21 @@ "> >index 752d5c7..e08da4d 100644\n" "> >--- a/drivers/clocksource/Makefile\n" "> >+++ b/drivers/clocksource/Makefile\n" - "> >@@ -51,3 +51,4 @@ obj-$(CONFIG_ARCH_INTEGRATOR_AP)\t+=3D timer-integrator=\n" - "-ap.o\n" - "> > obj-$(CONFIG_CLKSRC_VERSATILE)\t\t+=3D versatile.o\n" - "> > obj-$(CONFIG_CLKSRC_MIPS_GIC)\t\t+=3D mips-gic-timer.o\n" - "> > obj-$(CONFIG_ASM9260_TIMER)\t\t+=3D asm9260_timer.o\n" - "> >+obj-$(CONFIG_CLKSRC_ST_LPC)\t\t+=3D clksrc_st_lpc.o\n" - "> >diff --git a/drivers/clocksource/clksrc_st_lpc.c b/drivers/clocksource/c=\n" - "lksrc_st_lpc.c\n" + "> >@@ -51,3 +51,4 @@ obj-$(CONFIG_ARCH_INTEGRATOR_AP)\t+= timer-integrator-ap.o\n" + "> > obj-$(CONFIG_CLKSRC_VERSATILE)\t\t+= versatile.o\n" + "> > obj-$(CONFIG_CLKSRC_MIPS_GIC)\t\t+= mips-gic-timer.o\n" + "> > obj-$(CONFIG_ASM9260_TIMER)\t\t+= asm9260_timer.o\n" + "> >+obj-$(CONFIG_CLKSRC_ST_LPC)\t\t+= clksrc_st_lpc.o\n" + "> >diff --git a/drivers/clocksource/clksrc_st_lpc.c b/drivers/clocksource/clksrc_st_lpc.c\n" "> >new file mode 100644\n" "> >index 0000000..18a7dcd0\n" "> >--- /dev/null\n" "> >+++ b/drivers/clocksource/clksrc_st_lpc.c\n" "> >@@ -0,0 +1,123 @@\n" "> >+/*\n" - "> >+ * Clocksource using the Low Power Timer found in the Low Power Control=\n" - "ler (LPC)\n" + "> >+ * Clocksource using the Low Power Timer found in the Low Power Controller (LPC)\n" "> >+ *\n" - "> >+ * Copyright (C) 2015 STMicroelectronics =E2=80=93 All Rights Reserved\n" + "> >+ * Copyright (C) 2015 STMicroelectronics \342\200\223 All Rights Reserved\n" "> >+ *\n" "> >+ * Author(s): Francesco Virlinzi <francesco.virlinzi@st.com>\n" "> >+ *\t Ajit Pal Singh <ajitpal.singh@st.com>\n" @@ -117,9 +113,9 @@ "> >+\n" "> >+\tst_clksrc_reset();\n" "> >+\n" - "> >+\trate =3D clk_get_rate(ddata.clk);\n" + "> >+\trate = clk_get_rate(ddata.clk);\n" "> >+\n" - "> >+\tret =3D clocksource_mmio_init(ddata.base + LPC_LPT_LSB_OFF,\n" + "> >+\tret = clocksource_mmio_init(ddata.base + LPC_LPT_LSB_OFF,\n" "> >+\t\t\t\t \"clksrc-st-lpc\", rate, 300, 32,\n" "> >+\t\t\t\t clocksource_mmio_readl_up);\n" "> >+\tif (ret) {\n" @@ -135,14 +131,14 @@ "> >+\tstruct clk *clk;\n" "> >+\tint ret;\n" "> >+\n" - "> >+\tclk =3D of_clk_get(np, 0);\n" + "> >+\tclk = of_clk_get(np, 0);\n" "> >+\tif (IS_ERR(clk)) {\n" "> >+\t\tpr_err(\"clksrc-st-lpc: Failed to get LPC clock\\n\");\n" - "> >+\t\tret =3D PTR_ERR(clk);\n" + "> >+\t\tret = PTR_ERR(clk);\n" "> >+\t\treturn ret;\n" - ">=20\n" + "> \n" "> return PTR_ERR(clk);\n" - ">=20\n" + "> \n" "> so you can get rid of the 'int ret' variable.\n" "\n" "Absolutely. Good spot.\n" @@ -160,7 +156,7 @@ "> >+\t\treturn -EINVAL;\n" "> >+\t}\n" "> >+\n" - "> >+\tddata.clk =3D clk;\n" + "> >+\tddata.clk = clk;\n" "> >+\n" "> >+\treturn 0;\n" "> >+}\n" @@ -170,19 +166,19 @@ "> >+\tint ret;\n" "> >+\tuint32_t mode;\n" "> >+\n" - "> >+\tret =3D of_property_read_u32(np, \"st,lpc-mode\", &mode);\n" + "> >+\tret = of_property_read_u32(np, \"st,lpc-mode\", &mode);\n" "> >+\tif (ret) {\n" "> >+\t\tpr_err(\"clksrc-st-lpc: An LPC mode must be provided\\n\");\n" "> >+\t\treturn;\n" "> >+\t}\n" "> >+\n" "> >+\t/* LPC can either run as a Clocksource or in RTC or WDT mode */\n" - "> >+\tif (mode !=3D ST_LPC_MODE_CLKSRC)\n" + "> >+\tif (mode != ST_LPC_MODE_CLKSRC)\n" "> >+\t\treturn;\n" - ">=20\n" + "> \n" "> I am confused with this patch description + comment and the patch\n" "> 1's description.\n" - ">=20\n" + "> \n" "> For the former, I understand the LPC could be in RTC or WDT mode and\n" "> used as a clocksource (clksrc + rtc / clksrc + wdt), for the latter\n" "> I understand there are three modes clocksource, rtc and watchdog\n" @@ -192,7 +188,7 @@ "re-enforce this.\n" "\n" "> >+\n" - "> >+\tddata.base =3D of_iomap(np, 0);\n" + "> >+\tddata.base = of_iomap(np, 0);\n" "> >+\tif (!ddata.base) {\n" "> >+\t\tpr_err(\"clksrc-st-lpc: Unable to map iomem\\n\");\n" "> >+\t\treturn;\n" @@ -213,26 +209,17 @@ "> >+}\n" "> >+CLOCKSOURCE_OF_DECLARE(ddata, \"st,stih407-lpc\", st_clksrc_of_register);\n" "> >\n" - ">=20\n" - ">=20\n" + "> \n" + "> \n" "\n" - "--=20\n" + "-- \n" "Lee Jones\n" "Linaro STMicroelectronics Landing Team Lead\n" - "Linaro.org =E2=94=82 Open source software for ARM SoCs\n" + "Linaro.org \342\224\202 Open source software for ARM SoCs\n" "Follow Linaro: Facebook | Twitter | Blog\n" - "\n" - "--=20\n" - "--=20\n" - "You received this message because you are subscribed to \"rtc-linux\".\n" - "Membership options at http://groups.google.com/group/rtc-linux .\n" - "Please read http://groups.google.com/group/rtc-linux/web/checklist\n" - "before submitting a driver.\n" - "---=20\n" - "You received this message because you are subscribed to the Google Groups \"=\n" - "rtc-linux\" group.\n" - "To unsubscribe from this group and stop receiving emails from it, send an e=\n" - "mail to rtc-linux+unsubscribe@googlegroups.com.\n" - For more options, visit https://groups.google.com/d/optout. + "--\n" + "To unsubscribe from this list: send the line \"unsubscribe linux-watchdog\" in\n" + "the body of a message to majordomo@vger.kernel.org\n" + More majordomo info at http://vger.kernel.org/majordomo-info.html -c575003e1f1e05dbf27f52dd365d827a415d93e5d1c88ca714454db48227ce9c +5e2735ec49eb6cd6ff79a19f2dc2d6260d34b1b412b760a72bf9094db488fea9
diff --git a/a/1.txt b/N2/1.txt index c4897eb..c4993e6 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -11,8 +11,7 @@ On Mon, 11 May 2015, Daniel Lezcano wrote: > >--- > > drivers/clocksource/Kconfig | 8 +++ > > drivers/clocksource/Makefile | 1 + -> > drivers/clocksource/clksrc_st_lpc.c | 123 ++++++++++++++++++++++++++++= -++++++++ +> > drivers/clocksource/clksrc_st_lpc.c | 123 ++++++++++++++++++++++++++++++++++++ > > 3 files changed, 132 insertions(+) > > create mode 100644 drivers/clocksource/clksrc_st_lpc.c > > @@ -37,24 +36,21 @@ On Mon, 11 May 2015, Daniel Lezcano wrote: > >index 752d5c7..e08da4d 100644 > >--- a/drivers/clocksource/Makefile > >+++ b/drivers/clocksource/Makefile -> >@@ -51,3 +51,4 @@ obj-$(CONFIG_ARCH_INTEGRATOR_AP) +=3D timer-integrator= --ap.o -> > obj-$(CONFIG_CLKSRC_VERSATILE) +=3D versatile.o -> > obj-$(CONFIG_CLKSRC_MIPS_GIC) +=3D mips-gic-timer.o -> > obj-$(CONFIG_ASM9260_TIMER) +=3D asm9260_timer.o -> >+obj-$(CONFIG_CLKSRC_ST_LPC) +=3D clksrc_st_lpc.o -> >diff --git a/drivers/clocksource/clksrc_st_lpc.c b/drivers/clocksource/c= -lksrc_st_lpc.c +> >@@ -51,3 +51,4 @@ obj-$(CONFIG_ARCH_INTEGRATOR_AP) += timer-integrator-ap.o +> > obj-$(CONFIG_CLKSRC_VERSATILE) += versatile.o +> > obj-$(CONFIG_CLKSRC_MIPS_GIC) += mips-gic-timer.o +> > obj-$(CONFIG_ASM9260_TIMER) += asm9260_timer.o +> >+obj-$(CONFIG_CLKSRC_ST_LPC) += clksrc_st_lpc.o +> >diff --git a/drivers/clocksource/clksrc_st_lpc.c b/drivers/clocksource/clksrc_st_lpc.c > >new file mode 100644 > >index 0000000..18a7dcd0 > >--- /dev/null > >+++ b/drivers/clocksource/clksrc_st_lpc.c > >@@ -0,0 +1,123 @@ > >+/* -> >+ * Clocksource using the Low Power Timer found in the Low Power Control= -ler (LPC) +> >+ * Clocksource using the Low Power Timer found in the Low Power Controller (LPC) > >+ * -> >+ * Copyright (C) 2015 STMicroelectronics =E2=80=93 All Rights Reserved +> >+ * Copyright (C) 2015 STMicroelectronics ? All Rights Reserved > >+ * > >+ * Author(s): Francesco Virlinzi <francesco.virlinzi@st.com> > >+ * Ajit Pal Singh <ajitpal.singh@st.com> @@ -98,9 +94,9 @@ ler (LPC) > >+ > >+ st_clksrc_reset(); > >+ -> >+ rate =3D clk_get_rate(ddata.clk); +> >+ rate = clk_get_rate(ddata.clk); > >+ -> >+ ret =3D clocksource_mmio_init(ddata.base + LPC_LPT_LSB_OFF, +> >+ ret = clocksource_mmio_init(ddata.base + LPC_LPT_LSB_OFF, > >+ "clksrc-st-lpc", rate, 300, 32, > >+ clocksource_mmio_readl_up); > >+ if (ret) { @@ -116,14 +112,14 @@ ler (LPC) > >+ struct clk *clk; > >+ int ret; > >+ -> >+ clk =3D of_clk_get(np, 0); +> >+ clk = of_clk_get(np, 0); > >+ if (IS_ERR(clk)) { > >+ pr_err("clksrc-st-lpc: Failed to get LPC clock\n"); -> >+ ret =3D PTR_ERR(clk); +> >+ ret = PTR_ERR(clk); > >+ return ret; ->=20 +> > return PTR_ERR(clk); ->=20 +> > so you can get rid of the 'int ret' variable. Absolutely. Good spot. @@ -141,7 +137,7 @@ Absolutely. Good spot. > >+ return -EINVAL; > >+ } > >+ -> >+ ddata.clk =3D clk; +> >+ ddata.clk = clk; > >+ > >+ return 0; > >+} @@ -151,19 +147,19 @@ Absolutely. Good spot. > >+ int ret; > >+ uint32_t mode; > >+ -> >+ ret =3D of_property_read_u32(np, "st,lpc-mode", &mode); +> >+ ret = of_property_read_u32(np, "st,lpc-mode", &mode); > >+ if (ret) { > >+ pr_err("clksrc-st-lpc: An LPC mode must be provided\n"); > >+ return; > >+ } > >+ > >+ /* LPC can either run as a Clocksource or in RTC or WDT mode */ -> >+ if (mode !=3D ST_LPC_MODE_CLKSRC) +> >+ if (mode != ST_LPC_MODE_CLKSRC) > >+ return; ->=20 +> > I am confused with this patch description + comment and the patch > 1's description. ->=20 +> > For the former, I understand the LPC could be in RTC or WDT mode and > used as a clocksource (clksrc + rtc / clksrc + wdt), for the latter > I understand there are three modes clocksource, rtc and watchdog @@ -173,7 +169,7 @@ They are all mutually exclusive. I will fix-up the commit log to re-enforce this. > >+ -> >+ ddata.base =3D of_iomap(np, 0); +> >+ ddata.base = of_iomap(np, 0); > >+ if (!ddata.base) { > >+ pr_err("clksrc-st-lpc: Unable to map iomem\n"); > >+ return; @@ -194,24 +190,11 @@ re-enforce this. > >+} > >+CLOCKSOURCE_OF_DECLARE(ddata, "st,stih407-lpc", st_clksrc_of_register); > > ->=20 ->=20 +> +> ---=20 +-- Lee Jones Linaro STMicroelectronics Landing Team Lead -Linaro.org =E2=94=82 Open source software for ARM SoCs +Linaro.org ? Open source software for ARM SoCs Follow Linaro: Facebook | Twitter | Blog - ---=20 ---=20 -You received this message because you are subscribed to "rtc-linux". -Membership options at http://groups.google.com/group/rtc-linux . -Please read http://groups.google.com/group/rtc-linux/web/checklist -before submitting a driver. ----=20 -You received this message because you are subscribed to the Google Groups "= -rtc-linux" group. -To unsubscribe from this group and stop receiving emails from it, send an e= -mail to rtc-linux+unsubscribe@googlegroups.com. -For more options, visit https://groups.google.com/d/optout. diff --git a/a/content_digest b/N2/content_digest index a23bca2..4b56edf 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,20 +1,10 @@ "ref\01431005924-21777-1-git-send-email-lee.jones@linaro.org\0" "ref\01431005924-21777-3-git-send-email-lee.jones@linaro.org\0" "ref\055506B87.3070807@linaro.org\0" - "From\0Lee Jones <lee.jones@linaro.org>\0" - "Subject\0[rtc-linux] Re: [PATCH 02/12] clocksource: sti: Provide support for the ST LPC Clocksource IP\0" + "From\0lee.jones@linaro.org (Lee Jones)\0" + "Subject\0[PATCH 02/12] clocksource: sti: Provide support for the ST LPC Clocksource IP\0" "Date\0Mon, 11 May 2015 11:53:47 +0100\0" - "To\0Daniel Lezcano <daniel.lezcano@linaro.org>\0" - "Cc\0linux-arm-kernel@lists.infradead.org" - linux-kernel@vger.kernel.org - kernel@stlinux.com - devicetree@vger.kernel.org - tglx@linutronix.de - wim@iguana.be - a.zummo@towertech.it - linux-watchdog@vger.kernel.org - rtc-linux@googlegroups.com - " linux@roeck-us.net\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "On Mon, 11 May 2015, Daniel Lezcano wrote:\n" @@ -30,8 +20,7 @@ "> >---\n" "> > drivers/clocksource/Kconfig | 8 +++\n" "> > drivers/clocksource/Makefile | 1 +\n" - "> > drivers/clocksource/clksrc_st_lpc.c | 123 ++++++++++++++++++++++++++++=\n" - "++++++++\n" + "> > drivers/clocksource/clksrc_st_lpc.c | 123 ++++++++++++++++++++++++++++++++++++\n" "> > 3 files changed, 132 insertions(+)\n" "> > create mode 100644 drivers/clocksource/clksrc_st_lpc.c\n" "> >\n" @@ -56,24 +45,21 @@ "> >index 752d5c7..e08da4d 100644\n" "> >--- a/drivers/clocksource/Makefile\n" "> >+++ b/drivers/clocksource/Makefile\n" - "> >@@ -51,3 +51,4 @@ obj-$(CONFIG_ARCH_INTEGRATOR_AP)\t+=3D timer-integrator=\n" - "-ap.o\n" - "> > obj-$(CONFIG_CLKSRC_VERSATILE)\t\t+=3D versatile.o\n" - "> > obj-$(CONFIG_CLKSRC_MIPS_GIC)\t\t+=3D mips-gic-timer.o\n" - "> > obj-$(CONFIG_ASM9260_TIMER)\t\t+=3D asm9260_timer.o\n" - "> >+obj-$(CONFIG_CLKSRC_ST_LPC)\t\t+=3D clksrc_st_lpc.o\n" - "> >diff --git a/drivers/clocksource/clksrc_st_lpc.c b/drivers/clocksource/c=\n" - "lksrc_st_lpc.c\n" + "> >@@ -51,3 +51,4 @@ obj-$(CONFIG_ARCH_INTEGRATOR_AP)\t+= timer-integrator-ap.o\n" + "> > obj-$(CONFIG_CLKSRC_VERSATILE)\t\t+= versatile.o\n" + "> > obj-$(CONFIG_CLKSRC_MIPS_GIC)\t\t+= mips-gic-timer.o\n" + "> > obj-$(CONFIG_ASM9260_TIMER)\t\t+= asm9260_timer.o\n" + "> >+obj-$(CONFIG_CLKSRC_ST_LPC)\t\t+= clksrc_st_lpc.o\n" + "> >diff --git a/drivers/clocksource/clksrc_st_lpc.c b/drivers/clocksource/clksrc_st_lpc.c\n" "> >new file mode 100644\n" "> >index 0000000..18a7dcd0\n" "> >--- /dev/null\n" "> >+++ b/drivers/clocksource/clksrc_st_lpc.c\n" "> >@@ -0,0 +1,123 @@\n" "> >+/*\n" - "> >+ * Clocksource using the Low Power Timer found in the Low Power Control=\n" - "ler (LPC)\n" + "> >+ * Clocksource using the Low Power Timer found in the Low Power Controller (LPC)\n" "> >+ *\n" - "> >+ * Copyright (C) 2015 STMicroelectronics =E2=80=93 All Rights Reserved\n" + "> >+ * Copyright (C) 2015 STMicroelectronics ? All Rights Reserved\n" "> >+ *\n" "> >+ * Author(s): Francesco Virlinzi <francesco.virlinzi@st.com>\n" "> >+ *\t Ajit Pal Singh <ajitpal.singh@st.com>\n" @@ -117,9 +103,9 @@ "> >+\n" "> >+\tst_clksrc_reset();\n" "> >+\n" - "> >+\trate =3D clk_get_rate(ddata.clk);\n" + "> >+\trate = clk_get_rate(ddata.clk);\n" "> >+\n" - "> >+\tret =3D clocksource_mmio_init(ddata.base + LPC_LPT_LSB_OFF,\n" + "> >+\tret = clocksource_mmio_init(ddata.base + LPC_LPT_LSB_OFF,\n" "> >+\t\t\t\t \"clksrc-st-lpc\", rate, 300, 32,\n" "> >+\t\t\t\t clocksource_mmio_readl_up);\n" "> >+\tif (ret) {\n" @@ -135,14 +121,14 @@ "> >+\tstruct clk *clk;\n" "> >+\tint ret;\n" "> >+\n" - "> >+\tclk =3D of_clk_get(np, 0);\n" + "> >+\tclk = of_clk_get(np, 0);\n" "> >+\tif (IS_ERR(clk)) {\n" "> >+\t\tpr_err(\"clksrc-st-lpc: Failed to get LPC clock\\n\");\n" - "> >+\t\tret =3D PTR_ERR(clk);\n" + "> >+\t\tret = PTR_ERR(clk);\n" "> >+\t\treturn ret;\n" - ">=20\n" + "> \n" "> return PTR_ERR(clk);\n" - ">=20\n" + "> \n" "> so you can get rid of the 'int ret' variable.\n" "\n" "Absolutely. Good spot.\n" @@ -160,7 +146,7 @@ "> >+\t\treturn -EINVAL;\n" "> >+\t}\n" "> >+\n" - "> >+\tddata.clk =3D clk;\n" + "> >+\tddata.clk = clk;\n" "> >+\n" "> >+\treturn 0;\n" "> >+}\n" @@ -170,19 +156,19 @@ "> >+\tint ret;\n" "> >+\tuint32_t mode;\n" "> >+\n" - "> >+\tret =3D of_property_read_u32(np, \"st,lpc-mode\", &mode);\n" + "> >+\tret = of_property_read_u32(np, \"st,lpc-mode\", &mode);\n" "> >+\tif (ret) {\n" "> >+\t\tpr_err(\"clksrc-st-lpc: An LPC mode must be provided\\n\");\n" "> >+\t\treturn;\n" "> >+\t}\n" "> >+\n" "> >+\t/* LPC can either run as a Clocksource or in RTC or WDT mode */\n" - "> >+\tif (mode !=3D ST_LPC_MODE_CLKSRC)\n" + "> >+\tif (mode != ST_LPC_MODE_CLKSRC)\n" "> >+\t\treturn;\n" - ">=20\n" + "> \n" "> I am confused with this patch description + comment and the patch\n" "> 1's description.\n" - ">=20\n" + "> \n" "> For the former, I understand the LPC could be in RTC or WDT mode and\n" "> used as a clocksource (clksrc + rtc / clksrc + wdt), for the latter\n" "> I understand there are three modes clocksource, rtc and watchdog\n" @@ -192,7 +178,7 @@ "re-enforce this.\n" "\n" "> >+\n" - "> >+\tddata.base =3D of_iomap(np, 0);\n" + "> >+\tddata.base = of_iomap(np, 0);\n" "> >+\tif (!ddata.base) {\n" "> >+\t\tpr_err(\"clksrc-st-lpc: Unable to map iomem\\n\");\n" "> >+\t\treturn;\n" @@ -213,26 +199,13 @@ "> >+}\n" "> >+CLOCKSOURCE_OF_DECLARE(ddata, \"st,stih407-lpc\", st_clksrc_of_register);\n" "> >\n" - ">=20\n" - ">=20\n" + "> \n" + "> \n" "\n" - "--=20\n" + "-- \n" "Lee Jones\n" "Linaro STMicroelectronics Landing Team Lead\n" - "Linaro.org =E2=94=82 Open source software for ARM SoCs\n" - "Follow Linaro: Facebook | Twitter | Blog\n" - "\n" - "--=20\n" - "--=20\n" - "You received this message because you are subscribed to \"rtc-linux\".\n" - "Membership options at http://groups.google.com/group/rtc-linux .\n" - "Please read http://groups.google.com/group/rtc-linux/web/checklist\n" - "before submitting a driver.\n" - "---=20\n" - "You received this message because you are subscribed to the Google Groups \"=\n" - "rtc-linux\" group.\n" - "To unsubscribe from this group and stop receiving emails from it, send an e=\n" - "mail to rtc-linux+unsubscribe@googlegroups.com.\n" - For more options, visit https://groups.google.com/d/optout. + "Linaro.org ? Open source software for ARM SoCs\n" + Follow Linaro: Facebook | Twitter | Blog -c575003e1f1e05dbf27f52dd365d827a415d93e5d1c88ca714454db48227ce9c +a0fca4292099f189bb82764ae0c4d53a6525223a56cfbae6e8c77918acd8b6dd
diff --git a/a/1.txt b/N3/1.txt index c4897eb..f87b560 100644 --- a/a/1.txt +++ b/N3/1.txt @@ -7,12 +7,11 @@ On Mon, 11 May 2015, Daniel Lezcano wrote: > > > >The ST LPC Clocksource IP can be used as the system (tick) timer. > > -> >Signed-off-by: Lee Jones <lee.jones@linaro.org> +> >Signed-off-by: Lee Jones <lee.jones-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org> > >--- > > drivers/clocksource/Kconfig | 8 +++ > > drivers/clocksource/Makefile | 1 + -> > drivers/clocksource/clksrc_st_lpc.c | 123 ++++++++++++++++++++++++++++= -++++++++ +> > drivers/clocksource/clksrc_st_lpc.c | 123 ++++++++++++++++++++++++++++++++++++ > > 3 files changed, 132 insertions(+) > > create mode 100644 drivers/clocksource/clksrc_st_lpc.c > > @@ -37,27 +36,24 @@ On Mon, 11 May 2015, Daniel Lezcano wrote: > >index 752d5c7..e08da4d 100644 > >--- a/drivers/clocksource/Makefile > >+++ b/drivers/clocksource/Makefile -> >@@ -51,3 +51,4 @@ obj-$(CONFIG_ARCH_INTEGRATOR_AP) +=3D timer-integrator= --ap.o -> > obj-$(CONFIG_CLKSRC_VERSATILE) +=3D versatile.o -> > obj-$(CONFIG_CLKSRC_MIPS_GIC) +=3D mips-gic-timer.o -> > obj-$(CONFIG_ASM9260_TIMER) +=3D asm9260_timer.o -> >+obj-$(CONFIG_CLKSRC_ST_LPC) +=3D clksrc_st_lpc.o -> >diff --git a/drivers/clocksource/clksrc_st_lpc.c b/drivers/clocksource/c= -lksrc_st_lpc.c +> >@@ -51,3 +51,4 @@ obj-$(CONFIG_ARCH_INTEGRATOR_AP) += timer-integrator-ap.o +> > obj-$(CONFIG_CLKSRC_VERSATILE) += versatile.o +> > obj-$(CONFIG_CLKSRC_MIPS_GIC) += mips-gic-timer.o +> > obj-$(CONFIG_ASM9260_TIMER) += asm9260_timer.o +> >+obj-$(CONFIG_CLKSRC_ST_LPC) += clksrc_st_lpc.o +> >diff --git a/drivers/clocksource/clksrc_st_lpc.c b/drivers/clocksource/clksrc_st_lpc.c > >new file mode 100644 > >index 0000000..18a7dcd0 > >--- /dev/null > >+++ b/drivers/clocksource/clksrc_st_lpc.c > >@@ -0,0 +1,123 @@ > >+/* -> >+ * Clocksource using the Low Power Timer found in the Low Power Control= -ler (LPC) +> >+ * Clocksource using the Low Power Timer found in the Low Power Controller (LPC) > >+ * -> >+ * Copyright (C) 2015 STMicroelectronics =E2=80=93 All Rights Reserved +> >+ * Copyright (C) 2015 STMicroelectronics – All Rights Reserved > >+ * -> >+ * Author(s): Francesco Virlinzi <francesco.virlinzi@st.com> -> >+ * Ajit Pal Singh <ajitpal.singh@st.com> +> >+ * Author(s): Francesco Virlinzi <francesco.virlinzi-qxv4g6HH51o@public.gmane.org> +> >+ * Ajit Pal Singh <ajitpal.singh-qxv4g6HH51o@public.gmane.org> > >+ * > >+ * This program is free software; you can redistribute it and/or modify > >+ * it under the terms of the GNU General Public License as published by @@ -98,9 +94,9 @@ ler (LPC) > >+ > >+ st_clksrc_reset(); > >+ -> >+ rate =3D clk_get_rate(ddata.clk); +> >+ rate = clk_get_rate(ddata.clk); > >+ -> >+ ret =3D clocksource_mmio_init(ddata.base + LPC_LPT_LSB_OFF, +> >+ ret = clocksource_mmio_init(ddata.base + LPC_LPT_LSB_OFF, > >+ "clksrc-st-lpc", rate, 300, 32, > >+ clocksource_mmio_readl_up); > >+ if (ret) { @@ -116,14 +112,14 @@ ler (LPC) > >+ struct clk *clk; > >+ int ret; > >+ -> >+ clk =3D of_clk_get(np, 0); +> >+ clk = of_clk_get(np, 0); > >+ if (IS_ERR(clk)) { > >+ pr_err("clksrc-st-lpc: Failed to get LPC clock\n"); -> >+ ret =3D PTR_ERR(clk); +> >+ ret = PTR_ERR(clk); > >+ return ret; ->=20 +> > return PTR_ERR(clk); ->=20 +> > so you can get rid of the 'int ret' variable. Absolutely. Good spot. @@ -141,7 +137,7 @@ Absolutely. Good spot. > >+ return -EINVAL; > >+ } > >+ -> >+ ddata.clk =3D clk; +> >+ ddata.clk = clk; > >+ > >+ return 0; > >+} @@ -151,19 +147,19 @@ Absolutely. Good spot. > >+ int ret; > >+ uint32_t mode; > >+ -> >+ ret =3D of_property_read_u32(np, "st,lpc-mode", &mode); +> >+ ret = of_property_read_u32(np, "st,lpc-mode", &mode); > >+ if (ret) { > >+ pr_err("clksrc-st-lpc: An LPC mode must be provided\n"); > >+ return; > >+ } > >+ > >+ /* LPC can either run as a Clocksource or in RTC or WDT mode */ -> >+ if (mode !=3D ST_LPC_MODE_CLKSRC) +> >+ if (mode != ST_LPC_MODE_CLKSRC) > >+ return; ->=20 +> > I am confused with this patch description + comment and the patch > 1's description. ->=20 +> > For the former, I understand the LPC could be in RTC or WDT mode and > used as a clocksource (clksrc + rtc / clksrc + wdt), for the latter > I understand there are three modes clocksource, rtc and watchdog @@ -173,7 +169,7 @@ They are all mutually exclusive. I will fix-up the commit log to re-enforce this. > >+ -> >+ ddata.base =3D of_iomap(np, 0); +> >+ ddata.base = of_iomap(np, 0); > >+ if (!ddata.base) { > >+ pr_err("clksrc-st-lpc: Unable to map iomem\n"); > >+ return; @@ -194,24 +190,15 @@ re-enforce this. > >+} > >+CLOCKSOURCE_OF_DECLARE(ddata, "st,stih407-lpc", st_clksrc_of_register); > > ->=20 ->=20 +> +> ---=20 +-- Lee Jones Linaro STMicroelectronics Landing Team Lead -Linaro.org =E2=94=82 Open source software for ARM SoCs +Linaro.org │ Open source software for ARM SoCs Follow Linaro: Facebook | Twitter | Blog - ---=20 ---=20 -You received this message because you are subscribed to "rtc-linux". -Membership options at http://groups.google.com/group/rtc-linux . -Please read http://groups.google.com/group/rtc-linux/web/checklist -before submitting a driver. ----=20 -You received this message because you are subscribed to the Google Groups "= -rtc-linux" group. -To unsubscribe from this group and stop receiving emails from it, send an e= -mail to rtc-linux+unsubscribe@googlegroups.com. -For more options, visit https://groups.google.com/d/optout. +-- +To unsubscribe from this list: send the line "unsubscribe linux-watchdog" in +the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org +More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/a/content_digest b/N3/content_digest index a23bca2..1e8e393 100644 --- a/a/content_digest +++ b/N3/content_digest @@ -1,20 +1,21 @@ "ref\01431005924-21777-1-git-send-email-lee.jones@linaro.org\0" "ref\01431005924-21777-3-git-send-email-lee.jones@linaro.org\0" "ref\055506B87.3070807@linaro.org\0" - "From\0Lee Jones <lee.jones@linaro.org>\0" - "Subject\0[rtc-linux] Re: [PATCH 02/12] clocksource: sti: Provide support for the ST LPC Clocksource IP\0" + "ref\055506B87.3070807-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org\0" + "From\0Lee Jones <lee.jones-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>\0" + "Subject\0Re: [PATCH 02/12] clocksource: sti: Provide support for the ST LPC Clocksource IP\0" "Date\0Mon, 11 May 2015 11:53:47 +0100\0" - "To\0Daniel Lezcano <daniel.lezcano@linaro.org>\0" - "Cc\0linux-arm-kernel@lists.infradead.org" - linux-kernel@vger.kernel.org - kernel@stlinux.com - devicetree@vger.kernel.org - tglx@linutronix.de - wim@iguana.be - a.zummo@towertech.it - linux-watchdog@vger.kernel.org - rtc-linux@googlegroups.com - " linux@roeck-us.net\0" + "To\0Daniel Lezcano <daniel.lezcano-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>\0" + "Cc\0linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org" + linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org + kernel-F5mvAk5X5gdBDgjK7y7TUQ@public.gmane.org + devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org + tglx-hfZtesqFncYOwBW4kG4KsQ@public.gmane.org + wim-IQzOog9fTRqzQB+pC5nmwQ@public.gmane.org + a.zummo-BfzFCNDTiLLj+vYz1yj4TQ@public.gmane.org + linux-watchdog-u79uwXL29TY76Z2rM5mHXA@public.gmane.org + rtc-linux-/JYPxA39Uh5TLH3MbocFFw@public.gmane.org + " linux-0h96xk9xTtrk1uMJSBkQmQ@public.gmane.org\0" "\00:1\0" "b\0" "On Mon, 11 May 2015, Daniel Lezcano wrote:\n" @@ -26,12 +27,11 @@ "> >\n" "> >The ST LPC Clocksource IP can be used as the system (tick) timer.\n" "> >\n" - "> >Signed-off-by: Lee Jones <lee.jones@linaro.org>\n" + "> >Signed-off-by: Lee Jones <lee.jones-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>\n" "> >---\n" "> > drivers/clocksource/Kconfig | 8 +++\n" "> > drivers/clocksource/Makefile | 1 +\n" - "> > drivers/clocksource/clksrc_st_lpc.c | 123 ++++++++++++++++++++++++++++=\n" - "++++++++\n" + "> > drivers/clocksource/clksrc_st_lpc.c | 123 ++++++++++++++++++++++++++++++++++++\n" "> > 3 files changed, 132 insertions(+)\n" "> > create mode 100644 drivers/clocksource/clksrc_st_lpc.c\n" "> >\n" @@ -56,27 +56,24 @@ "> >index 752d5c7..e08da4d 100644\n" "> >--- a/drivers/clocksource/Makefile\n" "> >+++ b/drivers/clocksource/Makefile\n" - "> >@@ -51,3 +51,4 @@ obj-$(CONFIG_ARCH_INTEGRATOR_AP)\t+=3D timer-integrator=\n" - "-ap.o\n" - "> > obj-$(CONFIG_CLKSRC_VERSATILE)\t\t+=3D versatile.o\n" - "> > obj-$(CONFIG_CLKSRC_MIPS_GIC)\t\t+=3D mips-gic-timer.o\n" - "> > obj-$(CONFIG_ASM9260_TIMER)\t\t+=3D asm9260_timer.o\n" - "> >+obj-$(CONFIG_CLKSRC_ST_LPC)\t\t+=3D clksrc_st_lpc.o\n" - "> >diff --git a/drivers/clocksource/clksrc_st_lpc.c b/drivers/clocksource/c=\n" - "lksrc_st_lpc.c\n" + "> >@@ -51,3 +51,4 @@ obj-$(CONFIG_ARCH_INTEGRATOR_AP)\t+= timer-integrator-ap.o\n" + "> > obj-$(CONFIG_CLKSRC_VERSATILE)\t\t+= versatile.o\n" + "> > obj-$(CONFIG_CLKSRC_MIPS_GIC)\t\t+= mips-gic-timer.o\n" + "> > obj-$(CONFIG_ASM9260_TIMER)\t\t+= asm9260_timer.o\n" + "> >+obj-$(CONFIG_CLKSRC_ST_LPC)\t\t+= clksrc_st_lpc.o\n" + "> >diff --git a/drivers/clocksource/clksrc_st_lpc.c b/drivers/clocksource/clksrc_st_lpc.c\n" "> >new file mode 100644\n" "> >index 0000000..18a7dcd0\n" "> >--- /dev/null\n" "> >+++ b/drivers/clocksource/clksrc_st_lpc.c\n" "> >@@ -0,0 +1,123 @@\n" "> >+/*\n" - "> >+ * Clocksource using the Low Power Timer found in the Low Power Control=\n" - "ler (LPC)\n" + "> >+ * Clocksource using the Low Power Timer found in the Low Power Controller (LPC)\n" "> >+ *\n" - "> >+ * Copyright (C) 2015 STMicroelectronics =E2=80=93 All Rights Reserved\n" + "> >+ * Copyright (C) 2015 STMicroelectronics \342\200\223 All Rights Reserved\n" "> >+ *\n" - "> >+ * Author(s): Francesco Virlinzi <francesco.virlinzi@st.com>\n" - "> >+ *\t Ajit Pal Singh <ajitpal.singh@st.com>\n" + "> >+ * Author(s): Francesco Virlinzi <francesco.virlinzi-qxv4g6HH51o@public.gmane.org>\n" + "> >+ *\t Ajit Pal Singh <ajitpal.singh-qxv4g6HH51o@public.gmane.org>\n" "> >+ *\n" "> >+ * This program is free software; you can redistribute it and/or modify\n" "> >+ * it under the terms of the GNU General Public License as published by\n" @@ -117,9 +114,9 @@ "> >+\n" "> >+\tst_clksrc_reset();\n" "> >+\n" - "> >+\trate =3D clk_get_rate(ddata.clk);\n" + "> >+\trate = clk_get_rate(ddata.clk);\n" "> >+\n" - "> >+\tret =3D clocksource_mmio_init(ddata.base + LPC_LPT_LSB_OFF,\n" + "> >+\tret = clocksource_mmio_init(ddata.base + LPC_LPT_LSB_OFF,\n" "> >+\t\t\t\t \"clksrc-st-lpc\", rate, 300, 32,\n" "> >+\t\t\t\t clocksource_mmio_readl_up);\n" "> >+\tif (ret) {\n" @@ -135,14 +132,14 @@ "> >+\tstruct clk *clk;\n" "> >+\tint ret;\n" "> >+\n" - "> >+\tclk =3D of_clk_get(np, 0);\n" + "> >+\tclk = of_clk_get(np, 0);\n" "> >+\tif (IS_ERR(clk)) {\n" "> >+\t\tpr_err(\"clksrc-st-lpc: Failed to get LPC clock\\n\");\n" - "> >+\t\tret =3D PTR_ERR(clk);\n" + "> >+\t\tret = PTR_ERR(clk);\n" "> >+\t\treturn ret;\n" - ">=20\n" + "> \n" "> return PTR_ERR(clk);\n" - ">=20\n" + "> \n" "> so you can get rid of the 'int ret' variable.\n" "\n" "Absolutely. Good spot.\n" @@ -160,7 +157,7 @@ "> >+\t\treturn -EINVAL;\n" "> >+\t}\n" "> >+\n" - "> >+\tddata.clk =3D clk;\n" + "> >+\tddata.clk = clk;\n" "> >+\n" "> >+\treturn 0;\n" "> >+}\n" @@ -170,19 +167,19 @@ "> >+\tint ret;\n" "> >+\tuint32_t mode;\n" "> >+\n" - "> >+\tret =3D of_property_read_u32(np, \"st,lpc-mode\", &mode);\n" + "> >+\tret = of_property_read_u32(np, \"st,lpc-mode\", &mode);\n" "> >+\tif (ret) {\n" "> >+\t\tpr_err(\"clksrc-st-lpc: An LPC mode must be provided\\n\");\n" "> >+\t\treturn;\n" "> >+\t}\n" "> >+\n" "> >+\t/* LPC can either run as a Clocksource or in RTC or WDT mode */\n" - "> >+\tif (mode !=3D ST_LPC_MODE_CLKSRC)\n" + "> >+\tif (mode != ST_LPC_MODE_CLKSRC)\n" "> >+\t\treturn;\n" - ">=20\n" + "> \n" "> I am confused with this patch description + comment and the patch\n" "> 1's description.\n" - ">=20\n" + "> \n" "> For the former, I understand the LPC could be in RTC or WDT mode and\n" "> used as a clocksource (clksrc + rtc / clksrc + wdt), for the latter\n" "> I understand there are three modes clocksource, rtc and watchdog\n" @@ -192,7 +189,7 @@ "re-enforce this.\n" "\n" "> >+\n" - "> >+\tddata.base =3D of_iomap(np, 0);\n" + "> >+\tddata.base = of_iomap(np, 0);\n" "> >+\tif (!ddata.base) {\n" "> >+\t\tpr_err(\"clksrc-st-lpc: Unable to map iomem\\n\");\n" "> >+\t\treturn;\n" @@ -213,26 +210,17 @@ "> >+}\n" "> >+CLOCKSOURCE_OF_DECLARE(ddata, \"st,stih407-lpc\", st_clksrc_of_register);\n" "> >\n" - ">=20\n" - ">=20\n" + "> \n" + "> \n" "\n" - "--=20\n" + "-- \n" "Lee Jones\n" "Linaro STMicroelectronics Landing Team Lead\n" - "Linaro.org =E2=94=82 Open source software for ARM SoCs\n" + "Linaro.org \342\224\202 Open source software for ARM SoCs\n" "Follow Linaro: Facebook | Twitter | Blog\n" - "\n" - "--=20\n" - "--=20\n" - "You received this message because you are subscribed to \"rtc-linux\".\n" - "Membership options at http://groups.google.com/group/rtc-linux .\n" - "Please read http://groups.google.com/group/rtc-linux/web/checklist\n" - "before submitting a driver.\n" - "---=20\n" - "You received this message because you are subscribed to the Google Groups \"=\n" - "rtc-linux\" group.\n" - "To unsubscribe from this group and stop receiving emails from it, send an e=\n" - "mail to rtc-linux+unsubscribe@googlegroups.com.\n" - For more options, visit https://groups.google.com/d/optout. + "--\n" + "To unsubscribe from this list: send the line \"unsubscribe linux-watchdog\" in\n" + "the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org\n" + More majordomo info at http://vger.kernel.org/majordomo-info.html -c575003e1f1e05dbf27f52dd365d827a415d93e5d1c88ca714454db48227ce9c +59c937c6ac5c41472f6db1a473273fe6c160924c458a502b85b7f08d8e830996
diff --git a/a/1.txt b/N4/1.txt index c4897eb..c965eb1 100644 --- a/a/1.txt +++ b/N4/1.txt @@ -11,8 +11,7 @@ On Mon, 11 May 2015, Daniel Lezcano wrote: > >--- > > drivers/clocksource/Kconfig | 8 +++ > > drivers/clocksource/Makefile | 1 + -> > drivers/clocksource/clksrc_st_lpc.c | 123 ++++++++++++++++++++++++++++= -++++++++ +> > drivers/clocksource/clksrc_st_lpc.c | 123 ++++++++++++++++++++++++++++++++++++ > > 3 files changed, 132 insertions(+) > > create mode 100644 drivers/clocksource/clksrc_st_lpc.c > > @@ -37,24 +36,21 @@ On Mon, 11 May 2015, Daniel Lezcano wrote: > >index 752d5c7..e08da4d 100644 > >--- a/drivers/clocksource/Makefile > >+++ b/drivers/clocksource/Makefile -> >@@ -51,3 +51,4 @@ obj-$(CONFIG_ARCH_INTEGRATOR_AP) +=3D timer-integrator= --ap.o -> > obj-$(CONFIG_CLKSRC_VERSATILE) +=3D versatile.o -> > obj-$(CONFIG_CLKSRC_MIPS_GIC) +=3D mips-gic-timer.o -> > obj-$(CONFIG_ASM9260_TIMER) +=3D asm9260_timer.o -> >+obj-$(CONFIG_CLKSRC_ST_LPC) +=3D clksrc_st_lpc.o -> >diff --git a/drivers/clocksource/clksrc_st_lpc.c b/drivers/clocksource/c= -lksrc_st_lpc.c +> >@@ -51,3 +51,4 @@ obj-$(CONFIG_ARCH_INTEGRATOR_AP) += timer-integrator-ap.o +> > obj-$(CONFIG_CLKSRC_VERSATILE) += versatile.o +> > obj-$(CONFIG_CLKSRC_MIPS_GIC) += mips-gic-timer.o +> > obj-$(CONFIG_ASM9260_TIMER) += asm9260_timer.o +> >+obj-$(CONFIG_CLKSRC_ST_LPC) += clksrc_st_lpc.o +> >diff --git a/drivers/clocksource/clksrc_st_lpc.c b/drivers/clocksource/clksrc_st_lpc.c > >new file mode 100644 > >index 0000000..18a7dcd0 > >--- /dev/null > >+++ b/drivers/clocksource/clksrc_st_lpc.c > >@@ -0,0 +1,123 @@ > >+/* -> >+ * Clocksource using the Low Power Timer found in the Low Power Control= -ler (LPC) +> >+ * Clocksource using the Low Power Timer found in the Low Power Controller (LPC) > >+ * -> >+ * Copyright (C) 2015 STMicroelectronics =E2=80=93 All Rights Reserved +> >+ * Copyright (C) 2015 STMicroelectronics – All Rights Reserved > >+ * > >+ * Author(s): Francesco Virlinzi <francesco.virlinzi@st.com> > >+ * Ajit Pal Singh <ajitpal.singh@st.com> @@ -98,9 +94,9 @@ ler (LPC) > >+ > >+ st_clksrc_reset(); > >+ -> >+ rate =3D clk_get_rate(ddata.clk); +> >+ rate = clk_get_rate(ddata.clk); > >+ -> >+ ret =3D clocksource_mmio_init(ddata.base + LPC_LPT_LSB_OFF, +> >+ ret = clocksource_mmio_init(ddata.base + LPC_LPT_LSB_OFF, > >+ "clksrc-st-lpc", rate, 300, 32, > >+ clocksource_mmio_readl_up); > >+ if (ret) { @@ -116,14 +112,14 @@ ler (LPC) > >+ struct clk *clk; > >+ int ret; > >+ -> >+ clk =3D of_clk_get(np, 0); +> >+ clk = of_clk_get(np, 0); > >+ if (IS_ERR(clk)) { > >+ pr_err("clksrc-st-lpc: Failed to get LPC clock\n"); -> >+ ret =3D PTR_ERR(clk); +> >+ ret = PTR_ERR(clk); > >+ return ret; ->=20 +> > return PTR_ERR(clk); ->=20 +> > so you can get rid of the 'int ret' variable. Absolutely. Good spot. @@ -141,7 +137,7 @@ Absolutely. Good spot. > >+ return -EINVAL; > >+ } > >+ -> >+ ddata.clk =3D clk; +> >+ ddata.clk = clk; > >+ > >+ return 0; > >+} @@ -151,19 +147,19 @@ Absolutely. Good spot. > >+ int ret; > >+ uint32_t mode; > >+ -> >+ ret =3D of_property_read_u32(np, "st,lpc-mode", &mode); +> >+ ret = of_property_read_u32(np, "st,lpc-mode", &mode); > >+ if (ret) { > >+ pr_err("clksrc-st-lpc: An LPC mode must be provided\n"); > >+ return; > >+ } > >+ > >+ /* LPC can either run as a Clocksource or in RTC or WDT mode */ -> >+ if (mode !=3D ST_LPC_MODE_CLKSRC) +> >+ if (mode != ST_LPC_MODE_CLKSRC) > >+ return; ->=20 +> > I am confused with this patch description + comment and the patch > 1's description. ->=20 +> > For the former, I understand the LPC could be in RTC or WDT mode and > used as a clocksource (clksrc + rtc / clksrc + wdt), for the latter > I understand there are three modes clocksource, rtc and watchdog @@ -173,7 +169,7 @@ They are all mutually exclusive. I will fix-up the commit log to re-enforce this. > >+ -> >+ ddata.base =3D of_iomap(np, 0); +> >+ ddata.base = of_iomap(np, 0); > >+ if (!ddata.base) { > >+ pr_err("clksrc-st-lpc: Unable to map iomem\n"); > >+ return; @@ -194,24 +190,11 @@ re-enforce this. > >+} > >+CLOCKSOURCE_OF_DECLARE(ddata, "st,stih407-lpc", st_clksrc_of_register); > > ->=20 ->=20 +> +> ---=20 +-- Lee Jones Linaro STMicroelectronics Landing Team Lead -Linaro.org =E2=94=82 Open source software for ARM SoCs +Linaro.org │ Open source software for ARM SoCs Follow Linaro: Facebook | Twitter | Blog - ---=20 ---=20 -You received this message because you are subscribed to "rtc-linux". -Membership options at http://groups.google.com/group/rtc-linux . -Please read http://groups.google.com/group/rtc-linux/web/checklist -before submitting a driver. ----=20 -You received this message because you are subscribed to the Google Groups "= -rtc-linux" group. -To unsubscribe from this group and stop receiving emails from it, send an e= -mail to rtc-linux+unsubscribe@googlegroups.com. -For more options, visit https://groups.google.com/d/optout. diff --git a/a/content_digest b/N4/content_digest index a23bca2..2092b59 100644 --- a/a/content_digest +++ b/N4/content_digest @@ -2,7 +2,7 @@ "ref\01431005924-21777-3-git-send-email-lee.jones@linaro.org\0" "ref\055506B87.3070807@linaro.org\0" "From\0Lee Jones <lee.jones@linaro.org>\0" - "Subject\0[rtc-linux] Re: [PATCH 02/12] clocksource: sti: Provide support for the ST LPC Clocksource IP\0" + "Subject\0Re: [PATCH 02/12] clocksource: sti: Provide support for the ST LPC Clocksource IP\0" "Date\0Mon, 11 May 2015 11:53:47 +0100\0" "To\0Daniel Lezcano <daniel.lezcano@linaro.org>\0" "Cc\0linux-arm-kernel@lists.infradead.org" @@ -30,8 +30,7 @@ "> >---\n" "> > drivers/clocksource/Kconfig | 8 +++\n" "> > drivers/clocksource/Makefile | 1 +\n" - "> > drivers/clocksource/clksrc_st_lpc.c | 123 ++++++++++++++++++++++++++++=\n" - "++++++++\n" + "> > drivers/clocksource/clksrc_st_lpc.c | 123 ++++++++++++++++++++++++++++++++++++\n" "> > 3 files changed, 132 insertions(+)\n" "> > create mode 100644 drivers/clocksource/clksrc_st_lpc.c\n" "> >\n" @@ -56,24 +55,21 @@ "> >index 752d5c7..e08da4d 100644\n" "> >--- a/drivers/clocksource/Makefile\n" "> >+++ b/drivers/clocksource/Makefile\n" - "> >@@ -51,3 +51,4 @@ obj-$(CONFIG_ARCH_INTEGRATOR_AP)\t+=3D timer-integrator=\n" - "-ap.o\n" - "> > obj-$(CONFIG_CLKSRC_VERSATILE)\t\t+=3D versatile.o\n" - "> > obj-$(CONFIG_CLKSRC_MIPS_GIC)\t\t+=3D mips-gic-timer.o\n" - "> > obj-$(CONFIG_ASM9260_TIMER)\t\t+=3D asm9260_timer.o\n" - "> >+obj-$(CONFIG_CLKSRC_ST_LPC)\t\t+=3D clksrc_st_lpc.o\n" - "> >diff --git a/drivers/clocksource/clksrc_st_lpc.c b/drivers/clocksource/c=\n" - "lksrc_st_lpc.c\n" + "> >@@ -51,3 +51,4 @@ obj-$(CONFIG_ARCH_INTEGRATOR_AP)\t+= timer-integrator-ap.o\n" + "> > obj-$(CONFIG_CLKSRC_VERSATILE)\t\t+= versatile.o\n" + "> > obj-$(CONFIG_CLKSRC_MIPS_GIC)\t\t+= mips-gic-timer.o\n" + "> > obj-$(CONFIG_ASM9260_TIMER)\t\t+= asm9260_timer.o\n" + "> >+obj-$(CONFIG_CLKSRC_ST_LPC)\t\t+= clksrc_st_lpc.o\n" + "> >diff --git a/drivers/clocksource/clksrc_st_lpc.c b/drivers/clocksource/clksrc_st_lpc.c\n" "> >new file mode 100644\n" "> >index 0000000..18a7dcd0\n" "> >--- /dev/null\n" "> >+++ b/drivers/clocksource/clksrc_st_lpc.c\n" "> >@@ -0,0 +1,123 @@\n" "> >+/*\n" - "> >+ * Clocksource using the Low Power Timer found in the Low Power Control=\n" - "ler (LPC)\n" + "> >+ * Clocksource using the Low Power Timer found in the Low Power Controller (LPC)\n" "> >+ *\n" - "> >+ * Copyright (C) 2015 STMicroelectronics =E2=80=93 All Rights Reserved\n" + "> >+ * Copyright (C) 2015 STMicroelectronics \342\200\223 All Rights Reserved\n" "> >+ *\n" "> >+ * Author(s): Francesco Virlinzi <francesco.virlinzi@st.com>\n" "> >+ *\t Ajit Pal Singh <ajitpal.singh@st.com>\n" @@ -117,9 +113,9 @@ "> >+\n" "> >+\tst_clksrc_reset();\n" "> >+\n" - "> >+\trate =3D clk_get_rate(ddata.clk);\n" + "> >+\trate = clk_get_rate(ddata.clk);\n" "> >+\n" - "> >+\tret =3D clocksource_mmio_init(ddata.base + LPC_LPT_LSB_OFF,\n" + "> >+\tret = clocksource_mmio_init(ddata.base + LPC_LPT_LSB_OFF,\n" "> >+\t\t\t\t \"clksrc-st-lpc\", rate, 300, 32,\n" "> >+\t\t\t\t clocksource_mmio_readl_up);\n" "> >+\tif (ret) {\n" @@ -135,14 +131,14 @@ "> >+\tstruct clk *clk;\n" "> >+\tint ret;\n" "> >+\n" - "> >+\tclk =3D of_clk_get(np, 0);\n" + "> >+\tclk = of_clk_get(np, 0);\n" "> >+\tif (IS_ERR(clk)) {\n" "> >+\t\tpr_err(\"clksrc-st-lpc: Failed to get LPC clock\\n\");\n" - "> >+\t\tret =3D PTR_ERR(clk);\n" + "> >+\t\tret = PTR_ERR(clk);\n" "> >+\t\treturn ret;\n" - ">=20\n" + "> \n" "> return PTR_ERR(clk);\n" - ">=20\n" + "> \n" "> so you can get rid of the 'int ret' variable.\n" "\n" "Absolutely. Good spot.\n" @@ -160,7 +156,7 @@ "> >+\t\treturn -EINVAL;\n" "> >+\t}\n" "> >+\n" - "> >+\tddata.clk =3D clk;\n" + "> >+\tddata.clk = clk;\n" "> >+\n" "> >+\treturn 0;\n" "> >+}\n" @@ -170,19 +166,19 @@ "> >+\tint ret;\n" "> >+\tuint32_t mode;\n" "> >+\n" - "> >+\tret =3D of_property_read_u32(np, \"st,lpc-mode\", &mode);\n" + "> >+\tret = of_property_read_u32(np, \"st,lpc-mode\", &mode);\n" "> >+\tif (ret) {\n" "> >+\t\tpr_err(\"clksrc-st-lpc: An LPC mode must be provided\\n\");\n" "> >+\t\treturn;\n" "> >+\t}\n" "> >+\n" "> >+\t/* LPC can either run as a Clocksource or in RTC or WDT mode */\n" - "> >+\tif (mode !=3D ST_LPC_MODE_CLKSRC)\n" + "> >+\tif (mode != ST_LPC_MODE_CLKSRC)\n" "> >+\t\treturn;\n" - ">=20\n" + "> \n" "> I am confused with this patch description + comment and the patch\n" "> 1's description.\n" - ">=20\n" + "> \n" "> For the former, I understand the LPC could be in RTC or WDT mode and\n" "> used as a clocksource (clksrc + rtc / clksrc + wdt), for the latter\n" "> I understand there are three modes clocksource, rtc and watchdog\n" @@ -192,7 +188,7 @@ "re-enforce this.\n" "\n" "> >+\n" - "> >+\tddata.base =3D of_iomap(np, 0);\n" + "> >+\tddata.base = of_iomap(np, 0);\n" "> >+\tif (!ddata.base) {\n" "> >+\t\tpr_err(\"clksrc-st-lpc: Unable to map iomem\\n\");\n" "> >+\t\treturn;\n" @@ -213,26 +209,13 @@ "> >+}\n" "> >+CLOCKSOURCE_OF_DECLARE(ddata, \"st,stih407-lpc\", st_clksrc_of_register);\n" "> >\n" - ">=20\n" - ">=20\n" + "> \n" + "> \n" "\n" - "--=20\n" + "-- \n" "Lee Jones\n" "Linaro STMicroelectronics Landing Team Lead\n" - "Linaro.org =E2=94=82 Open source software for ARM SoCs\n" - "Follow Linaro: Facebook | Twitter | Blog\n" - "\n" - "--=20\n" - "--=20\n" - "You received this message because you are subscribed to \"rtc-linux\".\n" - "Membership options at http://groups.google.com/group/rtc-linux .\n" - "Please read http://groups.google.com/group/rtc-linux/web/checklist\n" - "before submitting a driver.\n" - "---=20\n" - "You received this message because you are subscribed to the Google Groups \"=\n" - "rtc-linux\" group.\n" - "To unsubscribe from this group and stop receiving emails from it, send an e=\n" - "mail to rtc-linux+unsubscribe@googlegroups.com.\n" - For more options, visit https://groups.google.com/d/optout. + "Linaro.org \342\224\202 Open source software for ARM SoCs\n" + Follow Linaro: Facebook | Twitter | Blog -c575003e1f1e05dbf27f52dd365d827a415d93e5d1c88ca714454db48227ce9c +e419a7d75a5c14c75844d8e8c8680aaf68e135fb680e43399a738b697c9333ca
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.