diff for duplicates of <1507188151.5452.65.camel@aj.id.au> diff --git a/a/1.txt b/N1/1.txt index 5ba22f6..ae70113 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -1,42 +1,42 @@ On Tue, 2017-10-03 at 17:25 +1030, Joel Stanley wrote: > This registers a platform driver to set up all of the non-core clocks. -> +>? > The clocks that have configurable rates are now registered. -> +>? > Signed-off-by: Joel Stanley <joel@jms.id.au> -> +>? > -- > v4: -> - Add eclk div table to fix ast2500 calculation -> - Add defines to document the BIT() macros -> - Pass dev where we can when registering clocks -> - Check for errors when registering clk_hws +> ?- Add eclk div table to fix ast2500 calculation +> ?- Add defines to document the BIT() macros +> ?- Pass dev where we can when registering clocks +> ?- Check for errors when registering clk_hws > v3: -> - Fix bclk and eclk calculation -> - Seperate out ast2400 and ast25000 for pll calculation -> +> ?- Fix bclk and eclk calculation +> ?- Seperate out ast2400 and ast25000 for pll calculation +>? > Signed-off-by: Joel Stanley <joel@jms.id.au> > --- -> drivers/clk/clk-aspeed.c | 163 +++++++++++++++++++++++++++++++++++++++++++++++ -> 1 file changed, 163 insertions(+) -> +> ?drivers/clk/clk-aspeed.c | 163 +++++++++++++++++++++++++++++++++++++++++++++++ +> ?1 file changed, 163 insertions(+) +>? > diff --git a/drivers/clk/clk-aspeed.c b/drivers/clk/clk-aspeed.c > index d39cf51a5114..adb295292189 100644 > --- a/drivers/clk/clk-aspeed.c > +++ b/drivers/clk/clk-aspeed.c > @@ -14,6 +14,8 @@ -> #include <linux/clk-provider.h> -> #include <linux/mfd/syscon.h> -> #include <linux/of_address.h> +> ?#include <linux/clk-provider.h> +> ?#include <linux/mfd/syscon.h> +> ?#include <linux/of_address.h> > +#include <linux/of_device.h> > +#include <linux/platform_device.h> -> #include <linux/regmap.h> -> #include <linux/slab.h> -> #include <linux/spinlock.h> +> ?#include <linux/regmap.h> +> ?#include <linux/slab.h> +> ?#include <linux/spinlock.h> > @@ -114,6 +116,32 @@ static const struct aspeed_gate_data aspeed_gates[] __initconst = { -> [ASPEED_CLK_GATE_LHCCLK] = { 28, -1, "lhclk-gate", "lhclk", 0 }, /* LPC master/LPC+ */ -> }; -> +> ? [ASPEED_CLK_GATE_LHCCLK] = { 28, -1, "lhclk-gate", "lhclk", 0 }, /* LPC master/LPC+ */ +> ?}; +> ? > +static const char * const eclk_parents[] = {"d1pll", "hpll", "mpll"}; Hate to throw a spanner in the works, but I think we need some extra bits here @@ -72,13 +72,13 @@ datasheet. > + { 0 } > +}; > + -> static const struct clk_div_table ast2400_div_table[] = { -> { 0x0, 2 }, -> { 0x1, 4 }, +> ?static const struct clk_div_table ast2400_div_table[] = { +> ? { 0x0, 2 }, +> ? { 0x1, 4 }, > @@ -179,6 +207,141 @@ static struct clk_hw *aspeed_ast2500_calc_pll(const char *name, u32 val) -> mult, div); -> } -> +> ? mult, div); +> ?} +> ? > +struct aspeed_clk_soc_data { > + const struct clk_div_table *div_table; > + const struct clk_div_table *mac_div_table; @@ -141,9 +141,9 @@ frequency" function, so the name might be inappropriate. > + aspeed_clk_data->hws[ASPEED_CLK_UART] = hw; > + > + /* -> + * Memory controller (M-PLL) PLL. This clock is configured by the -> + * bootloader, and is exposed to Linux as a read-only clock rate. -> + */ +> + ?* Memory controller (M-PLL) PLL. This clock is configured by the +> + ?* bootloader, and is exposed to Linux as a read-only clock rate. +> + ?*/ > + regmap_read(map, ASPEED_MPLL_PARAM, &val); > + hw = soc_data->calc_pll("mpll", val); > + if (IS_ERR(hw)) @@ -218,7 +218,7 @@ See my comment on the eclk_parents table above. > +}; > + > +static struct platform_driver aspeed_clk_driver = { -> + .probe = aspeed_clk_probe, +> + .probe??= aspeed_clk_probe, > + .driver = { > + .name = "aspeed-clk", > + .of_match_table = aspeed_clk_dt_ids, @@ -227,10 +227,17 @@ See my comment on the eclk_parents table above. > +}; > +builtin_platform_driver(aspeed_clk_driver); > + -> static void __init aspeed_ast2400_cc(struct regmap *map) -> { -> struct clk_hw *hw; +> ?static void __init aspeed_ast2400_cc(struct regmap *map) +> ?{ +> ? struct clk_hw *hw; Cheers, Andrew +-------------- next part -------------- +A non-text attachment was scrubbed... +Name: signature.asc +Type: application/pgp-signature +Size: 801 bytes +Desc: This is a digitally signed message part +URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20171005/82c465d9/attachment.sig> diff --git a/a/2.bin b/a/2.bin deleted file mode 100644 index f945f35..0000000 --- a/a/2.bin +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIcBAABCgAGBQJZ1d23AAoJEJ0dnzgO5LT5p0MP/0hGb5GQnrI17GqEKpHRGzIN -t1VULYPPY6kIgxz4KtdXW2ItkPbCht67S4+VgbiVwiyFhmLh6OgFrpK6+bdpC5eD -8CCIgQelWo54zJK9wj0dAgXd+TcbqYx0hNNWCGPMtIpo10sPyvJ0Vxo3MNhd93/p -ohc26z/7UiQH92xpcfGRxeTrFNHWnrsj7JcN6gBDyr63sd+RfwzcTwYsCiumh8Vf -WSIeogUudpPc3uDOgREo/TK7PFkqJF1yqquYNL1+xpkKek+FJF1hiCpI49tqKYBP -/RKisZKy+7rbWrSAbM8gNp7evwO1gzVnuLFYKBENnSxyRyb3eQrChfof6pUZrl52 -6t/mSit5ig19p4MnyrAbcRGvpCgCvj1L7pYmmv9qD5u74B4f9xZmFTCl1HbB9NUF -mnQAKEpvUGpeFrwK8N3zEcPUVOD+esecMICchyGFpluCOFVemnaUbQdFO1aJk+S2 -8aSosYV6zfrIFCThfpq5BnaBeaR4iIsch5nOYhrMMcNJ2ogGfi5lob6j6uUHSM24 -c74U8fcT9T76Ijf6L+RRN+vdkghTanAXUp66AIt5b2CFCtVqlFnP91O9pThQAxUa -U8pZ3BBzSCBBCPu8XyKQGeK2tkHGe3f4dHgpIP/Fd8w7QnFAalT2CA8nTmeIWtPk -2K1yWdfk6RV7ftCOEVIx -=Ri7g ------END PGP SIGNATURE----- diff --git a/a/2.hdr b/a/2.hdr deleted file mode 100644 index da6d245..0000000 --- a/a/2.hdr +++ /dev/null @@ -1,3 +0,0 @@ -Content-Type: application/pgp-signature; name="signature.asc" -Content-Description: This is a digitally signed message part -Content-Transfer-Encoding: 7bit diff --git a/a/content_digest b/N1/content_digest index 57f4c67..130ad79 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,61 +1,50 @@ "ref\020171003065540.11722-1-joel@jms.id.au\0" "ref\020171003065540.11722-4-joel@jms.id.au\0" - "From\0Andrew Jeffery <andrew@aj.id.au>\0" - "Subject\0Re: [PATCH v4 3/5] clk: aspeed: Add platform driver and register PLLs\0" + "From\0andrew@aj.id.au (Andrew Jeffery)\0" + "Subject\0[PATCH v4 3/5] clk: aspeed: Add platform driver and register PLLs\0" "Date\0Thu, 05 Oct 2017 17:52:31 +1030\0" - "To\0Joel Stanley <joel@jms.id.au>" - Lee Jones <lee.jones@linaro.org> - Michael Turquette <mturquette@baylibre.com> - " Stephen Boyd <sboyd@codeaurora.org>\0" - "Cc\0linux-kernel@vger.kernel.org" - linux-clk@vger.kernel.org - linux-arm-kernel@lists.infradead.org - Benjamin Herrenschmidt <benh@kernel.crashing.org> - Jeremy Kerr <jk@ozlabs.org> - Rick Altherr <raltherr@google.com> - Ryan Chen <ryan_chen@aspeedtech.com> - " Arnd Bergmann <arnd@arndb.de>\0" - "\01:1\0" + "To\0linux-arm-kernel@lists.infradead.org\0" + "\00:1\0" "b\0" "On Tue, 2017-10-03 at 17:25 +1030, Joel Stanley wrote:\n" "> This registers a platform driver to set up all of the non-core clocks.\n" - ">\302\240\n" + ">?\n" "> The clocks that have configurable rates are now registered.\n" - ">\302\240\n" + ">?\n" "> Signed-off-by: Joel Stanley <joel@jms.id.au>\n" - ">\302\240\n" + ">?\n" "> --\n" "> v4:\n" - "> \302\240- Add eclk div table to fix ast2500 calculation\n" - "> \302\240- Add defines to document the BIT() macros\n" - "> \302\240- Pass dev where we can when registering clocks\n" - "> \302\240- Check for errors when registering clk_hws\n" + "> ?- Add eclk div table to fix ast2500 calculation\n" + "> ?- Add defines to document the BIT() macros\n" + "> ?- Pass dev where we can when registering clocks\n" + "> ?- Check for errors when registering clk_hws\n" "> v3:\n" - "> \302\240- Fix bclk and eclk calculation\n" - "> \302\240- Seperate out ast2400 and ast25000 for pll calculation\n" - ">\302\240\n" + "> ?- Fix bclk and eclk calculation\n" + "> ?- Seperate out ast2400 and ast25000 for pll calculation\n" + ">?\n" "> Signed-off-by: Joel Stanley <joel@jms.id.au>\n" "> ---\n" - "> \302\240drivers/clk/clk-aspeed.c | 163 +++++++++++++++++++++++++++++++++++++++++++++++\n" - "> \302\2401 file changed, 163 insertions(+)\n" - ">\302\240\n" + "> ?drivers/clk/clk-aspeed.c | 163 +++++++++++++++++++++++++++++++++++++++++++++++\n" + "> ?1 file changed, 163 insertions(+)\n" + ">?\n" "> diff --git a/drivers/clk/clk-aspeed.c b/drivers/clk/clk-aspeed.c\n" "> index d39cf51a5114..adb295292189 100644\n" "> --- a/drivers/clk/clk-aspeed.c\n" "> +++ b/drivers/clk/clk-aspeed.c\n" "> @@ -14,6 +14,8 @@\n" - "> \302\240#include <linux/clk-provider.h>\n" - "> \302\240#include <linux/mfd/syscon.h>\n" - "> \302\240#include <linux/of_address.h>\n" + "> ?#include <linux/clk-provider.h>\n" + "> ?#include <linux/mfd/syscon.h>\n" + "> ?#include <linux/of_address.h>\n" "> +#include <linux/of_device.h>\n" "> +#include <linux/platform_device.h>\n" - "> \302\240#include <linux/regmap.h>\n" - "> \302\240#include <linux/slab.h>\n" - "> \302\240#include <linux/spinlock.h>\n" + "> ?#include <linux/regmap.h>\n" + "> ?#include <linux/slab.h>\n" + "> ?#include <linux/spinlock.h>\n" "> @@ -114,6 +116,32 @@ static const struct aspeed_gate_data aspeed_gates[] __initconst = {\n" - "> \302\240\t[ASPEED_CLK_GATE_LHCCLK] =\t{ 28, -1, \"lhclk-gate\",\t\t\"lhclk\", 0 }, /* LPC master/LPC+ */\n" - "> \302\240};\n" - "> \302\240\n" + "> ?\t[ASPEED_CLK_GATE_LHCCLK] =\t{ 28, -1, \"lhclk-gate\",\t\t\"lhclk\", 0 }, /* LPC master/LPC+ */\n" + "> ?};\n" + "> ?\n" "> +static const char * const eclk_parents[] = {\"d1pll\", \"hpll\", \"mpll\"};\n" "\n" "Hate to throw a spanner in the works, but I think we need some extra bits here\n" @@ -91,13 +80,13 @@ "> +\t{ 0 }\n" "> +};\n" "> +\n" - "> \302\240static const struct clk_div_table ast2400_div_table[] = {\n" - "> \302\240\t{ 0x0, 2 },\n" - "> \302\240\t{ 0x1, 4 },\n" + "> ?static const struct clk_div_table ast2400_div_table[] = {\n" + "> ?\t{ 0x0, 2 },\n" + "> ?\t{ 0x1, 4 },\n" "> @@ -179,6 +207,141 @@ static struct clk_hw *aspeed_ast2500_calc_pll(const char *name, u32 val)\n" - "> \302\240\t\t\tmult, div);\n" - "> \302\240}\n" - "> \302\240\n" + "> ?\t\t\tmult, div);\n" + "> ?}\n" + "> ?\n" "> +struct aspeed_clk_soc_data {\n" "> +\tconst struct clk_div_table *div_table;\n" "> +\tconst struct clk_div_table *mac_div_table;\n" @@ -160,9 +149,9 @@ "> +\taspeed_clk_data->hws[ASPEED_CLK_UART] = hw;\n" "> +\n" "> +\t/*\n" - "> +\t\302\240* Memory controller (M-PLL) PLL. This clock is configured by the\n" - "> +\t\302\240* bootloader, and is exposed to Linux as a read-only clock rate.\n" - "> +\t\302\240*/\n" + "> +\t?* Memory controller (M-PLL) PLL. This clock is configured by the\n" + "> +\t?* bootloader, and is exposed to Linux as a read-only clock rate.\n" + "> +\t?*/\n" "> +\tregmap_read(map, ASPEED_MPLL_PARAM, &val);\n" "> +\thw = soc_data->calc_pll(\"mpll\", val);\n" "> +\tif (IS_ERR(hw))\n" @@ -237,7 +226,7 @@ "> +};\n" "> +\n" "> +static struct platform_driver aspeed_clk_driver = {\n" - "> +\t.probe\302\240\302\240= aspeed_clk_probe,\n" + "> +\t.probe??= aspeed_clk_probe,\n" "> +\t.driver = {\n" "> +\t\t.name = \"aspeed-clk\",\n" "> +\t\t.of_match_table = aspeed_clk_dt_ids,\n" @@ -246,32 +235,19 @@ "> +};\n" "> +builtin_platform_driver(aspeed_clk_driver);\n" "> +\n" - "> \302\240static void __init aspeed_ast2400_cc(struct regmap *map)\n" - "> \302\240{\n" - "> \302\240\tstruct clk_hw *hw;\n" + "> ?static void __init aspeed_ast2400_cc(struct regmap *map)\n" + "> ?{\n" + "> ?\tstruct clk_hw *hw;\n" "\n" "Cheers,\n" "\n" - Andrew - "\01:2\0" - "fn\0signature.asc\0" - "d\0This is a digitally signed message part\0" - "b\0" - "-----BEGIN PGP SIGNATURE-----\n" - "\n" - "iQIcBAABCgAGBQJZ1d23AAoJEJ0dnzgO5LT5p0MP/0hGb5GQnrI17GqEKpHRGzIN\n" - "t1VULYPPY6kIgxz4KtdXW2ItkPbCht67S4+VgbiVwiyFhmLh6OgFrpK6+bdpC5eD\n" - "8CCIgQelWo54zJK9wj0dAgXd+TcbqYx0hNNWCGPMtIpo10sPyvJ0Vxo3MNhd93/p\n" - "ohc26z/7UiQH92xpcfGRxeTrFNHWnrsj7JcN6gBDyr63sd+RfwzcTwYsCiumh8Vf\n" - "WSIeogUudpPc3uDOgREo/TK7PFkqJF1yqquYNL1+xpkKek+FJF1hiCpI49tqKYBP\n" - "/RKisZKy+7rbWrSAbM8gNp7evwO1gzVnuLFYKBENnSxyRyb3eQrChfof6pUZrl52\n" - "6t/mSit5ig19p4MnyrAbcRGvpCgCvj1L7pYmmv9qD5u74B4f9xZmFTCl1HbB9NUF\n" - "mnQAKEpvUGpeFrwK8N3zEcPUVOD+esecMICchyGFpluCOFVemnaUbQdFO1aJk+S2\n" - "8aSosYV6zfrIFCThfpq5BnaBeaR4iIsch5nOYhrMMcNJ2ogGfi5lob6j6uUHSM24\n" - "c74U8fcT9T76Ijf6L+RRN+vdkghTanAXUp66AIt5b2CFCtVqlFnP91O9pThQAxUa\n" - "U8pZ3BBzSCBBCPu8XyKQGeK2tkHGe3f4dHgpIP/Fd8w7QnFAalT2CA8nTmeIWtPk\n" - "2K1yWdfk6RV7ftCOEVIx\n" - "=Ri7g\n" - "-----END PGP SIGNATURE-----\n" + "Andrew\n" + "-------------- next part --------------\n" + "A non-text attachment was scrubbed...\n" + "Name: signature.asc\n" + "Type: application/pgp-signature\n" + "Size: 801 bytes\n" + "Desc: This is a digitally signed message part\n" + URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20171005/82c465d9/attachment.sig> -dfedb66e974f7fc4fe3a384002e4f74ebbcedfd2009769b7d7135cad21cb9e77 +9a8ebfe3181b8bd509e39f508166b3fa148e758d70110bd80c9cefd0baf9da79
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.