From: Andre Przywara <andre.przywara@arm.com> To: "Emilio López" <emilio@elopez.com.ar>, "Maxime Ripard" <maxime.ripard@free-electrons.com>, "Chen-Yu Tsai" <wens@csie.org> Cc: Michael Turquette <mturquette@baylibre.com>, Stephen Boyd <sboyd@codeaurora.org>, linux-clk@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-sunxi@googlegroups.com Subject: [PATCH] clk: sunxi: allow PLL6 clock to be reused Date: Mon, 22 Feb 2016 01:39:58 +0000 [thread overview] Message-ID: <1456105198-25295-1-git-send-email-andre.przywara@arm.com> (raw) Currently we hard-code the base name for the PLL6 clock for both the sun4i and sun6i variants in the driver (pll6 and pll6x2, respectively). This unfortunately denies reusing this clock for the H3 and A64 PLL8 clock, which is the same otherwise. Remove the hard-coded name in the source code and replace it with an appropriate index into the clock-output-names array in the DT. This is compatible with all current device trees, since they all carry the hard-coded base name in there. Signed-off-by: Andre Przywara <andre.przywara@arm.com> --- Salut Maxime, does that patch make sense? It fixes the re-usability problem while still keeping compatibility with existing DTs and also is pretty small. If you agree with this, I'll send out a v3 of the A64 series including this patch and the H3 PLL8 enablement later. I tested this on my BananaPi, the clk_summary output was identical with and without this patch. Cheers, Andre. drivers/clk/sunxi/clk-factors.c | 3 ++- drivers/clk/sunxi/clk-factors.h | 1 + drivers/clk/sunxi/clk-sunxi.c | 4 ++-- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/drivers/clk/sunxi/clk-factors.c b/drivers/clk/sunxi/clk-factors.c index ddefe96..7daf01d 100644 --- a/drivers/clk/sunxi/clk-factors.c +++ b/drivers/clk/sunxi/clk-factors.c @@ -202,7 +202,8 @@ struct clk *sunxi_factors_register(struct device_node *node, if (data->name) clk_name = data->name; else - of_property_read_string(node, "clock-output-names", &clk_name); + of_property_read_string_index(node, "clock-output-names", + data->name_idx, &clk_name); factors = kzalloc(sizeof(struct clk_factors), GFP_KERNEL); if (!factors) diff --git a/drivers/clk/sunxi/clk-factors.h b/drivers/clk/sunxi/clk-factors.h index 1e63c5b..3a7da86 100644 --- a/drivers/clk/sunxi/clk-factors.h +++ b/drivers/clk/sunxi/clk-factors.h @@ -36,6 +36,7 @@ struct factors_data { void (*getter)(struct factors_request *req); void (*recalc)(struct factors_request *req); const char *name; + int name_idx; }; struct clk_factors { diff --git a/drivers/clk/sunxi/clk-sunxi.c b/drivers/clk/sunxi/clk-sunxi.c index 99f60ef..53f5927 100644 --- a/drivers/clk/sunxi/clk-sunxi.c +++ b/drivers/clk/sunxi/clk-sunxi.c @@ -530,14 +530,14 @@ static const struct factors_data sun4i_pll6_data __initconst = { .enable = 31, .table = &sun4i_pll5_config, .getter = sun4i_get_pll5_factors, - .name = "pll6", + .name_idx = 2, }; static const struct factors_data sun6i_a31_pll6_data __initconst = { .enable = 31, .table = &sun6i_a31_pll6_config, .getter = sun6i_a31_get_pll6_factors, - .name = "pll6x2", + .name_idx = 1, }; static const struct factors_data sun5i_a13_ahb_data __initconst = { -- 1.8.4
WARNING: multiple messages have this Message-ID (diff)
From: andre.przywara@arm.com (Andre Przywara) To: linux-arm-kernel@lists.infradead.org Subject: [PATCH] clk: sunxi: allow PLL6 clock to be reused Date: Mon, 22 Feb 2016 01:39:58 +0000 [thread overview] Message-ID: <1456105198-25295-1-git-send-email-andre.przywara@arm.com> (raw) Currently we hard-code the base name for the PLL6 clock for both the sun4i and sun6i variants in the driver (pll6 and pll6x2, respectively). This unfortunately denies reusing this clock for the H3 and A64 PLL8 clock, which is the same otherwise. Remove the hard-coded name in the source code and replace it with an appropriate index into the clock-output-names array in the DT. This is compatible with all current device trees, since they all carry the hard-coded base name in there. Signed-off-by: Andre Przywara <andre.przywara@arm.com> --- Salut Maxime, does that patch make sense? It fixes the re-usability problem while still keeping compatibility with existing DTs and also is pretty small. If you agree with this, I'll send out a v3 of the A64 series including this patch and the H3 PLL8 enablement later. I tested this on my BananaPi, the clk_summary output was identical with and without this patch. Cheers, Andre. drivers/clk/sunxi/clk-factors.c | 3 ++- drivers/clk/sunxi/clk-factors.h | 1 + drivers/clk/sunxi/clk-sunxi.c | 4 ++-- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/drivers/clk/sunxi/clk-factors.c b/drivers/clk/sunxi/clk-factors.c index ddefe96..7daf01d 100644 --- a/drivers/clk/sunxi/clk-factors.c +++ b/drivers/clk/sunxi/clk-factors.c @@ -202,7 +202,8 @@ struct clk *sunxi_factors_register(struct device_node *node, if (data->name) clk_name = data->name; else - of_property_read_string(node, "clock-output-names", &clk_name); + of_property_read_string_index(node, "clock-output-names", + data->name_idx, &clk_name); factors = kzalloc(sizeof(struct clk_factors), GFP_KERNEL); if (!factors) diff --git a/drivers/clk/sunxi/clk-factors.h b/drivers/clk/sunxi/clk-factors.h index 1e63c5b..3a7da86 100644 --- a/drivers/clk/sunxi/clk-factors.h +++ b/drivers/clk/sunxi/clk-factors.h @@ -36,6 +36,7 @@ struct factors_data { void (*getter)(struct factors_request *req); void (*recalc)(struct factors_request *req); const char *name; + int name_idx; }; struct clk_factors { diff --git a/drivers/clk/sunxi/clk-sunxi.c b/drivers/clk/sunxi/clk-sunxi.c index 99f60ef..53f5927 100644 --- a/drivers/clk/sunxi/clk-sunxi.c +++ b/drivers/clk/sunxi/clk-sunxi.c @@ -530,14 +530,14 @@ static const struct factors_data sun4i_pll6_data __initconst = { .enable = 31, .table = &sun4i_pll5_config, .getter = sun4i_get_pll5_factors, - .name = "pll6", + .name_idx = 2, }; static const struct factors_data sun6i_a31_pll6_data __initconst = { .enable = 31, .table = &sun6i_a31_pll6_config, .getter = sun6i_a31_get_pll6_factors, - .name = "pll6x2", + .name_idx = 1, }; static const struct factors_data sun5i_a13_ahb_data __initconst = { -- 1.8.4
next reply other threads:[~2016-02-22 1:40 UTC|newest] Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top 2016-02-22 1:39 Andre Przywara [this message] 2016-02-22 1:39 ` [PATCH] clk: sunxi: allow PLL6 clock to be reused Andre Przywara 2016-02-22 8:08 ` Chen-Yu Tsai 2016-02-22 8:08 ` Chen-Yu Tsai 2016-02-22 9:38 ` Andre Przywara 2016-02-22 9:38 ` Andre Przywara 2016-02-25 18:11 ` Maxime Ripard 2016-02-25 18:11 ` Maxime Ripard 2016-02-25 20:58 ` André Przywara 2016-02-25 20:58 ` André Przywara
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=1456105198-25295-1-git-send-email-andre.przywara@arm.com \ --to=andre.przywara@arm.com \ --cc=emilio@elopez.com.ar \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-clk@vger.kernel.org \ --cc=linux-sunxi@googlegroups.com \ --cc=maxime.ripard@free-electrons.com \ --cc=mturquette@baylibre.com \ --cc=sboyd@codeaurora.org \ --cc=wens@csie.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
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.