From: Stephen Boyd <sboyd@codeaurora.org>
To: Mike Turquette <mturquette@baylibre.com>,
Stephen Boyd <sboyd@codeaurora.org>
Cc: linux-kernel@vger.kernel.org, linux-clk@vger.kernel.org,
linux-arm-kernel@lists.infradead.org,
Russell King <rmk+kernel@arm.linux.org.uk>
Subject: [PATCH] clk: gpio: Really allow an optional clock= DT property
Date: Thu, 18 Feb 2016 19:12:05 -0800 [thread overview]
Message-ID: <1455851525-18972-1-git-send-email-sboyd@codeaurora.org> (raw)
In-Reply-To: <20160219030731.GS4847@codeaurora.org>
We mis-merged the original patch from Russell here and so the
patch went almost all the way, except that we still failed to
probe when there wasn't a clocks property in the DT node. Allow
that case by making a negative value from
of_clk_get_parent_count() into "no parents", like the original
patch did.
Fixes: 7ed88aa2efa5 ("clk: fix clk-gpio.c with optional clock= DT property")
Cc: Russell King <rmk+kernel@arm.linux.org.uk>
Cc: Michael Turquette <mturquette@baylibre.com>
Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
---
drivers/clk/clk-gpio.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/clk/clk-gpio.c b/drivers/clk/clk-gpio.c
index 19fed65587e8..7b09a265d79f 100644
--- a/drivers/clk/clk-gpio.c
+++ b/drivers/clk/clk-gpio.c
@@ -289,7 +289,7 @@ static void __init of_gpio_clk_setup(struct device_node *node,
num_parents = of_clk_get_parent_count(node);
if (num_parents < 0)
- return;
+ num_parents = 0;
data = kzalloc(sizeof(*data), GFP_KERNEL);
if (!data)
--
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
a Linux Foundation Collaborative Project
WARNING: multiple messages have this Message-ID (diff)
From: sboyd@codeaurora.org (Stephen Boyd)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH] clk: gpio: Really allow an optional clock= DT property
Date: Thu, 18 Feb 2016 19:12:05 -0800 [thread overview]
Message-ID: <1455851525-18972-1-git-send-email-sboyd@codeaurora.org> (raw)
In-Reply-To: <20160219030731.GS4847@codeaurora.org>
We mis-merged the original patch from Russell here and so the
patch went almost all the way, except that we still failed to
probe when there wasn't a clocks property in the DT node. Allow
that case by making a negative value from
of_clk_get_parent_count() into "no parents", like the original
patch did.
Fixes: 7ed88aa2efa5 ("clk: fix clk-gpio.c with optional clock= DT property")
Cc: Russell King <rmk+kernel@arm.linux.org.uk>
Cc: Michael Turquette <mturquette@baylibre.com>
Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
---
drivers/clk/clk-gpio.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/clk/clk-gpio.c b/drivers/clk/clk-gpio.c
index 19fed65587e8..7b09a265d79f 100644
--- a/drivers/clk/clk-gpio.c
+++ b/drivers/clk/clk-gpio.c
@@ -289,7 +289,7 @@ static void __init of_gpio_clk_setup(struct device_node *node,
num_parents = of_clk_get_parent_count(node);
if (num_parents < 0)
- return;
+ num_parents = 0;
data = kzalloc(sizeof(*data), GFP_KERNEL);
if (!data)
--
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
a Linux Foundation Collaborative Project
next prev parent reply other threads:[~2016-02-19 3:12 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-01-02 10:01 [PATCH] clk: fix clk-gpio.c with optional clock= DT property Russell King
2016-01-02 10:01 ` Russell King
2016-01-03 6:47 ` Michael Turquette
2016-01-03 6:47 ` Michael Turquette
2016-01-03 10:53 ` Russell King - ARM Linux
2016-01-03 10:53 ` Russell King - ARM Linux
2016-01-03 23:35 ` Fabio Estevam
2016-01-03 23:35 ` Fabio Estevam
2016-02-17 23:05 ` Russell King - ARM Linux
2016-02-17 23:05 ` Russell King - ARM Linux
2016-02-18 0:07 ` Michael Turquette
2016-02-18 0:07 ` Michael Turquette
2016-02-18 0:55 ` Russell King - ARM Linux
2016-02-18 0:55 ` Russell King - ARM Linux
2016-02-19 3:07 ` Stephen Boyd
2016-02-19 3:07 ` Stephen Boyd
2016-02-19 3:12 ` Stephen Boyd [this message]
2016-02-19 3:12 ` [PATCH] clk: gpio: Really allow an " Stephen Boyd
2016-02-19 16:18 ` Michael Turquette
2016-02-19 16:18 ` Michael Turquette
2016-02-19 16:48 ` Russell King - ARM Linux
2016-02-19 16:48 ` Russell King - ARM Linux
2016-02-23 11:30 ` Russell King - ARM Linux
2016-02-23 11:30 ` Russell King - ARM Linux
2016-02-24 21:47 ` Michael Turquette
2016-02-24 21:47 ` Michael Turquette
2016-02-24 21:47 ` Michael Turquette
2016-02-24 22:18 ` Russell King - ARM Linux
2016-02-24 22:18 ` Russell King - ARM Linux
2016-02-19 9:39 ` [PATCH] clk: fix clk-gpio.c with " Russell King - ARM Linux
2016-02-19 9:39 ` Russell King - ARM Linux
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=1455851525-18972-1-git-send-email-sboyd@codeaurora.org \
--to=sboyd@codeaurora.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-clk@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mturquette@baylibre.com \
--cc=rmk+kernel@arm.linux.org.uk \
/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.