diff for duplicates of <20150526123943.GI11677@x1> diff --git a/a/1.txt b/N1/1.txt index 7c69be1..ccf4bd1 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -31,24 +31,21 @@ diff --git a/drivers/clocksource/Makefile b/drivers/clocksource/Makefile 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/clks= -rc_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..f38cf33 --- /dev/null +++ b/drivers/clocksource/clksrc_st_lpc.c @@ -0,0 +1,123 @@ +/* -+ * Clocksource using the Low Power Timer found in the Low Power Controller= - (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> @@ -92,9 +89,9 @@ index 0000000..f38cf33 + + 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) { @@ -109,7 +106,7 @@ index 0000000..f38cf33 +{ + struct clk *clk; + -+ 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"); + return PTR_ERR(clk); @@ -126,7 +123,7 @@ index 0000000..f38cf33 + return -EINVAL; + } + -+ ddata.clk =3D clk; ++ ddata.clk = clk; + + return 0; +} @@ -136,17 +133,17 @@ index 0000000..f38cf33 + 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; + -+ 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; @@ -168,16 +165,7 @@ index 0000000..f38cf33 + clk_get_rate(ddata.clk)); +} +CLOCKSOURCE_OF_DECLARE(ddata, "st,stih407-lpc", st_clksrc_of_register); - ---=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 1f22320..b4c1e9a 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,7 +1,7 @@ "ref\01431435500-22899-1-git-send-email-lee.jones@linaro.org\0" "ref\01431435500-22899-3-git-send-email-lee.jones@linaro.org\0" "From\0Lee Jones <lee.jones@linaro.org>\0" - "Subject\0[rtc-linux] [PATCH v2.1 02/12] clocksource: sti: Provide support for the ST LPC Clocksource IP\0" + "Subject\0[PATCH v2.1 02/12] clocksource: sti: Provide support for the ST LPC Clocksource IP\0" "Date\0Tue, 26 May 2015 13:39:43 +0100\0" "To\0linux-arm-kernel@lists.infradead.org" linux-kernel@vger.kernel.org @@ -49,24 +49,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-ap=\n" - ".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/clks=\n" - "rc_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..f38cf33\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 Controller=\n" - " (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" @@ -110,9 +107,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" @@ -127,7 +124,7 @@ "+{\n" "+\tstruct clk *clk;\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\treturn PTR_ERR(clk);\n" @@ -144,7 +141,7 @@ "+\t\treturn -EINVAL;\n" "+\t}\n" "+\n" - "+\tddata.clk =3D clk;\n" + "+\tddata.clk = clk;\n" "+\n" "+\treturn 0;\n" "+}\n" @@ -154,17 +151,17 @@ "+\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" - "+\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" @@ -186,18 +183,9 @@ "+\t\tclk_get_rate(ddata.clk));\n" "+}\n" "+CLOCKSOURCE_OF_DECLARE(ddata, \"st,stih407-lpc\", st_clksrc_of_register);\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 -5004cc6679324a578ea423f75280272cc43da47026d09508ac44020c68b606d8 +cc4e43389d1d1157ca075ba0a6a2ec27b285a7dbcb8f2bc4c6d0fe5e471e698d
diff --git a/a/1.txt b/N2/1.txt index 7c69be1..d646747 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -31,24 +31,21 @@ diff --git a/drivers/clocksource/Makefile b/drivers/clocksource/Makefile 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/clks= -rc_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..f38cf33 --- /dev/null +++ b/drivers/clocksource/clksrc_st_lpc.c @@ -0,0 +1,123 @@ +/* -+ * Clocksource using the Low Power Timer found in the Low Power Controller= - (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> @@ -92,9 +89,9 @@ index 0000000..f38cf33 + + 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) { @@ -109,7 +106,7 @@ index 0000000..f38cf33 +{ + struct clk *clk; + -+ 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"); + return PTR_ERR(clk); @@ -126,7 +123,7 @@ index 0000000..f38cf33 + return -EINVAL; + } + -+ ddata.clk =3D clk; ++ ddata.clk = clk; + + return 0; +} @@ -136,17 +133,17 @@ index 0000000..f38cf33 + 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; + -+ 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; @@ -168,16 +165,3 @@ index 0000000..f38cf33 + clk_get_rate(ddata.clk)); +} +CLOCKSOURCE_OF_DECLARE(ddata, "st,stih407-lpc", st_clksrc_of_register); - ---=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 1f22320..4586084 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,19 +1,9 @@ "ref\01431435500-22899-1-git-send-email-lee.jones@linaro.org\0" "ref\01431435500-22899-3-git-send-email-lee.jones@linaro.org\0" - "From\0Lee Jones <lee.jones@linaro.org>\0" - "Subject\0[rtc-linux] [PATCH v2.1 02/12] clocksource: sti: Provide support for the ST LPC Clocksource IP\0" + "From\0lee.jones@linaro.org (Lee Jones)\0" + "Subject\0[PATCH v2.1 02/12] clocksource: sti: Provide support for the ST LPC Clocksource IP\0" "Date\0Tue, 26 May 2015 13:39:43 +0100\0" - "To\0linux-arm-kernel@lists.infradead.org" - linux-kernel@vger.kernel.org - devicetree@vger.kernel.org - daniel.lezcano@linaro.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" - "Cc\0kernel@stlinux.com\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "clocksource: sti: Provide support for the ST LPC Clocksource IP\n" @@ -49,24 +39,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-ap=\n" - ".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/clks=\n" - "rc_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..f38cf33\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 Controller=\n" - " (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" @@ -110,9 +97,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" @@ -127,7 +114,7 @@ "+{\n" "+\tstruct clk *clk;\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\treturn PTR_ERR(clk);\n" @@ -144,7 +131,7 @@ "+\t\treturn -EINVAL;\n" "+\t}\n" "+\n" - "+\tddata.clk =3D clk;\n" + "+\tddata.clk = clk;\n" "+\n" "+\treturn 0;\n" "+}\n" @@ -154,17 +141,17 @@ "+\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" - "+\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" @@ -185,19 +172,6 @@ "+\tpr_info(\"clksrc-st-lpc: clocksource initialised - running @ %luHz\\n\",\n" "+\t\tclk_get_rate(ddata.clk));\n" "+}\n" - "+CLOCKSOURCE_OF_DECLARE(ddata, \"st,stih407-lpc\", st_clksrc_of_register);\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. + "+CLOCKSOURCE_OF_DECLARE(ddata, \"st,stih407-lpc\", st_clksrc_of_register);" -5004cc6679324a578ea423f75280272cc43da47026d09508ac44020c68b606d8 +9b445f5e7807429e59f99ab0b2be3261665a53443a433b18b7135ae64860b823
diff --git a/a/1.txt b/N3/1.txt index 7c69be1..f1186ac 100644 --- a/a/1.txt +++ b/N3/1.txt @@ -31,24 +31,21 @@ diff --git a/drivers/clocksource/Makefile b/drivers/clocksource/Makefile 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/clks= -rc_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..f38cf33 --- /dev/null +++ b/drivers/clocksource/clksrc_st_lpc.c @@ -0,0 +1,123 @@ +/* -+ * Clocksource using the Low Power Timer found in the Low Power Controller= - (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> @@ -92,9 +89,9 @@ index 0000000..f38cf33 + + 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) { @@ -109,7 +106,7 @@ index 0000000..f38cf33 +{ + struct clk *clk; + -+ 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"); + return PTR_ERR(clk); @@ -126,7 +123,7 @@ index 0000000..f38cf33 + return -EINVAL; + } + -+ ddata.clk =3D clk; ++ ddata.clk = clk; + + return 0; +} @@ -136,17 +133,17 @@ index 0000000..f38cf33 + 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; + -+ 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; @@ -169,15 +166,7 @@ index 0000000..f38cf33 +} +CLOCKSOURCE_OF_DECLARE(ddata, "st,stih407-lpc", st_clksrc_of_register); ---=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. +_______________________________________________ +linux-arm-kernel mailing list +linux-arm-kernel@lists.infradead.org +http://lists.infradead.org/mailman/listinfo/linux-arm-kernel diff --git a/a/content_digest b/N3/content_digest index 1f22320..b378517 100644 --- a/a/content_digest +++ b/N3/content_digest @@ -1,7 +1,7 @@ "ref\01431435500-22899-1-git-send-email-lee.jones@linaro.org\0" "ref\01431435500-22899-3-git-send-email-lee.jones@linaro.org\0" "From\0Lee Jones <lee.jones@linaro.org>\0" - "Subject\0[rtc-linux] [PATCH v2.1 02/12] clocksource: sti: Provide support for the ST LPC Clocksource IP\0" + "Subject\0[PATCH v2.1 02/12] clocksource: sti: Provide support for the ST LPC Clocksource IP\0" "Date\0Tue, 26 May 2015 13:39:43 +0100\0" "To\0linux-arm-kernel@lists.infradead.org" linux-kernel@vger.kernel.org @@ -49,24 +49,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-ap=\n" - ".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/clks=\n" - "rc_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..f38cf33\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 Controller=\n" - " (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" @@ -110,9 +107,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" @@ -127,7 +124,7 @@ "+{\n" "+\tstruct clk *clk;\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\treturn PTR_ERR(clk);\n" @@ -144,7 +141,7 @@ "+\t\treturn -EINVAL;\n" "+\t}\n" "+\n" - "+\tddata.clk =3D clk;\n" + "+\tddata.clk = clk;\n" "+\n" "+\treturn 0;\n" "+}\n" @@ -154,17 +151,17 @@ "+\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" - "+\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" @@ -187,17 +184,9 @@ "+}\n" "+CLOCKSOURCE_OF_DECLARE(ddata, \"st,stih407-lpc\", st_clksrc_of_register);\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" + "linux-arm-kernel mailing list\n" + "linux-arm-kernel@lists.infradead.org\n" + http://lists.infradead.org/mailman/listinfo/linux-arm-kernel -5004cc6679324a578ea423f75280272cc43da47026d09508ac44020c68b606d8 +46a821cd452ce51e7d2ee65f05dbc7dc5ee4643595622283ae2fc3f059ac8df0
diff --git a/a/1.txt b/N4/1.txt index 7c69be1..4c9306f 100644 --- a/a/1.txt +++ b/N4/1.txt @@ -31,24 +31,21 @@ diff --git a/drivers/clocksource/Makefile b/drivers/clocksource/Makefile 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/clks= -rc_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..f38cf33 --- /dev/null +++ b/drivers/clocksource/clksrc_st_lpc.c @@ -0,0 +1,123 @@ +/* -+ * Clocksource using the Low Power Timer found in the Low Power Controller= - (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> @@ -92,9 +89,9 @@ index 0000000..f38cf33 + + 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) { @@ -109,7 +106,7 @@ index 0000000..f38cf33 +{ + struct clk *clk; + -+ 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"); + return PTR_ERR(clk); @@ -126,7 +123,7 @@ index 0000000..f38cf33 + return -EINVAL; + } + -+ ddata.clk =3D clk; ++ ddata.clk = clk; + + return 0; +} @@ -136,17 +133,17 @@ index 0000000..f38cf33 + 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; + -+ 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; @@ -168,16 +165,3 @@ index 0000000..f38cf33 + clk_get_rate(ddata.clk)); +} +CLOCKSOURCE_OF_DECLARE(ddata, "st,stih407-lpc", st_clksrc_of_register); - ---=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 1f22320..53c250b 100644 --- a/a/content_digest +++ b/N4/content_digest @@ -1,7 +1,7 @@ "ref\01431435500-22899-1-git-send-email-lee.jones@linaro.org\0" "ref\01431435500-22899-3-git-send-email-lee.jones@linaro.org\0" "From\0Lee Jones <lee.jones@linaro.org>\0" - "Subject\0[rtc-linux] [PATCH v2.1 02/12] clocksource: sti: Provide support for the ST LPC Clocksource IP\0" + "Subject\0[PATCH v2.1 02/12] clocksource: sti: Provide support for the ST LPC Clocksource IP\0" "Date\0Tue, 26 May 2015 13:39:43 +0100\0" "To\0linux-arm-kernel@lists.infradead.org" linux-kernel@vger.kernel.org @@ -49,24 +49,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-ap=\n" - ".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/clks=\n" - "rc_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..f38cf33\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 Controller=\n" - " (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" @@ -110,9 +107,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" @@ -127,7 +124,7 @@ "+{\n" "+\tstruct clk *clk;\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\treturn PTR_ERR(clk);\n" @@ -144,7 +141,7 @@ "+\t\treturn -EINVAL;\n" "+\t}\n" "+\n" - "+\tddata.clk =3D clk;\n" + "+\tddata.clk = clk;\n" "+\n" "+\treturn 0;\n" "+}\n" @@ -154,17 +151,17 @@ "+\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" - "+\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" @@ -185,19 +182,6 @@ "+\tpr_info(\"clksrc-st-lpc: clocksource initialised - running @ %luHz\\n\",\n" "+\t\tclk_get_rate(ddata.clk));\n" "+}\n" - "+CLOCKSOURCE_OF_DECLARE(ddata, \"st,stih407-lpc\", st_clksrc_of_register);\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. + "+CLOCKSOURCE_OF_DECLARE(ddata, \"st,stih407-lpc\", st_clksrc_of_register);" -5004cc6679324a578ea423f75280272cc43da47026d09508ac44020c68b606d8 +2a8b9909b12a53d9fbe55a8ca9210581ee2703942c6d2726cacc9a49ce7a1c28
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.