diff options
Diffstat (limited to 'drivers/sh')
| -rw-r--r-- | drivers/sh/Makefile | 9 | ||||
| -rw-r--r-- | drivers/sh/clk/cpg.c | 4 |
2 files changed, 3 insertions, 10 deletions
diff --git a/drivers/sh/Makefile b/drivers/sh/Makefile index 67e272ab1623..7139ad2f2086 100644 --- a/drivers/sh/Makefile +++ b/drivers/sh/Makefile @@ -7,11 +7,4 @@ obj-$(CONFIG_HAVE_CLK) += clk/ obj-$(CONFIG_MAPLE) += maple/ obj-$(CONFIG_SUPERHYWAY) += superhyway/ obj-$(CONFIG_GENERIC_GPIO) += pfc.o - -# -# For the moment we only use this framework for ARM-based SH/R-Mobile -# platforms and generic SH. SH-based SH-Mobile platforms are still using -# an older framework that is pending up-porting, at which point this -# special casing can go away. -# -obj-$(CONFIG_SUPERH)$(CONFIG_ARCH_SHMOBILE) += pm_runtime.o +obj-y += pm_runtime.o diff --git a/drivers/sh/clk/cpg.c b/drivers/sh/clk/cpg.c index a0d8faa40baa..45fee368b092 100644 --- a/drivers/sh/clk/cpg.c +++ b/drivers/sh/clk/cpg.c @@ -222,11 +222,11 @@ static int __init sh_clk_div6_register_ops(struct clk *clks, int nr, clkp->ops = ops; clkp->freq_table = freq_table + (k * freq_table_size); clkp->freq_table[nr_divs].frequency = CPUFREQ_TABLE_END; - ret = sh_clk_init_parent(clkp); + ret = clk_register(clkp); if (ret < 0) break; - ret = clk_register(clkp); + ret = sh_clk_init_parent(clkp); } return ret; |