projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'armsoc-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
[linux-2.6-block.git]
/
drivers
/
clk
/
shmobile
/
clk-mstp.c
diff --git
a/drivers/clk/shmobile/clk-mstp.c
b/drivers/clk/shmobile/clk-mstp.c
index 4abf21172625e81a7036dad77f90ea2d4158039c..3b09716ebda28227eebd52da5616c40245e490d5 100644
(file)
--- a/
drivers/clk/shmobile/clk-mstp.c
+++ b/
drivers/clk/shmobile/clk-mstp.c
@@
-259,6
+259,10
@@
int cpg_mstp_attach_dev(struct generic_pm_domain *domain, struct device *dev)
"renesas,cpg-mstp-clocks"))
goto found;
+ /* BSC on r8a73a4/sh73a0 uses zb_clk instead of an mstp clock */
+ if (!strcmp(clkspec.np->name, "zb_clk"))
+ goto found;
+
of_node_put(clkspec.np);
i++;
}