projects
/
firefly-linux-kernel-4.4.55.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
a9ff423
)
clk: rockchip: allow no rockchip,grf in dts on arm
author
Huang, Tao
<huangtao@rock-chips.com>
Thu, 21 May 2015 10:23:29 +0000
(18:23 +0800)
committer
Huang, Tao
<huangtao@rock-chips.com>
Thu, 21 May 2015 10:33:07 +0000
(18:33 +0800)
Signed-off-by: Huang, Tao <huangtao@rock-chips.com>
drivers/clk/rockchip/clk.c
patch
|
blob
|
history
diff --git
a/drivers/clk/rockchip/clk.c
b/drivers/clk/rockchip/clk.c
index dcc80e542a4b4b32a5bb00a847c9883ee5ec279b..d198c73001a7e6e45b2ad6a194993f8f85830b4d 100755
(executable)
--- a/
drivers/clk/rockchip/clk.c
+++ b/
drivers/clk/rockchip/clk.c
@@
-1885,7
+1885,12
@@
static void __init rk_clk_tree_init(struct device_node *np)
}
node = of_parse_phandle(np, "rockchip,grf", 0);
- rk_grf_base = of_iomap(node, 0);
+ if (node)
+ rk_grf_base = of_iomap(node, 0);
+#ifdef CONFIG_ARM
+ if (!rk_grf_base)
+ rk_grf_base = RK_GRF_VIRT;
+#endif
for_each_available_child_of_node(np, node) {
clk_debug("\n");