diff for duplicates of <8761epwgni.fsf@free.fr> diff --git a/a/1.txt b/N1/1.txt index f7d4595..79e664b 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -35,11 +35,3 @@ Cheers. -- Robert - --------------- next part -------------- -A non-text attachment was scrubbed... -Name: 0001-clk-pxa-add-missing-clocks-for-Irda-and-sa1100-rtc.patch -Type: text/x-diff -Size: 1945 bytes -Desc: not available -URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20141108/d3e8e121/attachment.bin> diff --git a/N1/2.hdr b/N1/2.hdr new file mode 100644 index 0000000..77db3be --- /dev/null +++ b/N1/2.hdr @@ -0,0 +1,3 @@ +Content-Type: text/x-diff +Content-Disposition: inline; + filename=0001-clk-pxa-add-missing-clocks-for-Irda-and-sa1100-rtc.patch diff --git a/N1/2.txt b/N1/2.txt new file mode 100644 index 0000000..66f86ec --- /dev/null +++ b/N1/2.txt @@ -0,0 +1,63 @@ +>From c36803b312621c1a69d2d6aed000ae7ee11da588 Mon Sep 17 00:00:00 2001 +From: Robert Jarzmik <robert.jarzmik@free.fr> +Date: Sat, 8 Nov 2014 21:46:51 +0100 +Subject: [PATCH] clk: pxa: add missing clocks for Irda and sa1100-rtc + +Add 2 clocks which were erronously forgotten by the clock framework +port, namely : + - sa1100-rtc + - irda for pxa2xx-ir:UARTCLK + +Signed-off-by: Robert Jarzmik <robert.jarzmik@free.fr> +--- + drivers/clk/pxa/clk-pxa27x.c | 28 ++++++++++++++++++++++++++++ + 1 file changed, 28 insertions(+) + +diff --git a/drivers/clk/pxa/clk-pxa27x.c b/drivers/clk/pxa/clk-pxa27x.c +index 2b8343a..611879b 100644 +--- a/drivers/clk/pxa/clk-pxa27x.c ++++ b/drivers/clk/pxa/clk-pxa27x.c +@@ -353,6 +353,33 @@ static u8 clk_pxa27x_memory_get_parent(struct clk_hw *hw) + PARENTS(clk_pxa27x_memory) = { "osc_13mhz", "system_bus", "run" }; + MUX_RO_RATE_RO_OPS(clk_pxa27x_memory, "memory"); + ++#define DUMMY_CLK(_con_id, _dev_id, _parent) \ ++ { .con_id = _con_id, .dev_id = _dev_id, .parent = _parent } ++struct dummy_clk { ++ const char *con_id; ++ const char *dev_id; ++ const char *parent; ++}; ++static struct dummy_clk dummy_clks[] __initdata = { ++ DUMMY_CLK(NULL, "sa1100-rtc", "osc_32_768khz"), ++ DUMMY_CLK("UARTCLK", "pxa2xx-ir", "STUART"), ++}; ++ ++static void __init pxa27x_dummy_clocks_init(void) ++{ ++ struct clk *clk; ++ struct dummy_clk *d; ++ const char *name; ++ int i; ++ ++ for (i = 0; i < ARRAY_SIZE(dummy_clks); i++) { ++ d = &dummy_clks[i]; ++ name = d->dev_id ? d->dev_id : d->con_id; ++ clk = clk_register_fixed_factor(NULL, name, d->parent, 0, 1, 1); ++ clk_register_clkdev(clk, d->con_id, d->dev_id); ++ } ++} ++ + static void __init pxa27x_base_clocks_init(void) + { + pxa27x_register_plls(); +@@ -365,6 +392,7 @@ static void __init pxa27x_base_clocks_init(void) + int __init pxa27x_clocks_init(void) + { + pxa27x_base_clocks_init(); ++ pxa27x_dummy_clocks_init(); + return clk_pxa_cken_init(pxa27x_clocks, ARRAY_SIZE(pxa27x_clocks)); + } + +-- +2.1.0 diff --git a/a/content_digest b/N1/content_digest index 87e9d60..acf82d7 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -2,11 +2,18 @@ "ref\0CALT56yOCBN1NAfNw=vThVZ_o=ONGOTvzKHBH5tCTQShJY0wkrQ@mail.gmail.com\0" "ref\087lhnlwqm4.fsf@free.fr\0" "ref\0CALT56yNOXq-ssvsjafz=ae+uWv1GyscoQ3RQ_h--i740zm4trA@mail.gmail.com\0" - "From\0robert.jarzmik@free.fr (Robert Jarzmik)\0" - "Subject\0[PATCH v1 0/3] Transition pxa25x clock to common clocks\0" + "From\0Robert Jarzmik <robert.jarzmik@free.fr>\0" + "Subject\0Re: [PATCH v1 0/3] Transition pxa25x clock to common clocks\0" "Date\0Sat, 08 Nov 2014 22:01:37 +0100\0" - "To\0linux-arm-kernel@lists.infradead.org\0" - "\00:1\0" + "To\0Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>\0" + "Cc\0Haojian Zhuang <haojian.zhuang@gmail.com>" + Mike Turquette <mturquette@linaro.org> + Marek Vasut <marek.vasut@gmail.com> + Ian Molton <ian.molton@codethink.co.uk> + linux-arm-kernel <linux-arm-kernel@lists.infradead.org> + Daniel Mack <zonque@gmail.com> + " kernel list <linux-kernel@vger.kernel.org>\0" + "\01:1\0" "b\0" "Dmitry Eremin-Solenikov <dbaryshkov@gmail.com> writes:\n" "\n" @@ -44,14 +51,72 @@ "Cheers.\n" "\n" "-- \n" - "Robert\n" - "\n" - "-------------- next part --------------\n" - "A non-text attachment was scrubbed...\n" - "Name: 0001-clk-pxa-add-missing-clocks-for-Irda-and-sa1100-rtc.patch\n" - "Type: text/x-diff\n" - "Size: 1945 bytes\n" - "Desc: not available\n" - URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20141108/d3e8e121/attachment.bin> + Robert + "\01:2\0" + "fn\00001-clk-pxa-add-missing-clocks-for-Irda-and-sa1100-rtc.patch\0" + "b\0" + ">From c36803b312621c1a69d2d6aed000ae7ee11da588 Mon Sep 17 00:00:00 2001\n" + "From: Robert Jarzmik <robert.jarzmik@free.fr>\n" + "Date: Sat, 8 Nov 2014 21:46:51 +0100\n" + "Subject: [PATCH] clk: pxa: add missing clocks for Irda and sa1100-rtc\n" + "\n" + "Add 2 clocks which were erronously forgotten by the clock framework\n" + "port, namely :\n" + " - sa1100-rtc\n" + " - irda for pxa2xx-ir:UARTCLK\n" + "\n" + "Signed-off-by: Robert Jarzmik <robert.jarzmik@free.fr>\n" + "---\n" + " drivers/clk/pxa/clk-pxa27x.c | 28 ++++++++++++++++++++++++++++\n" + " 1 file changed, 28 insertions(+)\n" + "\n" + "diff --git a/drivers/clk/pxa/clk-pxa27x.c b/drivers/clk/pxa/clk-pxa27x.c\n" + "index 2b8343a..611879b 100644\n" + "--- a/drivers/clk/pxa/clk-pxa27x.c\n" + "+++ b/drivers/clk/pxa/clk-pxa27x.c\n" + "@@ -353,6 +353,33 @@ static u8 clk_pxa27x_memory_get_parent(struct clk_hw *hw)\n" + " PARENTS(clk_pxa27x_memory) = { \"osc_13mhz\", \"system_bus\", \"run\" };\n" + " MUX_RO_RATE_RO_OPS(clk_pxa27x_memory, \"memory\");\n" + " \n" + "+#define DUMMY_CLK(_con_id, _dev_id, _parent) \\\n" + "+\t{ .con_id = _con_id, .dev_id = _dev_id, .parent = _parent }\n" + "+struct dummy_clk {\n" + "+\tconst char *con_id;\n" + "+\tconst char *dev_id;\n" + "+\tconst char *parent;\n" + "+};\n" + "+static struct dummy_clk dummy_clks[] __initdata = {\n" + "+\tDUMMY_CLK(NULL, \"sa1100-rtc\", \"osc_32_768khz\"),\n" + "+\tDUMMY_CLK(\"UARTCLK\", \"pxa2xx-ir\", \"STUART\"),\n" + "+};\n" + "+\n" + "+static void __init pxa27x_dummy_clocks_init(void)\n" + "+{\n" + "+\tstruct clk *clk;\n" + "+\tstruct dummy_clk *d;\n" + "+\tconst char *name;\n" + "+\tint i;\n" + "+\n" + "+\tfor (i = 0; i < ARRAY_SIZE(dummy_clks); i++) {\n" + "+\t\td = &dummy_clks[i];\n" + "+\t\tname = d->dev_id ? d->dev_id : d->con_id;\n" + "+\t\tclk = clk_register_fixed_factor(NULL, name, d->parent, 0, 1, 1);\n" + "+\t\tclk_register_clkdev(clk, d->con_id, d->dev_id);\n" + "+\t}\n" + "+}\n" + "+\n" + " static void __init pxa27x_base_clocks_init(void)\n" + " {\n" + " \tpxa27x_register_plls();\n" + "@@ -365,6 +392,7 @@ static void __init pxa27x_base_clocks_init(void)\n" + " int __init pxa27x_clocks_init(void)\n" + " {\n" + " \tpxa27x_base_clocks_init();\n" + "+\tpxa27x_dummy_clocks_init();\n" + " \treturn clk_pxa_cken_init(pxa27x_clocks, ARRAY_SIZE(pxa27x_clocks));\n" + " }\n" + " \n" + "-- \n" + 2.1.0 -6265c5ddfdad5fe78940892a736742b3c01944270bf1a70a76c1874b46a0f2e3 +998eb767706a7a6dfb45a1a1d62b3f28eef043c90613c5908a8716b3e2cce872
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.