提交 e9bcd470 编写于 作者: P Paul Mundt

Merge branches 'sh/urgent' and 'sh/trivial' into sh-fixes-for-linus

...@@ -239,7 +239,7 @@ static int __init pcie_clk_init(struct sh7786_pcie_port *port) ...@@ -239,7 +239,7 @@ static int __init pcie_clk_init(struct sh7786_pcie_port *port)
clk->enable_reg = (void __iomem *)(chan->reg_base + SH4A_PCIEPHYCTLR); clk->enable_reg = (void __iomem *)(chan->reg_base + SH4A_PCIEPHYCTLR);
clk->enable_bit = BITS_CKE; clk->enable_bit = BITS_CKE;
ret = sh_clk_mstp32_register(clk, 1); ret = sh_clk_mstp_register(clk, 1);
if (unlikely(ret < 0)) if (unlikely(ret < 0))
goto err_phy; goto err_phy;
......
...@@ -283,7 +283,7 @@ int __init arch_clk_init(void) ...@@ -283,7 +283,7 @@ int __init arch_clk_init(void)
ret = sh_clk_div6_register(div6_clks, DIV6_NR); ret = sh_clk_div6_register(div6_clks, DIV6_NR);
if (!ret) if (!ret)
ret = sh_clk_mstp32_register(mstp_clks, MSTP_NR); ret = sh_clk_mstp_register(mstp_clks, MSTP_NR);
return ret; return ret;
} }
...@@ -276,7 +276,7 @@ int __init arch_clk_init(void) ...@@ -276,7 +276,7 @@ int __init arch_clk_init(void)
ret = sh_clk_div6_register(div6_clks, DIV6_NR); ret = sh_clk_div6_register(div6_clks, DIV6_NR);
if (!ret) if (!ret)
ret = sh_clk_mstp32_register(mstp_clks, MSTP_NR); ret = sh_clk_mstp_register(mstp_clks, MSTP_NR);
return ret; return ret;
} }
...@@ -261,7 +261,7 @@ int __init arch_clk_init(void) ...@@ -261,7 +261,7 @@ int __init arch_clk_init(void)
ret = sh_clk_div6_register(div6_clks, DIV6_NR); ret = sh_clk_div6_register(div6_clks, DIV6_NR);
if (!ret) if (!ret)
ret = sh_clk_mstp32_register(mstp_clks, HWBLK_NR); ret = sh_clk_mstp_register(mstp_clks, HWBLK_NR);
return ret; return ret;
} }
...@@ -311,7 +311,7 @@ int __init arch_clk_init(void) ...@@ -311,7 +311,7 @@ int __init arch_clk_init(void)
ret = sh_clk_div6_register(div6_clks, DIV6_NR); ret = sh_clk_div6_register(div6_clks, DIV6_NR);
if (!ret) if (!ret)
ret = sh_clk_mstp32_register(mstp_clks, HWBLK_NR); ret = sh_clk_mstp_register(mstp_clks, HWBLK_NR);
return ret; return ret;
} }
...@@ -375,7 +375,7 @@ int __init arch_clk_init(void) ...@@ -375,7 +375,7 @@ int __init arch_clk_init(void)
ret = sh_clk_div6_reparent_register(div6_clks, DIV6_NR); ret = sh_clk_div6_reparent_register(div6_clks, DIV6_NR);
if (!ret) if (!ret)
ret = sh_clk_mstp32_register(mstp_clks, HWBLK_NR); ret = sh_clk_mstp_register(mstp_clks, HWBLK_NR);
return ret; return ret;
} }
...@@ -260,7 +260,7 @@ int __init arch_clk_init(void) ...@@ -260,7 +260,7 @@ int __init arch_clk_init(void)
&div4_table); &div4_table);
if (!ret) if (!ret)
ret = sh_clk_mstp32_register(mstp_clks, MSTP_NR); ret = sh_clk_mstp_register(mstp_clks, MSTP_NR);
return ret; return ret;
} }
...@@ -148,7 +148,7 @@ int __init arch_clk_init(void) ...@@ -148,7 +148,7 @@ int __init arch_clk_init(void)
ret = sh_clk_div4_register(div4_clks, ARRAY_SIZE(div4_clks), ret = sh_clk_div4_register(div4_clks, ARRAY_SIZE(div4_clks),
&div4_table); &div4_table);
if (!ret) if (!ret)
ret = sh_clk_mstp32_register(mstp_clks, MSTP_NR); ret = sh_clk_mstp_register(mstp_clks, MSTP_NR);
return ret; return ret;
} }
......
...@@ -175,7 +175,7 @@ int __init arch_clk_init(void) ...@@ -175,7 +175,7 @@ int __init arch_clk_init(void)
ret = sh_clk_div4_register(div4_clks, ARRAY_SIZE(div4_clks), ret = sh_clk_div4_register(div4_clks, ARRAY_SIZE(div4_clks),
&div4_table); &div4_table);
if (!ret) if (!ret)
ret = sh_clk_mstp32_register(mstp_clks, MSTP_NR); ret = sh_clk_mstp_register(mstp_clks, MSTP_NR);
return ret; return ret;
} }
...@@ -194,7 +194,7 @@ int __init arch_clk_init(void) ...@@ -194,7 +194,7 @@ int __init arch_clk_init(void)
ret = sh_clk_div4_register(div4_clks, ARRAY_SIZE(div4_clks), ret = sh_clk_div4_register(div4_clks, ARRAY_SIZE(div4_clks),
&div4_table); &div4_table);
if (!ret) if (!ret)
ret = sh_clk_mstp32_register(mstp_clks, MSTP_NR); ret = sh_clk_mstp_register(mstp_clks, MSTP_NR);
return ret; return ret;
} }
...@@ -149,7 +149,7 @@ int __init arch_clk_init(void) ...@@ -149,7 +149,7 @@ int __init arch_clk_init(void)
ret = sh_clk_div4_register(div4_clks, ARRAY_SIZE(div4_clks), ret = sh_clk_div4_register(div4_clks, ARRAY_SIZE(div4_clks),
&div4_table); &div4_table);
if (!ret) if (!ret)
ret = sh_clk_mstp32_register(mstp_clks, MSTP_NR); ret = sh_clk_mstp_register(mstp_clks, MSTP_NR);
return ret; return ret;
} }
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册