All of lore.kernel.org
 help / color / mirror / Atom feed
From: Chen-Yu Tsai <wens-jdAy2FN1RRM@public.gmane.org>
To: Maxime Ripard
	<maxime.ripard-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org>,
	Lee Jones <lee.jones-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>,
	Samuel Ortiz <sameo-VuQAYsv1563Yd54FQh9/CA@public.gmane.org>,
	Rob Herring <robh+dt-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>,
	Greg Kroah-Hartman
	<gregkh-hQyY1W1yCW8ekmWlsbkhG0B+6BGkLq7r@public.gmane.org>,
	Emilio Lopez <emilio-0Z03zUJReD5OxF6Tv1QG9Q@public.gmane.org>,
	Mike Turquette
	<mturquette-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>
Cc: Chen-Yu Tsai <wens-jdAy2FN1RRM@public.gmane.org>,
	linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org,
	devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org,
	linux-serial-u79uwXL29TY76Z2rM5mHXA@public.gmane.org,
	linux-sunxi-/JYPxA39Uh5TLH3MbocFFw@public.gmane.org
Subject: [PATCH v3 2/9] clk: sunxi: Fix gate indexing for sun6i-a31-apb0-gates
Date: Thu,  3 Jul 2014 22:55:42 +0800	[thread overview]
Message-ID: <1404399349-20237-3-git-send-email-wens@csie.org> (raw)
In-Reply-To: <1404399349-20237-1-git-send-email-wens-jdAy2FN1RRM@public.gmane.org>

sun6i-a31-apb0-gates supports using clock-indices for holes between
individual gates. However, the driver passes the number of gates
registered in clk_data->clk_num, which of_clk_src_onecell_get uses
to recognize the range of valid indices a consumer can use.

This patch makes the driver pass the maximum gate index + 1, so
of_clk_src_onecell_get does not complain about indices greater
than gates registered.

This was tested on the A23 SoC, which has a similar APB0 clock,
but has holes for gates to removed IP blocks.

Signed-off-by: Chen-Yu Tsai <wens-jdAy2FN1RRM@public.gmane.org>
Acked-by: Maxime Ripard <maxime.ripard-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org>
---
 drivers/clk/sunxi/clk-sun6i-apb0-gates.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/drivers/clk/sunxi/clk-sun6i-apb0-gates.c b/drivers/clk/sunxi/clk-sun6i-apb0-gates.c
index 44cd27c..b342f2a 100644
--- a/drivers/clk/sunxi/clk-sun6i-apb0-gates.c
+++ b/drivers/clk/sunxi/clk-sun6i-apb0-gates.c
@@ -25,6 +25,7 @@ static int sun6i_a31_apb0_gates_clk_probe(struct platform_device *pdev)
 	void __iomem *reg;
 	int gate_id;
 	int ngates;
+	int gate_max = 0;
 	int i;
 
 	r = platform_get_resource(pdev, IORESOURCE_MEM, 0);
@@ -72,9 +73,12 @@ static int sun6i_a31_apb0_gates_clk_probe(struct platform_device *pdev)
 							    reg, gate_id,
 							    0, NULL);
 		WARN_ON(IS_ERR(clk_data->clks[gate_id]));
+
+		if (gate_id > gate_max)
+			gate_max = gate_id;
 	}
 
-	clk_data->clk_num = ngates;
+	clk_data->clk_num = gate_max + 1;
 
 	return of_clk_add_provider(np, of_clk_src_onecell_get, clk_data);
 }
-- 
2.0.1

WARNING: multiple messages have this Message-ID (diff)
From: wens@csie.org (Chen-Yu Tsai)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH v3 2/9] clk: sunxi: Fix gate indexing for sun6i-a31-apb0-gates
Date: Thu,  3 Jul 2014 22:55:42 +0800	[thread overview]
Message-ID: <1404399349-20237-3-git-send-email-wens@csie.org> (raw)
In-Reply-To: <1404399349-20237-1-git-send-email-wens@csie.org>

sun6i-a31-apb0-gates supports using clock-indices for holes between
individual gates. However, the driver passes the number of gates
registered in clk_data->clk_num, which of_clk_src_onecell_get uses
to recognize the range of valid indices a consumer can use.

This patch makes the driver pass the maximum gate index + 1, so
of_clk_src_onecell_get does not complain about indices greater
than gates registered.

This was tested on the A23 SoC, which has a similar APB0 clock,
but has holes for gates to removed IP blocks.

Signed-off-by: Chen-Yu Tsai <wens@csie.org>
Acked-by: Maxime Ripard <maxime.ripard@free-electrons.com>
---
 drivers/clk/sunxi/clk-sun6i-apb0-gates.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/drivers/clk/sunxi/clk-sun6i-apb0-gates.c b/drivers/clk/sunxi/clk-sun6i-apb0-gates.c
index 44cd27c..b342f2a 100644
--- a/drivers/clk/sunxi/clk-sun6i-apb0-gates.c
+++ b/drivers/clk/sunxi/clk-sun6i-apb0-gates.c
@@ -25,6 +25,7 @@ static int sun6i_a31_apb0_gates_clk_probe(struct platform_device *pdev)
 	void __iomem *reg;
 	int gate_id;
 	int ngates;
+	int gate_max = 0;
 	int i;
 
 	r = platform_get_resource(pdev, IORESOURCE_MEM, 0);
@@ -72,9 +73,12 @@ static int sun6i_a31_apb0_gates_clk_probe(struct platform_device *pdev)
 							    reg, gate_id,
 							    0, NULL);
 		WARN_ON(IS_ERR(clk_data->clks[gate_id]));
+
+		if (gate_id > gate_max)
+			gate_max = gate_id;
 	}
 
-	clk_data->clk_num = ngates;
+	clk_data->clk_num = gate_max + 1;
 
 	return of_clk_add_provider(np, of_clk_src_onecell_get, clk_data);
 }
-- 
2.0.1

  parent reply	other threads:[~2014-07-03 14:55 UTC|newest]

Thread overview: 34+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-07-03 14:55 [PATCH v3 0/9] ARM: sun8i: Support A23 PRCM clock and reset controllers Chen-Yu Tsai
2014-07-03 14:55 ` Chen-Yu Tsai
     [not found] ` <1404399349-20237-1-git-send-email-wens-jdAy2FN1RRM@public.gmane.org>
2014-07-03 14:55   ` [PATCH v3 1/9] clk: sunxi: Add A23 APB0 divider clock support Chen-Yu Tsai
2014-07-03 14:55     ` Chen-Yu Tsai
     [not found]     ` <1404399349-20237-2-git-send-email-wens-jdAy2FN1RRM@public.gmane.org>
2014-07-07  8:47       ` Maxime Ripard
2014-07-07  8:47         ` Maxime Ripard
2014-07-03 14:55   ` Chen-Yu Tsai [this message]
2014-07-03 14:55     ` [PATCH v3 2/9] clk: sunxi: Fix gate indexing for sun6i-a31-apb0-gates Chen-Yu Tsai
2014-07-07  8:54     ` Maxime Ripard
2014-07-07  8:54       ` Maxime Ripard
2014-07-03 14:55   ` [PATCH v3 3/9] clk: sunxi: Add A23 specific compatible to sun6i-a31-apb0-gates-clk Chen-Yu Tsai
2014-07-03 14:55     ` Chen-Yu Tsai
2014-07-03 14:55   ` [PATCH v3 4/9] mfd: sun6i-prcm: Add support for Allwinner A23 PRCM Chen-Yu Tsai
2014-07-03 14:55     ` Chen-Yu Tsai
     [not found]     ` <1404399349-20237-5-git-send-email-wens-jdAy2FN1RRM@public.gmane.org>
2014-07-07  8:55       ` Maxime Ripard
2014-07-07  8:55         ` Maxime Ripard
2014-07-03 14:55   ` [PATCH v3 5/9] serial: 8250_dw: Add optional reset control support Chen-Yu Tsai
2014-07-03 14:55     ` Chen-Yu Tsai
2014-07-03 14:55   ` [PATCH v3 6/9] serial: 8250_dw: Add support for deferred probing Chen-Yu Tsai
2014-07-03 14:55     ` Chen-Yu Tsai
2014-07-03 14:55   ` [PATCH v3 7/9] ARM: sunxi: select MFD_SUN6I_PRCM when sun8i arch support is enabled Chen-Yu Tsai
2014-07-03 14:55     ` Chen-Yu Tsai
2014-07-07  9:00     ` Maxime Ripard
2014-07-07  9:00       ` Maxime Ripard
2014-07-03 14:55   ` [PATCH v3 8/9] ARM: sun8i: Add PRCM clock and reset controller nodes to the DTSI Chen-Yu Tsai
2014-07-03 14:55     ` Chen-Yu Tsai
     [not found]     ` <1404399349-20237-9-git-send-email-wens-jdAy2FN1RRM@public.gmane.org>
2014-07-07  8:58       ` Maxime Ripard
2014-07-07  8:58         ` Maxime Ripard
2014-07-07 10:19         ` Chen-Yu Tsai
2014-07-07 10:19           ` Chen-Yu Tsai
2014-07-03 14:55   ` [PATCH v3 9/9] ARM: sun8i: Add " Chen-Yu Tsai
2014-07-03 14:55     ` Chen-Yu Tsai
     [not found]     ` <1404399349-20237-10-git-send-email-wens-jdAy2FN1RRM@public.gmane.org>
2014-07-07  9:01       ` Maxime Ripard
2014-07-07  9:01         ` Maxime Ripard

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=1404399349-20237-3-git-send-email-wens@csie.org \
    --to=wens-jday2fn1rrm@public.gmane.org \
    --cc=devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
    --cc=emilio-0Z03zUJReD5OxF6Tv1QG9Q@public.gmane.org \
    --cc=gregkh-hQyY1W1yCW8ekmWlsbkhG0B+6BGkLq7r@public.gmane.org \
    --cc=lee.jones-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org \
    --cc=linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org \
    --cc=linux-serial-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
    --cc=linux-sunxi-/JYPxA39Uh5TLH3MbocFFw@public.gmane.org \
    --cc=maxime.ripard-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org \
    --cc=mturquette-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org \
    --cc=robh+dt-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org \
    --cc=sameo-VuQAYsv1563Yd54FQh9/CA@public.gmane.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: link
Be 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.