diff for duplicates of <55506B87.3070807@linaro.org> diff --git a/a/1.txt b/N1/1.txt index 149cb0d..65d72c1 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -9,8 +9,7 @@ On 05/07/2015 03:38 PM, Lee Jones 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 > @@ -35,24 +34,21 @@ On 05/07/2015 03:38 PM, Lee Jones 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/cl= -ksrc_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 Controll= -er (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> @@ -96,9 +92,9 @@ er (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) { @@ -114,10 +110,10 @@ er (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; return PTR_ERR(clk); @@ -137,7 +133,7 @@ so you can get rid of the 'int ret' variable. > + return -EINVAL; > + } > + -> + ddata.clk =3D clk; +> + ddata.clk = clk; > + > + return 0; > +} @@ -147,26 +143,26 @@ so you can get rid of the 'int ret' variable. > + 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; -I am confused with this patch description + comment and the patch 1's=20 +I am confused with this patch description + comment and the patch 1's description. -For the former, I understand the LPC could be in RTC or WDT mode and=20 -used as a clocksource (clksrc + rtc / clksrc + wdt), for the latter I=20 -understand there are three modes clocksource, rtc and watchdog (mutually=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 (mutually exclusive). Could you clarify ? > + -> + 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; @@ -189,23 +185,14 @@ exclusive). Could you clarify ? > ---=20 - <http://www.linaro.org/> Linaro.org =E2=94=82 Open source software for AR= -M SoCs +-- + <http://www.linaro.org/> Linaro.org │ Open source software for ARM SoCs Follow Linaro: <http://www.facebook.com/pages/Linaro> Facebook | <http://twitter.com/#!/linaroorg> Twitter | <http://www.linaro.org/linaro-blog/> 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 ad369fd..f596a1b 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,7 +1,7 @@ "ref\01431005924-21777-1-git-send-email-lee.jones@linaro.org\0" "ref\01431005924-21777-3-git-send-email-lee.jones@linaro.org\0" "From\0Daniel Lezcano <daniel.lezcano@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 10:42:47 +0200\0" "To\0Lee Jones <lee.jones@linaro.org>" linux-arm-kernel@lists.infradead.org @@ -27,8 +27,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" @@ -53,24 +52,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/cl=\n" - "ksrc_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 Controll=\n" - "er (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" @@ -114,9 +110,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" @@ -132,10 +128,10 @@ "> +\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" "\n" "return PTR_ERR(clk);\n" @@ -155,7 +151,7 @@ "> +\t\treturn -EINVAL;\n" "> +\t}\n" "> +\n" - "> +\tddata.clk =3D clk;\n" + "> +\tddata.clk = clk;\n" "> +\n" "> +\treturn 0;\n" "> +}\n" @@ -165,26 +161,26 @@ "> +\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" "\n" - "I am confused with this patch description + comment and the patch 1's=20\n" + "I am confused with this patch description + comment and the patch 1's \n" "description.\n" "\n" - "For the former, I understand the LPC could be in RTC or WDT mode and=20\n" - "used as a clocksource (clksrc + rtc / clksrc + wdt), for the latter I=20\n" - "understand there are three modes clocksource, rtc and watchdog (mutually=20\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 I \n" + "understand there are three modes clocksource, rtc and watchdog (mutually \n" "exclusive). Could you clarify ?\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" @@ -207,25 +203,16 @@ ">\n" "\n" "\n" - "--=20\n" - " <http://www.linaro.org/> Linaro.org =E2=94=82 Open source software for AR=\n" - "M SoCs\n" + "-- \n" + " <http://www.linaro.org/> Linaro.org \342\224\202 Open source software for ARM SoCs\n" "\n" "Follow Linaro: <http://www.facebook.com/pages/Linaro> Facebook |\n" "<http://twitter.com/#!/linaroorg> Twitter |\n" "<http://www.linaro.org/linaro-blog/> 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 -0d0da1ee085084f5d5b30acbcdbe2b84ddd490353955d0f806934c73eb819f8b +0d0f2d16df39513306bc8f82d701a7a0f83b8769c338caf67314331e103a188d
diff --git a/a/1.txt b/N2/1.txt index 149cb0d..3071405 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -9,8 +9,7 @@ On 05/07/2015 03:38 PM, Lee Jones 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 > @@ -35,24 +34,21 @@ On 05/07/2015 03:38 PM, Lee Jones 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/cl= -ksrc_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 Controll= -er (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> @@ -96,9 +92,9 @@ er (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) { @@ -114,10 +110,10 @@ er (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; return PTR_ERR(clk); @@ -137,7 +133,7 @@ so you can get rid of the 'int ret' variable. > + return -EINVAL; > + } > + -> + ddata.clk =3D clk; +> + ddata.clk = clk; > + > + return 0; > +} @@ -147,26 +143,26 @@ so you can get rid of the 'int ret' variable. > + 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; -I am confused with this patch description + comment and the patch 1's=20 +I am confused with this patch description + comment and the patch 1's description. -For the former, I understand the LPC could be in RTC or WDT mode and=20 -used as a clocksource (clksrc + rtc / clksrc + wdt), for the latter I=20 -understand there are three modes clocksource, rtc and watchdog (mutually=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 (mutually exclusive). Could you clarify ? > + -> + 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; @@ -189,23 +185,9 @@ exclusive). Could you clarify ? > ---=20 - <http://www.linaro.org/> Linaro.org =E2=94=82 Open source software for AR= -M SoCs +-- + <http://www.linaro.org/> Linaro.org ? Open source software for ARM SoCs Follow Linaro: <http://www.facebook.com/pages/Linaro> Facebook | <http://twitter.com/#!/linaroorg> Twitter | <http://www.linaro.org/linaro-blog/> 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 ad369fd..7300151 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,19 +1,9 @@ "ref\01431005924-21777-1-git-send-email-lee.jones@linaro.org\0" "ref\01431005924-21777-3-git-send-email-lee.jones@linaro.org\0" - "From\0Daniel Lezcano <daniel.lezcano@linaro.org>\0" - "Subject\0[rtc-linux] Re: [PATCH 02/12] clocksource: sti: Provide support for the ST LPC Clocksource IP\0" + "From\0daniel.lezcano@linaro.org (Daniel Lezcano)\0" + "Subject\0[PATCH 02/12] clocksource: sti: Provide support for the ST LPC Clocksource IP\0" "Date\0Mon, 11 May 2015 10:42:47 +0200\0" - "To\0Lee Jones <lee.jones@linaro.org>" - linux-arm-kernel@lists.infradead.org - " linux-kernel@vger.kernel.org\0" - "Cc\0kernel@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 05/07/2015 03:38 PM, Lee Jones wrote:\n" @@ -27,8 +17,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" @@ -53,24 +42,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/cl=\n" - "ksrc_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 Controll=\n" - "er (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" @@ -114,9 +100,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" @@ -132,10 +118,10 @@ "> +\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" "\n" "return PTR_ERR(clk);\n" @@ -155,7 +141,7 @@ "> +\t\treturn -EINVAL;\n" "> +\t}\n" "> +\n" - "> +\tddata.clk =3D clk;\n" + "> +\tddata.clk = clk;\n" "> +\n" "> +\treturn 0;\n" "> +}\n" @@ -165,26 +151,26 @@ "> +\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" "\n" - "I am confused with this patch description + comment and the patch 1's=20\n" + "I am confused with this patch description + comment and the patch 1's \n" "description.\n" "\n" - "For the former, I understand the LPC could be in RTC or WDT mode and=20\n" - "used as a clocksource (clksrc + rtc / clksrc + wdt), for the latter I=20\n" - "understand there are three modes clocksource, rtc and watchdog (mutually=20\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 I \n" + "understand there are three modes clocksource, rtc and watchdog (mutually \n" "exclusive). Could you clarify ?\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" @@ -207,25 +193,11 @@ ">\n" "\n" "\n" - "--=20\n" - " <http://www.linaro.org/> Linaro.org =E2=94=82 Open source software for AR=\n" - "M SoCs\n" + "-- \n" + " <http://www.linaro.org/> Linaro.org ? Open source software for ARM SoCs\n" "\n" "Follow Linaro: <http://www.facebook.com/pages/Linaro> Facebook |\n" "<http://twitter.com/#!/linaroorg> Twitter |\n" - "<http://www.linaro.org/linaro-blog/> 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. + <http://www.linaro.org/linaro-blog/> Blog -0d0da1ee085084f5d5b30acbcdbe2b84ddd490353955d0f806934c73eb819f8b +c629e84e22a540dcd4c56488d80bcd2d961a654f7ec791d08807dfddfc1a8599
diff --git a/a/1.txt b/N3/1.txt index 149cb0d..629616c 100644 --- a/a/1.txt +++ b/N3/1.txt @@ -5,12 +5,11 @@ On 05/07/2015 03:38 PM, Lee Jones 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 > @@ -35,27 +34,24 @@ On 05/07/2015 03:38 PM, Lee Jones 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/cl= -ksrc_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 Controll= -er (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 @@ -96,9 +92,9 @@ er (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) { @@ -114,10 +110,10 @@ er (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; return PTR_ERR(clk); @@ -137,7 +133,7 @@ so you can get rid of the 'int ret' variable. > + return -EINVAL; > + } > + -> + ddata.clk =3D clk; +> + ddata.clk = clk; > + > + return 0; > +} @@ -147,26 +143,26 @@ so you can get rid of the 'int ret' variable. > + 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; -I am confused with this patch description + comment and the patch 1's=20 +I am confused with this patch description + comment and the patch 1's description. -For the former, I understand the LPC could be in RTC or WDT mode and=20 -used as a clocksource (clksrc + rtc / clksrc + wdt), for the latter I=20 -understand there are three modes clocksource, rtc and watchdog (mutually=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 (mutually exclusive). Could you clarify ? > + -> + 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; @@ -189,23 +185,14 @@ exclusive). Could you clarify ? > ---=20 - <http://www.linaro.org/> Linaro.org =E2=94=82 Open source software for AR= -M SoCs +-- + <http://www.linaro.org/> Linaro.org │ Open source software for ARM SoCs Follow Linaro: <http://www.facebook.com/pages/Linaro> Facebook | <http://twitter.com/#!/linaroorg> Twitter | <http://www.linaro.org/linaro-blog/> 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 ad369fd..6b48e5b 100644 --- a/a/content_digest +++ b/N3/content_digest @@ -1,19 +1,20 @@ "ref\01431005924-21777-1-git-send-email-lee.jones@linaro.org\0" "ref\01431005924-21777-3-git-send-email-lee.jones@linaro.org\0" - "From\0Daniel Lezcano <daniel.lezcano@linaro.org>\0" - "Subject\0[rtc-linux] Re: [PATCH 02/12] clocksource: sti: Provide support for the ST LPC Clocksource IP\0" + "ref\01431005924-21777-3-git-send-email-lee.jones-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org\0" + "From\0Daniel Lezcano <daniel.lezcano-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 10:42:47 +0200\0" - "To\0Lee Jones <lee.jones@linaro.org>" - linux-arm-kernel@lists.infradead.org - " linux-kernel@vger.kernel.org\0" - "Cc\0kernel@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\0Lee Jones <lee.jones-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>" + linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org + " linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org\0" + "Cc\0kernel-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 05/07/2015 03:38 PM, Lee Jones wrote:\n" @@ -23,12 +24,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" @@ -53,27 +53,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/cl=\n" - "ksrc_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 Controll=\n" - "er (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" @@ -114,9 +111,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" @@ -132,10 +129,10 @@ "> +\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" "\n" "return PTR_ERR(clk);\n" @@ -155,7 +152,7 @@ "> +\t\treturn -EINVAL;\n" "> +\t}\n" "> +\n" - "> +\tddata.clk =3D clk;\n" + "> +\tddata.clk = clk;\n" "> +\n" "> +\treturn 0;\n" "> +}\n" @@ -165,26 +162,26 @@ "> +\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" "\n" - "I am confused with this patch description + comment and the patch 1's=20\n" + "I am confused with this patch description + comment and the patch 1's \n" "description.\n" "\n" - "For the former, I understand the LPC could be in RTC or WDT mode and=20\n" - "used as a clocksource (clksrc + rtc / clksrc + wdt), for the latter I=20\n" - "understand there are three modes clocksource, rtc and watchdog (mutually=20\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 I \n" + "understand there are three modes clocksource, rtc and watchdog (mutually \n" "exclusive). Could you clarify ?\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" @@ -207,25 +204,16 @@ ">\n" "\n" "\n" - "--=20\n" - " <http://www.linaro.org/> Linaro.org =E2=94=82 Open source software for AR=\n" - "M SoCs\n" + "-- \n" + " <http://www.linaro.org/> Linaro.org \342\224\202 Open source software for ARM SoCs\n" "\n" "Follow Linaro: <http://www.facebook.com/pages/Linaro> Facebook |\n" "<http://twitter.com/#!/linaroorg> Twitter |\n" "<http://www.linaro.org/linaro-blog/> 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 -0d0da1ee085084f5d5b30acbcdbe2b84ddd490353955d0f806934c73eb819f8b +080c11cda512d56cee15496c1cb8c2d73d513b6eef95ac80082bbb19dfe066fe
diff --git a/a/1.txt b/N4/1.txt index 149cb0d..185b1b3 100644 --- a/a/1.txt +++ b/N4/1.txt @@ -9,8 +9,7 @@ On 05/07/2015 03:38 PM, Lee Jones 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 > @@ -35,24 +34,21 @@ On 05/07/2015 03:38 PM, Lee Jones 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/cl= -ksrc_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 Controll= -er (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> @@ -96,9 +92,9 @@ er (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) { @@ -114,10 +110,10 @@ er (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; return PTR_ERR(clk); @@ -137,7 +133,7 @@ so you can get rid of the 'int ret' variable. > + return -EINVAL; > + } > + -> + ddata.clk =3D clk; +> + ddata.clk = clk; > + > + return 0; > +} @@ -147,26 +143,26 @@ so you can get rid of the 'int ret' variable. > + 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; -I am confused with this patch description + comment and the patch 1's=20 +I am confused with this patch description + comment and the patch 1's description. -For the former, I understand the LPC could be in RTC or WDT mode and=20 -used as a clocksource (clksrc + rtc / clksrc + wdt), for the latter I=20 -understand there are three modes clocksource, rtc and watchdog (mutually=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 (mutually exclusive). Could you clarify ? > + -> + 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; @@ -189,23 +185,9 @@ exclusive). Could you clarify ? > ---=20 - <http://www.linaro.org/> Linaro.org =E2=94=82 Open source software for AR= -M SoCs +-- + <http://www.linaro.org/> Linaro.org │ Open source software for ARM SoCs Follow Linaro: <http://www.facebook.com/pages/Linaro> Facebook | <http://twitter.com/#!/linaroorg> Twitter | <http://www.linaro.org/linaro-blog/> 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 ad369fd..7a737c5 100644 --- a/a/content_digest +++ b/N4/content_digest @@ -1,7 +1,7 @@ "ref\01431005924-21777-1-git-send-email-lee.jones@linaro.org\0" "ref\01431005924-21777-3-git-send-email-lee.jones@linaro.org\0" "From\0Daniel Lezcano <daniel.lezcano@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 10:42:47 +0200\0" "To\0Lee Jones <lee.jones@linaro.org>" linux-arm-kernel@lists.infradead.org @@ -27,8 +27,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" @@ -53,24 +52,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/cl=\n" - "ksrc_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 Controll=\n" - "er (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" @@ -114,9 +110,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" @@ -132,10 +128,10 @@ "> +\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" "\n" "return PTR_ERR(clk);\n" @@ -155,7 +151,7 @@ "> +\t\treturn -EINVAL;\n" "> +\t}\n" "> +\n" - "> +\tddata.clk =3D clk;\n" + "> +\tddata.clk = clk;\n" "> +\n" "> +\treturn 0;\n" "> +}\n" @@ -165,26 +161,26 @@ "> +\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" "\n" - "I am confused with this patch description + comment and the patch 1's=20\n" + "I am confused with this patch description + comment and the patch 1's \n" "description.\n" "\n" - "For the former, I understand the LPC could be in RTC or WDT mode and=20\n" - "used as a clocksource (clksrc + rtc / clksrc + wdt), for the latter I=20\n" - "understand there are three modes clocksource, rtc and watchdog (mutually=20\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 I \n" + "understand there are three modes clocksource, rtc and watchdog (mutually \n" "exclusive). Could you clarify ?\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" @@ -207,25 +203,11 @@ ">\n" "\n" "\n" - "--=20\n" - " <http://www.linaro.org/> Linaro.org =E2=94=82 Open source software for AR=\n" - "M SoCs\n" + "-- \n" + " <http://www.linaro.org/> Linaro.org \342\224\202 Open source software for ARM SoCs\n" "\n" "Follow Linaro: <http://www.facebook.com/pages/Linaro> Facebook |\n" "<http://twitter.com/#!/linaroorg> Twitter |\n" - "<http://www.linaro.org/linaro-blog/> 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. + <http://www.linaro.org/linaro-blog/> Blog -0d0da1ee085084f5d5b30acbcdbe2b84ddd490353955d0f806934c73eb819f8b +432564ac52fde44c3df784c1d8dee6471d33e9c058b7faff8cdc235ddef29e88
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.