* [PATCH] sh: Check return value of clk_get on ecovec24
@ 2010-05-13 1:08 Kuninori Morimoto
2010-05-13 1:08 ` [PATCH] sh: Check return value of clk_get on ms7724 Kuninori Morimoto
2010-05-13 8:50 ` [PATCH] sh: Check return value of clk_get on ecovec24 Paul Mundt
0 siblings, 2 replies; 3+ messages in thread
From: Kuninori Morimoto @ 2010-05-13 1:08 UTC (permalink / raw)
To: linux-sh
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
---
arch/sh/boards/mach-ecovec24/setup.c | 24 +++++++++++++++---------
1 files changed, 15 insertions(+), 9 deletions(-)
diff --git a/arch/sh/boards/mach-ecovec24/setup.c b/arch/sh/boards/mach-ecovec24/setup.c
index 6c13b92..cc87a69 100644
--- a/arch/sh/boards/mach-ecovec24/setup.c
+++ b/arch/sh/boards/mach-ecovec24/setup.c
@@ -1138,16 +1138,20 @@ static int __init arch_setup(void)
/* set SPU2 clock to 83.4 MHz */
clk = clk_get(NULL, "spu_clk");
- clk_set_rate(clk, clk_round_rate(clk, 83333333));
- clk_put(clk);
+ if (clk) {
+ clk_set_rate(clk, clk_round_rate(clk, 83333333));
+ clk_put(clk);
+ }
/* change parent of FSI B */
clk = clk_get(NULL, "fsib_clk");
- clk_register(&fsimckb_clk);
- clk_set_parent(clk, &fsimckb_clk);
- clk_set_rate(clk, 11000);
- clk_set_rate(&fsimckb_clk, 11000);
- clk_put(clk);
+ if (clk) {
+ clk_register(&fsimckb_clk);
+ clk_set_parent(clk, &fsimckb_clk);
+ clk_set_rate(clk, 11000);
+ clk_set_rate(&fsimckb_clk, 11000);
+ clk_put(clk);
+ }
gpio_request(GPIO_PTU0, NULL);
gpio_direction_output(GPIO_PTU0, 0);
@@ -1159,8 +1163,10 @@ static int __init arch_setup(void)
/* set VPU clock to 166 MHz */
clk = clk_get(NULL, "vpu_clk");
- clk_set_rate(clk, clk_round_rate(clk, 166000000));
- clk_put(clk);
+ if (clk) {
+ clk_set_rate(clk, clk_round_rate(clk, 166000000));
+ clk_put(clk);
+ }
/* enable IrDA */
gpio_request(GPIO_FN_IRDA_OUT, NULL);
--
1.7.0.4
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [PATCH] sh: Check return value of clk_get on ms7724
2010-05-13 1:08 [PATCH] sh: Check return value of clk_get on ecovec24 Kuninori Morimoto
@ 2010-05-13 1:08 ` Kuninori Morimoto
2010-05-13 8:50 ` [PATCH] sh: Check return value of clk_get on ecovec24 Paul Mundt
1 sibling, 0 replies; 3+ messages in thread
From: Kuninori Morimoto @ 2010-05-13 1:08 UTC (permalink / raw)
To: linux-sh
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
---
arch/sh/boards/mach-se/7724/setup.c | 18 +++++++++++-------
1 files changed, 11 insertions(+), 7 deletions(-)
diff --git a/arch/sh/boards/mach-se/7724/setup.c b/arch/sh/boards/mach-se/7724/setup.c
index ccaa290..4b24125 100644
--- a/arch/sh/boards/mach-se/7724/setup.c
+++ b/arch/sh/boards/mach-se/7724/setup.c
@@ -771,16 +771,20 @@ static int __init devices_setup(void)
/* set SPU2 clock to 83.4 MHz */
clk = clk_get(NULL, "spu_clk");
- clk_set_rate(clk, clk_round_rate(clk, 83333333));
- clk_put(clk);
+ if (clk) {
+ clk_set_rate(clk, clk_round_rate(clk, 83333333));
+ clk_put(clk);
+ }
/* change parent of FSI A */
clk = clk_get(NULL, "fsia_clk");
- clk_register(&fsimcka_clk);
- clk_set_parent(clk, &fsimcka_clk);
- clk_set_rate(clk, 11000);
- clk_set_rate(&fsimcka_clk, 11000);
- clk_put(clk);
+ if (clk) {
+ clk_register(&fsimcka_clk);
+ clk_set_parent(clk, &fsimcka_clk);
+ clk_set_rate(clk, 11000);
+ clk_set_rate(&fsimcka_clk, 11000);
+ clk_put(clk);
+ }
/* SDHI0 connected to cn7 */
gpio_request(GPIO_FN_SDHI0CD, NULL);
--
1.7.0.4
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] sh: Check return value of clk_get on ecovec24
2010-05-13 1:08 [PATCH] sh: Check return value of clk_get on ecovec24 Kuninori Morimoto
2010-05-13 1:08 ` [PATCH] sh: Check return value of clk_get on ms7724 Kuninori Morimoto
@ 2010-05-13 8:50 ` Paul Mundt
1 sibling, 0 replies; 3+ messages in thread
From: Paul Mundt @ 2010-05-13 8:50 UTC (permalink / raw)
To: linux-sh
On Thu, May 13, 2010 at 10:08:33AM +0900, Kuninori Morimoto wrote:
> Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
> ---
> arch/sh/boards/mach-ecovec24/setup.c | 24 +++++++++++++++---------
> 1 files changed, 15 insertions(+), 9 deletions(-)
On Thu, May 13, 2010 at 10:08:37AM +0900, Kuninori Morimoto wrote:
> Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
> ---
> arch/sh/boards/mach-se/7724/setup.c | 18 +++++++++++-------
> 1 files changed, 11 insertions(+), 7 deletions(-)
Both applied, thanks.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2010-05-13 8:50 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-05-13 1:08 [PATCH] sh: Check return value of clk_get on ecovec24 Kuninori Morimoto
2010-05-13 1:08 ` [PATCH] sh: Check return value of clk_get on ms7724 Kuninori Morimoto
2010-05-13 8:50 ` [PATCH] sh: Check return value of clk_get on ecovec24 Paul Mundt
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).