diff for duplicates of <1507189072.5452.67.camel@aj.id.au> diff --git a/a/1.txt b/N1/1.txt index b197149..64fc377 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: > The majority of the clocks in the system are gates paired with a reset > controller that holds the IP in reset. -> +>? > This borrows from clk_hw_register_gate, but registers two 'gates', one > to control the clock enable register and the other to control the reset > IP. This allows us to enforce the ordering: -> -> 1. Place IP in reset -> 2. Enable clock -> 3. Delay -> 4. Release reset -> +>? +> ?1. Place IP in reset +> ?2. Enable clock +> ?3. Delay +> ?4. Release reset +>? > There are some gates that do not have an associated reset; these are > handled by using -1 as the index for the reset. -> +>? > Signed-off-by: Joel Stanley <joel@jms.id.au> -> +>? > --- > v4: -> - Drop useless 'disable clock' comment -> - Drop CLK_IS_BASIC flag -> - Fix 'there are a number of clocks...' comment -> - Pass device to clk registration functions -> - Check for errors when registering clk_hws +> ?- Drop useless 'disable clock' comment +> ?- Drop CLK_IS_BASIC flag +> ?- Fix 'there are a number of clocks...' comment +> ?- Pass device to clk registration functions +> ?- Check for errors when registering clk_hws > v3: -> - Remove gates offset as gates are now at the start of the list +> ?- Remove gates offset as gates are now at the start of the list > --- -> drivers/clk/clk-aspeed.c | 130 +++++++++++++++++++++++++++++++++++++++++++++++ -> 1 file changed, 130 insertions(+) -> +> ?drivers/clk/clk-aspeed.c | 130 +++++++++++++++++++++++++++++++++++++++++++++++ +> ?1 file changed, 130 insertions(+) +>? > diff --git a/drivers/clk/clk-aspeed.c b/drivers/clk/clk-aspeed.c > index adb295292189..a424b056e767 100644 > --- a/drivers/clk/clk-aspeed.c > +++ b/drivers/clk/clk-aspeed.c > @@ -228,6 +228,107 @@ static const struct aspeed_clk_soc_data ast2400_data = { -> .calc_pll = aspeed_ast2400_calc_pll, -> }; -> +> ? .calc_pll = aspeed_ast2400_calc_pll, +> ?}; +> ? > +static int aspeed_clk_enable(struct clk_hw *hw) > +{ > + struct aspeed_clk_gate *gate = to_aspeed_clk_gate(hw); @@ -147,31 +147,31 @@ Acked-by: Andrew Jeffery <andrew@aj.id.au> > + return hw; > +} > + -> static int aspeed_clk_probe(struct platform_device *pdev) -> { -> const struct aspeed_clk_soc_data *soc_data; +> ?static int aspeed_clk_probe(struct platform_device *pdev) +> ?{ +> ? const struct aspeed_clk_soc_data *soc_data; > @@ -235,6 +336,7 @@ static int aspeed_clk_probe(struct platform_device *pdev) -> struct regmap *map; -> struct clk_hw *hw; -> u32 val, rate; +> ? struct regmap *map; +> ? struct clk_hw *hw; +> ? u32 val, rate; > + int i; -> -> map = syscon_node_to_regmap(dev->of_node); -> if (IS_ERR(map)) { +> ? +> ? map = syscon_node_to_regmap(dev->of_node); +> ? if (IS_ERR(map)) { > @@ -323,6 +425,34 @@ static int aspeed_clk_probe(struct platform_device *pdev) -> return PTR_ERR(hw); -> aspeed_clk_data->hws[ASPEED_CLK_BCLK] = hw; -> +> ? return PTR_ERR(hw); +> ? aspeed_clk_data->hws[ASPEED_CLK_BCLK] = hw; +> ? > + /* -> + * TODO: There are a number of clocks that not included in this driver -> + * as more information is required: -> + * D2-PLL -> + * D-PLL -> + * YCLK -> + * RGMII -> + * RMII -> + * UART[1..5] clock source mux -> + */ +> + ?* TODO: There are a number of clocks that not included in this driver +> + ?* as more information is required: +> + ?*???D2-PLL +> + ?*???D-PLL +> + ?*???YCLK +> + ?*???RGMII +> + ?*???RMII +> + ?*???UART[1..5] clock source mux +> + ?*/ > + > + for (i = 0; i < ARRAY_SIZE(aspeed_gates); i++) { > + const struct aspeed_gate_data *gd = &aspeed_gates[i]; @@ -190,6 +190,13 @@ Acked-by: Andrew Jeffery <andrew@aj.id.au> > + aspeed_clk_data->hws[i] = hw; > + } > + -> return 0; -> }; -> +> ? return 0; +> ?}; +> ? +-------------- 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/716a881a/attachment.sig> diff --git a/a/2.bin b/a/2.bin deleted file mode 100644 index c8ec956..0000000 --- a/a/2.bin +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIcBAABCgAGBQJZ1eFQAAoJEJ0dnzgO5LT5zigP/jTaCMcU/Me3Ykiw6fZAv02z -Jm+37vhC41qTGb8u73FblkrKPYjqvThI2Seafqtzt+7se0mEcegQWO5uqwAaUGYv -DWY34azfQUdXi4sDtBAHUUYAYXK2HSljZ1bBFh3QN6NrQZKrOxemILNBKKC9/IUB -wjQlmqACEiGZ/BP/G/wlMF2RBBtXKLDLCrsfyotVi0W4ddJ/q2f4URuzEZIrrJA7 -GTbaa7wnr1N7fJpg+w7hwmaKG8OPDb6hEFM1M5CTLvDFOQ+/y+5b1cvG4kqqp7BO -wGLRD59Nn+XGOUL22hc6oz0xF01jN/HnboNFJK25qqvkC3nXRbqxYdvcE0Blx3YQ -y/PS+bgtEcayJOQ0eUIk15FPtkf/1EQo8oL4UE1C+s7F7g76dcGAjhp5T+3Oaydl -CYO44Qc8s+arx86+iqN0VeTep3vIs4FFyGD9KD9wDbz/8nLAKqKXBT+C1i0Hg/IX -p4U0pLIDs0DySbEpvRwfE1KZkJEt/UYvglSij9hakpJOs1/XrRQKcxFLx8GbedrC -T+K7xypauv7IidP3DCsVcSbDi3Hcl52lldKtnsbMu+FDgPBgIL0+GoZbNLYZ1TyD -6GDQDojyFttc/Urk5YPHJ5vtldxAMPvFFDG3USP8AA56suQeobMBPUbsvU0dWL+e -LLYktgo/GDPUlzqjbh7L -=0t2R ------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 86270c9..5c2ce3b 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-5-joel@jms.id.au\0" - "From\0Andrew Jeffery <andrew@aj.id.au>\0" - "Subject\0Re: [PATCH v4 4/5] clk: aspeed: Register gated clocks\0" + "From\0andrew@aj.id.au (Andrew Jeffery)\0" + "Subject\0[PATCH v4 4/5] clk: aspeed: Register gated clocks\0" "Date\0Thu, 05 Oct 2017 18:07:52 +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" "> The majority of the clocks in the system are gates paired with a reset\n" "> controller that holds the IP in reset.\n" - ">\302\240\n" + ">?\n" "> This borrows from clk_hw_register_gate, but registers two 'gates', one\n" "> to control the clock enable register and the other to control the reset\n" "> IP. This allows us to enforce the ordering:\n" - ">\302\240\n" - "> \302\2401. Place IP in reset\n" - "> \302\2402. Enable clock\n" - "> \302\2403. Delay\n" - "> \302\2404. Release reset\n" - ">\302\240\n" + ">?\n" + "> ?1. Place IP in reset\n" + "> ?2. Enable clock\n" + "> ?3. Delay\n" + "> ?4. Release reset\n" + ">?\n" "> There are some gates that do not have an associated reset; these are\n" "> handled by using -1 as the index for the reset.\n" - ">\302\240\n" + ">?\n" "> Signed-off-by: Joel Stanley <joel@jms.id.au>\n" - ">\302\240\n" + ">?\n" "> ---\n" "> v4:\n" - "> \302\240- Drop useless 'disable clock' comment\n" - "> \302\240- Drop CLK_IS_BASIC flag\n" - "> \302\240- Fix 'there are a number of clocks...' comment\n" - "> \302\240- Pass device to clk registration functions\n" - "> \302\240- Check for errors when registering clk_hws\n" + "> ?- Drop useless 'disable clock' comment\n" + "> ?- Drop CLK_IS_BASIC flag\n" + "> ?- Fix 'there are a number of clocks...' comment\n" + "> ?- Pass device to clk registration functions\n" + "> ?- Check for errors when registering clk_hws\n" "> v3:\n" - "> \302\240- Remove gates offset as gates are now at the start of the list\n" + "> ?- Remove gates offset as gates are now at the start of the list\n" "> ---\n" - "> \302\240drivers/clk/clk-aspeed.c | 130 +++++++++++++++++++++++++++++++++++++++++++++++\n" - "> \302\2401 file changed, 130 insertions(+)\n" - ">\302\240\n" + "> ?drivers/clk/clk-aspeed.c | 130 +++++++++++++++++++++++++++++++++++++++++++++++\n" + "> ?1 file changed, 130 insertions(+)\n" + ">?\n" "> diff --git a/drivers/clk/clk-aspeed.c b/drivers/clk/clk-aspeed.c\n" "> index adb295292189..a424b056e767 100644\n" "> --- a/drivers/clk/clk-aspeed.c\n" "> +++ b/drivers/clk/clk-aspeed.c\n" "> @@ -228,6 +228,107 @@ static const struct aspeed_clk_soc_data ast2400_data = {\n" - "> \302\240\t.calc_pll = aspeed_ast2400_calc_pll,\n" - "> \302\240};\n" - "> \302\240\n" + "> ?\t.calc_pll = aspeed_ast2400_calc_pll,\n" + "> ?};\n" + "> ?\n" "> +static int aspeed_clk_enable(struct clk_hw *hw)\n" "> +{\n" "> +\tstruct aspeed_clk_gate *gate = to_aspeed_clk_gate(hw);\n" @@ -166,31 +155,31 @@ "> +\treturn hw;\n" "> +}\n" "> +\n" - "> \302\240static int aspeed_clk_probe(struct platform_device *pdev)\n" - "> \302\240{\n" - "> \302\240\tconst struct aspeed_clk_soc_data *soc_data;\n" + "> ?static int aspeed_clk_probe(struct platform_device *pdev)\n" + "> ?{\n" + "> ?\tconst struct aspeed_clk_soc_data *soc_data;\n" "> @@ -235,6 +336,7 @@ static int aspeed_clk_probe(struct platform_device *pdev)\n" - "> \302\240\tstruct regmap *map;\n" - "> \302\240\tstruct clk_hw *hw;\n" - "> \302\240\tu32 val, rate;\n" + "> ?\tstruct regmap *map;\n" + "> ?\tstruct clk_hw *hw;\n" + "> ?\tu32 val, rate;\n" "> +\tint i;\n" - "> \302\240\n" - "> \302\240\tmap = syscon_node_to_regmap(dev->of_node);\n" - "> \302\240\tif (IS_ERR(map)) {\n" + "> ?\n" + "> ?\tmap = syscon_node_to_regmap(dev->of_node);\n" + "> ?\tif (IS_ERR(map)) {\n" "> @@ -323,6 +425,34 @@ static int aspeed_clk_probe(struct platform_device *pdev)\n" - "> \302\240\t\treturn PTR_ERR(hw);\n" - "> \302\240\taspeed_clk_data->hws[ASPEED_CLK_BCLK] = hw;\n" - "> \302\240\n" + "> ?\t\treturn PTR_ERR(hw);\n" + "> ?\taspeed_clk_data->hws[ASPEED_CLK_BCLK] = hw;\n" + "> ?\n" "> +\t/*\n" - "> +\t\302\240* TODO: There are a number of clocks that not included in this driver\n" - "> +\t\302\240* as more information is required:\n" - "> +\t\302\240*\302\240\302\240\302\240D2-PLL\n" - "> +\t\302\240*\302\240\302\240\302\240D-PLL\n" - "> +\t\302\240*\302\240\302\240\302\240YCLK\n" - "> +\t\302\240*\302\240\302\240\302\240RGMII\n" - "> +\t\302\240*\302\240\302\240\302\240RMII\n" - "> +\t\302\240*\302\240\302\240\302\240UART[1..5] clock source mux\n" - "> +\t\302\240*/\n" + "> +\t?* TODO: There are a number of clocks that not included in this driver\n" + "> +\t?* as more information is required:\n" + "> +\t?*???D2-PLL\n" + "> +\t?*???D-PLL\n" + "> +\t?*???YCLK\n" + "> +\t?*???RGMII\n" + "> +\t?*???RMII\n" + "> +\t?*???UART[1..5] clock source mux\n" + "> +\t?*/\n" "> +\n" "> +\tfor (i = 0; i < ARRAY_SIZE(aspeed_gates); i++) {\n" "> +\t\tconst struct aspeed_gate_data *gd = &aspeed_gates[i];\n" @@ -209,28 +198,15 @@ "> +\t\taspeed_clk_data->hws[i] = hw;\n" "> +\t}\n" "> +\n" - "> \302\240\treturn 0;\n" - "> \302\240};\n" - > - "\01:2\0" - "fn\0signature.asc\0" - "d\0This is a digitally signed message part\0" - "b\0" - "-----BEGIN PGP SIGNATURE-----\n" - "\n" - "iQIcBAABCgAGBQJZ1eFQAAoJEJ0dnzgO5LT5zigP/jTaCMcU/Me3Ykiw6fZAv02z\n" - "Jm+37vhC41qTGb8u73FblkrKPYjqvThI2Seafqtzt+7se0mEcegQWO5uqwAaUGYv\n" - "DWY34azfQUdXi4sDtBAHUUYAYXK2HSljZ1bBFh3QN6NrQZKrOxemILNBKKC9/IUB\n" - "wjQlmqACEiGZ/BP/G/wlMF2RBBtXKLDLCrsfyotVi0W4ddJ/q2f4URuzEZIrrJA7\n" - "GTbaa7wnr1N7fJpg+w7hwmaKG8OPDb6hEFM1M5CTLvDFOQ+/y+5b1cvG4kqqp7BO\n" - "wGLRD59Nn+XGOUL22hc6oz0xF01jN/HnboNFJK25qqvkC3nXRbqxYdvcE0Blx3YQ\n" - "y/PS+bgtEcayJOQ0eUIk15FPtkf/1EQo8oL4UE1C+s7F7g76dcGAjhp5T+3Oaydl\n" - "CYO44Qc8s+arx86+iqN0VeTep3vIs4FFyGD9KD9wDbz/8nLAKqKXBT+C1i0Hg/IX\n" - "p4U0pLIDs0DySbEpvRwfE1KZkJEt/UYvglSij9hakpJOs1/XrRQKcxFLx8GbedrC\n" - "T+K7xypauv7IidP3DCsVcSbDi3Hcl52lldKtnsbMu+FDgPBgIL0+GoZbNLYZ1TyD\n" - "6GDQDojyFttc/Urk5YPHJ5vtldxAMPvFFDG3USP8AA56suQeobMBPUbsvU0dWL+e\n" - "LLYktgo/GDPUlzqjbh7L\n" - "=0t2R\n" - "-----END PGP SIGNATURE-----\n" + "> ?\treturn 0;\n" + "> ?};\n" + "> ?\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/716a881a/attachment.sig> -c3453b59fec7de66b8054d49267bd88227df19dc075f66a183e1c96d434037d7 +83b6dbe06ae5f781c0465230fec8843a3fe20ec01e95aafc1c9cb6b0b715c0e2
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.