diff options
| author | LiXin <li.xin@linaro.org> | 2013-02-01 10:18:33 +0800 |
|---|---|---|
| committer | Guodong Xu <guodong.xu@linaro.org> | 2013-02-21 16:12:38 +0800 |
| commit | 58db109ac8de64bd0cd8a1f4bc74e7f2e4ee0348 (patch) | |
| tree | e6935a361a7bc538e590055c7fe0e241bcca05f8 | |
| parent | 4fa0b56c82101f61934b94506f85025fc38f266f (diff) | |
ARM: hs: solve sysctrl conflict
Solve sysctrl redefine for hi3620.
Signed-off-by: LiXin <li.xin@linaro.org>
| -rw-r--r-- | arch/arm/boot/dts/hi3620.dtsi | 5 | ||||
| -rw-r--r-- | drivers/clk/clk-hs.c | 3 |
2 files changed, 1 insertions, 7 deletions
diff --git a/arch/arm/boot/dts/hi3620.dtsi b/arch/arm/boot/dts/hi3620.dtsi index 7f78f3a6bdae..9ea90a5b53cf 100644 --- a/arch/arm/boot/dts/hi3620.dtsi +++ b/arch/arm/boot/dts/hi3620.dtsi @@ -29,11 +29,6 @@ reg = <0xfca08000 0x1000>; }; - sctrl: sctrl@fc802000 { - compatible = "hisilicon,sctrl"; - reg = <0xfc802000 0x1000>; - }; - /*clocks begins*/ clocks { #address-cells = <1>; diff --git a/drivers/clk/clk-hs.c b/drivers/clk/clk-hs.c index 88ad41c59fa7..f564d321930a 100644 --- a/drivers/clk/clk-hs.c +++ b/drivers/clk/clk-hs.c @@ -74,7 +74,6 @@ void __init of_fixed_factor_clk_setup(struct device_node *node) const char *clk_name = node->name; const char *clk_parnet; int err; - unsigned long rate; u32 vals[2]; clk_parnet = of_clk_get_parent_name(node, 0); @@ -224,7 +223,7 @@ void __init hs_init_clocks(void) pmctrl_base = of_iomap(node, 0); WARN_ON(!pmctrl_base); - node = of_find_compatible_node(NULL, NULL, "hisilicon,sctrl"); + node = of_find_compatible_node(NULL, NULL, "hisilicon,sysctrl"); sctrl_base = of_iomap(node, 0); of_clk_init(hs_clk_match); |