* [PATCH] sun9i: clk: Fix compile error caused by "clk: sunxi: Give sunxi_factors_register a registers parameter"
@ 2014-12-12 15:14 Hans de Goede
2014-12-12 15:16 ` Hans de Goede
0 siblings, 1 reply; 2+ messages in thread
From: Hans de Goede @ 2014-12-12 15:14 UTC (permalink / raw)
To: linux-arm-kernel
My "clk: sunxi: Give sunxi_factors_register a registers parameter" patch did
not adjust the sunxi_factors_clock register calls in the new clk-sun9i-core.c
clock code, causing compilation errors. This fixes this.
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
---
drivers/clk/sunxi/clk-sun9i-core.c | 27 ++++++++++++++++++++++-----
1 file changed, 22 insertions(+), 5 deletions(-)
diff --git a/drivers/clk/sunxi/clk-sun9i-core.c b/drivers/clk/sunxi/clk-sun9i-core.c
index 3cb9036..3b4495c 100644
--- a/drivers/clk/sunxi/clk-sun9i-core.c
+++ b/drivers/clk/sunxi/clk-sun9i-core.c
@@ -22,6 +22,21 @@
#include "clk-factors.h"
+static clk *sun9i_factors_register(struct device_node *node,
+ const struct factors_data *data,
+ spinlock_t *lock)
+{
+ void __iomem *reg;
+
+ reg = of_iomap(node, 0);
+ if (!reg) {
+ pr_err("Could not get registers for factors-clk: %s\n",
+ node->name);
+ return NULL;
+ }
+
+ sunxi_factors_register(node, data, lock, reg);
+}
/**
* sun9i_a80_get_pll4_factors() - calculates n, p, m factors for PLL1
@@ -89,7 +104,7 @@ static DEFINE_SPINLOCK(sun9i_a80_pll4_lock);
static void __init sun9i_a80_pll4_setup(struct device_node *node)
{
- sunxi_factors_register(node, &sun9i_a80_pll4_data, &sun9i_a80_pll4_lock);
+ sun9i_factors_register(node, &sun9i_a80_pll4_data, &sun9i_a80_pll4_lock);
}
CLK_OF_DECLARE(sun9i_a80_pll4, "allwinner,sun9i-a80-pll4-clk", sun9i_a80_pll4_setup);
@@ -139,8 +154,10 @@ static DEFINE_SPINLOCK(sun9i_a80_gt_lock);
static void __init sun9i_a80_gt_setup(struct device_node *node)
{
- struct clk *gt = sunxi_factors_register(node, &sun9i_a80_gt_data,
+ struct clk *gt = sun9i_factors_register(node, &sun9i_a80_gt_data,
&sun9i_a80_gt_lock);
+ if (!gt)
+ return;
/* The GT bus clock needs to be always enabled */
__clk_get(gt);
@@ -194,7 +211,7 @@ static DEFINE_SPINLOCK(sun9i_a80_ahb_lock);
static void __init sun9i_a80_ahb_setup(struct device_node *node)
{
- sunxi_factors_register(node, &sun9i_a80_ahb_data, &sun9i_a80_ahb_lock);
+ sun9i_factors_register(node, &sun9i_a80_ahb_data, &sun9i_a80_ahb_lock);
}
CLK_OF_DECLARE(sun9i_a80_ahb, "allwinner,sun9i-a80-ahb-clk", sun9i_a80_ahb_setup);
@@ -210,7 +227,7 @@ static DEFINE_SPINLOCK(sun9i_a80_apb0_lock);
static void __init sun9i_a80_apb0_setup(struct device_node *node)
{
- sunxi_factors_register(node, &sun9i_a80_apb0_data, &sun9i_a80_apb0_lock);
+ sun9i_factors_register(node, &sun9i_a80_apb0_data, &sun9i_a80_apb0_lock);
}
CLK_OF_DECLARE(sun9i_a80_apb0, "allwinner,sun9i-a80-apb0-clk", sun9i_a80_apb0_setup);
@@ -266,6 +283,6 @@ static DEFINE_SPINLOCK(sun9i_a80_apb1_lock);
static void __init sun9i_a80_apb1_setup(struct device_node *node)
{
- sunxi_factors_register(node, &sun9i_a80_apb1_data, &sun9i_a80_apb1_lock);
+ sun9i_factors_register(node, &sun9i_a80_apb1_data, &sun9i_a80_apb1_lock);
}
CLK_OF_DECLARE(sun9i_a80_apb1, "allwinner,sun9i-a80-apb1-clk", sun9i_a80_apb1_setup);
--
2.1.0
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [PATCH] sun9i: clk: Fix compile error caused by "clk: sunxi: Give sunxi_factors_register a registers parameter"
2014-12-12 15:14 [PATCH] sun9i: clk: Fix compile error caused by "clk: sunxi: Give sunxi_factors_register a registers parameter" Hans de Goede
@ 2014-12-12 15:16 ` Hans de Goede
0 siblings, 0 replies; 2+ messages in thread
From: Hans de Goede @ 2014-12-12 15:16 UTC (permalink / raw)
To: linux-arm-kernel
Hi,
On 12-12-14 16:14, Hans de Goede wrote:
> My "clk: sunxi: Give sunxi_factors_register a registers parameter" patch did
> not adjust the sunxi_factors_clock register calls in the new clk-sun9i-core.c
> clock code, causing compilation errors. This fixes this.
>
> Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Sorry, this one is no good, self-nak.
Note to self, the proper order is: test, then git send-email not the other way around.
Regards,
Hans
> ---
> drivers/clk/sunxi/clk-sun9i-core.c | 27 ++++++++++++++++++++++-----
> 1 file changed, 22 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/clk/sunxi/clk-sun9i-core.c b/drivers/clk/sunxi/clk-sun9i-core.c
> index 3cb9036..3b4495c 100644
> --- a/drivers/clk/sunxi/clk-sun9i-core.c
> +++ b/drivers/clk/sunxi/clk-sun9i-core.c
> @@ -22,6 +22,21 @@
>
> #include "clk-factors.h"
>
> +static clk *sun9i_factors_register(struct device_node *node,
> + const struct factors_data *data,
> + spinlock_t *lock)
> +{
> + void __iomem *reg;
> +
> + reg = of_iomap(node, 0);
> + if (!reg) {
> + pr_err("Could not get registers for factors-clk: %s\n",
> + node->name);
> + return NULL;
> + }
> +
> + sunxi_factors_register(node, data, lock, reg);
> +}
>
> /**
> * sun9i_a80_get_pll4_factors() - calculates n, p, m factors for PLL1
> @@ -89,7 +104,7 @@ static DEFINE_SPINLOCK(sun9i_a80_pll4_lock);
>
> static void __init sun9i_a80_pll4_setup(struct device_node *node)
> {
> - sunxi_factors_register(node, &sun9i_a80_pll4_data, &sun9i_a80_pll4_lock);
> + sun9i_factors_register(node, &sun9i_a80_pll4_data, &sun9i_a80_pll4_lock);
> }
> CLK_OF_DECLARE(sun9i_a80_pll4, "allwinner,sun9i-a80-pll4-clk", sun9i_a80_pll4_setup);
>
> @@ -139,8 +154,10 @@ static DEFINE_SPINLOCK(sun9i_a80_gt_lock);
>
> static void __init sun9i_a80_gt_setup(struct device_node *node)
> {
> - struct clk *gt = sunxi_factors_register(node, &sun9i_a80_gt_data,
> + struct clk *gt = sun9i_factors_register(node, &sun9i_a80_gt_data,
> &sun9i_a80_gt_lock);
> + if (!gt)
> + return;
>
> /* The GT bus clock needs to be always enabled */
> __clk_get(gt);
> @@ -194,7 +211,7 @@ static DEFINE_SPINLOCK(sun9i_a80_ahb_lock);
>
> static void __init sun9i_a80_ahb_setup(struct device_node *node)
> {
> - sunxi_factors_register(node, &sun9i_a80_ahb_data, &sun9i_a80_ahb_lock);
> + sun9i_factors_register(node, &sun9i_a80_ahb_data, &sun9i_a80_ahb_lock);
> }
> CLK_OF_DECLARE(sun9i_a80_ahb, "allwinner,sun9i-a80-ahb-clk", sun9i_a80_ahb_setup);
>
> @@ -210,7 +227,7 @@ static DEFINE_SPINLOCK(sun9i_a80_apb0_lock);
>
> static void __init sun9i_a80_apb0_setup(struct device_node *node)
> {
> - sunxi_factors_register(node, &sun9i_a80_apb0_data, &sun9i_a80_apb0_lock);
> + sun9i_factors_register(node, &sun9i_a80_apb0_data, &sun9i_a80_apb0_lock);
> }
> CLK_OF_DECLARE(sun9i_a80_apb0, "allwinner,sun9i-a80-apb0-clk", sun9i_a80_apb0_setup);
>
> @@ -266,6 +283,6 @@ static DEFINE_SPINLOCK(sun9i_a80_apb1_lock);
>
> static void __init sun9i_a80_apb1_setup(struct device_node *node)
> {
> - sunxi_factors_register(node, &sun9i_a80_apb1_data, &sun9i_a80_apb1_lock);
> + sun9i_factors_register(node, &sun9i_a80_apb1_data, &sun9i_a80_apb1_lock);
> }
> CLK_OF_DECLARE(sun9i_a80_apb1, "allwinner,sun9i-a80-apb1-clk", sun9i_a80_apb1_setup);
>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2014-12-12 15:16 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-12-12 15:14 [PATCH] sun9i: clk: Fix compile error caused by "clk: sunxi: Give sunxi_factors_register a registers parameter" Hans de Goede
2014-12-12 15:16 ` Hans de Goede
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).