|
@@ -908,12 +908,13 @@ static unsigned long exynos4_get_xom(void)
|
|
|
return xom;
|
|
|
}
|
|
|
|
|
|
-static void __init exynos4_clk_register_finpll(unsigned long xom)
|
|
|
+static void __init exynos4_clk_register_finpll(void)
|
|
|
{
|
|
|
struct samsung_fixed_rate_clock fclk;
|
|
|
struct clk *clk;
|
|
|
unsigned long finpll_f = 24000000;
|
|
|
char *parent_name;
|
|
|
+ unsigned int xom = exynos4_get_xom();
|
|
|
|
|
|
parent_name = xom & 1 ? "xusbxti" : "xxti";
|
|
|
clk = clk_get(NULL, parent_name);
|
|
@@ -1038,9 +1039,10 @@ static struct samsung_pll_clock exynos4x12_plls[nr_plls] __initdata = {
|
|
|
|
|
|
/* register exynos4 clocks */
|
|
|
static void __init exynos4_clk_init(struct device_node *np,
|
|
|
- enum exynos4_soc exynos4_soc,
|
|
|
- void __iomem *reg_base, unsigned long xom)
|
|
|
+ enum exynos4_soc exynos4_soc)
|
|
|
{
|
|
|
+ void __iomem *reg_base;
|
|
|
+
|
|
|
reg_base = of_iomap(np, 0);
|
|
|
if (!reg_base)
|
|
|
panic("%s: failed to map registers\n", __func__);
|
|
@@ -1058,7 +1060,7 @@ static void __init exynos4_clk_init(struct device_node *np,
|
|
|
ARRAY_SIZE(exynos4_fixed_rate_ext_clks),
|
|
|
ext_clk_match);
|
|
|
|
|
|
- exynos4_clk_register_finpll(xom);
|
|
|
+ exynos4_clk_register_finpll();
|
|
|
|
|
|
if (exynos4_soc == EXYNOS4210) {
|
|
|
samsung_clk_register_mux(exynos4210_mux_early,
|
|
@@ -1136,12 +1138,12 @@ static void __init exynos4_clk_init(struct device_node *np,
|
|
|
|
|
|
static void __init exynos4210_clk_init(struct device_node *np)
|
|
|
{
|
|
|
- exynos4_clk_init(np, EXYNOS4210, NULL, exynos4_get_xom());
|
|
|
+ exynos4_clk_init(np, EXYNOS4210);
|
|
|
}
|
|
|
CLK_OF_DECLARE(exynos4210_clk, "samsung,exynos4210-clock", exynos4210_clk_init);
|
|
|
|
|
|
static void __init exynos4412_clk_init(struct device_node *np)
|
|
|
{
|
|
|
- exynos4_clk_init(np, EXYNOS4X12, NULL, exynos4_get_xom());
|
|
|
+ exynos4_clk_init(np, EXYNOS4X12);
|
|
|
}
|
|
|
CLK_OF_DECLARE(exynos4412_clk, "samsung,exynos4412-clock", exynos4412_clk_init);
|